From 02cb5696fc4addea1a8358d4df023109876b6ced Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 1 Mar 2010 12:25:29 +0000 Subject: Fix 'debian/rules quilt-setup' to avoid writing .orig files if some patches apply with offsets. --- debian/changelog | 7 +++++++ debian/rules | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 77bf05933..c9916fb7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +openssh (1:5.3p1-4) UNRELEASED; urgency=low + + * Fix 'debian/rules quilt-setup' to avoid writing .orig files if some + patches apply with offsets. + + -- Colin Watson Mon, 01 Mar 2010 12:24:41 +0000 + openssh (1:5.3p1-3) unstable; urgency=low * Convert to source format 3.0 (quilt). diff --git a/debian/rules b/debian/rules index 1abd84781..c855dc6c2 100755 --- a/debian/rules +++ b/debian/rules @@ -352,7 +352,7 @@ debian/faq.html: quilt-setup: [ ! -d .pc ] set -e; for patch in $$(quilt series | tac); do \ - patch -p1 -R <"debian/patches/$$patch"; \ + patch -p1 -R --no-backup-if-mismatch <"debian/patches/$$patch"; \ done quilt push -a -- cgit v1.2.3