From 5652a7467fafb7dfe97a0acc99a380b1e5e9557f Mon Sep 17 00:00:00 2001 From: calc Date: Thu, 13 Dec 2001 22:24:13 +0000 Subject: [PATCH] Debian Packaging Updates svn path=/trunk/vorbis/; revision=2600 --- debian/README.Debian | 6 ------ debian/changelog | 8 +++++++- debian/control | 33 +++++++++++++-------------------- debian/copyright | 2 +- debian/libvorbis-dev.dirs | 2 -- debian/libvorbis-dev.docs | 2 +- debian/libvorbis-dev.examples | 6 +----- debian/libvorbis0.dirs | 1 - debian/libvorbis0.docs | 1 - debian/rules | 33 ++++++++++++++++++++++++--------- 10 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 debian/README.Debian delete mode 100644 debian/libvorbis-dev.dirs delete mode 100644 debian/libvorbis0.dirs delete mode 100644 debian/libvorbis0.docs diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index d049ad9..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,6 +0,0 @@ -libvorbis for Debian --------------------- - -Nothing important to mention at this time. - - -- Christopher L Cheney , Tue, 31 Oct 2000 15:08:22 -0600 diff --git a/debian/changelog b/debian/changelog index f8a92cb..3982567 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libvorbis (1.0rc3-1) unstable; urgency=low + + * New upstream. + * added autotools target (config.* updater) to rules + + -- Christopher L Cheney Thu, 13 Dec 2001 11:00:00 -0600 + libvorbis (1.0rc2-1) unstable; urgency=low * New upstream. @@ -68,5 +75,4 @@ vorbis (0.0-1) unstable; urgency=low Local variables: mode: debian-changelog -add-log-mailing-address "ccheney@debian.org" End: diff --git a/debian/control b/debian/control index c9fdd33..45e9e03 100644 --- a/debian/control +++ b/debian/control @@ -2,29 +2,22 @@ Source: libvorbis Section: libs Priority: optional Maintainer: Christopher L Cheney -Build-Depends: debhelper (>> 3.0.0), libogg-dev (>> 1.0rc2) +Build-Depends: debhelper (>> 3.0.0), libogg-dev (>> 1.0rc3), autotools-dev, devscripts Standards-Version: 3.5.6.0 -Package: libvorbis-dev -Architecture: any -Section: devel -Depends: libvorbis0 (= ${Source-Version}), libogg-dev, libc6-dev -Description: Development library for OGG Vorbis - Ogg Vorbis is a fully Open, non-proprietary, patent-and-royalty-free, - general-purpose compressed audio format for high quality (44.1-48.0kHz, - 16+ bit, polyphonic) audio and music at fixed and variable bitrates - from 16 to 128 kbps/channel. This places Vorbis in the same class as - audio representations including MPEG-1 audio layer 3, MPEG-4 - audio (AAC and TwinVQ), and PAC. - Package: libvorbis0 Architecture: any Section: libs Depends: ${shlibs:Depends} -Description: The OGG Vorbis lossy audio compression codec. - Ogg Vorbis is a fully Open, non-proprietary, patent-and-royalty-free, - general-purpose compressed audio format for high quality (44.1-48.0kHz, - 16+ bit, polyphonic) audio and music at fixed and variable bitrates - from 16 to 128 kbps/channel. This places Vorbis in the same class as - audio representations including MPEG-1 audio layer 3, MPEG-4 - audio (AAC and TwinVQ), and PAC. +Description: The Vorbis General Audio Compression Codec + Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, + general-purpose compressed audio format for audio and music at fixed + and variable bitrates from 16 to 128 kbps/channel. + +Package: libvorbis-dev +Architecture: any +Section: devel +Depends: libvorbis0 (= ${Source-Version}), libogg-dev, libc6-dev +Description: Vorbis Library Development + The libvorbis-dev package contains the header files and documentation + needed to develop applications with libvorbis. diff --git a/debian/copyright b/debian/copyright index cadd6a9..5df704e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ This package was debianized by Christopher L Cheney on Tue, 31 Oct 2000 15:08:22 -0600. -It was downloaded from http://www.xiph.org/ogg/vorbis/download/ +It was downloaded from http://www.vorbis.com/download_unix.psp Upstream Author(s): Monty diff --git a/debian/libvorbis-dev.dirs b/debian/libvorbis-dev.dirs deleted file mode 100644 index 4418816..0000000 --- a/debian/libvorbis-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib -usr/include diff --git a/debian/libvorbis-dev.docs b/debian/libvorbis-dev.docs index e845566..58ee487 100644 --- a/debian/libvorbis-dev.docs +++ b/debian/libvorbis-dev.docs @@ -1 +1 @@ -README +debian/tmp/usr/share/doc/libvorbis-1.0rc3/* diff --git a/debian/libvorbis-dev.examples b/debian/libvorbis-dev.examples index 2ebd4e7..43ec862 100644 --- a/debian/libvorbis-dev.examples +++ b/debian/libvorbis-dev.examples @@ -1,5 +1 @@ -examples/chaining_example.c -examples/decoder_example.c -examples/encoder_example.c -examples/seeking_example.c -examples/vorbisfile_example.c +examples/*.c diff --git a/debian/libvorbis0.dirs b/debian/libvorbis0.dirs deleted file mode 100644 index 6845771..0000000 --- a/debian/libvorbis0.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/libvorbis0.docs b/debian/libvorbis0.docs deleted file mode 100644 index e845566..0000000 --- a/debian/libvorbis0.docs +++ /dev/null @@ -1 +0,0 @@ -README diff --git a/debian/rules b/debian/rules index 37916bd..0c5bbef 100755 --- a/debian/rules +++ b/debian/rules @@ -8,13 +8,16 @@ # This is the debhelper compatability version to use. export DH_COMPAT=3 +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + configure: configure-stamp configure-stamp: dh_testdir - # Add here commands to configure the package. - # If compiling cvs version change to ./autogen.sh --prefix=/usr - ./configure --prefix=/usr + # If compiling cvs version change to ./autogen.sh --prefix=/usr + ./configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \ + --prefix=/usr touch configure-stamp @@ -22,17 +25,30 @@ build: configure-stamp build-stamp build-stamp: dh_testdir - # Add here commands to compile the package. $(MAKE) touch build-stamp -clean: +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 + +clean: autotools dh_testdir dh_testroot rm -f build-stamp configure-stamp - # Add here commands to clean up after the build process. -$(MAKE) distclean dh_clean @@ -43,7 +59,6 @@ install: build dh_clean -k dh_installdirs - # Add here commands to install the package into debian/tmp. $(MAKE) install DESTDIR=`pwd`/debian/tmp @@ -57,7 +72,7 @@ binary-arch: build install dh_testroot dh_movefiles - dh_installdocs debian/tmp/usr/share/doc/libvorbis-1.0rc2/* + dh_installdocs dh_installexamples dh_installmanpages dh_installchangelogs @@ -73,4 +88,4 @@ binary-arch: build install dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: autotools build clean binary-indep binary-arch binary install configure -- 2.7.4