r38454 - in /packages/flann/trunk/debian: patches/remove_lib64.patch patches/series rules

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

Author: malat-guest
Date: Thu Apr 28 07:51:32 2011
New Revision: 38454

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38454
Log:
remove lib64 convention

Added:
    packages/flann/trunk/debian/patches/remove_lib64.patch
Modified:
    packages/flann/trunk/debian/patches/series
    packages/flann/trunk/debian/rules

Added: packages/flann/trunk/debian/patches/remove_lib64.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/patches/remove_lib64.patch?rev=38454&op=file
==============================================================================
--- packages/flann/trunk/debian/patches/remove_lib64.patch (added)
+++ packages/flann/trunk/debian/patches/remove_lib64.patch Thu Apr 28 07:51:32 2011
@@ -1,0 +1,13 @@
+Index: flann-1.6.8/cmake/flann_utils.cmake
+===================================================================
+--- flann-1.6.8.orig/cmake/flann_utils.cmake	2011-04-28 09:48:48.000000000 +0200
++++ flann-1.6.8/cmake/flann_utils.cmake	2011-04-28 09:48:58.000000000 +0200
+@@ -2,7 +2,7 @@
+     string(REGEX MATCH "Linux" OS_IS_LINUX ${CMAKE_SYSTEM_NAME})
+     if(OS_IS_LINUX)
+         if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+-            set(FLANN_LIB_INSTALL_DIR "lib64")
++            set(FLANN_LIB_INSTALL_DIR "lib")
+         else(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+             set(FLANN_LIB_INSTALL_DIR "lib")
+         endif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")

Modified: packages/flann/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/patches/series?rev=38454&op=diff
==============================================================================
--- packages/flann/trunk/debian/patches/series (original)
+++ packages/flann/trunk/debian/patches/series Thu Apr 28 07:51:32 2011
@@ -1,1 +1,2 @@
-#remove_tests.patch
+remove_tests.patch
+remove_lib64.patch

Modified: packages/flann/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/flann/trunk/debian/rules?rev=38454&op=diff
==============================================================================
--- packages/flann/trunk/debian/rules (original)
+++ packages/flann/trunk/debian/rules Thu Apr 28 07:51:32 2011
@@ -43,6 +43,7 @@
 	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