debian/changelog | 6 ++++++
debian/patches/07_xorgconf_manpage_overhaul.diff | 17 +++++++++--------
debian/xprint-common.xprint.init | 2 +-
3 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit dbe62ee3a04500a2bb922c964b5b5dad9f3baee2
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Fri May 11 22:10:32 2007 +0200
Fix warning in /etc/init.d/xprint when /usr/lib/X11/fonts does not exist.
diff --git a/debian/changelog b/debian/changelog
index 2eda77e..b9dfe03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ xorg-server (2:1.3.0.0.dfsg-5) UNRELEASED; urgency=low
xorg.conf example which we do not install since Xserver 1.3 does automatic
configuration, the manpage is very well documented, and we generate a
config file during installation. Closes: #222932.
+ * Fix warning in /etc/init.d/xprint when /usr/lib/X11/fonts does not exist.
+ Closes: #422352. Thanks Cristian Ionescu-Idbohrn!
-- Brice Goglin <[EMAIL PROTECTED]> Fri, 11 May 2007 02:37:19 +0200
diff --git a/debian/xprint-common.xprint.init b/debian/xprint-common.xprint.init
index 3197aed..9c49de9 100644
--- a/debian/xprint-common.xprint.init
+++ b/debian/xprint-common.xprint.init
@@ -324,7 +324,7 @@ get_system_fontlist()
## List all fonts in all locales installed on this machine
(
[ -d "/usr/share/fonts" ] && find /usr/share/fonts -name
fonts.dir
- find "${XPROJECTROOT}/lib/X11/fonts" -name fonts.dir
+ [ -d "${XPROJECTROOT}/lib/X11/fonts" ] && find
"${XPROJECTROOT}/lib/X11/fonts" -name fonts.dir
) |
while read i ; do echo "${i%/fonts.dir}" ; done
) | sort -u
commit 9370bbf757332041f0d725fa0ef1c1e0d543f30e
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Fri May 11 21:48:30 2007 +0200
Update 07_xorgconf_manpage_overhaul.diff to drop the reference to the
xorg.conf example.
diff --git a/debian/changelog b/debian/changelog
index 2c87ddb..2eda77e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ xorg-server (2:1.3.0.0.dfsg-5) UNRELEASED; urgency=low
PCI management code is broken at least on sparc and powerpc.
Closes: #422077, #422095. Thanks to Jim Watson for testing!
* Install the Xephyr README, closes: #395888.
+ * Update 07_xorgconf_manpage_overhaul.diff to drop the reference to the
+ xorg.conf example which we do not install since Xserver 1.3 does automatic
+ configuration, the manpage is very well documented, and we generate a
+ config file during installation. Closes: #222932.
-- Brice Goglin <[EMAIL PROTECTED]> Fri, 11 May 2007 02:37:19 +0200
diff --git a/debian/patches/07_xorgconf_manpage_overhaul.diff
b/debian/patches/07_xorgconf_manpage_overhaul.diff
index df8c300..c0f1751 100644
--- a/debian/patches/07_xorgconf_manpage_overhaul.diff
+++ b/debian/patches/07_xorgconf_manpage_overhaul.diff
@@ -11,10 +11,14 @@ Forward-ported by Fabio M. Di Nitto.
NOTE: Branden you must really love this package!
+---
+ hw/xfree86/doc/man/xorg.conf.man.pre | 1307
++++++++++++++++++++---------------
+ 1 file changed, 751 insertions(+), 556 deletions(-)
+
Index: hw/xfree86/doc/man/xorg.conf.man.pre
===================================================================
---- hw/xfree86/doc/man/xorg.conf.man.pre.orig 2007-04-14 12:40:43.000000000
-0400
-+++ hw/xfree86/doc/man/xorg.conf.man.pre 2007-04-14 12:40:46.000000000
-0400
+--- hw/xfree86/doc/man/xorg.conf.man.pre.orig 2007-05-11 20:57:19.000000000
+0200
++++ hw/xfree86/doc/man/xorg.conf.man.pre 2007-05-11 21:10:58.000000000
+0200
@@ -3,7 +3,7 @@
.ds q \N'34'
.TH __xconfigfile__ __filemansuffix__ __vendorversion__
@@ -2059,7 +2063,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.TP 7
.BI "Option \*qSingleCard\*q \*q" boolean \*q
As
-@@ -1845,68 +2011,102 @@
+@@ -1845,68 +2011,97 @@
.B "EndSection"
.fi
.RE
@@ -2088,12 +2092,9 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
+flags.
+The data therein is not used in this release.
.PP
- .SH FILES
+-.SH FILES
-For an example of an __xconfigfile__ file, see the file installed as
-+For an example of an
-+.I __xconfigfile__
-+file, see the file installed as
- __projectroot__/lib/X11/__xconfigfile__.eg.
+-__projectroot__/lib/X11/__xconfigfile__.eg.
-.fi
.SH "SEE ALSO"
-X(__miscmansuffix__),
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
