[SCM] adplug/master: Switch to quilt for patching.

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Sun Sep 26 15:46:40 UTC 2010


The following commit has been merged in the master branch:
commit 9a59f0a7c0728b48c591156b8b053486ada6fc45
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Sep 26 11:19:22 2010 -0400

    Switch to quilt for patching.

diff --git a/debian/control b/debian/control
index b5f7452..e050cac 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Andres Mejia <mcitadel at gmail.com>
-Build-Depends: debhelper (>= 5), dpatch, libbinio-dev, pkg-config
+Build-Depends: debhelper (>= 5), quilt, libbinio-dev, pkg-config
 Standards-Version: 3.9.1
 Homepage: http://adplug.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/adplug.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f7485a8..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01-include
-02-fix-ftbfs-with-gcc-4.3.dpatch
-03-no-tests.dpatch
diff --git a/debian/patches/01-include.dpatch b/debian/patches/01-include.patch
similarity index 100%
rename from debian/patches/01-include.dpatch
rename to debian/patches/01-include.patch
diff --git a/debian/patches/02-fix-ftbfs-with-gcc-4.3.dpatch b/debian/patches/02-fix-ftbfs-with-gcc-4.3.patch
similarity index 100%
rename from debian/patches/02-fix-ftbfs-with-gcc-4.3.dpatch
rename to debian/patches/02-fix-ftbfs-with-gcc-4.3.patch
diff --git a/debian/patches/03-no-tests.dpatch b/debian/patches/03-no-tests.patch
similarity index 100%
rename from debian/patches/03-no-tests.dpatch
rename to debian/patches/03-no-tests.patch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..935b94a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01-include.patch
+02-fix-ftbfs-with-gcc-4.3.patch
+03-no-tests.patch
diff --git a/debian/rules b/debian/rules
index d668e2c..b5a0816 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 CFLAGS = -Wall -g
 
@@ -13,7 +13,7 @@ else
 	CFLAGS += -O2
 endif
 
-config.status: configure patch-stamp
+config.status: patch configure patch-stamp
 	dh_testdir
 
 	# Configuring package

-- 
adplug packaging



More information about the pkg-multimedia-commits mailing list