summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorRoger Leigh <rleigh@debian.org>2009-01-04 12:14:16 +0000
committerRoger Leigh <rleigh@debian.org>2009-01-04 12:14:16 +0000
commit071554808f48f984e0017719b1af2bd66618f687 (patch)
tree3c543350b4441a17fe848ad0c61e56d4c95c971c /debian
parent8063c1faf9dfd440d6d8623b110358841030eef9 (diff)
[debian] rules: update-patch-series uses xargs -r
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rwxr-xr-xdebian/rules2
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 04eb44e..0666f57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ gutenprint (5.2.2-1) experimental; urgency=low
(Closes: #447533).
* debian/cups-driver-gutenprint.postinst: Don't use full path
when running cups-genppdupdate (fix Lintian warning).
+ * debian/rules: update-patch-series: Use xargs -r to cope with null
+ input.
- -- Roger Leigh <rleigh@debian.org> Sun, 04 Jan 2009 12:07:27 +0000
+ -- Roger Leigh <rleigh@debian.org> Sun, 04 Jan 2009 12:13:37 +0000
gutenprint (5.2.1-2) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 7356551..2b886bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ update-patch-series:
mkdir -p $(CURDIR)/debian/patches
rm -f $(CURDIR)/debian/patches/*.patch
git format-patch -o $(CURDIR)/debian/patches patches ^upstream | \
- xargs -n 1 basename > $(CURDIR)/debian/patches/series
+ xargs -n 1 -r basename > $(CURDIR)/debian/patches/series
for patch in $$(ls $(CURDIR)/debian/patches/*.patch); do \
lines=$$(cat $$patch | wc -l); \
head -n $$(($$lines - 3)) $$patch > $${patch}.chomped; \