[mlpack-svn] r11862 - mlpack/conf/packages/mlpack/trunk/debian/patches

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

Author: rcurtin
Date: 2012-03-14 14:14:00 -0400 (Wed, 14 Mar 2012)
New Revision: 11862

Modified:
   mlpack/conf/packages/mlpack/trunk/debian/patches/build-Doxygen.patch
   mlpack/conf/packages/mlpack/trunk/debian/patches/no-debug-or-profiling-info.patch
   mlpack/conf/packages/mlpack/trunk/debian/patches/require-manpage-generation.patch
Log:
Rebuild patches for changed CMake configuration.


Modified: mlpack/conf/packages/mlpack/trunk/debian/patches/build-Doxygen.patch
===================================================================
--- mlpack/conf/packages/mlpack/trunk/debian/patches/build-Doxygen.patch	2012-03-14 17:52:24 UTC (rev 11861)
+++ mlpack/conf/packages/mlpack/trunk/debian/patches/build-Doxygen.patch	2012-03-14 18:14:00 UTC (rev 11862)
@@ -1,11 +1,11 @@
---- 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.
+--- a/CMakeLists.txt	2012-03-14 13:26:32.000000000 -0400
++++ b/CMakeLists.txt	2012-03-14 13:54:31.000000000 -0400
+@@ -153,7 +153,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/trunk/debian/patches/no-debug-or-profiling-info.patch
===================================================================
--- mlpack/conf/packages/mlpack/trunk/debian/patches/no-debug-or-profiling-info.patch	2012-03-14 17:52:24 UTC (rev 11861)
+++ mlpack/conf/packages/mlpack/trunk/debian/patches/no-debug-or-profiling-info.patch	2012-03-14 18:14:00 UTC (rev 11862)
@@ -1,16 +1,16 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -70,9 +70,10 @@
-   include_directories(${Boost_INCLUDE_DIRS})
- endif(Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 45)
- 
--# Default to debugging mode for developers.
+--- a/CMakeLists.txt	2012-03-14 13:26:32.000000000 -0400
++++ b/CMakeLists.txt	2012-03-14 13:56:32.000000000 -0400
+@@ -2,9 +2,10 @@
+ project(mlpack C CXX)
+
+ # First, define all the compilation options.
+-# We default to debugging mode for developers.
 -option(DEBUG "Compile with debugging information" ON)
 -option(PROFILE "Compile with profiling information" ON)
-+# Default to clean for packaging and release, developers can call
-+#   for debugging and profiling if they need it.
++# Default to clean for packaging and release; developers can call for debugging
++# and profiling if they need to.
 +option(DEBUG "Compile with debugging information" OFF)
 +option(PROFILE "Compile with profiling information" OFF)
  option(ARMA_EXTRA_DEBUG "Compile with extra Armadillo debugging symbols." OFF)
- 
+
  # This is as of yet unused.

Modified: mlpack/conf/packages/mlpack/trunk/debian/patches/require-manpage-generation.patch
===================================================================
--- mlpack/conf/packages/mlpack/trunk/debian/patches/require-manpage-generation.patch	2012-03-14 17:52:24 UTC (rev 11861)
+++ mlpack/conf/packages/mlpack/trunk/debian/patches/require-manpage-generation.patch	2012-03-14 18:14:00 UTC (rev 11862)
@@ -1,7 +1,7 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -153,7 +153,7 @@
- 
+--- a/CMakeLists.txt	2012-03-14 13:26:32.000000000 -0400
++++ b/CMakeLists.txt	2012-03-14 14:13:39.000000000 -0400
+@@ -174,7 +174,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.")