[flann] 11/54: remove lib64 convention

[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 e2e0f802ee35919d253056e795308177111425c7
Author: Mathieu Malaterre <malat at debian.org>
Date:   Thu Apr 28 07:51:32 2011 +0000

    remove lib64 convention
---
 debian/patches/remove_lib64.patch | 13 +++++++++++++
 debian/patches/series             |  3 ++-
 debian/rules                      |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/patches/remove_lib64.patch b/debian/patches/remove_lib64.patch
new file mode 100644
index 0000000..1cc7c48
--- /dev/null
+++ b/debian/patches/remove_lib64.patch
@@ -0,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")
diff --git a/debian/patches/series b/debian/patches/series
index 3d7f694..f3ba908 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-#remove_tests.patch
+remove_tests.patch
+remove_lib64.patch
diff --git a/debian/rules b/debian/rules
index eec7435..1ca0786 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,7 @@ 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