[xiph-cvs] cvs commit: ao/debian changelog control libao-dev.install libao2.install rules
Chris Cheney
calc at xiph.org
Tue Sep 2 21:26:37 PDT 2003
calc 03/09/03 00:26:37
Modified: debian changelog control libao-dev.install libao2.install
rules
Log:
debian packaging updates for libao 0.8.4-1
Revision Changes Path
1.29 +16 -0 ao/debian/changelog
Index: changelog
===================================================================
RCS file: /usr/local/cvsroot/ao/debian/changelog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- changelog 19 Jul 2002 13:54:14 -0000 1.28
+++ changelog 3 Sep 2003 04:26:37 -0000 1.29
@@ -1,3 +1,19 @@
+libao (0.8.4-1) unstable; urgency=low
+
+ * New upstream.
+
+ -- Christopher L Cheney <ccheney at 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 at ilmari.org> Mon, 14 Jul 2003 15:55:31 +0200
+
libao (0.8.3-1) unstable; urgency=low
* New upstream. (Closes: #134520, #145785)
<p><p>1.26 +2 -2 ao/debian/control
Index: control
===================================================================
RCS file: /usr/local/cvsroot/ao/debian/control,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- control 11 Jul 2002 21:33:22 -0000 1.25
+++ control 3 Sep 2003 04:26:37 -0000 1.26
@@ -2,14 +2,14 @@
Section: libs
Priority: optional
Maintainer: Christopher L Cheney <ccheney at 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.
<p><p>1.2 +7 -0 ao/debian/libao-dev.install
Index: libao-dev.install
===================================================================
RCS file: /usr/local/cvsroot/ao/debian/libao-dev.install,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libao-dev.install 3 Jul 2002 04:04:32 -0000 1.1
+++ libao-dev.install 3 Sep 2003 04:26:37 -0000 1.2
@@ -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
<p><p>1.2 +1 -0 ao/debian/libao2.install
Index: libao2.install
===================================================================
RCS file: /usr/local/cvsroot/ao/debian/libao2.install,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libao2.install 3 Jul 2002 04:04:32 -0000 1.1
+++ libao2.install 3 Sep 2003 04:26:37 -0000 1.2
@@ -2,5 +2,6 @@
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.*
<p><p>1.18 +48 -45 ao/debian/rules
Index: rules
===================================================================
RCS file: /usr/local/cvsroot/ao/debian/rules,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rules 12 Jul 2002 01:02:56 -0000 1.17
+++ rules 3 Sep 2003 04:26:37 -0000 1.18
@@ -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 @@
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 @@
# 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
+ touch build-arch-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
+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 @@
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 @@
dh_clean
-install: DH_OPTIONS=
-install: build
+install: install-indep install-arch
+install-indep:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -i
+ dh_installdirs -i
+
+ dh_install -i --list-missing
+
+install-arch:
dh_testdir
dh_testroot
- dh_clean -k
- dh_installdirs
+ 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 @@
# 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
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list