summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-03-01 12:25:29 +0000
committerColin Watson <cjwatson@debian.org>2010-03-01 12:25:29 +0000
commit02cb5696fc4addea1a8358d4df023109876b6ced (patch)
treeae54077f80de4b985fabf02924f200116b2d7cd7
parentc27683d815d5ebfbd7cc4a58cabf5d25791ba4df (diff)
Fix 'debian/rules quilt-setup' to avoid writing .orig files if some
patches apply with offsets.
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/rules2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 77bf05933..c9916fb7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1openssh (1:5.3p1-4) UNRELEASED; urgency=low
2
3 * Fix 'debian/rules quilt-setup' to avoid writing .orig files if some
4 patches apply with offsets.
5
6 -- Colin Watson <cjwatson@debian.org> Mon, 01 Mar 2010 12:24:41 +0000
7
1openssh (1:5.3p1-3) unstable; urgency=low 8openssh (1:5.3p1-3) unstable; urgency=low
2 9
3 * Convert to source format 3.0 (quilt). 10 * 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:
352quilt-setup: 352quilt-setup:
353 [ ! -d .pc ] 353 [ ! -d .pc ]
354 set -e; for patch in $$(quilt series | tac); do \ 354 set -e; for patch in $$(quilt series | tac); do \
355 patch -p1 -R <"debian/patches/$$patch"; \ 355 patch -p1 -R --no-backup-if-mismatch <"debian/patches/$$patch"; \
356 done 356 done
357 quilt push -a 357 quilt push -a
358 358