[SCM] Packaging for openal-soft branch, master, updated. debian/1%1.13-2-7-ge8ed7a9

Sun Sep 25 15:22:56 UTC 2011

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

    Convert package to support multiarch libraries.

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 3309e32..49d6615 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Bruno "Fuddl" Kleinert <fuddl at tauware.de>,
            Reinhard Tartler <siretart at tauware.de>,
            Cyril Brulebois <kibi at debian.org>,
            Gonéri Le Bouder <goneri at rulezlan.org>
-Build-Depends: debhelper (>= 7.0.50),
+Build-Depends: debhelper (>= 8.1.3~),
                libasound2-dev [linux-any],
                cmake, portaudio19-dev, libpulse-dev,
 Standards-Version: 3.9.2
@@ -46,7 +46,11 @@ Description: Software implementation of the OpenAL API (development files)
 
 Package: libopenal1
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libopenal-data (= ${source:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
 Description: Software implementation of the OpenAL API (shared library)
  OpenAL, the Open Audio Library, is a joint effort to create an open,
  vendor-neutral, cross-platform API for interactive, primarily spatialized
@@ -69,3 +73,31 @@ Description: Software implementation of the OpenAL API (shared library)
  and others.
  .
  This package installs the OpenAL Soft shared library.
+
+Package: libopenal-data
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: libopenal1 (<< 1:1.13-3)
+Breaks: libopenal1 (<< 1:1.13-3)
+Description: Software implementation of the OpenAL API (data files)
+ OpenAL, the Open Audio Library, is a joint effort to create an open,
+ vendor-neutral, cross-platform API for interactive, primarily spatialized
+ audio. OpenAL's primary audience are application developers and desktop
+ users that rely on portable standards like OpenGL, for games and other
+ multimedia applications.
+ .
+ This library is meant as a compatible update/replacement to the OpenAL Sample
+ Implementation (the SI). The SI has been unmaintained for quite a while, and
+ would require a lot of work to clean up. This is a fork the old Windows version
+ to attempt an accelerated ALSA version of an OpenAL implementation.
+ .
+ OpenAL Soft supports mono, stereo, 4-channel, 5.1, 6.1, and 7.1 output, as
+ opposed to the SI's 4-channel max (though it did have some provisions for 6
+ channel, this was not 5.1, and was seemingly a "late" addition). OpenAL Soft
+ does not support the Vorbis and MP3 extensions, however those were considered
+ deprecated even in the SI. It does, though, support some of the newer
+ extensions like AL_EXT_FLOAT32 and AL_EXT_MCFORMATS for multi-channel and
+ floating-point formats, as well as ALC_EXT_EFX for environmental audio effects,
+ and others.
+ .
+ This package installs data files used by the OpenAL Soft shared library.
diff --git a/debian/libopenal-data.install b/debian/libopenal-data.install
new file mode 100644
index 0000000..ad17242
--- /dev/null
+++ b/debian/libopenal-data.install
@@ -0,0 +1 @@
+etc/openal
diff --git a/debian/libopenal-dev.install b/debian/libopenal-dev.install
index da02757..6feebb8 100644
--- a/debian/libopenal-dev.install
+++ b/debian/libopenal-dev.install
@@ -1,3 +1,3 @@
 usr/include/AL
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/libopenal1.install b/debian/libopenal1.install
index dc37ce7..d6adfbc 100644
--- a/debian/libopenal1.install
+++ b/debian/libopenal1.install
@@ -1,2 +1 @@
-usr/lib/libopenal.so.*
-etc/openal
+usr/lib/*/libopenal.so.*
diff --git a/debian/patches/multiarch-support.patch b/debian/patches/multiarch-support.patch
new file mode 100644
index 0000000..abdc3fe
--- /dev/null
+++ b/debian/patches/multiarch-support.patch
@@ -0,0 +1,54 @@
+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 971f34a..ae93fe1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 compiler-flags-change.patch
+multiarch-support.patch
diff --git a/debian/rules b/debian/rules
index 0daa46b..bf4dae6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,14 @@ else
    TYPE=Debug
 endif
 
+# For multiarch
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 # Use this variable to allow options passed to cmake to be overridable
 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 \
 		..
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..32d80ed
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# Only Build-Depends on debhelper (>= 8.1.3) is needed, so ignore this.
+openal-soft source: package-needs-versioned-debhelper-build-depends 9

-- 
Packaging for openal-soft

