debian/changelog | 9 +++++
debian/control | 12 +++---
debian/patches/09_debian_xserver_rtff.diff | 52 -----------------------------
3 files changed, 15 insertions(+), 58 deletions(-)
New commits:
commit 01e2291f5f2675858bc370c9f2772e6f6583d461
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Oct 4 17:44:23 2009 +0200
Change the server's dependency on xserver-common to >= ${source:Version}
This allows installation of different versions of the various servers.
diff --git a/debian/changelog b/debian/changelog
index acfa68a..c643712 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg-server (2:1.7.0-2) UNRELEASED; urgency=low
* Delete 09_debian_xserver_rtff.diff. Was disabled since 1.3.99, and is not
necessary since the fall back to builtin fonts was added.
+ * Change the server's dependency on xserver-common to >= ${source:Version},
+ to allow installation of different versions of the various servers.
-- Julien Cristau <jcris...@debian.org> Sun, 04 Oct 2009 17:39:13 +0200
diff --git a/debian/control b/debian/control
index a4b1ee9..8dfed7e 100644
--- a/debian/control
+++ b/debian/control
@@ -78,7 +78,7 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
Package: xserver-xorg-core
Architecture: any
Depends:
- xserver-common (= ${source:Version}),
+ xserver-common (>= ${source:Version}),
xserver-xorg,
${shlibs:Depends},
${misc:Depends},
@@ -152,7 +152,7 @@ Description: Xorg X server - development files
Package: xdmx
Architecture: any
Depends:
- xserver-common (= ${source:Version}),
+ xserver-common (>= ${source:Version}),
${shlibs:Depends},
${misc:Depends},
Description: distributed multihead X server
@@ -193,7 +193,7 @@ Description: Distributed Multihead X tools
Package: xnest
Architecture: any
Depends:
- xserver-common (= ${source:Version}),
+ xserver-common (>= ${source:Version}),
${shlibs:Depends},
${misc:Depends},
Recommends: libgl1-mesa-dri (>= 7.1~rc1)
@@ -215,7 +215,7 @@ Description: Nested X server
Package: xvfb
Architecture: any
Depends:
- xserver-common (= ${source:Version}),
+ xserver-common (>= ${source:Version}),
${shlibs:Depends},
${misc:Depends},
Recommends: xauth
@@ -245,7 +245,7 @@ Description: Virtual Framebuffer 'fake' X server
Package: xserver-xephyr
Architecture: any
Depends:
- xserver-common (= ${source:Version}),
+ xserver-common (>= ${source:Version}),
${shlibs:Depends},
${misc:Depends},
Recommends: xbase-clients, libgl1-mesa-dri (>= 7.1~rc1)
@@ -265,7 +265,7 @@ Description: nested X server
Package: xserver-xfbdev
Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips
mipsel powerpc ppc64 sh3 sh3eb sh4 sh4eb sparc
Depends:
- xserver-common (= ${source:Version}),
+ xserver-common (>= ${source:Version}),
${shlibs:Depends},
${misc:Depends},
Recommends: xbase-clients
commit aaa59cc3a4af5d8fc5d26ad22478d13d77b856f8
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Oct 4 17:40:26 2009 +0200
Delete 09_debian_xserver_rtff.diff.
Was disabled since 1.3.99, and is not necessary since the fall back to
builtin fonts was added.
diff --git a/debian/changelog b/debian/changelog
index 8ad256c..acfa68a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.7.0-2) UNRELEASED; urgency=low
+
+ * Delete 09_debian_xserver_rtff.diff. Was disabled since 1.3.99, and is not
+ necessary since the fall back to builtin fonts was added.
+
+ -- Julien Cristau <jcris...@debian.org> Sun, 04 Oct 2009 17:39:13 +0200
+
xorg-server (2:1.7.0-1) experimental; urgency=low
* Add missing Conflicts on xserver-xorg-video-5 and xserver-xorg-input-4.
diff --git a/debian/patches/09_debian_xserver_rtff.diff
b/debian/patches/09_debian_xserver_rtff.diff
deleted file mode 100644
index 65039b3..0000000
--- a/debian/patches/09_debian_xserver_rtff.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-$Id: 910_debian_Xserver_RTFF.diff 486 2005-08-03 04:51:11Z dnusinow $
-
-Give the user a far stronger clue as to what to do when their font
configuration
-is horribly screwed up; this patch by Branden Robinson.
-
-Index: a/dix/main.c
-===================================================================
---- a/dix/main.c.orig 2006-11-13 19:59:22.000000000 +0100
-+++ b/dix/main.c 2006-11-26 01:55:13.000000000 +0100
-@@ -407,10 +407,42 @@
- defaultFontPath);
- }
- if (!SetDefaultFont(defaultTextFont))
-+#ifdef DEBIAN
-+ FatalError("could not open default font '%s';\n"
-+"the X server's font paths might be misconfigured, remote font server(s)\n"
-+"may be unreachable, and/or local fonts may not be installed or are not\n"
-+"configured correctly.\n"
-+"\n"
-+"People inexperienced with the X Window System should have the\n"
-+"\"xorg\" package installed.\n"
-+"# apt-get install xorg\n"
-+"\n"
-+"Other useful commands to run include:\n"
-+"$ dpkg --status x11-common\n"
-+"$ dpkg --status xfonts-base\n"
-+"$ zmore /usr/share/doc/x11-common/FAQ.gz", defaultTextFont);
-+#else
- FatalError("could not open default font '%s'", defaultTextFont);
-+#endif
- if (!(rootCursor = CreateRootCursor(defaultCursorFont, 0)))
-+#ifdef DEBIAN
-+ FatalError("could not open default cursor font '%s';\n"
-+"the X server's font paths might be misconfigured, remote font server(s)\n"
-+"may be unreachable, and/or local fonts may not be installed or are not\n"
-+"configured correctly.\n"
-+"\n"
-+"People inexperienced with the X Window System should have the\n"
-+"\"xorg\" package installed.\n"
-+"# apt-get install xorg\n"
-+"\n"
-+"Other useful commands to run include:\n"
-+"$ dpkg --status x11-common\n"
-+"$ dpkg --status xfonts-base\n"
-+"$ zmore /usr/share/doc/x11-common/FAQ.gz", defaultTextFont);
-+#else
- FatalError("could not open default cursor font '%s'",
- defaultCursorFont);
-+#endif
- #ifdef DPMSExtension
- /* check all screens, looking for DPMS Capabilities */
- DPMSCapableFlag = DPMSSupported();
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
