From bf8f15471f410790d3a3083f74d38aa999bcb5c5 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Sat, 20 Nov 2010 22:07:37 +0100 Subject: [PATCH] sponsor-patch: Call dpkg-source with --no-preparation to not apply patches if the packages uses the 3.0 (quilt) format. --- debian/changelog | 7 ++++++- sponsor-patch | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4343d98..31cde8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ ubuntu-dev-tools (0.106) UNRELEASED; urgency=low + [ Kees Cook ] * mk-sbuild: drop "priority" option; sbuild no longer uses it. - -- Kees Cook Fri, 05 Nov 2010 17:36:28 -0700 + [ Benjamin Drung ] + * sponsor-patch: Call dpkg-source with --no-preparation to not apply patches + if the packages uses the 3.0 (quilt) format. + + -- Benjamin Drung Sat, 20 Nov 2010 22:03:07 +0100 ubuntu-dev-tools (0.105) experimental; urgency=low diff --git a/sponsor-patch b/sponsor-patch index 67805be..77a66e5 100755 --- a/sponsor-patch +++ b/sponsor-patch @@ -409,7 +409,7 @@ def merge_branch(branch): return edit def extract_source(dsc_file, verbose=False): - cmd = ["dpkg-source", "-x", dsc_file] + cmd = ["dpkg-source", "--no-preparation", "-x", dsc_file] if not verbose: cmd.insert(1, "-q") Print.command(cmd)