r19 - in trunk/packages/vorbis-tools/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2006-01-16 21:56:11 +0000 (Mon, 16 Jan 2006)
New Revision: 19

Added:
   trunk/packages/vorbis-tools/debian/patches/series
Removed:
   trunk/packages/vorbis-tools/debian/do-patches.sh
Modified:
   trunk/packages/vorbis-tools/debian/changelog
   trunk/packages/vorbis-tools/debian/control
   trunk/packages/vorbis-tools/debian/rules
Log:
Go quilt.


Modified: trunk/packages/vorbis-tools/debian/changelog
===================================================================
--- trunk/packages/vorbis-tools/debian/changelog	2006-01-16 21:04:52 UTC (rev 18)
+++ trunk/packages/vorbis-tools/debian/changelog	2006-01-16 21:56:11 UTC (rev 19)
@@ -1,3 +1,9 @@
+vorbis-tools (1.1.1-3) unstable; urgency=low
+
+  * Switch patch management to quilt.
+
+ -- Adeodato Simó <dato at net.com.org.es>  Mon, 16 Jan 2006 22:49:20 +0100
+
 vorbis-tools (1.1.1-2) unstable; urgency=medium
 
   * Switch maintenance to the Debian Xiph.org Maintainers (alioth/pkg-xiph).

Modified: trunk/packages/vorbis-tools/debian/control
===================================================================
--- trunk/packages/vorbis-tools/debian/control	2006-01-16 21:04:52 UTC (rev 18)
+++ trunk/packages/vorbis-tools/debian/control	2006-01-16 21:56:11 UTC (rev 19)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xiph.org Maintainers <pkg-xiph-maint at lists.alioth.debian.org>
 Uploaders: Christopher L Cheney <ccheney at debian.org>, Adeodato Simó <dato at net.com.org.es>
-Build-Depends: autotools-dev, debhelper, libcurl3-gnutls-dev, libao-dev, libogg-dev, liboggflac-dev, libspeex-dev, libvorbis-dev
+Build-Depends: autotools-dev, debhelper, quilt, libcurl3-gnutls-dev, libao-dev, libogg-dev, liboggflac-dev, libspeex-dev, libvorbis-dev
 Standards-Version: 3.6.2
 
 Package: vorbis-tools

Deleted: trunk/packages/vorbis-tools/debian/do-patches.sh

Added: trunk/packages/vorbis-tools/debian/patches/series
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/series	2006-01-16 21:04:52 UTC (rev 18)
+++ trunk/packages/vorbis-tools/debian/patches/series	2006-01-16 21:56:11 UTC (rev 19)
@@ -0,0 +1,10 @@
+upstream_r9935-dont_clobber_file_on_error.diff
+upstream_r9696-play_from_pipe.diff
+upstream_r10080-fix_non-ascii_comments.diff
+for_upstream-mention_alsa09_in_ogg123.1.diff
+for_upstream-oggenc_inputfile_vs_input.wav.diff
+for_upstream-mention_option_-R_in_vorbiscomment.1.diff
+for_upstream-manpage_typos.diff
+for_upstream-encodage_vs_codage_in_fr.po.diff
+no_debian_subdir.diff
+no_fast-math.diff

Modified: trunk/packages/vorbis-tools/debian/rules
===================================================================
--- trunk/packages/vorbis-tools/debian/rules	2006-01-16 21:04:52 UTC (rev 18)
+++ trunk/packages/vorbis-tools/debian/rules	2006-01-16 21:56:11 UTC (rev 19)
@@ -43,7 +43,8 @@
 	ln -sf /usr/share/misc/config.sub .
 	ln -sf /usr/share/misc/config.guess .
 
-	sh debian/do-patches.sh apply
+	ln -sf debian/patches
+	quilt push -a || test $$? = 2
 
 	-mkdir $(objdir)
 	cd $(objdir) && \
@@ -66,8 +67,12 @@
 	dh_testdir
 	dh_testroot
 
-	sh debian/do-patches.sh unapply
+	quilt pop -a -R || test $$? = 2
 
+	# remove quilt cruft
+	rm -f   patches
+	rm -rf .pc
+
 	rm -f configure-stamp build-stamp install-stamp
 	rm -f config.guess config.sub