[SCM] lame/master: Use dpkg-source unapply-patches option to unapply patches.
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Wed Jul 27 01:27:12 UTC 2011
The following commit has been merged in the master branch:
commit a96a1fbed38373ebae363f8e778a0ad2f1eb52d6
Author: Andres Mejia <mcitadel at gmail.com>
Date: Tue Jul 26 21:18:49 2011 -0400
Use dpkg-source unapply-patches option to unapply patches.
diff --git a/debian/rules b/debian/rules
index a6153cd..b566395 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,3 @@ override_dh_auto_configure:
--with-fileio=lame \
--enable-expopt=full \
--disable-debug
-
-override_dh_clean:
- dh_clean
- ! test -x `which quilt` || \
- QUILT_PATCHES=debian/patches quilt pop -a || \
- true
- rm -rf .pc/
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 6932cad..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# Ignore this error. A test will be used to check if quilt is installed and if
-# so, use quilt to unapply patches.
-lame source: missing-build-dependency quilt
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes
--
lame packaging
More information about the pkg-multimedia-commits
mailing list