Package: libao
Version: 1.2.2-1
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for libao (versioned as 1.2.2-1.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I
should delay it longer.
The primary goal of this NMU is to drop esd support.
I've also included the patch from Ubuntu to convert the package to multiarch.
AFAICS, Ubuntu is including this patch for a long time without any major
problem.
Regards.
diff -u libao-1.2.2/debian/changelog libao-1.2.2/debian/changelog
--- libao-1.2.2/debian/changelog
+++ libao-1.2.2/debian/changelog
@@ -1,3 +1,25 @@
+libao (1.2.2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ [ Ron ]
+ * Fix the Vcs-Browser URL
+
+ [ Andreas Henriksson ]
+ * Disable esound support (Closes: #856082)
+
+ [ Kees Cook ]
+ * debian/{compat,control,rules,*.install}: Convert to Multi-arch. (Closes:
+ #638741)
+ * debian/control: Switch libao-common to Arch: all.
+
+ [ Laurent Bigonville ]
+ * Drop libao-dbg package and rely on the automatically built one (dbgsym)
+ * Bump debhelper compatibility to 11 so dh_autoreconf is automatically
+ called during the build, remove manual update of config.{sub,guess}
+ * Bump Standards-Version to 4.1.3 (no further changes)
+
+ -- Laurent Bigonville <[email protected]> Sat, 30 Dec 2017 18:43:18 +0100
+
libao (1.2.2-1) unstable; urgency=medium
* Build the sndio plugin, now that it's included in Debian too.
diff -u libao-1.2.2/debian/compat libao-1.2.2/debian/compat
--- libao-1.2.2/debian/compat
+++ libao-1.2.2/debian/compat
@@ -1 +1 @@
-7
+11
diff -u libao-1.2.2/debian/control libao-1.2.2/debian/control
--- libao-1.2.2/debian/control
+++ libao-1.2.2/debian/control
@@ -3,18 +3,20 @@
Priority: optional
Maintainer: Ron Lee <[email protected]>
Uploaders: John Francesco Ferlito <[email protected]>
-Build-Depends: autotools-dev, debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 11),
libasound2-dev [linux-any],
- libaudio-dev, libesd0-dev, libpulse-dev, libxt-dev, libxau-dev, libsndio-dev
-Standards-Version: 3.9.8.0
+ libaudio-dev, libpulse-dev, libxt-dev, libxau-dev, libsndio-dev
+Standards-Version: 4.1.3
Homepage: http://www.xiph.org/ao/
Vcs-Git: git://git.debian.org/users/ron/libao.git
-Vcs-Browser: http://git.debian.org/?p=users/ron/libao.git;a=summary
+Vcs-Browser: http://git.debian.org/?p=users/ron/libao.git
Package: libao4
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, libao-common
-Suggests: libasound2, libaudio2, libesd0 | libesd-alsa0, libpulse0, libsndio6.1
+Suggests: libasound2, libaudio2, libpulse0, libsndio6.1
Replaces: libao-pulse
Description: Cross Platform Audio Output Library
Libao is a cross-platform audio library that allows programs to output audio
@@ -26,11 +28,11 @@
* OSS (Open Sound System, used on Linux and FreeBSD)
* ALSA (Advanced Linux Sound Architecture)
* PulseAudio (next generation GNOME sound server)
- * esd (EsounD or Enlightened Sound Daemon)
* and several others.
Package: libao-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: ${misc:Depends}, libao4 (= ${binary:Version}), libc6-dev
Description: Cross Platform Audio Output Library Development
@@ -43,35 +45,14 @@
* OSS (Open Sound System, used on Linux and FreeBSD)
* ALSA (Advanced Linux Sound Architecture)
* PulseAudio (next generation GNOME sound server)
- * esd (EsounD or Enlightened Sound Daemon)
* and several others.
.
This package contains the header files and static libraries required for
developing applications that use libao.
-Package: libao-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: ${misc:Depends}, libao4 (= ${binary:Version})
-Description: Cross Platform Audio Output Library Debug Symbols
- Libao is a cross-platform audio library that allows programs to output audio
- using a simple API on a wide variety of platforms. It currently supports:
- .
- * Null output (handy for testing without a sound device)
- * WAV files
- * AU files
- * OSS (Open Sound System, used on Linux and FreeBSD)
- * ALSA (Advanced Linux Sound Architecture)
- * PulseAudio (next generation GNOME sound server)
- * esd (EsounD or Enlightened Sound Daemon)
- * and several others.
- .
- This package contains debugging symbols useful for tracing bugs in the
- libao package.
-
Package: libao-common
-Architecture: any
+Architecture: all
+Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libao2
Replaces: libao4 (<< 1.0.0-2)
@@ -86,7 +67,6 @@
* OSS (Open Sound System, used on Linux and FreeBSD)
* ALSA (Advanced Linux Sound Architecture)
* PulseAudio (next generation GNOME sound server)
- * esd (EsounD or Enlightened Sound Daemon)
* and several others.
.
This package contains config files and man pages for libao.
diff -u libao-1.2.2/debian/libao-dev.install
libao-1.2.2/debian/libao-dev.install
--- libao-1.2.2/debian/libao-dev.install
+++ libao-1.2.2/debian/libao-dev.install
@@ -1,5 +1,5 @@
debian/tmp/usr/include/ao/*
-debian/tmp/usr/lib/libao.so
-debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/lib/*/libao.so
+debian/tmp/usr/lib/*/pkgconfig/*
debian/tmp/usr/share/aclocal/*
debian/tmp/usr/share/doc/libao-*/* usr/share/doc/libao-dev/html
diff -u libao-1.2.2/debian/libao4.install libao-1.2.2/debian/libao4.install
--- libao-1.2.2/debian/libao4.install
+++ libao-1.2.2/debian/libao4.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/ao/plugins-4/*.so
-debian/tmp/usr/lib/libao.so.*
+debian/tmp/usr/lib/*/ao/plugins-4/*.so
+debian/tmp/usr/lib/*/libao.so.*
diff -u libao-1.2.2/debian/rules libao-1.2.2/debian/rules
--- libao-1.2.2/debian/rules
+++ libao-1.2.2/debian/rules
@@ -7,14 +7,10 @@
- dh_strip --dbg-package=libao-dbg
+ dh_strip --dbgsym-migration='libao-dbg (<< 1.2.2-1.1~)'
override_dh_shlibdeps:
- dh_shlibdeps --exclude=/usr/lib/ao/plugins-4
+ dh_shlibdeps --exclude=/usr/lib/$(DEB_HOST_MULTIARCH)/ao/plugins-4
-# Put config.sub rules in until
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559098 is fixed
-override_dh_auto_configure:
- ln -sf /usr/share/misc/config.sub .
- ln -sf /usr/share/misc/config.guess .
- dh_auto_configure -- CFLAGS='-g -Wall'
+override_dh_makeshlibs:
+ dh_makeshlibs --exclude=/usr/lib/$(DEB_HOST_MULTIARCH)/ao/plugins-4
-override_dh_auto_clean:
- dh_auto_clean
- rm -f config.sub config.guess
+override_dh_auto_configure:
+ dh_auto_configure -- CFLAGS='-g -Wall' --disable-esd
