./libao r24: Patch from William Pitcock:

[Clint Adams]

------------------------------------------------------------
revno: 24
committer: Clint Adams <schizo at debian.org>
branch nick: libao
timestamp: Fri 2008-02-08 18:13:25 -0500
message:
  Patch from William Pitcock:
    * debian/control, debian/rules: Add debug symbols package libao-dbg.
    * debian/patches/01_fix_arts_init_wackyness.patch:
      Fix arts_init() wackyness where on non-KDE systems, it causes _exit()
      to be called in ao_initialize().  (Closes: #464638, #461119, #440040).
    * Standards-Version bump; no changes required.
added:
  debian/patches/01_fix_arts_init_wackyness.patch
modified:
  debian/changelog
  debian/compat
  debian/control
  debian/patches/series
  debian/rules
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-02 00:48:55 +0000
+++ b/debian/changelog	2008-02-08 23:13:25 +0000
@@ -1,3 +1,13 @@
+libao (0.8.8-3local1) unstable; urgency=low
+
+  * debian/control, debian/rules: Add debug symbols package libao-dbg.
+  * debian/patches/01_fix_arts_init_wackyness.patch:
+    Fix arts_init() wackyness where on non-KDE systems, it causes _exit()
+    to be called in ao_initialize().  (Closes: #464638, #461119, #440040).
+  * Standards-Version bump; no changes required.
+
+ -- William Pitcock <nenolod at sacredspiral.co.uk>  Thu, 07 Feb 2008 22:00:25 -0600
+
 libao (0.8.8-3) unstable; urgency=low
 
   * Change default_driver from 'alsa09' to 'alsa' in /etc/libao.conf.

=== modified file 'debian/compat'
--- a/debian/compat	2005-12-22 02:26:52 +0000
+++ b/debian/compat	2008-02-08 23:13:25 +0000
@@ -1,1 +1,1 @@
-4
+5

=== modified file 'debian/control'
--- a/debian/control	2007-05-30 19:15:34 +0000
+++ b/debian/control	2008-02-08 23:13:25 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Xiph.org Maintainers <pkg-xiph-maint at lists.alioth.debian.org>
 Uploaders: Christopher L Cheney <ccheney at debian.org>, Adeodato Sim? <dato at net.com.org.es>, Clint Adams <schizo at debian.org>
 Build-Depends: autotools-dev, debhelper, quilt, libartsc0-dev, libasound2-dev [!kfreebsd-i386 !hurd-i386 !kfreebsd-amd64], libaudio-dev, libesd0-dev, libpulse-dev, libxt-dev, libxau-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: libao2
 Architecture: any
@@ -23,3 +23,10 @@
 Description: Cross Platform Audio Output Library Development
  The libao-dev package contains the header files and documentation
  needed to develop applications with libao.
+
+Package: libao-dbg
+Architecture: any
+Section: libdevel
+Depends: libao2 (= ${binary:Version}), libc6-dev
+Description: Cross Platform Audio Output Library Debug Symbols
+ The libao-dev package contains the debug symbols for libao.

=== added file 'debian/patches/01_fix_arts_init_wackyness.patch'
--- a/debian/patches/01_fix_arts_init_wackyness.patch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/01_fix_arts_init_wackyness.patch	2008-02-08 23:13:25 +0000
@@ -0,0 +1,46 @@
+diff -urN libao-0.8.8/src/plugins/arts/ao_arts.c libao-0.8.8+patched/src/plugins/arts/ao_arts.c
+--- libao-0.8.8/src/plugins/arts/ao_arts.c	2007-05-24 04:19:07.000000000 -0500
++++ libao-0.8.8+patched/src/plugins/arts/ao_arts.c	2008-02-07 21:55:50.000000000 -0600
+@@ -57,17 +57,9 @@
+ 
+ int ao_plugin_test()
+ {
+-	if (arts_init() == 0) {
+-#ifdef HAVE_ARTS_SUSPENDED
+-		if (arts_suspended() == 1) {
+-			arts_free();
+-			return 0;
+-		}
+-#endif
+-		arts_free();
+-		return 1;
+-	} else
+-		return 0;
++	/* blindly assume that this plugin is ok to use;
++	   arts_init() is volatile (Debian #464638) */
++	return 1;
+ }
+ 
+ 
+@@ -76,10 +68,20 @@
+ 	return &ao_arts_info;
+ }
+ 
+-
+ int ao_plugin_device_init(ao_device *device)
+ {
+ 	ao_arts_internal *internal;
++	static int arts_initted = 0;
++
++	if (!arts_initted && arts_init() == 0) {
++#ifdef HAVE_ARTS_SUSPENDED
++		if (arts_suspended() == 1) {
++			arts_free();
++			return 0;
++		}
++#endif
++		arts_initted++;
++	}
+ 
+ 	internal = (ao_arts_internal *) malloc(sizeof(ao_arts_internal));
+ 

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2007-05-29 21:06:59 +0000
+++ b/debian/patches/series	2008-02-08 23:13:25 +0000
@@ -0,0 +1,1 @@
+01_fix_arts_init_wackyness.patch

=== modified file 'debian/rules'
--- a/debian/rules	2007-05-29 21:06:59 +0000
+++ b/debian/rules	2008-02-08 23:13:25 +0000
@@ -106,7 +106,7 @@
 	dh_installmime
 	dh_installman
 	dh_link
-	dh_strip
+	dh_strip --dbg-package=libao-dbg
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -V