Author: branden
Date: 2003-07-23 12:02:45 -0500 (Wed, 23 Jul 2003)
New Revision: 302
Modified:
branches/4.3.0/sid/debian/rules
Log:
debian/rules: really resync this file with the trunk; get rid of some of
daniels's editorializing, clean up comments, clean up whitespace,
eradicate gratuitous style changes, and so forth, leaving only the new
stuff that is actually needed for packaging 4.3.0
Modified: branches/4.3.0/sid/debian/rules
==============================================================================
--- branches/4.3.0/sid/debian/rules 2003-07-23 17:00:43 UTC (rev 301)
+++ branches/4.3.0/sid/debian/rules 2003-07-23 17:02:45 UTC (rev 302)
@@ -63,28 +63,24 @@
DEBUGFLAGS:=-DDebianGccOptimizeOpt='-O0'
# Set some Imake variables for the regular and server-debugging builds.
-# Don't remove *any* spaces from IMAKE_DEFINES or SERVER_DEBUG_IMAKE_DEFINES
-# lines. Ever.
TIMESTAMP:=$(shell env TZ=UTC date +%Y%m%d%H%M%S)
IMAKE_DEFINES:=-DXFree86CustomVersion='\"Debian $(SOURCE_VERSION) $(TIMESTAMP)
$(BUILDER)\"'
-SERVERDEBUG_IMAKE_DEFINES:=-DXFree86CustomVersion='\"Debian (static)
$(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"' -DBuildServersOnly=YES
-DDoLoadableServer=NO -DXnestServer=NO -DXVirtualFramebufferServer=NO -DXprtServer=NO
$(DEBUGFLAGS)
+# XXX: replace -DDefaultGcc2OptimizeOpt=-O0 with $(DEBUGFLAGS) when the time
+# comes (see above)
+SERVERDEBUG_IMAKE_DEFINES:=-DXFree86CustomVersion='\"Debian (static)
$(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"' -DBuildServersOnly=YES
-DDoLoadableServer=NO -DXnestServer=NO -DXVirtualFramebufferServer=NO -DXprtServer=NO
-DDefaultGcc2OptimizeOpt=-O0
# If this is an official build, set the BuilderEMailAddr that gets displayed in
# some error messages.
ifeq ($(OFFICIAL_BUILD),yes)
BUILDER_EMAIL_ADDR:[EMAIL PROTECTED]
-else
-BUILDER_EMAIL_ADDR:[EMAIL PROTECTED]
-endif
-
IMAKE_DEFINES+= -DBuilderEMailAddr='\"$(BUILDER_EMAIL_ADDR)\"'
SERVERDEBUG_IMAKE_DEFINES+= -DBuilderEMailAddr='\"$(BUILDER_EMAIL_ADDR)\"'
+endif
# Determine whether we're compiling with optimization turned off; does
# DEB_BUILD_OPTIONS contain the "noopt" flag? (see XXX comment above)
-
-# does DEB_BUILD_OPTIONS contain the "noopt" flag?
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+# don't get rid of the space in the next line
IMAKE_DEFINES+= $(DEBUGFLAGS)
endif
@@ -144,16 +140,17 @@
# Rule to clean the maintainer scripts.
cleanscripts:
rm -f debian/*.config debian/*.postinst debian/*.postrm debian/*.preinst
debian/*.prerm
- rm -f $(STAMP_DIR)/genscripts debian/xserver-xfree86-dbg.templates
- # Tell debconf that -dbg.templates is gone.
+ rm -f debian/xserver-xfree86-dbg.templates
+ # tell po-debconf xserver-xfree86-dbg.templates is gone
debconf2po-update
+ rm -f $(STAMP_DIR)/genscripts
clean: source.clean cleanscripts
dh_testdir
dh_testroot
rm -rf $(STAMP_DIR) $(DEBTREEDIR)
- dh_clean debian/local/xserver-wrapper debian/local/xterm.faq.text.gz
debian/MANIFEST.$(ARCH).new # debian/local/XFree86-FAQ.text.gz
rm -rf debian/local/exports debian/local/xlibmesa-drm-src/modules
+ dh_clean debian/local/xserver-wrapper debian/local/xterm.faq.text.gz
debian/MANIFEST.$(ARCH).new
# All 'important' targets have 2 lines. The one that is run by
# dpkg-buildpackage or the user, and the one that does the actual work. This
@@ -192,9 +189,10 @@
< $$FILE > $$MAINTSCRIPT; \
fi; \
done
- # don't forget the templates files, which doesn't need any substitutions
- cp debian/xserver-xfree86.templates debian/xserver-xfree86-dbg.templates
- # And tell po-debconf that -dbg.templates is here again.
+ # don't forget the templates file, which doesn't need any substitutions
+ cp debian/xserver-xfree86.templates \
+ debian/xserver-xfree86-dbg.templates
+ # tell po-debconf xserver-xfree86-dbg.templates is here
debconf2po-update
touch $@
@@ -203,8 +201,7 @@
$(STAMP_DIR)/build: $(STAMP_DIR)/source.make $(STAMP_DIR)/genscripts
dh_testdir
$(checksource_command)
-
- # shoot me now. please.
+
# copy Xft stuff into exports/{lib,include} so we don't have to pull
# in -L/usr/include and other, similarly ugly, stuff (including, but
# not limited to, -I/usr/include).
@@ -225,8 +222,6 @@
# build Debian's X server wrapper
$(CC) -Wall -g -O2 -o debian/local/xserver-wrapper
debian/local/xserver-wrapper.c
endif
- #$(HTML2TEXT) debian/local/XFree86-FAQ.html > debian/local/XFree86-FAQ.text
- #gzip -9 debian/local/XFree86-FAQ.text
$(HTML2TEXT) debian/local/xterm.faq.html > debian/local/xterm.faq.text
gzip -9 debian/local/xterm.faq.text
ifndef test_rules
@@ -314,7 +309,6 @@
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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
