[mlpack-svn] r12129 - in mlpack/conf/packages/mlpack/branches/1.0.X: . debian rpm
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Thu Mar 29 18:52:44 EDT 2012
Author: speet3
Date: 2012-03-29 18:52:44 -0400 (Thu, 29 Mar 2012)
New Revision: 12129
Added:
mlpack/conf/packages/mlpack/branches/1.0.X/debian/mlpack.lintian-overrides
mlpack/conf/packages/mlpack/branches/1.0.X/rpm/
mlpack/conf/packages/mlpack/branches/1.0.X/rpm/cmake_libdir.patch
mlpack/conf/packages/mlpack/branches/1.0.X/rpm/mlpack.spec
mlpack/conf/packages/mlpack/branches/1.0.X/rpm/range_search_install.patch
Removed:
mlpack/conf/packages/mlpack/branches/1.0.X/rpm/cmake_libdir.patch
mlpack/conf/packages/mlpack/branches/1.0.X/rpm/mlpack.spec
mlpack/conf/packages/mlpack/branches/1.0.X/rpm/range_search_install.patch
Modified:
mlpack/conf/packages/mlpack/branches/1.0.X/
mlpack/conf/packages/mlpack/branches/1.0.X/debian/mlpack-doc.docs
Log:
merge updates from packaging trunk
Property changes on: mlpack/conf/packages/mlpack/branches/1.0.X
___________________________________________________________________
Added: svn:mergeinfo
+ /mlpack/conf/packages/mlpack/trunk:11350-12128
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-29 20:27:59 UTC (rev 12128)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/mlpack-doc.docs 2012-03-29 22:52:44 UTC (rev 12129)
@@ -1,2 +1,2 @@
-doc/html
+debian/tmp/usr/share/doc/mlpack/html
doc/tutorials
Copied: mlpack/conf/packages/mlpack/branches/1.0.X/debian/mlpack.lintian-overrides (from rev 12128, mlpack/conf/packages/mlpack/trunk/debian/mlpack.lintian-overrides)
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/mlpack.lintian-overrides (rev 0)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/mlpack.lintian-overrides 2012-03-29 22:52:44 UTC (rev 12129)
@@ -0,0 +1,2 @@
+mlpack source: changelog-should-mention-nmu
+mlpack source: source-nmu-has-incorrect-version-number
Deleted: mlpack/conf/packages/mlpack/branches/1.0.X/rpm/cmake_libdir.patch
===================================================================
--- mlpack/conf/packages/mlpack/trunk/rpm/cmake_libdir.patch 2012-03-29 20:27:59 UTC (rev 12128)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/rpm/cmake_libdir.patch 2012-03-29 22:52:44 UTC (rev 12129)
@@ -1,28 +0,0 @@
---- mlpack-1.0.1/CMakeLists.txt 2012-03-07 23:35:40.000000000 -0500
-+++ mlpack-1.0.1/CMakeLists.txt.new 2012-03-07 23:37:32.000000000 -0500
-@@ -75,6 +75,12 @@
- option(PROFILE "Compile with profiling information" ON)
- option(ARMA_EXTRA_DEBUG "Compile with extra Armadillo debugging symbols." OFF)
-
-+if(LIBDIR)
-+ message(STATUS "Setting library install directory to ${LIBDIR}.")
-+else(LIBDIR)
-+ set(LIBDIR "lib") # Default.
-+endif()
-+
- # This is as of yet unused.
- #option(PGO "Use profile-guided optimization if not a debug build" ON)
-
---- mlpack-1.0.1/src/mlpack/CMakeLists.txt 2012-03-07 23:35:47.000000000 -0500
-+++ mlpack-1.0.1/src/mlpack/CMakeLists.txt.new 2012-03-07 23:36:03.000000000 -0500
-@@ -55,8 +55,8 @@
- # be entered...
- install(TARGETS mlpack
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib)
-+ LIBRARY DESTINATION ${LIBDIR}
-+ ARCHIVE DESTINATION ${LIBDIR})
-
- # For 'make test'.
- add_custom_target(test
Copied: mlpack/conf/packages/mlpack/branches/1.0.X/rpm/cmake_libdir.patch (from rev 12128, mlpack/conf/packages/mlpack/trunk/rpm/cmake_libdir.patch)
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/rpm/cmake_libdir.patch (rev 0)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/rpm/cmake_libdir.patch 2012-03-29 22:52:44 UTC (rev 12129)
@@ -0,0 +1,28 @@
+--- mlpack-1.0.1/CMakeLists.txt 2012-03-07 23:35:40.000000000 -0500
++++ mlpack-1.0.1/CMakeLists.txt.new 2012-03-07 23:37:32.000000000 -0500
+@@ -75,6 +75,12 @@
+ option(PROFILE "Compile with profiling information" ON)
+ option(ARMA_EXTRA_DEBUG "Compile with extra Armadillo debugging symbols." OFF)
+
++if(LIBDIR)
++ message(STATUS "Setting library install directory to ${LIBDIR}.")
++else(LIBDIR)
++ set(LIBDIR "lib") # Default.
++endif()
++
+ # This is as of yet unused.
+ #option(PGO "Use profile-guided optimization if not a debug build" ON)
+
+--- mlpack-1.0.1/src/mlpack/CMakeLists.txt 2012-03-07 23:35:47.000000000 -0500
++++ mlpack-1.0.1/src/mlpack/CMakeLists.txt.new 2012-03-07 23:36:03.000000000 -0500
+@@ -55,8 +55,8 @@
+ # be entered...
+ install(TARGETS mlpack
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib)
++ LIBRARY DESTINATION ${LIBDIR}
++ ARCHIVE DESTINATION ${LIBDIR})
+
+ # For 'make test'.
+ add_custom_target(test
Deleted: mlpack/conf/packages/mlpack/branches/1.0.X/rpm/mlpack.spec
===================================================================
--- mlpack/conf/packages/mlpack/trunk/rpm/mlpack.spec 2012-03-29 20:27:59 UTC (rev 12128)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/rpm/mlpack.spec 2012-03-29 22:52:44 UTC (rev 12129)
@@ -1,157 +0,0 @@
-Name: mlpack
-Version: 1.0.1
-Release: 1%{?dist}
-Summary: A scalable, fast C++ machine learning library
-
-Group: Development/Libraries
-License: LGPLv3+
-URL: http://www.mlpack.org
-Source0: http://www.mlpack.org/files/%{name}-%{version}.tar.gz
-
-# CMake by default doesn't provide support for specifying libdir on install
-# (argh!) and this has to be done by hand in the CMake configuration. This'll
-# be fixed by mlpack 1.0.2.
-Patch0: cmake_libdir.patch
-
-# Oversight means that the rule which says "install range_search to bin/" didn't
-# get there.
-Patch1: range_search_install.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: cmake >= 2.8.0
-BuildRequires: armadillo-devel >= 2.4.0
-BuildRequires: libxml2-devel
-BuildRequires: boost-devel, boost-program-options, boost-math
-BuildRequires: lapack-devel
-# For generating man pages (CMake configuration takes care of this assuming
-# txt2man is installed). It is possible that we could just add all the man
-# pages, generated offline, as a patch to this SRPM, but txt2man seems to exist
-# in repos.
-BuildRequires: txt2man
-
-Requires: armadillo >= 2.4.0
-Requires: libxml2
-Requires: boost, boost-program-options, boost-math
-Requires: lapack
-
-%description
-mlpack is a C++ machine learning library with emphasis on scalability, speed,
-and ease-of-use. Its aim is to make machine learning possible for novice users
-by means of a simple, consistent API, while simultaneously exploiting C++
-language features to provide maximum performance and maximum flexibility for
-expert users. mlpack outperforms competing machine learning libraries by large
-margins.
-
-# Executables.
-%package bin
-Summary: Command-line executables for mlpack (machine learning library)
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description bin
-mlpack is a C++ machine learning library with emphasis on scalability, speed,
-and ease-of-use. Its aim is to make machine learning possible for novice users
-by means of a simple, consistent API, while simultaneously exploiting C++
-language features to provide maximum performance and maximum flexibility for
-expert users. mlpack outperforms competing machine learning libraries by large
-margins. This package provides the command-line executables which run mlpack
-methods and related documentation.
-
-# Development headers.
-%package devel
-Summary: Development headers for mlpack (C++ machine learning library)
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: armadillo-devel >= 2.4.0
-Requires: boost-devel, boost-program-options, boost-math
-Requires: libxml2-devel
-Requires: lapack-devel
-
-%description devel
-mlpack is a C++ machine learning library with emphasis on scalability, speed,
-and ease-of-use. Its aim is to make machine learning possible for novice users
-by means of a simple, consistent API, while simultaneously exploiting C++
-language features to provide maximum performance and maximum flexibility for
-expert users. mlpack outperforms competing machine learning libraries by large
-margins. This package provides the headers to compile applications against
-mlpack.
-
-
-%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-
-
-%build
-%{cmake} -D LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF .
-make %{?_smp_mflags}
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root,-)
-%{_libdir}/libmlpack.so
-%{_libdir}/libmlpack.so.1
-%{_libdir}/libmlpack.so.1.0.1
-
-%files bin
-%defattr(-,root,root,-)
-%{_bindir}/allknn
-%{_bindir}/allkfn
-%{_bindir}/emst
-%{_bindir}/gmm
-%{_bindir}/hmm_generate
-%{_bindir}/hmm_loglik
-%{_bindir}/hmm_train
-%{_bindir}/hmm_viterbi
-%{_bindir}/kernel_pca
-%{_bindir}/kmeans
-%{_bindir}/lars
-%{_bindir}/linear_regression
-%{_bindir}/local_coordinate_coding
-%{_bindir}/nbc
-%{_bindir}/nca
-%{_bindir}/pca
-%{_bindir}/radical
-%{_bindir}/range_search
-%{_bindir}/sparse_coding
-%doc %{_mandir}/man1/allknn.1.gz
-%doc %{_mandir}/man1/allkfn.1.gz
-%doc %{_mandir}/man1/emst.1.gz
-%doc %{_mandir}/man1/gmm.1.gz
-%doc %{_mandir}/man1/hmm_generate.1.gz
-%doc %{_mandir}/man1/hmm_loglik.1.gz
-%doc %{_mandir}/man1/hmm_train.1.gz
-%doc %{_mandir}/man1/hmm_viterbi.1.gz
-%doc %{_mandir}/man1/kernel_pca.1.gz
-%doc %{_mandir}/man1/kmeans.1.gz
-%doc %{_mandir}/man1/lars.1.gz
-%doc %{_mandir}/man1/linear_regression.1.gz
-%doc %{_mandir}/man1/local_coordinate_coding.1.gz
-%doc %{_mandir}/man1/nbc.1.gz
-%doc %{_mandir}/man1/nca.1.gz
-%doc %{_mandir}/man1/pca.1.gz
-%doc %{_mandir}/man1/radical.1.gz
-%doc %{_mandir}/man1/range_search.1.gz
-%doc %{_mandir}/man1/sparse_coding.1.gz
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/mlpack/
-%{_includedir}/mlpack/core.hpp
-%{_includedir}/mlpack/core/
-%{_includedir}/mlpack/methods/
-
-%changelog
-* Thu Mar 08 2012 Ryan Curtin <gth671b at mail.gatech.edu> - 1.0.1-1
-- Initial packaging of mlpack.
Copied: mlpack/conf/packages/mlpack/branches/1.0.X/rpm/mlpack.spec (from rev 12128, mlpack/conf/packages/mlpack/trunk/rpm/mlpack.spec)
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/rpm/mlpack.spec (rev 0)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/rpm/mlpack.spec 2012-03-29 22:52:44 UTC (rev 12129)
@@ -0,0 +1,157 @@
+Name: mlpack
+Version: 1.0.1
+Release: 1%{?dist}
+Summary: A scalable, fast C++ machine learning library
+
+Group: Development/Libraries
+License: LGPLv3+
+URL: http://www.mlpack.org
+Source0: http://www.mlpack.org/files/%{name}-%{version}.tar.gz
+
+# CMake by default doesn't provide support for specifying libdir on install
+# (argh!) and this has to be done by hand in the CMake configuration. This'll
+# be fixed by mlpack 1.0.2.
+Patch0: cmake_libdir.patch
+
+# Oversight means that the rule which says "install range_search to bin/" didn't
+# get there.
+Patch1: range_search_install.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: cmake >= 2.8.0
+BuildRequires: armadillo-devel >= 2.4.0
+BuildRequires: libxml2-devel
+BuildRequires: boost-devel, boost-program-options, boost-math
+BuildRequires: lapack-devel
+# For generating man pages (CMake configuration takes care of this assuming
+# txt2man is installed). It is possible that we could just add all the man
+# pages, generated offline, as a patch to this SRPM, but txt2man seems to exist
+# in repos.
+BuildRequires: txt2man
+
+Requires: armadillo >= 2.4.0
+Requires: libxml2
+Requires: boost, boost-program-options, boost-math
+Requires: lapack
+
+%description
+mlpack is a C++ machine learning library with emphasis on scalability, speed,
+and ease-of-use. Its aim is to make machine learning possible for novice users
+by means of a simple, consistent API, while simultaneously exploiting C++
+language features to provide maximum performance and maximum flexibility for
+expert users. mlpack outperforms competing machine learning libraries by large
+margins.
+
+# Executables.
+%package bin
+Summary: Command-line executables for mlpack (machine learning library)
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description bin
+mlpack is a C++ machine learning library with emphasis on scalability, speed,
+and ease-of-use. Its aim is to make machine learning possible for novice users
+by means of a simple, consistent API, while simultaneously exploiting C++
+language features to provide maximum performance and maximum flexibility for
+expert users. mlpack outperforms competing machine learning libraries by large
+margins. This package provides the command-line executables which run mlpack
+methods and related documentation.
+
+# Development headers.
+%package devel
+Summary: Development headers for mlpack (C++ machine learning library)
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: armadillo-devel >= 2.4.0
+Requires: boost-devel, boost-program-options, boost-math
+Requires: libxml2-devel
+Requires: lapack-devel
+
+%description devel
+mlpack is a C++ machine learning library with emphasis on scalability, speed,
+and ease-of-use. Its aim is to make machine learning possible for novice users
+by means of a simple, consistent API, while simultaneously exploiting C++
+language features to provide maximum performance and maximum flexibility for
+expert users. mlpack outperforms competing machine learning libraries by large
+margins. This package provides the headers to compile applications against
+mlpack.
+
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+
+
+%build
+%{cmake} -D LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF .
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%{_libdir}/libmlpack.so
+%{_libdir}/libmlpack.so.1
+%{_libdir}/libmlpack.so.1.0.1
+
+%files bin
+%defattr(-,root,root,-)
+%{_bindir}/allknn
+%{_bindir}/allkfn
+%{_bindir}/emst
+%{_bindir}/gmm
+%{_bindir}/hmm_generate
+%{_bindir}/hmm_loglik
+%{_bindir}/hmm_train
+%{_bindir}/hmm_viterbi
+%{_bindir}/kernel_pca
+%{_bindir}/kmeans
+%{_bindir}/lars
+%{_bindir}/linear_regression
+%{_bindir}/local_coordinate_coding
+%{_bindir}/nbc
+%{_bindir}/nca
+%{_bindir}/pca
+%{_bindir}/radical
+%{_bindir}/range_search
+%{_bindir}/sparse_coding
+%doc %{_mandir}/man1/allknn.1.gz
+%doc %{_mandir}/man1/allkfn.1.gz
+%doc %{_mandir}/man1/emst.1.gz
+%doc %{_mandir}/man1/gmm.1.gz
+%doc %{_mandir}/man1/hmm_generate.1.gz
+%doc %{_mandir}/man1/hmm_loglik.1.gz
+%doc %{_mandir}/man1/hmm_train.1.gz
+%doc %{_mandir}/man1/hmm_viterbi.1.gz
+%doc %{_mandir}/man1/kernel_pca.1.gz
+%doc %{_mandir}/man1/kmeans.1.gz
+%doc %{_mandir}/man1/lars.1.gz
+%doc %{_mandir}/man1/linear_regression.1.gz
+%doc %{_mandir}/man1/local_coordinate_coding.1.gz
+%doc %{_mandir}/man1/nbc.1.gz
+%doc %{_mandir}/man1/nca.1.gz
+%doc %{_mandir}/man1/pca.1.gz
+%doc %{_mandir}/man1/radical.1.gz
+%doc %{_mandir}/man1/range_search.1.gz
+%doc %{_mandir}/man1/sparse_coding.1.gz
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/mlpack/
+%{_includedir}/mlpack/core.hpp
+%{_includedir}/mlpack/core/
+%{_includedir}/mlpack/methods/
+
+%changelog
+* Thu Mar 08 2012 Ryan Curtin <gth671b at mail.gatech.edu> - 1.0.1-1
+- Initial packaging of mlpack.
Deleted: mlpack/conf/packages/mlpack/branches/1.0.X/rpm/range_search_install.patch
===================================================================
--- mlpack/conf/packages/mlpack/trunk/rpm/range_search_install.patch 2012-03-29 20:27:59 UTC (rev 12128)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/rpm/range_search_install.patch 2012-03-29 22:52:44 UTC (rev 12129)
@@ -1,7 +0,0 @@
---- mlpack-1.0.1/src/mlpack/methods/range_search/CMakeLists.txt 2012-03-07 23:56:53.000000000 -0500
-+++ mlpack-1.0.1/src/mlpack/methods/range_search/CMakeLists.txt.new 2012-03-07 23:56:31.000000000 -0500
-@@ -22,3 +22,4 @@
- target_link_libraries(range_search
- mlpack
- )
-+install(TARGETS range_search RUNTIME DESTINATION bin)
Copied: mlpack/conf/packages/mlpack/branches/1.0.X/rpm/range_search_install.patch (from rev 12128, mlpack/conf/packages/mlpack/trunk/rpm/range_search_install.patch)
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/rpm/range_search_install.patch (rev 0)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/rpm/range_search_install.patch 2012-03-29 22:52:44 UTC (rev 12129)
@@ -0,0 +1,7 @@
+--- mlpack-1.0.1/src/mlpack/methods/range_search/CMakeLists.txt 2012-03-07 23:56:53.000000000 -0500
++++ mlpack-1.0.1/src/mlpack/methods/range_search/CMakeLists.txt.new 2012-03-07 23:56:31.000000000 -0500
+@@ -22,3 +22,4 @@
+ target_link_libraries(range_search
+ mlpack
+ )
++install(TARGETS range_search RUNTIME DESTINATION bin)
More information about the mlpack-svn
mailing list