Author: branden
Date: 2004-03-25 14:01:12 -0500 (Thu, 25 Mar 2004)
New Revision: 1177
Modified:
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/rules
trunk/debian/scripts/vars.s390
Log:
Clean up debian/rules's "not building" logic.
+ Rename NOT_BUILDING_XF86_SERVER to NOT_BUILDING_XFREE86_X_SERVER.
+ Use NOT_BUILDING_XFREE86_X_SERVER, not NOT_BUILDING_X_SERVER, to control
whether build-tree/xc-xserver-xfree86-dbg is populated and built. This
should speed up builds on the s390 architecture.
+ Drop now-unused NOT_BUILDING_X_SERVER variable entirely.
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-03-25 17:48:15 UTC (rev 1176)
+++ trunk/debian/TODO 2004-03-25 19:01:12 UTC (rev 1177)
@@ -81,9 +81,6 @@
see bug report
* #238555: xfonts-scalable: drop encodings.dir, fonts.cache-1, fonts.dir, and
fonts.scale from package
-* Stop s390 from doing the debugging build -- it's a waste of time. Ensure
- distinction between NOT_BUILDING_X_SERVER and NOT_BUILDING_XF86_SERVER still
- needed.
Probably for 4.4.0
==================
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-03-25 17:48:15 UTC (rev 1176)
+++ trunk/debian/changelog 2004-03-25 19:01:12 UTC (rev 1177)
@@ -29,8 +29,15 @@
its file argument.
+ For clarity, make source() return from only one location.
- -- Branden Robinson <[EMAIL PROTECTED]> Thu, 25 Mar 2004 12:46:02 -0500
+ * Clean up debian/rules's "not building" logic.
+ + Rename NOT_BUILDING_XF86_SERVER to NOT_BUILDING_XFREE86_X_SERVER.
+ + Use NOT_BUILDING_XFREE86_X_SERVER, not NOT_BUILDING_X_SERVER, to control
+ whether build-tree/xc-xserver-xfree86-dbg is populated and built. This
+ should speed up builds on the s390 architecture.
+ + Drop now-unused NOT_BUILDING_X_SERVER variable entirely.
+ -- Branden Robinson <[EMAIL PROTECTED]> Thu, 25 Mar 2004 13:11:07 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2004-03-25 17:48:15 UTC (rev 1176)
+++ trunk/debian/rules 2004-03-25 19:01:12 UTC (rev 1177)
@@ -223,7 +223,7 @@
# Remove Xft1 -- it is built as part of XFree86.
rm -f imports/lib/libXft.so.1* imports/lib/libXft1*
ln -nsf /usr/include/X11/Xft imports/include/X11
-ifndef NOT_BUILDING_X_SERVER
+ifndef NOT_BUILDING_XFREE86_X_SERVER
# create source tree for static, debuggable XFree86 server
cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xfree86-dbg
# build Debian's X server wrapper
@@ -233,7 +233,7 @@
gzip -9f debian/local/xterm.faq.text
ifndef test_rules
$(MAKE) -C $(SOURCE_TREE) WORLDOPTS="" IMAKE_DEFINES="$(IMAKE_DEFINES)"
World
- ifndef NOT_BUILDING_X_SERVER
+ ifndef NOT_BUILDING_XFREE86_X_SERVER
$(MAKE) -C $(SOURCE_TREE)-xserver-xfree86-dbg WORLDOPTS=""
IMAKE_DEFINES="$(SERVERDEBUG_IMAKE_DEFINES)" World
endif
else
@@ -265,23 +265,12 @@
install -m 755 debian/local/update-fonts-$$FOO
$(DEBTREEDIR)/usr/sbin; \
install -m 644 debian/local/update-fonts-$$FOO.8
$(DEBTREEDIR)/usr/share/man/man8; \
done
- ifdef NOT_BUILDING_X_SERVER
+ ifdef NOT_BUILDING_XFREE86_X_SERVER
# these files need to be installed with the upstream Imakefiles
install -m 644 $(SOURCE_TREE)/programs/Xserver/hw/xfree86/doc/README \
$(SOURCE_TREE)/programs/Xserver/hw/xfree86/doc/README.fonts \
debian/tmp/usr/X11R6/lib/X11/doc
- mkdir -p $(DEBTREEDIR)/etc/X11/xkb
- rm $(DEBTREEDIR)/usr/X11R6/lib/X11/xkb/compiled
- mv $(DEBTREEDIR)/usr/X11R6/lib/X11/xkb/* $(DEBTREEDIR)/etc/X11/xkb
- ln -nsf /etc/X11/xkb/* $(DEBTREEDIR)/usr/X11R6/lib/X11/xkb/
- ln -nsf /var/lib/xkb $(DEBTREEDIR)/usr/X11R6/lib/X11/xkb/compiled
else
- ifdef NOT_BUILDING_XF86_SERVER
- # these files need to be installed with the upstream Imakefiles
- install -m 644 $(SOURCE_TREE)/programs/Xserver/hw/xfree86/doc/README \
-
$(SOURCE_TREE)/programs/Xserver/hw/xfree86/doc/README.fonts \
- debian/tmp/usr/X11R6/lib/X11/doc
- else
# rename the XF86Config manpage to XF86Config-4
mv $(DEBTREEDIR)/usr/X11R6/man/man5/XF86Config.5x \
$(DEBTREEDIR)/usr/X11R6/man/man5/XF86Config-4.5x
@@ -290,7 +279,7 @@
debian/tmp/usr/X11R6/bin/XFree86-debug
mkdir -p $(DEBTREEDIR)/etc/X11/cursors
install -m 644 debian/local/cursors/*.theme
$(DEBTREEDIR)/etc/X11/cursors
- endif
+ endif
rm -f $(DEBTREEDIR)/usr/X11R6/lib/X11/icons/default/index.theme
# remove the upstream symlink X -> XFree86
rm -f $(DEBTREEDIR)/usr/X11R6/bin/X
@@ -304,7 +293,6 @@
# install the Python/GNOME based configlet
install -m 755 -d $(DEBTREEDIR)/usr/share/configlets/xserver-common
install -m 644 debian/local/dexlet/*
$(DEBTREEDIR)/usr/share/configlets/xserver-common
- endif
# other stuff
install -m 755 -d $(DEBTREEDIR)/usr/share/man/man7
install -m 644 debian/local/XF86Config.7
$(DEBTREEDIR)/usr/share/man/man7
@@ -406,7 +394,7 @@
dh_installdirs
dh_installdocs
# how about a dh_installbug? :)
-ifndef NOT_BUILDING_XF86_SERVER
+ifndef NOT_BUILDING_XFREE86_X_SERVER
install -m 755 -d debian/xserver-xfree86/usr/share/bug
install -m 755 debian/xserver-xfree86.bug
debian/xserver-xfree86/usr/share/bug/xserver-xfree86
install -m 755 -d debian/xserver-xfree86-dbg/usr/share/bug
@@ -451,10 +439,8 @@
dh_link
dh_compress
dh_fixperms
-ifndef NOT_BUILDING_X_SERVER
chown root:root debian/xserver-common/usr/X11R6/bin/X
chmod ug+s debian/xserver-common/usr/X11R6/bin/X
-endif
chown :utmp debian/xterm/usr/X11R6/bin/xterm
chmod g+s debian/xterm/usr/X11R6/bin/xterm
dh_installdeb
@@ -486,12 +472,8 @@
@echo '$$(XWSC_SPECIAL_DEPENDS)' is \"$(XWSC_SPECIAL_DEPENDS)\"
@echo '$$(XWSD_SPECIAL_DEPENDS)' is \"$(XWSD_SPECIAL_DEPENDS)\"
@echo '$$(XLIBMESA_GL_SPECIAL_DEPENDS)' is
\"$(XLIBMESA_GL_SPECIAL_DEPENDS)\"
-ifdef NOT_BUILDING_X_SERVER
- @echo '*** This architecture does not build any X server packages.'
-else
- ifdef NOT_BUILDING_XF86_SERVER
+ifdef NOT_BUILDING_XFREE86_X_SERVER
@echo '*** This architecture does not build the XFree86 X server
packages.'
- endif
endif
@echo 'See debian/control for build dependencies.'
Modified: trunk/debian/scripts/vars.s390
===================================================================
--- trunk/debian/scripts/vars.s390 2004-03-25 17:48:15 UTC (rev 1176)
+++ trunk/debian/scripts/vars.s390 2004-03-25 19:01:12 UTC (rev 1177)
@@ -2,4 +2,4 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-NOT_BUILDING_XF86_SERVER=1
+NOT_BUILDING_XFREE86_X_SERVER=1
