[flann] 20/54: Adapt to 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 c2c84605d130a36f3b429e96a01657cb4e3b9e54
Author: Mathieu Malaterre <malat at debian.org>
Date:   Tue Aug 23 13:20:02 2011 +0000

    Adapt to new release
---
 debian/changelog                  |  2 +-
 debian/patches/adddoctoall.patch  | 12 ++++++------
 debian/patches/remove_tests.patch | 10 ++++++----
 debian/rules                      |  3 +--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aee32d5..06d5d91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-flann (1.6.8-1) unstable; urgency=low
+flann (1.6.11-1) unstable; urgency=low
 
   * Initial release (Closes: #581903)
 
diff --git a/debian/patches/adddoctoall.patch b/debian/patches/adddoctoall.patch
index fc457d7..7ab70e2 100644
--- a/debian/patches/adddoctoall.patch
+++ b/debian/patches/adddoctoall.patch
@@ -1,20 +1,20 @@
-Index: flann-1.6.8/doc/CMakeLists.txt
+Index: flann-1.6.11/doc/CMakeLists.txt
 ===================================================================
---- flann-1.6.8.orig/doc/CMakeLists.txt	2011-04-28 10:34:05.000000000 +0200
-+++ flann-1.6.8/doc/CMakeLists.txt	2011-04-28 10:34:09.000000000 +0200
+--- flann-1.6.11.orig/doc/CMakeLists.txt	2011-05-17 07:34:25.000000000 +0200
++++ flann-1.6.11/doc/CMakeLists.txt	2011-08-23 15:17:34.000000000 +0200
 @@ -5,7 +5,7 @@
  
-     add_latex_document(manual.tex BIBFILES references.bib DEFAULT_PDF)
+     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
-Index: flann-1.6.8/patches/adddoctoall.patch
+Index: flann-1.6.11/patches/adddoctoall.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ flann-1.6.8/patches/adddoctoall.patch	2011-04-28 10:34:02.000000000 +0200
++++ flann-1.6.11/patches/adddoctoall.patch	2011-08-23 15:17:34.000000000 +0200
 @@ -0,0 +1,13 @@
 +Index: flann-1.6.8/doc/CMakeLists.txt
 +===================================================================
diff --git a/debian/patches/remove_tests.patch b/debian/patches/remove_tests.patch
index 5f1d0a0..e2308d8 100644
--- a/debian/patches/remove_tests.patch
+++ b/debian/patches/remove_tests.patch
@@ -1,11 +1,13 @@
-Index: flann-1.6.8/CMakeLists.txt
+Index: flann-1.6.11/CMakeLists.txt
 ===================================================================
---- flann-1.6.8.orig/CMakeLists.txt	2011-04-27 11:21:43.000000000 +0200
-+++ flann-1.6.8/CMakeLists.txt	2011-04-27 11:21:46.000000000 +0200
-@@ -114,5 +114,5 @@
+--- flann-1.6.11.orig/CMakeLists.txt	2011-06-27 07:50:32.000000000 +0200
++++ flann-1.6.11/CMakeLists.txt	2011-08-23 15:17:29.000000000 +0200
+@@ -106,7 +106,7 @@
  add_subdirectory( cmake )
  add_subdirectory( src )
  add_subdirectory( examples )
 -add_subdirectory( test )
 +#add_subdirectory( test )
  add_subdirectory( doc )
+ 
+ 
diff --git a/debian/rules b/debian/rules
index 3840493..62b2f8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ override_dh_compress:
 
 VER_MAJOR = 1
 VER_MINOR = 6
-VER_PATCH = 8
+VER_PATCH = 11
 VER_FULL = $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
 
 UPSTREAM_SRC = flann-$(VER_FULL)-src
@@ -36,7 +36,6 @@ get-orig-source: $(UPSTREAM_SRC).zip
 	unzip -q $(UPSTREAM_SRC).zip
 	mv $(UPSTREAM_SRC) $(DEBIAN_SRC_DIR)
 	rm $(DEBIAN_SRC_DIR)/doc/manual.pdf # will be rebuild from latex
-	rm $(DEBIAN_SRC_DIR)/Makefile
 	GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
 	rm -rf $(DEBIAN_SRC_DIR)
 	rm $(UPSTREAM_SRC).zip

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