X Strike Force X.Org X11 SVN commit: r551 - branches/6.9/debian
Author: dnusinow
Date: 2005-08-23 17:58:03 -0500 (Tue, 23 Aug 2005)
New Revision: 551
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/rules
Log:
* Tighten up debian/rules to allow more flexibility
+ Test things in prepare and patch targets so they don't fail when we've
interrupted a build for some reason and we attempt to re-run them
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-08-23 22:23:01 UTC (rev 550)
+++ branches/6.9/debian/changelog 2005-08-23 22:58:03 UTC (rev 551)
@@ -59,8 +59,11 @@
of xf86Wacom.c to get the patch to apply
* Add new patches:
+ general/018_fix_mesa_build_issues.diff to fix FTBFS
+ * Tighten up debian/rules to allow more flexibility
+ + Test things in prepare and patch targets so they don't fail when we've
+ interrupted a build for some reason and we attempt to re-run them
- -- David Nusinow <dnusinow@debian.org> Sat, 23 Jul 2005 17:40:13 -0400
+ -- David Nusinow <david@squee.verizon.net> Tue, 23 Aug 2005 18:56:19 -0400
xorg-x11 (6.8.2.dfsg.1-5+SVN) UNRELEASED; urgency=low
Modified: branches/6.9/debian/rules
===================================================================
--- branches/6.9/debian/rules 2005-08-23 22:23:01 UTC (rev 550)
+++ branches/6.9/debian/rules 2005-08-23 22:58:03 UTC (rev 551)
@@ -169,12 +169,19 @@
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/prepare
+prepare: $(STAMP_DIR)/prepare $(STAMP_DIR)/patches $(STAMP_DIR)/log
$(STAMP_DIR)/prepare: $(STAMP_DIR)
- mkdir $(STAMP_DIR)/patches $(STAMP_DIR)/log
- echo 2 >$(STAMP_DIR)/patches/.version
- ln -s debian/patches patches
- ln -s $(STAMP_DIR)/patches .pc
+ if [ ! -e $(STAMP_DIR)/patches ]; then \
+ mkdir $(STAMP_DIR)/patches; \
+ ln -s $(STAMP_DIR)/patches .pc \
+ echo 2 >$(STAMP_DIR)/patches/.version \
+ fi;
+ if [ ! -e $(STAMP_DIR)/log ]; then \
+ mkdir $(STAMP_DIR)/log; \
+ fi;
+ if [ ! -e patches ]; then \
+ ln -s debian/patches patches \
+ fi;
>$@
# Apply all patches to the upstream source.
@@ -186,8 +193,10 @@
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; \
+ if [ ! grep '^File series fully applied' $(STAMP_DIR)/log/patch > /dev/null]; then \
+ echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
+ exit 1; \
+ fi; \
fi; \
>$@
Reply to: