xserver-xorg-video-nv: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
debian/xsfbs/xsfbs.mk | 8 ++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit e0af1bf9f253caf12c3e753062575ec988517275
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Jul 12 17:05:51 2007 +0200
add changelog entry
diff --git a/debian/changelog b/debian/changelog
index 428784a..fa60e6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.2-3) UNRELEASED; urgency=low
+
+ * Update to a non-buggy xsfbs patching.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Thu, 12 Jul 2007 16:40:08 +0200
+
xserver-xorg-video-nv (1:2.1.2-2) unstable; urgency=low
* Pull upstream commit ec78618d, to "fix a minor GeForceFX + flatpanel +
commit 12a633f722a2ff9677728d1e2ae56767f804232a
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Jul 12 16:06:22 2007 +0200
Fix "display the output of quilt push/pop".
Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the
return value of quilt, not the one of tee.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5f13302..bfca7bb 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
fi; \
if $(QUILT) next >/dev/null 2>&1; then \
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; \
@@ -164,9 +166,11 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if $(QUILT) pop -a -v 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; \
Reply to: