[mlpack-svn] r11755 - in mlpack/conf/packages/mlpack/branches/1.0.X: . debian debian/patches
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Mon Mar 5 12:32:21 EST 2012
Author: speet3
Date: 2012-03-05 12:32:20 -0500 (Mon, 05 Mar 2012)
New Revision: 11755
Removed:
mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/dont-dynamically-generate-manpages.patch
mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/dont-include-unavailable-targets.patch
mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/update-to-svn-CMakeLists.patch
mlpack/conf/packages/mlpack/branches/1.0.X/man/
Modified:
mlpack/conf/packages/mlpack/branches/1.0.X/debian/changelog
mlpack/conf/packages/mlpack/branches/1.0.X/debian/control
mlpack/conf/packages/mlpack/branches/1.0.X/debian/mlpack-bin.install
mlpack/conf/packages/mlpack/branches/1.0.X/debian/mlpack-doc.docs
mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/build-Doxygen.patch
mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/no-debug-or-profiling-info.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:
adjustments for mlpack 1.0.1, gets us back close to the truck package state
Modified: mlpack/conf/packages/mlpack/branches/1.0.X/debian/changelog
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/changelog 2012-03-05 17:28:01 UTC (rev 11754)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/changelog 2012-03-05 17:32:20 UTC (rev 11755)
@@ -1,5 +1,5 @@
-mlpack (1.0.0-0~rc4) sid; urgency=high
+mlpack (1.0.1-0~rc1~precise) UNRELEASED; urgency=high
* Initial release (Closes: #660925)
- -- Sterling Lewis Peet <sterling.peet at gatech.edu> Thu, 23 Feb 2012 17:31:52 -0500
+ -- Sterling Lewis Peet <sterling.peet at gatech.edu> Mon, 06 Mar 2012 11:39:52 -0500
Modified: mlpack/conf/packages/mlpack/branches/1.0.X/debian/control
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/control 2012-03-05 17:28:01 UTC (rev 11754)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/control 2012-03-05 17:32:20 UTC (rev 11755)
@@ -1,7 +1,8 @@
Source: mlpack
Priority: extra
Maintainer: Sterling Peet <sterling.peet at gatech.edu>
-Build-Depends: liblapack-dev, libarmadillo-dev (>= 2.4.0), libxml2-dev, libboost-dev, libboost-math-dev, libboost-program-options-dev, libboost-random-dev, libboost-test-dev, debhelper (>= 7.0.50~), cmake, doxygen
+Build-Depends: debhelper (>= 7.0.50~), cmake, doxygen
+# Build-Depends: liblapack-dev, libarmadillo-dev (>= 2.4.0), libxml2-dev, libboost-dev, libboost-math-dev, libboost-program-options-dev, libboost-random-dev, libboost-test-dev, debhelper (>= 7.0.50~), cmake, doxygen
Standards-Version: 3.9.1
Section: libs
Homepage: http://www.mlpack.org/
Modified: mlpack/conf/packages/mlpack/branches/1.0.X/debian/mlpack-bin.install
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/mlpack-bin.install 2012-03-05 17:28:01 UTC (rev 11754)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/mlpack-bin.install 2012-03-05 17:32:20 UTC (rev 11755)
@@ -1 +1 @@
-#/usr/bin/*
+/usr/bin/*
Modified: mlpack/conf/packages/mlpack/branches/1.0.X/debian/mlpack-doc.docs
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/mlpack-doc.docs 2012-03-05 17:28:01 UTC (rev 11754)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/mlpack-doc.docs 2012-03-05 17:32:20 UTC (rev 11755)
@@ -1,2 +1,2 @@
doc/html
-#doc/tutorials
+doc/tutorials
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-03-05 17:28:01 UTC (rev 11754)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/build-Doxygen.patch 2012-03-05 17:32:20 UTC (rev 11755)
@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -114,7 +114,7 @@
+@@ -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.
Deleted: mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/dont-dynamically-generate-manpages.patch
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/dont-dynamically-generate-manpages.patch 2012-03-05 17:28:01 UTC (rev 11754)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/dont-dynamically-generate-manpages.patch 2012-03-05 17:32:20 UTC (rev 11755)
@@ -1,60 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -134,30 +134,30 @@
- )
- endif (DOXYGEN_FOUND)
-
--# Make a target to generate the man page documentation, but only if we are on a
--# UNIX-like system.
--if (UNIX)
-- find_program(TXT2MAN txt2man)
--
-- # It's not a requirement that we make man pages.
-- if (NOT TXT2MAN)
-- message(WARNING "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
-- ${CMAKE_CURRENT_SOURCE_DIR}/CMake/allexec2man.sh
-- ${CMAKE_CURRENT_SOURCE_DIR}/CMake/exec2man.sh
-- ${CMAKE_BINARY_DIR}/share/man
-- WORKING_DIRECTORY
-- ${CMAKE_BINARY_DIR}/bin
-- DEPENDS
-- allkfn allknn emst gmm hmm_generate hmm_loglik hmm_train hmm_viterbi
-- kmeans lars linear_regression mvu nbc nca pca radical
-- COMMENT "Generating man pages from built executables."
-- )
--
-- # Set the rules to install the documentation.
-- install(DIRECTORY ${CMAKE_BINARY_DIR}/share/man/
-- DESTINATION share/man/man1/)
-- endif (NOT TXT2MAN)
--endif (UNIX)
-+## Make a target to generate the man page documentation, but only if we are on a
-+## UNIX-like system.
-+#if (UNIX)
-+# find_program(TXT2MAN txt2man)
-+#
-+# # It's not a requirement that we make man pages.
-+# if (NOT TXT2MAN)
-+# message(WARNING "txt2man not found; man pages will not be generated.")
-+# else (NOT TXT2MAN)
-+# # We have the tools. We can make them.
-+# add_custom_target(man
-+# ${CMAKE_CURRENT_SOURCE_DIR}/CMake/allexec2man.sh
-+# ${CMAKE_CURRENT_SOURCE_DIR}/CMake/exec2man.sh
-+# ${CMAKE_BINARY_DIR}/share/man
-+# WORKING_DIRECTORY
-+# ${CMAKE_BINARY_DIR}/bin
-+# DEPENDS
-+# allkfn allknn emst gmm hmm_generate hmm_loglik hmm_train hmm_viterbi
-+# kmeans lars linear_regression mvu nbc nca pca radical
-+# COMMENT "Generating man pages from built executables."
-+# )
-+#
-+# # Set the rules to install the documentation.
-+# install(DIRECTORY ${CMAKE_BINARY_DIR}/share/man/
-+# DESTINATION share/man/man1/)
-+# endif (NOT TXT2MAN)
-+#endif (UNIX)
Deleted: mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/dont-include-unavailable-targets.patch
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/dont-include-unavailable-targets.patch 2012-03-05 17:28:01 UTC (rev 11754)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/dont-include-unavailable-targets.patch 2012-03-05 17:32:20 UTC (rev 11755)
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -152,7 +152,7 @@
- ${CMAKE_BINARY_DIR}/bin
- DEPENDS
- allkfn allknn emst gmm hmm_generate hmm_loglik hmm_train hmm_viterbi
-- kernel_pca kmeans lars linear_regression mvu nbc nca pca radical
-+ kmeans lars linear_regression mvu nbc nca pca radical
- COMMENT "Generating man pages from built executables."
- )
-
Modified: mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/no-debug-or-profiling-info.patch
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/no-debug-or-profiling-info.patch 2012-03-05 17:28:01 UTC (rev 11754)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/no-debug-or-profiling-info.patch 2012-03-05 17:32:20 UTC (rev 11755)
@@ -1,7 +1,7 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -58,9 +58,10 @@
- set(BOOST_LIBS ${BOOST_LIBS} "boost_random")
+@@ -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.
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-03-05 17:28:01 UTC (rev 11754)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/require-manpage-generation.patch 2012-03-05 17:32:20 UTC (rev 11755)
@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -141,7 +141,7 @@
+@@ -153,7 +153,7 @@
# It's not a requirement that we make man pages.
if (NOT TXT2MAN)
Modified: mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/series
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/series 2012-03-05 17:28:01 UTC (rev 11754)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/series 2012-03-05 17:32:20 UTC (rev 11755)
@@ -1,5 +1,3 @@
-update-to-svn-CMakeLists.patch
build-Doxygen.patch
no-debug-or-profiling-info.patch
-dont-include-unavailable-targets.patch
-dont-dynamically-generate-manpages.patch
+require-manpage-generation.patch
Deleted: mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/update-to-svn-CMakeLists.patch
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/update-to-svn-CMakeLists.patch 2012-03-05 17:28:01 UTC (rev 11754)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/update-to-svn-CMakeLists.patch 2012-03-05 17:32:20 UTC (rev 11755)
@@ -1,201 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,5 @@
- cmake_minimum_required(VERSION 2.8)
--project(MLPACK C CXX)
-+project(mlpack C CXX)
-
- ## External Libraries
- # ls /usr/share/cmake-2.6/Modules/Find* | \
-@@ -58,7 +58,6 @@
- set(BOOST_LIBS ${BOOST_LIBS} "boost_random")
- endif(Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 45)
-
--
- # Default to debugging mode for developers.
- option(DEBUG "Compile with debugging information" ON)
- option(PROFILE "Compile with profiling information" ON)
-@@ -69,13 +68,13 @@
-
- if(DEBUG)
- add_definitions(-DDEBUG)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -O0")
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -g -Wall -O0")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -O0 -Wextra")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -g -Wall -Wextra -O0")
- else()
- add_definitions(-DARMA_NO_DEBUG)
- add_definitions(-DNDEBUG)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2")
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -O2")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -O2")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -O2")
- endif(DEBUG)
-
- if(PROFILE)
-@@ -101,7 +100,6 @@
- include(CMake/TargetDistclean.cmake OPTIONAL)
-
- include_directories(${CMAKE_SOURCE_DIR})
--#TODO link_directories()
-
- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/)
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/)
-@@ -109,3 +107,56 @@
-
- ## recurse
- add_subdirectory(src/mlpack) # mlpack
-+
-+# Make a target to generate the documentation. If Doxygen isn't installed, then
-+# I guess this option will just be unavailable.
-+find_package(Doxygen)
-+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.
-+ add_custom_target(doc
-+ ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile
-+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+ COMMENT "Generating API documentation with Doxygen"
-+ )
-+ add_custom_command(TARGET doc
-+ POST_BUILD
-+ COMMAND cmake -E copy_directory
-+ ${CMAKE_CURRENT_SOURCE_DIR}/doc ${CMAKE_BINARY_DIR}/doc
-+ COMMENT "Copying API documentation to build directory"
-+ )
-+
-+ install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html
-+ DESTINATION share/doc/mlpack
-+ COMPONENT doc
-+ OPTIONAL
-+ )
-+endif (DOXYGEN_FOUND)
-+
-+# Make a target to generate the man page documentation, but only if we are on a
-+# UNIX-like system.
-+if (UNIX)
-+ find_program(TXT2MAN txt2man)
-+
-+ # It's not a requirement that we make man pages.
-+ if (NOT TXT2MAN)
-+ message(WARNING "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
-+ ${CMAKE_CURRENT_SOURCE_DIR}/CMake/allexec2man.sh
-+ ${CMAKE_CURRENT_SOURCE_DIR}/CMake/exec2man.sh
-+ ${CMAKE_BINARY_DIR}/share/man
-+ WORKING_DIRECTORY
-+ ${CMAKE_BINARY_DIR}/bin
-+ DEPENDS
-+ allkfn allknn emst gmm hmm_generate hmm_loglik hmm_train hmm_viterbi
-+ kernel_pca kmeans lars linear_regression mvu nbc nca pca radical
-+ COMMENT "Generating man pages from built executables."
-+ )
-+
-+ # Set the rules to install the documentation.
-+ install(DIRECTORY ${CMAKE_BINARY_DIR}/share/man/
-+ DESTINATION share/man/man1/)
-+ endif (NOT TXT2MAN)
-+endif (UNIX)
---- /dev/null
-+++ b/CMake/allexec2man.sh
-@@ -0,0 +1,22 @@
-+#!/bin/bash
-+#
-+# Convert all of the executables in this directory that are not tests to man
-+# pages in the given directory.
-+#
-+# Usage:
-+# allexec2man.sh /full/path/of/exec2man.sh output_directory/
-+#
-+# For the executable 'cheese', the file 'cheese.1.gz' will be created in the
-+# output directory.
-+exec2man=$1
-+outdir=$2
-+
-+mkdir -p $outdir
-+for program in `find . -perm /u=x,g=x,o=x | \
-+ grep -v '[.]$' | \
-+ grep -v '_test$' | \
-+ sed 's|^./||'`; do
-+ echo "Generating man page for $program...";
-+ $1 $program $outdir/$program.1
-+ gzip -f $outdir/$program.1
-+done
---- /dev/null
-+++ b/CMake/exec2man.sh
-@@ -0,0 +1,73 @@
-+#!/bin/bash
-+# Convert the output of an MLPACK executable into a man page. This assumes that
-+# the CLI subsystem is used to output help, that the executable is properly
-+# documented, and that the program is run in the directory that the executable
-+# is in. Usually, this is used by CMake on Linux/UNIX systems to generate the
-+# man pages.
-+#
-+# Usage:
-+# exec2man.sh executable_name output_file_name
-+#
-+# No warranties...
-+#
-+# @author Ryan Curtin
-+name=$1
-+output=$2
-+
-+# Generate the synopsis.
-+# First, required options.
-+reqoptions=`./$name -h | \
-+ awk '/Required options:/,/Options:/' | \
-+ grep '^ --' | \
-+ sed 's/^ --/--/' | \
-+ sed 's/^--[A-Za-z0-9_-]* (\(-[A-Za-z0-9]\))/\1/' | \
-+ sed 's/\(^-[A-Za-z0-9]\) [^\[].*/\1/' | \
-+ sed 's/\(^-[A-Za-z0-9] \[[A-Za-z0-9]*\]\) .*/\1/' | \
-+ sed 's/\(^--[A-Za-z0-9_-]*\) [^[].*/\1/' | \
-+ sed 's/\(^--[A-Za-z0-9_-]* \[[A-Za-z0-9]*\]\) [^[].*/\1/' | \
-+ tr '\n' ' ' | \
-+ sed 's/\[//g' | \
-+ sed 's/\]//g'`
-+
-+# Then, regular options.
-+options=`./$name -h | \
-+ awk '/Options:/,0' | \
-+ grep '^ --' | \
-+ sed 's/^ --/--/' | \
-+ grep -v -- '--help' | \
-+ grep -v -- '--info' | \
-+ grep -v -- '--verbose' | \
-+ sed 's/^--[A-Za-z0-9_-]* (\(-[A-Za-z0-9]\))/\1/' | \
-+ sed 's/\(^-[A-Za-z0-9]\) [^\[].*/\1/' | \
-+ sed 's/\(^-[A-Za-z0-9] \[[A-Za-z0-9]*\]\) .*/\1/' | \
-+ sed 's/\(^--[A-Za-z0-9_-]*\) [^[].*/\1/' | \
-+ sed 's/\(^--[A-Za-z0-9_-]* \[[A-Za-z0-9]*\]\) [^[].*/\1/' | \
-+ tr '\n' ' ' | \
-+ sed 's/\[//g' | \
-+ sed 's/\]//g' | \
-+ sed 's/\(-[A-Za-z0-9]\)\( [^a-z]\)/\[\1\]\2/g' | \
-+ sed 's/\(--[A-Za-z0-9_-]*\)\( [^a-z]\)/\[\1\]\2/g' | \
-+ sed 's/\(-[A-Za-z0-9] [a-z]*\) /\[\1\] /g' | \
-+ sed 's/\(--[A-Za-z0-9_-]* [a-z]*\) /\[\1\] /g'`
-+
-+synopsis="$name [-h] [-v] $reqoptions $options";
-+
-+# Preview the whole thing first.
-+#./$name -h | \
-+# awk -v syn="$synopsis" \
-+# '{ if (NR == 1) print "NAME\n '$name' - "tolower($0)"\nSYNOPSIS\n "syn" \nDESCRIPTION\n" ; else print } ' | \
-+# sed '/^[^ ]/ y/qwertyuiopasdfghjklzxcvbnm:/QWERTYUIOPASDFGHJKLZXCVBNM /' | \
-+# txt2man -T -P mlpack -t $name -d 1
-+
-+# Now do it.
-+# The awk script is a little ugly, but it is meant to format parameters
-+# correctly so that the entire description of the parameter is on one line (this
-+# helps avoid 'man' warnings).
-+./$name -h | \
-+ awk -v syn="$synopsis" \
-+ '{ if (NR == 1) print "NAME\n '$name' - "tolower($0)"\nSYNOPSIS\n "syn" \nDESCRIPTION\n" ; else print } ' | \
-+ sed '/^[^ ]/ y/qwertyuiopasdfghjklzxcvbnm:/QWERTYUIOPASDFGHJKLZXCVBNM /' | \
-+ sed 's/ / /g' | \
-+ awk '/NAME/,/REQUIRED OPTIONS/ { print; } /REQUIRED OPTIONS/,0 { if (!/REQUIRED_OPTIONS/ && !/OPTIONS/) { if (/ --/) { printf "\n" } sub(/^[ ]*/, ""); sub(/ [ ]*/, " "); printf "%s ", $0; } else { if (!/REQUIRED OPTIONS/) { print "\n"$0; } } }' | \
-+ txt2man -P mlpack -t $name -d 1 > $output
-+
More information about the mlpack-svn
mailing list