Author: branden
Date: 2004-03-07 15:40:39 -0500 (Sun, 07 Mar 2004)
New Revision: 1141
Modified:
trunk/debian/changelog
trunk/debian/rules
Log:
Fix build-server rule to copy a hardlinked source tree for the debugging
server build exactly as the normal build rule does; the clever tricks
undertaken to conserve inodes did not work properly (thanks, Daniel
Jacobowitz).
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-03-05 19:41:48 UTC (rev 1140)
+++ trunk/debian/changelog 2004-03-07 20:40:39 UTC (rev 1141)
@@ -1,3 +1,13 @@
+xfree86 (4.3.0-6) unstable; urgency=low
+
+ * Fix build-server rule to copy a hardlinked source tree for the debugging
+ server build exactly as the normal build rule does; the clever tricks
+ undertaken to conserve inodes did not work properly (thanks, Daniel
+ Jacobowitz).
+ - debian/rules
+
+ -- Branden Robinson <[EMAIL PROTECTED]> Sun, 7 Mar 2004 15:39:07 -0500
+
xfree86 (4.3.0-5) unstable; urgency=medium
* Urgency due to fix for FTBFS on some architectures.
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2004-03-05 19:41:48 UTC (rev 1140)
+++ trunk/debian/rules 2004-03-07 20:40:39 UTC (rev 1141)
@@ -501,23 +501,7 @@
$(STAMP_DIR)/build-server: patch-audit $(STAMP_DIR)/genscripts
dh_testdir
# create source tree for static, debuggable XFree86 server
- mkdir $(SOURCE_TREE)-xserver-xfree86-dbg
- # we don't copy the doc, fonts or nls directories to save space; see
- # the definition of SUBDIRS in xc/Imakefile
- for FILE in $(SOURCE_TREE)/* \
- $(SOURCE_TREE)/lib/* \
- $(SOURCE_TREE)/programs/* \
- $(SOURCE_TREE)/programs/Xserver; do \
- if [ -f $$FILE ]; then \
- cp -p $$FILE $(SOURCE_TREE)-xserver-xfree86-dbg; \
- fi; \
- done
- for DIR in config extras include util \
- lib/GL lib/Xau lib/Xdmcp lib/font lib/xkbfile lib/xtrans \
- programs/Xserver; do \
- mkdir -p $(SOURCE_TREE)-xserver-xfree86-dbg/$$DIR; \
- cp -drl $(SOURCE_TREE)/$$DIR
$(SOURCE_TREE)-xserver-xfree86-dbg/$$DIR; \
- done
+ cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xfree86-dbg
ifndef test_rules
$(MAKE) -C $(SOURCE_TREE) WORLDOPTS="" IMAKE_DEFINES="$(IMAKE_DEFINES)
-DBuildServersOnly=YES" World
$(MAKE) -C $(SOURCE_TREE)-xserver-xfree86-dbg WORLDOPTS=""
IMAKE_DEFINES="$(SERVERDEBUG_IMAKE_DEFINES)" World
