X Strike Force XFree86 SVN commit: r2053 - branches/4.3.0/sid/debian
Author: fabbione
Date: 2004-12-09 11:13:12 -0500 (Thu, 09 Dec 2004)
New Revision: 2053
Modified:
branches/4.3.0/sid/debian/CHANGESETS
branches/4.3.0/sid/debian/xfree86-common.docs
branches/4.3.0/sid/debian/xfree86-common.docs.s390
Log:
Merge commit r2052 from trunk to fix FTBFS when building arch all.
Modified: branches/4.3.0/sid/debian/CHANGESETS
===================================================================
--- branches/4.3.0/sid/debian/CHANGESETS 2004-12-09 16:10:25 UTC (rev 2052)
+++ branches/4.3.0/sid/debian/CHANGESETS 2004-12-09 16:13:12 UTC (rev 2053)
@@ -178,7 +178,7 @@
Stop manually compressing the plain text version of the Debian X FAQ;
dh_compress will take care of that. Tell dh_compress to avoid compressing
the XHTML version of the FAQ.
- 1965
+ 1965, 2052
Restore xdm's Xreset script, which was removed in 4.2.1-12. If the
use-sessreg option is set and the sessreg command is available, user X
Modified: branches/4.3.0/sid/debian/xfree86-common.docs
===================================================================
--- branches/4.3.0/sid/debian/xfree86-common.docs 2004-12-09 16:10:25 UTC (rev 2052)
+++ branches/4.3.0/sid/debian/xfree86-common.docs 2004-12-09 16:13:12 UTC (rev 2053)
@@ -2,7 +2,7 @@
build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG.ND
build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG.R5
debian/changelog.Debian.old
-debian/local/FAQ.gz
+debian/local/FAQ
debian/local/FAQ.xhtml
debian/local/README.Debian-upgrade
debian/tmp/usr/X11R6/lib/X11/doc/README
Modified: branches/4.3.0/sid/debian/xfree86-common.docs.s390
===================================================================
--- branches/4.3.0/sid/debian/xfree86-common.docs.s390 2004-12-09 16:10:25 UTC (rev 2052)
+++ branches/4.3.0/sid/debian/xfree86-common.docs.s390 2004-12-09 16:13:12 UTC (rev 2053)
@@ -5,7 +5,7 @@
build-tree/xc/programs/Xserver/hw/xfree86/doc/RELNOTES
build-tree/xc/programs/Xserver/hw/xfree86/doc/Versions
debian/changelog.Debian.old
-debian/local/FAQ.gz
+debian/local/FAQ
debian/local/FAQ.xhtml
debian/local/README.Debian-upgrade
debian/tmp/usr/X11R6/lib/X11/doc/README
Reply to: