r44238 - in /packages/flann/trunk/debian: changelog control patches/series rules

[malat-guest at users.alioth.debian.org]

Author: malat-guest
Date: Wed Dec 21 16:06:48 2011
New Revision: 44238

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44238
Log:
Redo packaging

Modified:
    packages/flann/trunk/debian/changelog
    packages/flann/trunk/debian/control
    packages/flann/trunk/debian/patches/series
    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=44238&op=diff
==============================================================================
--- packages/flann/trunk/debian/changelog (original)
+++ packages/flann/trunk/debian/changelog Wed Dec 21 16:06:48 2011
@@ -1,3 +1,10 @@
+flann (1.7.0-2) UNRELEASED; urgency=low
+
+  * Remove TBB for non-intel arch
+  * Move indep dependencies to B-D-I
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Wed, 21 Dec 2011 13:57:04 +0100
+
 flann (1.7.0-1) unstable; urgency=low
 
   * New upstream. Fix MPI binding

Modified: packages/flann/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/control?rev=44238&op=diff
==============================================================================
--- packages/flann/trunk/debian/control (original)
+++ packages/flann/trunk/debian/control Wed Dec 21 16:06:48 2011
@@ -5,9 +5,10 @@
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>,
  Michael Kleiber <mike at kleibi.de>
-Build-Depends: debhelper (>= 8), cmake, libtbb-dev,
- libgtest-dev, python, python-numpy, texlive-binaries, libboost-all-dev,
- texlive-latex-base, latex2html, mpi-default-dev, libhdf5-mpi-dev [!hurd-i386]
+Build-Depends: debhelper (>= 8), cmake, libtbb-dev [amd64 i386 ia64],
+ libgtest-dev, python, python-numpy, libboost-all-dev,
+ mpi-default-dev, libhdf5-mpi-dev [!hurd-i386]
+Build-Depends-Indep: texlive-latex-base, texlive-binaries, latex2html
 Standards-Version: 3.9.2
 Homepage: http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/flann/trunk/

Modified: packages/flann/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/patches/series?rev=44238&op=diff
==============================================================================
--- packages/flann/trunk/debian/patches/series (original)
+++ packages/flann/trunk/debian/patches/series Wed Dec 21 16:06:48 2011
@@ -1,3 +1,2 @@
 remove_tests.patch
 remove_lib64.patch
-adddoctoall.patch

Modified: packages/flann/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/rules?rev=44238&op=diff
==============================================================================
--- packages/flann/trunk/debian/rules (original)
+++ packages/flann/trunk/debian/rules Wed Dec 21 16:06:48 2011
@@ -6,7 +6,6 @@
 
 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 \
@@ -23,6 +22,13 @@
 
 override_dh_compress:
 	dh_compress --exclude=.pdf
+
+# Let's be smart with building doc
+override_dh_auto_build-indep:
+	$(MAKE) -C obj-* doc
+
+# No tests needed for docs
+override_dh_auto_test-indep:
 
 VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)