From 97e8eeb30cf9870103236f35c5724a0e09c52851 Mon Sep 17 00:00:00 2001 From: calc Date: Wed, 3 Sep 2003 07:17:09 +0000 Subject: [PATCH] debian packaging updates for vorbis-tools 1.0.1-1 svn path=/trunk/vorbis-tools/; revision=5303 --- debian/changelog | 16 ++++++ debian/control | 4 +- debian/copyright | 4 +- debian/rules | 91 ++++++++++++++++--------------- debian/vorbis-tools.README.Debian | 2 +- debian/vorbis-tools.install | 5 ++ 6 files changed, 73 insertions(+), 49 deletions(-) diff --git a/debian/changelog b/debian/changelog index 58e7ddf..323ffd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +vorbis-tools (1.0.1-1) unstable; urgency=low + + * New upstream. + * Include ogg123rc-example. (Closes: #187204) + * Add application/ogg to vorbis-tools.mime. (Closes: #204883) + + -- Christopher L Cheney Wed, 3 Sep 2003 02:00:00 -0500 + +vorbis-tools (1.0.0-2) unstable; urgency=low + + * Rebuild against new libvorbis0a package. + * GNU config automated update: config.sub (20020621 to 20030103), + config.guess (20020529 to 20030110) + + -- Christopher L Cheney Sat, 8 Mar 2003 13:30:00 -0600 + vorbis-tools (1.0.0-1) unstable; urgency=low * New upstream. diff --git a/debian/control b/debian/control index ee12c44..2116c42 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: vorbis-tools Section: sound Priority: optional Maintainer: Christopher L Cheney -Build-Depends: autotools-dev, bison, debhelper (>> 3.0.0), devscripts, libcurl-dev, libao-dev (>> 0.8.3), libogg-dev (>> 1.0.0), libvorbis-dev (>> 1.0.0) -Standards-Version: 3.5.6.0 +Build-Depends: autotools-dev, bison, debhelper (>> 4.0.18), devscripts, libcurl-dev, libao-dev (>> 0.8.4), libogg-dev (>> 1.1.0), liboggflac-dev, libspeex-dev, libvorbis-dev (>> 1.0.1) +Standards-Version: 3.6.1.0 Package: vorbis-tools Architecture: any diff --git a/debian/copyright b/debian/copyright index a2aff0f..a6ba491 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,8 +3,8 @@ Tue, 31 Oct 2000 16:38:42 -0600. It was downloaded from http://www.vorbis.com/download_unix.psp -Upstream Author(s): Kenneth Arnold - Michael Smith +Upstream Authors: Kenneth Arnold + Michael Smith Copyright: diff --git a/debian/rules b/debian/rules index 3e99d0e..7381f38 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 @@ -40,29 +47,23 @@ configure-stamp: 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_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 diff --git a/debian/vorbis-tools.README.Debian b/debian/vorbis-tools.README.Debian index d1b1b51..72907a9 100644 --- a/debian/vorbis-tools.README.Debian +++ b/debian/vorbis-tools.README.Debian @@ -1,6 +1,6 @@ vorbis-tools for Debian ----------------------- -Copy examples/ogg123rc-example to ~/.ogg123rc +Copy examples/ogg123rc-example to /etc/ogg123rc or ~/.ogg123rc -- Christopher L Cheney , Tue, 31 Oct 2000 16:38:42 -0600 diff --git a/debian/vorbis-tools.install b/debian/vorbis-tools.install index 997f6a3..f2c6060 100644 --- a/debian/vorbis-tools.install +++ b/debian/vorbis-tools.install @@ -4,6 +4,11 @@ debian/tmp/usr/bin/oggenc debian/tmp/usr/bin/ogginfo debian/tmp/usr/bin/vcut debian/tmp/usr/bin/vorbiscomment +debian/tmp/usr/share/locale/da/LC_MESSAGES/vorbis-tools.mo +debian/tmp/usr/share/locale/es/LC_MESSAGES/vorbis-tools.mo debian/tmp/usr/share/locale/fr/LC_MESSAGES/vorbis-tools.mo +debian/tmp/usr/share/locale/hr/LC_MESSAGES/vorbis-tools.mo +debian/tmp/usr/share/locale/hu/LC_MESSAGES/vorbis-tools.mo debian/tmp/usr/share/locale/nl/LC_MESSAGES/vorbis-tools.mo +debian/tmp/usr/share/locale/ru/LC_MESSAGES/vorbis-tools.mo debian/tmp/usr/share/locale/sv/LC_MESSAGES/vorbis-tools.mo -- GitLab