[flann] 42/54: New release

[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 e57ad54f3cf71ff06ae71ab4be2f8e2f5b2f9624
Author: Mathieu Malaterre <malat at debian.org>
Date:   Wed Dec 28 15:45:34 2011 +0000

    New release
---
 debian/changelog                      | 16 ++++++++++++----
 debian/patches/removedocinstall.patch | 17 -----------------
 debian/patches/series                 |  1 -
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ab319d..b872fc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
-flann (1.7.0-4) UNRELEASED; urgency=low
+flann (1.7.1-1) unstable; urgency=low
 
-  * Rebuild flann using boost 1.48
-  * Set minimum cmake version
+  * New upstream
+  - Fix clashes with other libraries
+  * Remove doc install patch (applied upstream)
 
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Mon, 26 Dec 2011 14:26:05 +0100
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Wed, 28 Dec 2011 16:44:49 +0100
+
+flann (1.7.0-4) unstable; urgency=low
+
+  * Rebuild flann using boost 1.48.
+  * Set minimum cmake version.
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Mon, 26 Dec 2011 14:27:11 +0100
 
 flann (1.7.0-3) unstable; urgency=low
 
diff --git a/debian/patches/removedocinstall.patch b/debian/patches/removedocinstall.patch
deleted file mode 100644
index fd9d469..0000000
--- a/debian/patches/removedocinstall.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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 6c8e4e8..f3ba908 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 remove_tests.patch
 remove_lib64.patch
-removedocinstall.patch

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