Author: dnusinow
Date: 2005-09-19 18:41:58 -0500 (Mon, 19 Sep 2005)
New Revision: 609
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/rules
Log:
* Allow patch target to succeed if there simply are no patches available
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-09-19 20:10:54 UTC (rev 608)
+++ branches/6.9/debian/changelog 2005-09-19 23:41:58 UTC (rev 609)
@@ -5,8 +5,9 @@
* Change NONDBG_PACKAGES to correctly remove packages we don't need to send
to dh_strip
* Remove obsolete "| xlibs (> 4.1.0)" from various shlibs packaging files
+ * Allow patch target to succeed if there simply are no patches available
- -- David Nusinow <[EMAIL PROTECTED]> Sun, 18 Sep 2005 20:28:42 -0400
+ -- David Nusinow <[EMAIL PROTECTED]> Mon, 19 Sep 2005 19:40:11 -0400
xorg-x11 (6.8.99.900.dfsg.1-0pre1) experimental; urgency=low
Modified: branches/6.9/debian/rules
===================================================================
--- branches/6.9/debian/rules 2005-09-19 20:10:54 UTC (rev 608)
+++ branches/6.9/debian/rules 2005-09-19 23:41:58 UTC (rev 609)
@@ -200,12 +200,16 @@
stampdir_targets+=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 \
- echo "successful."; \
+ if quilt next; then \
+ @echo -n "Applying patches..."; \
+ if quilt push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ echo "successful."; \
+ else \
+ echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
+ exit 1; \
+ fi; \
else \
- echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
- exit 1; \
+ @echo "No patches to apply"; \
fi; \
>$@
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
