[SCM] Packaging for openal-soft branch, master, updated. debian/1%1.13-3-3-g7fd67a0

[Andres Mejia]

The following commit has been merged in the master branch:
commit df65a480a23a068363fe4c32fb88079844beb43a
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Sep 25 12:46:53 2011 -0400

    Remove unnecessary use of patch to support multiarch.

diff --git a/debian/changelog b/debian/changelog
index 607229d..d98b8a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openal-soft (1:1.13-4) unstable; urgency=low
+
+  * Remove unnecessary use of patch to support multiarch.
+
+ -- Andres Mejia <amejia at debian.org>  Sun, 25 Sep 2011 12:43:19 -0400
+
 openal-soft (1:1.13-3) unstable; urgency=low
 
   * Update to my @debian.org email.
diff --git a/debian/patches/multiarch-support.patch b/debian/patches/multiarch-support.patch
deleted file mode 100644
index abdc3fe..0000000
--- a/debian/patches/multiarch-support.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Patch to allow OpenAL Soft to install shared libraries in
- directories used in distros supporting multiarch libraries.
-Author: Andres Mejia <amejia at debian.org>
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,6 +8,7 @@
- 
- SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
- 
-+INCLUDE(GNUInstallDirs)
- INCLUDE(CheckFunctionExists)
- INCLUDE(CheckLibraryExists)
- INCLUDE(CheckSharedLibraryExists)
-@@ -462,7 +463,7 @@
- # Needed for openal.pc.in
- SET(prefix ${CMAKE_INSTALL_PREFIX})
- SET(exec_prefix "\${prefix}")
--SET(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
-+SET(libdir "${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}")
- SET(bindir "\${exec_prefix}/bin")
- SET(includedir "\${prefix}/include")
- SET(PACKAGE_VERSION "${LIB_VERSION}")
-@@ -491,8 +492,8 @@
- # Add an install target here
- INSTALL(TARGETS ${LIBNAME}
-         RUNTIME DESTINATION bin
--        LIBRARY DESTINATION "lib${LIB_SUFFIX}"
--        ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
-+        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}"
-+        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}"
- )
- INSTALL(FILES include/AL/al.h
-               include/AL/alc.h
-@@ -502,7 +503,7 @@
-         DESTINATION include/AL
- )
- INSTALL(FILES "${OpenAL_BINARY_DIR}/openal.pc"
--        DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
-+        DESTINATION "${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}/pkgconfig")
- 
- 
- MESSAGE(STATUS "")
-@@ -533,8 +534,8 @@
-     TARGET_LINK_LIBRARIES(openal-info ${LIBNAME})
-     INSTALL(TARGETS openal-info
-             RUNTIME DESTINATION bin
--            LIBRARY DESTINATION "lib${LIB_SUFFIX}"
--            ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
-+            LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}"
-+            ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}"
-     )
-     MESSAGE(STATUS "Building utility programs")
-     MESSAGE(STATUS "")
diff --git a/debian/patches/series b/debian/patches/series
index 34b4475..cafd205 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-multiarch-support.patch
+# Nothing to patch
diff --git a/debian/rules b/debian/rules
index 8394f68..6544915 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,9 +14,9 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_CMAKE_OPTIONS ?= -DCMAKE_VERBOSE_MAKEFILE=ON \
 		-DCMAKE_BUILD_TYPE=$(TYPE) \
 		-DCMAKE_INSTALL_PREFIX="/usr" \
-		-DCMAKE_INSTALL_LIBDIR="/usr/lib/$(DEB_HOST_MULTIARCH)" \
 		-DCMAKE_C_FLAGS="$(DEB_CFLAGS)" \
 		-DALSOFT_CONFIG=ON \
+		-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
 		..
 
 BUILD_TREE=$(CURDIR)/build-tree

-- 
Packaging for openal-soft