r44200 - in /packages/flann/trunk/debian: changelog compat control libflann1.install libflann1.lintian-overrides rules

Tue Dec 20 15:45:15 UTC 2011

Author: malat-guest
Date: Tue Dec 20 15:45:14 2011
New Revision: 44200

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44200
Log:
prepare next upstream

Modified:
    packages/flann/trunk/debian/changelog
    packages/flann/trunk/debian/compat
    packages/flann/trunk/debian/control
    packages/flann/trunk/debian/libflann1.install
    packages/flann/trunk/debian/libflann1.lintian-overrides
    packages/flann/trunk/debian/rules

Modified: packages/flann/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/changelog?rev=44200&op=diff
==============================================================================

--- packages/flann/trunk/debian/changelog (original)
+++ packages/flann/trunk/debian/changelog Tue Dec 20 15:45:14 2011
@@ -1,3 +1,9 @@
+flann (1.7.0-1) UNRELEASED; urgency=low
+
+  * New upstream. Fix MPI binding
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Tue, 20 Dec 2011 16:15:36 +0100
+
 flann (1.6.11-2) unstable; urgency=low
 
   * Remove hardcoded version number for boost librairies

Modified: packages/flann/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/compat?rev=44200&op=diff
==============================================================================
--- packages/flann/trunk/debian/compat (original)
+++ packages/flann/trunk/debian/compat Tue Dec 20 15:45:14 2011
@@ -1,1 +1,1 @@
-7
+8

Modified: packages/flann/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/control?rev=44200&op=diff
==============================================================================
--- packages/flann/trunk/debian/control (original)
+++ packages/flann/trunk/debian/control Tue Dec 20 15:45:14 2011
@@ -5,13 +5,13 @@
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>,
  Michael Kleiber <mike at kleibi.de>
-Build-Depends: debhelper (>= 7.0.50~), cmake, quilt (>= 0.46-7~),
+Build-Depends: debhelper (>= 8), cmake,
  libgtest-dev, python, python-numpy, texlive-binaries, libboost-dev,
  texlive-latex-base, latex2html, mpi-default-dev, libhdf5-mpi-dev [!hurd-i386]
 Standards-Version: 3.9.2
 Homepage: http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN
-Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/flann/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/flann/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-science/packages/flann/trunk/
 
 Package: libflann-dev
 Section: libdevel
@@ -39,7 +39,7 @@
 Package: flann-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, doc-base
 Description: Fast Library for Approximate Nearest Neighbors - documentation
  FLANN is a library for performing fast approximate nearest neighbor searches
  in high dimensional spaces. It contains a collection of algorithms we found

Modified: packages/flann/trunk/debian/libflann1.install
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/libflann1.install?rev=44200&op=diff
==============================================================================
--- packages/flann/trunk/debian/libflann1.install (original)
+++ packages/flann/trunk/debian/libflann1.install Tue Dec 20 15:45:14 2011
@@ -1,4 +1,2 @@
-usr/lib/libflann_cpp.so.1.6.11
-usr/lib/libflann_cpp.so.1.6
-usr/lib/libflann.so.1.6.11
-usr/lib/libflann.so.1.6
+usr/lib/libflann_cpp.so.1.*
+usr/lib/libflann.so.1.*

Modified: packages/flann/trunk/debian/libflann1.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/libflann1.lintian-overrides?rev=44200&op=diff
==============================================================================
--- packages/flann/trunk/debian/libflann1.lintian-overrides (original)
+++ packages/flann/trunk/debian/libflann1.lintian-overrides Tue Dec 20 15:45:14 2011
@@ -1,1 +1,1 @@
-libflann1: package-name-doesnt-match-sonames libflann1.6 libflann-cpp1.6
+libflann1: package-name-doesnt-match-sonames

Modified: packages/flann/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/rules?rev=44200&op=diff
==============================================================================
--- packages/flann/trunk/debian/rules (original)
+++ packages/flann/trunk/debian/rules Tue Dec 20 15:45:14 2011
@@ -1,17 +1,22 @@
 #!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
+
+CMAKE_FLAGS = \
+	-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+	-DCMAKE_SKIP_RPATH:BOOL=ON \
+	-DBUILD_MATLAB_BINDINGS:BOOL=OFF \
+	-DBUILD_PYTHON_BINDINGS:BOOL=OFF \
+	-DUSE_MPI:BOOL=ON \
+	-DBUILD_CUDA_LIB:BOOL=OFF
 
 %:
-	dh --parallel --with quilt --buildsystem=cmake $@ 
+	dh $@ --parallel
 
 override_dh_auto_configure:
-	# cant get mpi to work for now: https://github.com/mariusmuja/flann/issues/10
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_SKIP_RPATH:BOOL=ON -DBUILD_MATLAB_BINDINGS:BOOL=OFF -DBUILD_PYTHON_BINDINGS:BOOL=OFF -DUSE_MPI:BOOL=OFF
+	dh_auto_configure -- $(CMAKE_FLAGS)
 
 override_dh_auto_test:
 	# test download material from the net. Removing them.
@@ -19,10 +24,7 @@
 override_dh_compress:
 	dh_compress --exclude=.pdf
 
-VER_MAJOR = 1
-VER_MINOR = 6
-VER_PATCH = 11
-VER_FULL = $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
+VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)
 
 UPSTREAM_SRC = flann-$(VER_FULL)-src
 DEBIAN_SRC_DIR = flann-$(VER_FULL)
@@ -37,6 +39,8 @@
 	unzip -q $(UPSTREAM_SRC).zip
 	mv $(UPSTREAM_SRC) $(DEBIAN_SRC_DIR)
 	rm $(DEBIAN_SRC_DIR)/doc/manual.pdf # will be rebuild from latex
+	# download changelog:
+	links -dump http://people.cs.ubc.ca/~mariusm/index.php/FLANN/Changelog | tail -n +10 | grep -v PmWiki > $(DEBIAN_SRC_DIR)/Changelog
 	GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
 	rm -rf $(DEBIAN_SRC_DIR)
 	rm $(UPSTREAM_SRC).zip


