r44241 - in /packages/flann/trunk/debian: changelog patches/removedocinstall.patch patches/series

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

Author: malat-guest
Date: Wed Dec 21 18:04:13 2011
New Revision: 44241

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44241
Log:
Fix doc build

Added:
    packages/flann/trunk/debian/patches/removedocinstall.patch
Modified:
    packages/flann/trunk/debian/changelog
    packages/flann/trunk/debian/patches/series

Modified: packages/flann/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/changelog?rev=44241&op=diff
==============================================================================
--- packages/flann/trunk/debian/changelog (original)
+++ packages/flann/trunk/debian/changelog Wed Dec 21 18:04:13 2011
@@ -1,3 +1,9 @@
+flann (1.7.0-3) UNRELEASED; urgency=low
+
+  * Remove cmake install rule for manual.pdf
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Wed, 21 Dec 2011 19:03:26 +0100
+
 flann (1.7.0-2) unstable; urgency=low
 
   * Remove TBB for non-intel arch

Added: packages/flann/trunk/debian/patches/removedocinstall.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/patches/removedocinstall.patch?rev=44241&op=file
==============================================================================
--- packages/flann/trunk/debian/patches/removedocinstall.patch (added)
+++ packages/flann/trunk/debian/patches/removedocinstall.patch Wed Dec 21 18:04:13 2011
@@ -1,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()

Modified: packages/flann/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/patches/series?rev=44241&op=diff
==============================================================================
--- packages/flann/trunk/debian/patches/series (original)
+++ packages/flann/trunk/debian/patches/series Wed Dec 21 18:04:13 2011
@@ -1,2 +1,3 @@
 remove_tests.patch
 remove_lib64.patch
+removedocinstall.patch