Author: branden
Date: 2004-02-21 00:45:35 -0500 (Sat, 21 Feb 2004)
New Revision: 1092
Modified:
trunk/debian/changelog
trunk/debian/rules
Log:
Make build rule idempotent by having ln and gzip overwrite their
destinations (based on a patch by Eduard Bloch). (Closes: #215793)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-02-21 05:31:29 UTC (rev 1091)
+++ trunk/debian/changelog 2004-02-21 05:45:35 UTC (rev 1092)
@@ -89,8 +89,12 @@
- debian/po/templates.pot
- debian/xserver-xfree86.templates
- -- Branden Robinson <[EMAIL PROTECTED]> Fri, 20 Feb 2004 18:32:58 -0500
+ * Make build rule idempotent by having ln and gzip overwrite their
+ destinations (based on a patch by Eduard Bloch). (Closes: #215793)
+ - debian/rules
+ -- Branden Robinson <[EMAIL PROTECTED]> Sat, 21 Feb 2004 00:43:44 -0500
+
xfree86 (4.3.0-2) unstable; urgency=low
* The "It's like I have a shotgun in my mouth, I've got my finger on the
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2004-02-21 05:31:29 UTC (rev 1091)
+++ trunk/debian/rules 2004-02-21 05:45:35 UTC (rev 1092)
@@ -211,18 +211,18 @@
mkdir -p imports/lib
mkdir -p imports/include/X11/extensions
# Render and Xrender
- ln -s /usr/lib/libXrender.* imports/lib
- ln -s /usr/include/X11/extensions/render.h
imports/include/X11/extensions
- ln -s /usr/include/X11/extensions/renderproto.h
imports/include/X11/extensions
- ln -s /usr/include/X11/extensions/Xrender.h
imports/include/X11/extensions
+ ln -sf /usr/lib/libXrender.* imports/lib
+ ln -sf /usr/include/X11/extensions/render.h
imports/include/X11/extensions
+ ln -sf /usr/include/X11/extensions/renderproto.h
imports/include/X11/extensions
+ ln -sf /usr/include/X11/extensions/Xrender.h
imports/include/X11/extensions
# Xcursor
- ln -s /usr/lib/libXcursor.* imports/lib
- ln -s /usr/include/X11/Xcursor imports/include/X11
+ ln -sf /usr/lib/libXcursor.* imports/lib
+ ln -nsf /usr/include/X11/Xcursor imports/include/X11
# Xft
- ln -s /usr/lib/libXft.* imports/lib
+ ln -sf /usr/lib/libXft.* imports/lib
# Remove Xft1 -- it is built as part of XFree86.
rm -f imports/lib/libXft.so.1* imports/lib/libXft1*
- ln -s /usr/include/X11/Xft imports/include/X11
+ ln -nsf /usr/include/X11/Xft imports/include/X11
ifndef NOT_BUILDING_X_SERVER
# create source tree for static, debuggable XFree86 server
cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xfree86-dbg
@@ -230,7 +230,7 @@
$(CC) -Wall -g -O2 -o debian/local/xserver-wrapper
debian/local/xserver-wrapper.c
endif
$(HTML2TEXT) debian/local/xterm.faq.html > debian/local/xterm.faq.text
- gzip -9 debian/local/xterm.faq.text
+ 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
