From 30689f39ddee8db45b3986ee7be1e3a01976693d Mon Sep 17 00:00:00 2001 From: calc Date: Wed, 3 Sep 2003 06:25:03 +0000 Subject: [PATCH] debian packaging updates for libvorbis 1.0.1-1 svn path=/trunk/vorbis/; revision=5301 --- debian/changelog | 23 ++++++ debian/control | 31 +++++-- debian/copyright | 2 +- debian/libvorbis-dev.examples | 1 + debian/{libvorbis0.install => libvorbis0a.install} | 0 debian/rules | 95 +++++++++++----------- 6 files changed, 97 insertions(+), 55 deletions(-) rename debian/{libvorbis0.install => libvorbis0a.install} (100%) diff --git a/debian/changelog b/debian/changelog index 8120b58..ad2650b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +libvorbis (1.0.1-1) unstable; urgency=low + + * New upstream. + * Improved descriptions. (Closes: #166649) + + -- Christopher L Cheney Wed, 3 Sep 2003 00:15:00 -0500 + +libvorbis (1.0.0-3) unstable; urgency=low + + * Add libvorbis0 conflict to libvorbis0a. + + -- Christopher L Cheney Wed, 12 Mar 2003 17:00:00 -0600 + +libvorbis (1.0.0-2) unstable; urgency=low + + * Rename libvorbis0 -> libvorbis0a to keep packages from upgrading to it + by mistake. (Closes: #156227, #156365, #161961, #171548, #172466, + #172469, #178756) + * GNU config automated update: config.sub (20020621 to 20030103), + config.guess (20020529 to 20030110) + + -- Christopher L Cheney Sat, 8 Mar 2003 13:00:00 -0600 + libvorbis (1.0.0-1) unstable; urgency=low * New upstream. diff --git a/debian/control b/debian/control index 79c4478..b3f2646 100644 --- a/debian/control +++ b/debian/control @@ -2,17 +2,21 @@ Source: libvorbis Section: libs Priority: optional Maintainer: Christopher L Cheney -Build-Depends: autotools-dev, debhelper (>> 4.0.0), devscripts, libogg-dev (>> 1.0.0) -Standards-Version: 3.5.6.0 +Build-Depends: autotools-dev, debhelper (>> 4.0.18), devscripts, libogg-dev (>> 1.1.0) +Standards-Version: 3.6.1.0 -Package: libvorbis0 +Package: libvorbis0a Architecture: any Section: libs Depends: ${shlibs:Depends} +Conflicts: libvorbis0 +Replaces: libvorbis0 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. + . + The Vorbis library is the primary Ogg Vorbis library. Package: libvorbisenc2 Architecture: any @@ -24,6 +28,9 @@ 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. + . + The Vorbisenc library provides a convenient API for setting up an encoding + environment using libvorbis. Package: libvorbisfile3 Architecture: any @@ -35,11 +42,19 @@ 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. + . + The Vorbisfile library provides a convenient high-level API for decoding + and basic manipulation of all Vorbis I audio streams. Package: libvorbis-dev Architecture: any -Section: devel -Depends: libogg-dev, libvorbis0 (= ${Source-Version}), libvorbisenc2 (= ${Source-Version}), libvorbisfile3 (= ${Source-Version}) -Description: Vorbis Library Development - The libvorbis-dev package contains the header files and documentation - needed to develop applications with libvorbis. +Section: libdevel +Depends: libogg-dev, libvorbis0a (= ${Source-Version}), libvorbisenc2 (= ${Source-Version}), libvorbisfile3 (= ${Source-Version}) +Description: The Vorbis General Audio Compression Codec (development files) + 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. + . + This package contains the header files and documentation needed to develop + applications with libvorbis. + diff --git a/debian/copyright b/debian/copyright index 8f46e97..2080282 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Tue, 31 Oct 2000 15:08:22 -0600. It was downloaded from http://www.vorbis.com/download_unix.psp -Upstream Author(s): Monty +Upstream Author: Monty Copyright: diff --git a/debian/libvorbis-dev.examples b/debian/libvorbis-dev.examples index 43ec862..1ae77b5 100644 --- a/debian/libvorbis-dev.examples +++ b/debian/libvorbis-dev.examples @@ -1 +1,2 @@ examples/*.c +examples/*.pl diff --git a/debian/libvorbis0.install b/debian/libvorbis0a.install similarity index 100% rename from debian/libvorbis0.install rename to debian/libvorbis0a.install diff --git a/debian/rules b/debian/rules index 295eae1..db21596 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 + dh_shlibdeps -ldebian/libvorbis0a/usr/lib dh_gencontrol dh_md5sums dh_builddeb # Build architecture independant packages using the common target. -binary-indep: build install +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 -- 2.7.4