[mlpack-svn] r13434 - mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: speet3
Date: 2012-08-20 15:37:25 -0400 (Mon, 20 Aug 2012)
New Revision: 13434

Modified:
   mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/build-Doxygen.patch
   mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/require-manpage-generation.patch
   mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/series
Log:
should need less patches now

Modified: mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/build-Doxygen.patch
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/build-Doxygen.patch	2012-08-20 18:41:57 UTC (rev 13433)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/build-Doxygen.patch	2012-08-20 19:37:25 UTC (rev 13434)
@@ -9,12 +9,12 @@
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -126,7 +126,7 @@
- if (DOXYGEN_FOUND)
-   # It may be better if we built the documentation into the build directory, but
-   # I'm leaving this for a later day.
+@@ -216,7 +216,7 @@
+   )
+ 
+   # Generate documentation.
 -  add_custom_target(doc
 +  add_custom_target(doc ALL
-     ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile
-     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-     COMMENT "Generating API documentation with Doxygen"
+       COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile
+       DEPENDS ${CMAKE_BINARY_DIR}/Doxyfile
+       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}

Modified: mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/require-manpage-generation.patch
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/require-manpage-generation.patch	2012-08-20 18:41:57 UTC (rev 13433)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/require-manpage-generation.patch	2012-08-20 19:37:25 UTC (rev 13434)
@@ -9,12 +9,12 @@
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -153,7 +153,7 @@
+@@ -237,7 +237,7 @@
  
    # It's not a requirement that we make man pages.
    if (NOT TXT2MAN)
 -    message(WARNING "txt2man not found; man pages will not be generated.")
-+    message(STATUS "txt2man not found; man pages will not be generated.")
++    message(FATAL "txt2man not found; man pages will not be generated.")
    else (NOT TXT2MAN)
      # We have the tools.  We can make them.
      add_custom_target(man ALL

Modified: mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/series
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/series	2012-08-20 18:41:57 UTC (rev 13433)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/series	2012-08-20 19:37:25 UTC (rev 13434)
@@ -1,8 +1,2 @@
-fully_qualified_as_scalar.patch
-no_sparse_tests.patch
-get_kernel_matrix.patch
 build-Doxygen.patch
-no-debug-or-profiling-info.patch
 require-manpage-generation.patch
-update-manpage-generation-for-less-errors.patch
-zero-memory-before-starting-test-r12476.patch