[xiph-cvs] cvs commit: vorbis-tools/debian changelog control copyright rules vorbis-tools.README.Debian vorbis-tools.install

Chris Cheney calc at xiph.org
Wed Sep 3 00:17:09 PDT 2003



calc        03/09/03 03:17:09

  Modified:    debian   changelog control copyright rules
                        vorbis-tools.README.Debian vorbis-tools.install
  Log:
  debian packaging updates for vorbis-tools 1.0.1-1

Revision  Changes    Path
1.18      +16 -0     vorbis-tools/debian/changelog

Index: changelog
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/debian/changelog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- changelog	19 Jul 2002 13:58:02 -0000	1.17
+++ changelog	3 Sep 2003 07:17:09 -0000	1.18
@@ -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 <ccheney at debian.org>  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 <ccheney at debian.org>  Sat,  8 Mar 2003 13:30:00 -0600
+
 vorbis-tools (1.0.0-1) unstable; urgency=low
 
   * New upstream.

<p><p>1.22      +2 -2      vorbis-tools/debian/control

Index: control
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/debian/control,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- control	12 Jul 2002 00:59:51 -0000	1.21
+++ control	3 Sep 2003 07:17:09 -0000	1.22
@@ -2,8 +2,8 @@
 Section: sound
 Priority: optional
 Maintainer: Christopher L Cheney <ccheney at debian.org>
-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

<p><p>1.5       +2 -2      vorbis-tools/debian/copyright

Index: copyright
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/debian/copyright,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- copyright	20 Dec 2001 00:42:30 -0000	1.4
+++ copyright	3 Sep 2003 07:17:09 -0000	1.5
@@ -3,8 +3,8 @@
 
 It was downloaded from http://www.vorbis.com/download_unix.psp
 
-Upstream Author(s): Kenneth Arnold <kcarnold at yahoo.com>
-                    Michael Smith <msmith at labyrinth.net.au>
+Upstream Authors: Kenneth Arnold <kcarnold at yahoo.com>
+                  Michael Smith <msmith at labyrinth.net.au>
 
 Copyright:
 

<p><p>1.11      +46 -43    vorbis-tools/debian/rules

Index: rules
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/debian/rules,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rules	12 Jul 2002 00:11:29 -0000	1.10
+++ rules	3 Sep 2003 07:17:09 -0000	1.11
@@ -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
@@ -40,29 +47,23 @@
 
         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
         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

<p><p>1.2       +1 -1      vorbis-tools/debian/vorbis-tools.README.Debian

Index: vorbis-tools.README.Debian
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/debian/vorbis-tools.README.Debian,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vorbis-tools.README.Debian	19 Dec 2001 05:14:32 -0000	1.1
+++ vorbis-tools.README.Debian	3 Sep 2003 07:17:09 -0000	1.2
@@ -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 <ccheney at debian.org>, Tue, 31 Oct 2000 16:38:42 -0600

<p><p>1.2       +5 -0      vorbis-tools/debian/vorbis-tools.install

Index: vorbis-tools.install
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/debian/vorbis-tools.install,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vorbis-tools.install	12 Jul 2002 00:12:10 -0000	1.1
+++ vorbis-tools.install	3 Sep 2003 07:17:09 -0000	1.2
@@ -4,6 +4,11 @@
 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

<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