xterm: Changes to 'debian-unstable'

[Brice Goglin <bgoglin-guest@alioth.debian.org>]

 debian/rules |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit bc10e20820ad6d2c923ea85a514e94f474127217
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date:   Thu Jul 12 16:18:13 2007 +0200

    Fix "display which patches are applied and removed".
    
    Fix commit 3b97855d7733d527a332c4b207878fcc8abd3a5b to check the
    return value of quilt, not the one of tee.

diff --git a/debian/rules b/debian/rules
index 8b81f61..a06375e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,9 +68,11 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
 patch: $(STAMP_DIR)/patch
 $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
 	@echo -n "Applying patches... "
-	@if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+	@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; \
@@ -83,9 +85,11 @@ unpatch:
 	rm -f $(STAMP_DIR)/patch
 	@if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
 	  echo -n "Unapplying patches... "; \
-	  if $(QUILT) pop -a 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+	  if $(QUILT) pop -a -v > $(STAMP_DIR)/log/unpatch 2>&1; then \
+	    cat $(STAMP_DIR)/log/unpatch; \
 	    echo " successful."; \
 	  else \
+	    cat $(STAMP_DIR)/log/unpatch; \
 	    echo " failed! (Check $(STAMP_DIR)/log/unpatch for details)"; \
 	    exit 1; \
 	  fi; \