[flann] 01/01: [svn-buildpackage] Tagging flann 1.7.0-3

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to tag debian/1.7.0-3
in repository flann.

commit 3bfebfc1924418109d9d9e980465f074da945f36
Author: Mathieu Malaterre <malat at debian.org>
Date:   Wed Dec 21 18:58:55 2011 +0000

    [svn-buildpackage] Tagging flann 1.7.0-3
---
 debian/changelog                      | 14 ++++++++++++++
 debian/control                        |  7 ++++---
 debian/patches/adddoctoall.patch      | 13 -------------
 debian/patches/removedocinstall.patch | 17 +++++++++++++++++
 debian/patches/series                 |  2 +-
 debian/rules                          |  8 +++++++-
 6 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c41f21..c145289 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+flann (1.7.0-3) unstable; urgency=low
+
+  * Remove cmake install rule for manual.pdf.
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Wed, 21 Dec 2011 19:46:50 +0100
+
+flann (1.7.0-2) unstable; urgency=low
+
+  * Remove TBB for non-intel arch
+  * Move indep dependencies to B-D-I
+  * Build doc in indep target
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Wed, 21 Dec 2011 18:14:28 +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/adddoctoall.patch b/debian/patches/adddoctoall.patch
deleted file mode 100644
index 8909889..0000000
--- a/debian/patches/adddoctoall.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: flann-1.7.0/doc/CMakeLists.txt
-===================================================================
---- flann-1.7.0.orig/doc/CMakeLists.txt	2011-12-20 17:15:04.000000000 +0100
-+++ flann-1.7.0/doc/CMakeLists.txt	2011-12-20 17:15:06.000000000 +0100
-@@ -5,7 +5,7 @@
- 
-     add_latex_document(manual.tex BIBFILES references.bib IMAGE_DIRS images DEFAULT_PDF)
- 
--    add_custom_target(doc)
-+    add_custom_target(doc ALL)
-     add_dependencies(doc pdf)
-     
-     add_custom_command( TARGET doc
diff --git a/debian/patches/removedocinstall.patch b/debian/patches/removedocinstall.patch
new file mode 100644
index 0000000..fd9d469
--- /dev/null
+++ b/debian/patches/removedocinstall.patch
@@ -0,0 +1,17 @@
+Description: Do not try to install manual.pdf if it is not build
+
+Index: flann-1.7.0/doc/CMakeLists.txt
+===================================================================
+--- flann-1.7.0.orig/doc/CMakeLists.txt	2011-12-21 19:02:37.000000000 +0100
++++ flann-1.7.0/doc/CMakeLists.txt	2011-12-21 19:02:42.000000000 +0100
+@@ -13,9 +13,9 @@
+         COMMAND ${CMAKE_COMMAND} -E copy
+         ARGS ${CMAKE_CURRENT_BINARY_DIR}/manual.pdf ${CMAKE_CURRENT_SOURCE_DIR}/manual.pdf
+     )
+-endif()
+ 
+ install(
+     FILES manual.pdf
+     DESTINATION share/doc/flann
+ )
++endif()
diff --git a/debian/patches/series b/debian/patches/series
index 11634c6..6c8e4e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 remove_tests.patch
 remove_lib64.patch
-adddoctoall.patch
+removedocinstall.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