[SCM] libdrumstick/master: install files in /usr/lib instead of /usr/lib64 (untested)

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

The following commit has been merged in the master branch:
commit a7395883d34711fad38a3af9f2fa9cbea1372c90
Author: Arnout <arnouten at bzzt.net>
Date:   Sat Sep 4 22:41:12 2010 +0200

    install files in /usr/lib instead of /usr/lib64 (untested)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9b9739..ac7595b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,11 +27,8 @@ IF(COMMAND CMAKE_POLICY)
     CMAKE_POLICY(SET CMP0003 NEW)
 ENDIF(COMMAND CMAKE_POLICY)
 
-IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
-    SET(_INIT_LIB_SUFFIX "64")
-ELSE(CMAKE_SIZEOF_VOID_P MATCHES "8")
-    SET(_INIT_LIB_SUFFIX "")
-ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+# Debian, unlike the FHS, does not use a '64' suffix like 'lib64'
+SET(_INIT_LIB_SUFFIX "")
 SET(LIB_SUFFIX ${_INIT_LIB_SUFFIX} CACHE STRING "optional library install directory suffix: 32, 64, none")
 
 #Comment out if relative paths break the link scripts
diff --git a/debian/libdrumstick-dev.install b/debian/libdrumstick-dev.install
index 5b77faa..5774e64 100644
--- a/debian/libdrumstick-dev.install
+++ b/debian/libdrumstick-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib*/lib*.so
-usr/lib*/pkgconfig/*
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
diff --git a/debian/libdrumstick0.install b/debian/libdrumstick0.install
index 4f3abe9..d0dbfd1 100644
--- a/debian/libdrumstick0.install
+++ b/debian/libdrumstick0.install
@@ -1 +1 @@
-usr/lib*/lib*.so.*
+usr/lib/lib*.so.*
diff --git a/debian/patches/no-lib-suffix.patch b/debian/patches/no-lib-suffix.patch
new file mode 100644
index 0000000..3022139
--- /dev/null
+++ b/debian/patches/no-lib-suffix.patch
@@ -0,0 +1,17 @@
+Install in /usr/lib instead of /usr/lib64, even on 64-bit archs
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,11 +27,8 @@
+     CMAKE_POLICY(SET CMP0003 NEW)
+ ENDIF(COMMAND CMAKE_POLICY)
+ 
+-IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+-    SET(_INIT_LIB_SUFFIX "64")
+-ELSE(CMAKE_SIZEOF_VOID_P MATCHES "8")
+-    SET(_INIT_LIB_SUFFIX "")
+-ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
++# Debian, unlike the FHS, does not use a '64' suffix like 'lib64'
++SET(_INIT_LIB_SUFFIX "")
+ SET(LIB_SUFFIX ${_INIT_LIB_SUFFIX} CACHE STRING "optional library install directory suffix: 32, 64, none")
+ 
+ #Comment out if relative paths break the link scripts
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4b7b0f4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no-lib-suffix.patch

-- 
libdrumstick packaging