[flann] 37/54: Redo packaging

[Leopold Palomo-Avellaneda]

This is an automated email from the git hooks/post-receive script.

lepalom-guest pushed a commit to branch master
in repository flann.

commit 03cddea823864c8677295ef5e52f42a34f153bf7
Author: Mathieu Malaterre <malat at debian.org>
Date:   Wed Dec 21 16:06:48 2011 +0000

    Redo packaging
---
 debian/changelog      | 7 +++++++
 debian/control        | 7 ++++---
 debian/patches/series | 1 -
 debian/rules          | 8 +++++++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c41f21..45aa7d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index 7faad9e..bb3da88 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,10 @@ Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.
 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/
diff --git a/debian/patches/series b/debian/patches/series
index 11634c6..f3ba908 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 remove_tests.patch
 remove_lib64.patch
-adddoctoall.patch
diff --git a/debian/rules b/debian/rules
index bbc2d96..a69062d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,6 @@ DPKG_EXPORT_BUILDFLAGS = 1
 
 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 \
@@ -24,6 +23,13 @@ override_dh_auto_test:
 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-)
 
 UPSTREAM_SRC = flann-$(VER_FULL)-src

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/flann.git