[SCM] ALURE packaging branch, master, updated. debian/1.2-4-1-ga7fb0ec

[Andres Mejia]

The following commit has been merged in the master branch:
commit a7fb0eceb47508939c16f2a2bbbd72c0b3315cbb
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Sat May 5 16:21:29 2012 -0400

    Change Depends on dlopened libraries to Recommends.
    This uses different mechanism to generate Recommends. (Closes: #669520)

diff --git a/debian/alure-dynload-shlibdeps b/debian/alure-dynload-shlibdeps
deleted file mode 100755
index 773cb17..0000000
--- a/debian/alure-dynload-shlibdeps
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# This script is used to check all dependencies for dynamically loaded
-# libraries.
-
-set -e
-
-LIBSNDFILE_DEPENDS=$(cat /var/lib/dpkg/info/libsndfile1.shlibs | \
-  sed 's/^[^[:space:]]\+\?[[:space:]]\+\?[^[:space:]]\+\?[[:space:]]\+\?\(.*\)$/\1/')
-LIBVORBISFILE_DEPENDS=$(cat /var/lib/dpkg/info/libvorbisfile3.shlibs | \
-  sed 's/^[^[:space:]]\+\?[[:space:]]\+\?[^[:space:]]\+\?[[:space:]]\+\?\(.*\)$/\1/')
-LIBFLAC_DEPENDS=$(cat /var/lib/dpkg/info/libflac8.shlibs | \
-  sed 's/^[^[:space:]]\+\?[[:space:]]\+\?[^[:space:]]\+\?[[:space:]]\+\?\(.*\)$/\1/')
-LIBMPG123_DEPENDS=$(cat /var/lib/dpkg/info/libmpg123-0.shlibs | \
-  sed 's/^[^[:space:]]\+\?[[:space:]]\+\?[^[:space:]]\+\?[[:space:]]\+\?\(.*\)$/\1/')
-LIBDUMB_DEPENDS=$(cat /var/lib/dpkg/info/libdumb1.shlibs | \
-  sed 's/^[^[:space:]]\+\?[[:space:]]\+\?[^[:space:]]\+\?[[:space:]]\+\?\(.*\)$/\1/')
-LIBMODPLUG_DEPENDS=$(cat /var/lib/dpkg/info/libmodplug1.shlibs | \
-  sed 's/^[^[:space:]]\+\?[[:space:]]\+\?[^[:space:]]\+\?[[:space:]]\+\?\(.*\)$/\1/')
-LIBFLUIDSYNTH_DEPENDS=$(cat /var/lib/dpkg/info/libfluidsynth1.shlibs | \
-  sed 's/^[^[:space:]]\+\?[[:space:]]\+\?[^[:space:]]\+\?[[:space:]]\+\?\(.*\)$/\1/')
-
-sed "s/^Depends:.*$/&, $LIBSNDFILE_DEPENDS, $LIBVORBISFILE_DEPENDS, $LIBFLAC_DEPENDS, $LIBMPG123_DEPENDS, $LIBDUMB_DEPENDS, $LIBMODPLUG_DEPENDS, $LIBFLUIDSYNTH_DEPENDS/" \
-  -i "debian/libalure1/DEBIAN/control"
-
-exit 0
diff --git a/debian/changelog b/debian/changelog
index 68f63f2..5abd2fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+alure (1.2-5) unstable; urgency=low
+
+  * Change Depends on dlopened libraries to Recommends.
+    This uses different mechanism to generate Recommends. (Closes: #669520)
+
+ -- Andres Mejia <amejia at debian.org>  Sat, 05 May 2012 16:14:42 -0400
+
 alure (1.2-4) unstable; urgency=low
 
   * Enable hardened compiler flags.
diff --git a/debian/control b/debian/control
index da91685..8817083 100644
--- a/debian/control
+++ b/debian/control
@@ -44,6 +44,7 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: ${shlibs:Recommends}
 Description: AL Utilities REtooled (shared library)
  ALURE is a utility library to help manage common tasks with OpenAL
  applications. This includes device enumeration and initialization, file
diff --git a/debian/rules b/debian/rules
index f621a42..c99e048 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,9 +37,21 @@ override_dh_auto_build:
 override_dh_auto_install:
 	$(MAKE) --directory=build install DESTDIR=$(CURDIR)/debian/tmp
 
-override_dh_gencontrol:
-	dh_gencontrol
-	debian/alure-dynload-shlibdeps
+override_dh_shlibdeps: debian/tmp/alure-dummy.so
+	dh_shlibdeps -O--parallel
+	# Need to manually add dependencies for dlopened libs.
+	dpkg-shlibdeps -dRecommends -edebian/tmp/alure-dummy.so -xlibc6 -O >>debian/libalure1.substvars
+
+debian/tmp/alure-dummy.so:
+	mkdir -p debian/tmp
+	cc -xc -shared -Wl,--no-as-needed -o $@ /dev/null \
+		-lsndfile \
+		-lvorbisfile \
+		-lFLAC \
+		-lmpg123 \
+		-ldumb \
+		-lmodplug \
+		-lfluidsynth
 
 get-orig-source:
 	$(dir $_)alure-get-orig-source

-- 
ALURE packaging