r43794 - in /packages/flann/trunk/debian: changelog patches/adddoctoall.patch patches/remove_tests.patch rules

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

Author: malat-guest
Date: Tue Aug 23 13:20:02 2011
New Revision: 43794

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=43794
Log:
Adapt to new release

Modified:
    packages/flann/trunk/debian/changelog
    packages/flann/trunk/debian/patches/adddoctoall.patch
    packages/flann/trunk/debian/patches/remove_tests.patch
    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=43794&op=diff
==============================================================================
--- packages/flann/trunk/debian/changelog (original)
+++ packages/flann/trunk/debian/changelog Tue Aug 23 13:20:02 2011
@@ -1,4 +1,4 @@
-flann (1.6.8-1) unstable; urgency=low
+flann (1.6.11-1) unstable; urgency=low
 
   * Initial release (Closes: #581903)
 

Modified: packages/flann/trunk/debian/patches/adddoctoall.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/patches/adddoctoall.patch?rev=43794&op=diff
==============================================================================
--- packages/flann/trunk/debian/patches/adddoctoall.patch (original)
+++ packages/flann/trunk/debian/patches/adddoctoall.patch Tue Aug 23 13:20:02 2011
@@ -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
 +===================================================================

Modified: packages/flann/trunk/debian/patches/remove_tests.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/patches/remove_tests.patch?rev=43794&op=diff
==============================================================================
--- packages/flann/trunk/debian/patches/remove_tests.patch (original)
+++ packages/flann/trunk/debian/patches/remove_tests.patch Tue Aug 23 13:20:02 2011
@@ -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 )
+ 
+ 

Modified: packages/flann/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/rules?rev=43794&op=diff
==============================================================================
--- packages/flann/trunk/debian/rules (original)
+++ packages/flann/trunk/debian/rules Tue Aug 23 13:20:02 2011
@@ -20,7 +20,7 @@
 
 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 @@
 	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