X Strike Force X.Org X11 SVN commit: r157 - trunk/debian
Author: branden
Date: 2005-06-09 12:13:35 -0500 (Thu, 09 Jun 2005)
New Revision: 157
Modified:
trunk/debian/rules
Log:
Resync debian/rules with Debian xfree86 SVN trunk where appropriate.
Update comments, Makefile variable names, and diagnostics to refer to the
X.Org, XOrg (the X server binary), and xorg-x11 (the source package),
instead of variations on the "XFree86" theme.
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-06-09 16:54:04 UTC (rev 156)
+++ trunk/debian/rules 2005-06-09 17:13:35 UTC (rev 157)
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-# Debian rules file for xfree86 source package
+# Debian rules file for xorg-x11 source package
# Originally by Stephen Early <sde1000@debian.org>
# Modified by Mark W. Eichin <eichin@kitten.gen.ma.us>
# Modified by Adam Heath <doogie@debian.org>
@@ -54,8 +54,6 @@
# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the
# version number. Anything else indicates an unofficial build.
OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" > /dev/null 2>&1; then echo yes; fi)
-# un-confuse Vim's syntax highlighter: "
-OFFICIAL_BUILD:=yes
# XXX: xc/config/cf/* needs some fairly serious hacking to support this in a
# way that David Dawes will accept upstream, so for the time being, this isn't
@@ -186,11 +184,10 @@
cp debian/xserver-xorg.templates \
debian/xserver-xorg-dbg.templates
- # simple sanity check on maintainer scripts
- sh debian/scripts/validate-posix-sh debian/*.config debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm debian/local/dexconf
- #for FILE in debian/*.config debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm; do \
- # sh debian/scripts/validate-posix-sh "$$FILE"; \
- #done
+ # Validate syntax of generated shell scripts.
+ sh debian/scripts/validate-posix-sh debian/*.config debian/*.postinst \
+ debian/*.postrm debian/*.preinst debian/*.prerm
+
touch $@
# Rule to generate the shlibs.local file.
@@ -243,14 +240,12 @@
ln -nsf /usr/include/X11/Xcursor imports/include/X11
# Xft
ln -sf /usr/lib/libXft.* imports/lib
- # Remove Xft1 -- it is built as part of XFree86.
+ # Remove Xft1 -- it is built as part of xorg-x11.
rm -f imports/lib/libXft.so.1* imports/lib/libXft1*
ln -nsf /usr/include/X11/Xft imports/include/X11
-ifndef NOT_BUILDING_XFREE86_X_SERVER
- # create source tree for static, debuggable XFree86 server
- mkdir $(SOURCE_TREE)-xserver-xorg-dbg
- cd $(SOURCE_TREE)/config/util && make -f Makefile.ini lndir
- cd $(SOURCE_TREE)-xserver-xorg-dbg && ../xc/config/util/lndir ../xc
+ifndef NOT_BUILDING_XORG_X_SERVER
+ # Create source tree for static, debuggable XOrg server.
+ cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xfree86-dbg
endif
# build Debian's X server wrapper
$(CC) -Wall -g -O2 -o debian/local/xserver-wrapper debian/local/xserver-wrapper.c
@@ -260,7 +255,7 @@
$(XHTML2TEXT) debian/local/FAQ.xhtml >debian/local/FAQ
ifndef test_rules
$(MAKE) -C $(SOURCE_TREE) WORLDOPTS="" IMAKE_DEFINES="$(IMAKE_DEFINES)" World
- ifndef NOT_BUILDING_XFREE86_X_SERVER
+ ifndef NOT_BUILDING_XORG_X_SERVER
$(MAKE) -C $(SOURCE_TREE)-xserver-xorg-dbg WORLDOPTS="" IMAKE_DEFINES="$(SERVERDEBUG_IMAKE_DEFINES)" World
endif
else
@@ -291,30 +286,30 @@
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_XFREE86_X_SERVER
- # These files, which document more than just the XFree86 X server,
- # should be installed by the upstream Imakefiles even when the XFree86
- # X server isn't being built, but they're poorly placed. Therefore we
- # have to create the destination directory ourselves.
+ ifdef NOT_BUILDING_XORG_X_SERVER
+ # These files, which document more than just the XOrg X server, should
+ # be installed by the upstream Imakefiles even when the XOrg X server
+ # isn't being built, but they're poorly placed. Therefore we have to
+ # create the destination directory ourselves.
install -m 755 -d debian/tmp/usr/X11R6/lib/X11/doc
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
- # copy the static, debuggable XFree86 server
+ # Install the static, debuggable XOrg server.
install -m 755 $(SOURCE_TREE)-xserver-xorg-dbg/programs/Xserver/Xorg \
debian/tmp/usr/X11R6/bin/Xorg-debug
mkdir -p $(DEBTREEDIR)/etc/X11/cursors
install -m 644 debian/local/cursors/*.theme $(DEBTREEDIR)/etc/X11/cursors
endif
rm -f $(DEBTREEDIR)/usr/X11R6/lib/X11/icons/default/index.theme
- # remove the upstream symlink X -> XFree86
+ # Remove the upstream symlink X -> XOrg.
rm -f $(DEBTREEDIR)/usr/X11R6/bin/X
# install Debian's X server wrapper
install -m 755 debian/local/xserver-wrapper $(DEBTREEDIR)/usr/X11R6/bin/X
install -m 644 debian/local/Xwrapper.config.5 $(DEBTREEDIR)/usr/share/man/man5
install -m 755 debian/local/xserverrc $(DEBTREEDIR)/etc/X11/xinit
- # install Debian's XF86Config generator
+ # Install Debian's xorg.conf generator.
install -m 755 debian/local/dexconf $(DEBTREEDIR)/usr/bin
install -m 644 debian/local/dexconf.1 $(DEBTREEDIR)/usr/share/man/man1
# install the Python/GNOME based configlet
@@ -442,9 +437,8 @@
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
- # special handling; don't do this if the manpage doesn't exist, which
- # will be the case if this architecture doesn't build the XFree86 X
- # server
+ # Special handling: don't do this if the manpage doesn't exist, which
+ # will be the case if this architecture doesn't build the XOrg X server.
if [ -e debian/tmp/usr/X11R6/man/man1/Xorg.1x ]; then \
install -m 755 -d debian/xserver-xorg-dbg/usr/X11R6/man/man1; \
install -m 644 debian/tmp/usr/X11R6/man/man1/Xorg.1x debian/xserver-xorg-dbg/usr/X11R6/man/man1/Xorg-debug.1x; \
@@ -453,7 +447,7 @@
dh_installdirs
dh_installdocs
# how about a dh_installbug? :)
-ifndef NOT_BUILDING_XFREE86_X_SERVER
+ifndef NOT_BUILDING_XORG_X_SERVER
install -m 755 -d debian/xserver-xorg/usr/share/bug/xserver-xorg
install -m 644 debian/xserver-xorg.bug.presubj debian/xserver-xorg/usr/share/bug/xserver-xorg/presubj
install -m 755 debian/xserver-xorg.bug.script debian/xserver-xorg/usr/share/bug/xserver-xorg/script
@@ -554,8 +548,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_XFREE86_X_SERVER
- @echo '*** This architecture does not build the XFree86 X server packages.'
+ifdef NOT_BUILDING_XORG_X_SERVER
+ @echo '*** This architecture does not build the XOrg X server packages.'
endif
@echo 'See debian/control for build dependencies.'
@@ -571,7 +565,7 @@
build-server: $(STAMP_DIR)/build-server
$(STAMP_DIR)/build-server: $(STAMP_DIR)/patch-audit $(STAMP_DIR)/genscripts
dh_testdir
- # create source tree for static, debuggable XFree86 server
+ # Create source tree for static, debuggable XOrg server.
cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xorg-dbg
ifndef test_rules
$(MAKE) -C $(SOURCE_TREE) WORLDOPTS="" IMAKE_DEFINES="$(IMAKE_DEFINES) -DBuildServersOnly=YES" World
@@ -581,16 +575,6 @@
endif
touch $@
-build-server-alone: $(STAMP_DIR)/build-server-alone
-$(STAMP_DIR)/build-server-alone: $(STAMP_DIR)/patch-audit $(STAMP_DIR)/genscripts
- dh_testdir
-ifndef test_rules
- $(MAKE) -C $(SOURCE_TREE) WORLDOPTS="" IMAKE_DEFINES="$(IMAKE_DEFINES) -DBuildServersOnly=YES" World
-else
- # skipping build rule because test_rules was defined
-endif
- touch $@
-
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE install RULE ABOVE
install-server: $(STAMP_DIR)/install-server
$(STAMP_DIR)/install-server: DH_OPTIONS=-pxserver-xorg -pxserver-xorg-dbg
@@ -601,7 +585,7 @@
umask 022
dh_clean -k
$(MAKE) -C $(SOURCE_TREE) SHELL="/bin/sh -e" DESTDIR=$(DEBTREEDIR) install install.man
- # copy the static, debuggable XFree86 server
+ # Install the static, debuggable XOrg server.
install -m 755 $(SOURCE_TREE)-xserver-xorg-dbg/programs/Xserver/Xorg \
debian/tmp/usr/X11R6/bin/Xorg-debug
else
@@ -658,6 +642,5 @@
.PHONY: check-manifest check-manifest-arch check-manifest-indep
.PHONY: environment
.PHONY: build-server install-server binary-server
-.PHONY: build-server-alone
# vim:set noet ai sts=8 sw=8 tw=0:
Reply to: