[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: r2036 - trunk/debian



Author: fabbione
Date: 2004-11-22 04:32:17 -0500 (Mon, 22 Nov 2004)
New Revision: 2036

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/changelog
   trunk/debian/rules
Log:
Sync debian/rules install-server target with install and make
binary-server work again.



Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS	2004-11-19 16:17:57 UTC (rev 2035)
+++ trunk/debian/CHANGESETS	2004-11-22 09:32:17 UTC (rev 2036)
@@ -319,4 +319,8 @@
 the latest security fixes and rediff 200_alpha_xpm_get_long64.diff.
     2035
 
+Sync debian/rules install-server target with install and make binary-server
+target work again.
+    2036
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-11-19 16:17:57 UTC (rev 2035)
+++ trunk/debian/changelog	2004-11-22 09:32:17 UTC (rev 2036)
@@ -271,6 +271,9 @@
     exiting upon encountering the first shell interpeter that fails on the
     script; instead, attempt all the interpreters and report all that fail.
 
+  * Sync debian/rules install-server target with install and make
+    binary-server work again.
+
  -- Branden Robinson <branden@debian.org>  Wed, 17 Nov 2004 18:00:21 -0500
 
 xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2004-11-19 16:17:57 UTC (rev 2035)
+++ trunk/debian/rules	2004-11-22 09:32:17 UTC (rev 2036)
@@ -567,6 +567,9 @@
 	umask 022
 	dh_clean -k
 	$(MAKE) -C $(SOURCE_TREE) SHELL="/bin/sh -e" DESTDIR=$(DEBTREEDIR) install install.man
+	# rename the XF86Config manpage to XF86Config-4
+	mv $(DEBTREEDIR)/usr/X11R6/man/man5/XF86Config.5x \
+	   $(DEBTREEDIR)/usr/X11R6/man/man5/XF86Config-4.5x
 	# copy the static, debuggable XFree86 server
 	install -m 755 $(SOURCE_TREE)-xserver-xfree86-dbg/programs/Xserver/XFree86 \
 	               debian/tmp/usr/X11R6/bin/XFree86-debug



Reply to: