xterm: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/rules | 23 +++++++++++++----------
2 files changed, 21 insertions(+), 10 deletions(-)
New commits:
commit d4ba8973f5f15d5a396fd5e4bf56e563205979ae
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 9 17:34:37 2008 +0100
debian/rules: don't fail in patch if the patches are already applied
Also create the patch stamp in the same way as the other stamp files
(closes: #498327). Thanks, Petr Salinger!
diff --git a/debian/changelog b/debian/changelog
index 94c4310..a859312 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xterm (236-2) UNRELEASED; urgency=low
+
+ * debian/rules: don't fail in patch if the patches are already applied; also
+ create the patch stamp in the same way as the other stamp files
+ (closes: #498327). Thanks, Petr Salinger!
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 09 Sep 2008 15:28:07 +0100
+
xterm (236-1) unstable; urgency=low
[ Brice Goglin ]
diff --git a/debian/rules b/debian/rules
index ecd5ad1..429293c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,17 +75,20 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
.PHONY: patch
patch: $(STAMP_DIR)/patch
$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
- @echo -n "Applying patches... "
- @if $(QUILT) push -a -v > $(STAMP_DIR)/log/patch 2>&1; then \
- cat $(STAMP_DIR)/log/patch; \
- echo "successful."; \
+ if $(QUILT) next >/dev/null 2>&1; then \
+ echo -n "Applying patches... "; \
+ if $(QUILT) push -a -v > $(STAMP_DIR)/log/patch 2>&1; then \
+ cat $(STAMP_DIR)/log/patch; \
+ echo "successful."; \
+ else \
+ cat $(STAMP_DIR)/log/patch; \
+ echo "failed! (Check $(STAMP_DIR)/log/patch for details)"; \
+ exit 1; \
+ fi; \
else \
- cat $(STAMP_DIR)/log/patch; \
- echo "failed! (Check $(STAMP_DIR)/log/patch for details)"; \
- exit 1; \
- fi; \
-
- touch $@
+ echo "No patches to apply"; \
+ fi
+ >$@
# Revert all patches to the upstream source.
.PHONY: unpatch
Reply to: