X Strike Force X.Org X11 SVN commit: r581 - trunk/debian
Author: dnusinow
Date: 2005-09-03 12:45:08 -0500 (Sat, 03 Sep 2005)
New Revision: 581
Modified:
trunk/debian/changelog
trunk/debian/rules
Log:
* In debian/rules, change STAMP_DIR target to use STAMP_DIR/stampdir. Have
targets that depended on this also change accordingly. This should allow
dpkg-buildpackage -nc to work. Thanks Jeremy Shaw.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-09-03 16:47:07 UTC (rev 580)
+++ trunk/debian/changelog 2005-09-03 17:45:08 UTC (rev 581)
@@ -11,8 +11,11 @@
people do not get FTBFSes due to Bug#320515. The previous build-conflict
was not enough to ensure that the necessary version of l-k-h was
installed, causing an FTBFS. This does not apply to non-linux arches.
+ * In debian/rules, change STAMP_DIR target to use STAMP_DIR/stampdir. Have
+ targets that depended on this also change accordingly. This should allow
+ dpkg-buildpackage -nc to work. Thanks Jeremy Shaw.
- -- David Nusinow <dnusinow@debian.org> Thu, 1 Sep 2005 19:14:56 -0400
+ -- David Nusinow <dnusinow@debian.org> Sat, 3 Sep 2005 13:39:36 -0400
xorg-x11 (6.8.2.dfsg.1-6) unstable; urgency=low
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-09-03 16:47:07 UTC (rev 580)
+++ trunk/debian/rules 2005-09-03 17:45:08 UTC (rev 581)
@@ -165,14 +165,18 @@
default: environment
# Set up the $(STAMP_DIR) directory.
-$(STAMP_DIR):
- mkdir $@
+.PHONY: stampdir
+stampdir_targets+=stampdir
+stampdir: $(STAMP_DIR)/stampdir
+$(STAMP_DIR)/stampdir:
+ mkdir $(STAMP_DIR)
+ >$@
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
mkdir $(STAMP_DIR)/patches $(STAMP_DIR)/log
echo 2 >$(STAMP_DIR)/patches/.version
ln -s debian/patches patches
@@ -269,7 +273,7 @@
.PHONY: genscripts
stampdir_targets+=genscripts
genscripts: $(STAMP_DIR)/genscripts
-$(STAMP_DIR)/genscripts: $(STAMP_DIR)
+$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
for FILE in debian/*.config.in \
debian/*.postinst.in \
debian/*.postrm.in \
Reply to: