diff --git a/debian/changelog b/debian/changelog
index 1f2d1da7bb75c5dc5899f0e22244b6b012874cef..fbf8814455f79248c6b854d9bd3eef5dd9b6d3ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+libao (0.8.4-1) unstable; urgency=low
+
+ * New upstream.
+
+ -- Christopher L Cheney <ccheney@debian.org> Tue, 2 Sep 2003 22:30:00 -0500
+
+libao (0.8.3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload sponsored by Joey Hess.
+ * Build-depend on libartsc0-dev and suggest libartsc0 instead of
+ libarts-dev and libarts (Closes: #189160).
+ * GNU config automated update: config.sub (20020621 to 20030509),
+ config.guess (20020529 to 20030519)
+
+ -- Dagfinn Ilmari Mannsaker <ilmari@ilmari.org> Mon, 14 Jul 2003 15:55:31 +0200
+
libao (0.8.3-1) unstable; urgency=low
* New upstream. (Closes: #134520, #145785)
diff --git a/debian/control b/debian/control
index 5c32a4f3d034c0d4f4043ad9deeef013438c2b84..dd710d83c78b410a59772c53f76ad53900a5c364 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: libao
Section: libs
Priority: optional
Maintainer: Christopher L Cheney <ccheney@debian.org>
-Build-Depends: autotools-dev, debhelper (>> 4.0.0), devscripts, libarts-dev, libasound2-dev, libesd0-dev, gawk
+Build-Depends: autotools-dev, debhelper (>> 4.0.18), devscripts, libartsc0-dev, libasound2-dev, libesd0-dev, gawk
Standards-Version: 3.5.6.0
Package: libao2
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
-Suggests: libarts, libasound2, libesd0 | libesd-alsa0
+Suggests: libartsc0, libasound2, libaudio2, libesd0 | libesd-alsa0
Description: Cross Platform Audio Output Library
Libao is a cross platform audio output library. It currently supports
ESD, OSS, Solaris, and IRIX.
diff --git a/debian/libao-dev.install b/debian/libao-dev.install
index 7f1a45ed13253c6cf8a192e4cbe9e871433f0d0a..b6c8df296aee2c925c39b750a7a0351e27abedad 100644
--- a/debian/libao-dev.install
+++ b/debian/libao-dev.install
@@ -1,10 +1,17 @@
debian/tmp/usr/include/ao/ao.h
debian/tmp/usr/include/ao/os_types.h
debian/tmp/usr/include/ao/plugin.h
+debian/tmp/usr/lib/ao/plugins-2/libalsa09.a
debian/tmp/usr/lib/ao/plugins-2/libalsa09.la
+debian/tmp/usr/lib/ao/plugins-2/libarts.a
debian/tmp/usr/lib/ao/plugins-2/libarts.la
+debian/tmp/usr/lib/ao/plugins-2/libesd.a
debian/tmp/usr/lib/ao/plugins-2/libesd.la
+debian/tmp/usr/lib/ao/plugins-2/libnas.a
+debian/tmp/usr/lib/ao/plugins-2/libnas.la
+debian/tmp/usr/lib/ao/plugins-2/liboss.a
debian/tmp/usr/lib/ao/plugins-2/liboss.la
+debian/tmp/usr/lib/libao.a
debian/tmp/usr/lib/libao.la
debian/tmp/usr/lib/libao.so
debian/tmp/usr/share/aclocal/ao.m4
diff --git a/debian/libao2.install b/debian/libao2.install
index 359ae923ab5509156c07a07a79ce17b2e0b4bd13..513139cfb6d2b234e0f4fe5e0dcc2f4ecfa7a43d 100644
--- a/debian/libao2.install
+++ b/debian/libao2.install
@@ -2,5 +2,6 @@ debian/libao.conf etc/
debian/tmp/usr/lib/ao/plugins-2/libalsa09.so
debian/tmp/usr/lib/ao/plugins-2/libarts.so
debian/tmp/usr/lib/ao/plugins-2/libesd.so
+debian/tmp/usr/lib/ao/plugins-2/libnas.so
debian/tmp/usr/lib/ao/plugins-2/liboss.so
debian/tmp/usr/lib/libao.so.*
diff --git a/debian/rules b/debian/rules
index 49daa5bae7b2c1db5f3c013a037b9da6229262e2..ee313f438dabdde6b7df55b7e57d7795d69160f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,9 @@
#!/usr/bin/make -f
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets by Bill Allombert 2001
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -18,8 +21,12 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
@@ -36,33 +43,27 @@ configure-stamp:
# change ../configure to ../autogen.sh for CVS build
cd $(objdir) && \
../configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
- --prefix=/usr
+ --prefix=/usr --enable-static
touch configure-stamp
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
+#Architecture
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp
cd $(objdir) && \
$(MAKE)
- touch build-stamp
-
-autotools:
- OLDDATESUB=`./config.sub -t | tr -d -` ;\
- OLDDATEGUESS=`./config.guess -t | tr -d -` ;\
- NEWDATESUB=`/usr/share/misc/config.sub -t | tr -d -` ;\
- NEWDATEGUESS=`/usr/share/misc/config.guess -t | tr -d -` ;\
- if [ $$OLDDATESUB -lt $$NEWDATESUB -o \
- $$OLDDATEGUESS -lt $$NEWDATEGUESS ]; then \
- dch -a -p "GNU config automated update: config.sub\
- ($$OLDDATESUB to $$NEWDATESUB), config.guess\
- ($$OLDDATEGUESS to $$NEWDATEGUESS)" ;\
- cp -f /usr/share/misc/config.sub config.sub ;\
- cp -f /usr/share/misc/config.guess config.guess ;\
- echo WARNING: GNU config scripts updated from master copies 1>&2 ;\
- fi
+ touch build-arch-stamp
+
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp
+
+ # Add here commands to compile the indep part of the package.
+ #$(MAKE) doc
+ touch build-indep-stamp
debian-clean:
dh_testdir
@@ -70,10 +71,10 @@ debian-clean:
dh_clean
-clean: autotools
+clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
+ rm -f build-arch-stamp build-indep-stamp configure-stamp
# Remove build tree
rm -rf $(objdir)
@@ -89,26 +90,32 @@ clean: autotools
dh_clean
-install: DH_OPTIONS=
-install: build
+install: install-indep install-arch
+install-indep:
dh_testdir
dh_testroot
- dh_clean -k
- dh_installdirs
+ dh_clean -k -i
+ dh_installdirs -i
+
+ dh_install -i --list-missing
+
+install-arch:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -s
+ dh_installdirs -s
cd $(objdir) && \
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- dh_install
+ dh_install -s --list-missing
-# This single target is used to build all the packages, all at once, or
-# one at a time. So keep in mind: any options passed to commands here will
-# affect _all_ packages. Anything you want to only affect one package
-# should be put in another target, such as the install target.
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
binary-common:
dh_testdir
dh_testroot
-# dh_installxfonts
dh_installchangelogs
dh_installdocs
dh_installexamples
@@ -121,31 +128,27 @@ binary-common:
# dh_installinit
# dh_installcron
# dh_installinfo
-# dh_undocumented
dh_installman
- dh_strip
dh_link
+ dh_strip
dh_compress
dh_fixperms
+# dh_perl
+# dh_python
dh_makeshlibs -V
dh_installdeb
-# dh_perl
dh_shlibdeps --exclude=/usr/lib/ao/plugins-2
dh_gencontrol
dh_md5sums
dh_builddeb
# Build architecture independant packages using the common target.
-binary-indep: build install
-# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+binary-indep: build-indep install-indep
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
# Build architecture dependant packages using the common target.
-binary-arch: build install
+binary-arch: build-arch install-arch
$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-# Any other binary targets build just one binary package at a time.
-binary-%: build install
- $(MAKE) -f debian/rules binary-common DH_OPTIONS=-p$*
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure