xorg-server: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/control | 13 +++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
New commits:
commit fde34d929ba17a881c2ec41a3b3add84778bb0a8
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Nov 2 14:57:02 2009 +0100
Add xfonts-base back to the Recommends field of xserver packages.
Some clients don't work without those.
diff --git a/debian/changelog b/debian/changelog
index 0982e19..ea11552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.6.5-2) UNRELEASED; urgency=low
+
+ * Add xfonts-base back to the Recommends field of xserver packages. Some
+ clients don't work without those.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 02 Nov 2009 14:56:24 +0100
+
xorg-server (2:1.6.5-1) unstable; urgency=low
* New upstream bugfix release.
diff --git a/debian/control b/debian/control
index f6358e5..6411d66 100644
--- a/debian/control
+++ b/debian/control
@@ -79,8 +79,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
Package: xserver-xorg-core
Architecture: any
Depends: xserver-common (>> 7), ${shlibs:Depends}, ${misc:Depends}, xserver-xorg
-Recommends: xkb-data, libgl1-mesa-dri (>= 7.1~rc1)
-Suggests: xfonts-base, xfonts-100dpi | xfonts-75dpi, xfonts-scalable
+Recommends: xkb-data, libgl1-mesa-dri (>= 7.1~rc1), xfonts-base
+Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
xserver-xorg-video, xserver-common (<< 7), xserver-xorg-video-1.0, xserver-xorg-input,
xserver-xorg-video-1.9, xserver-xorg-input-wacom (<< 0.7.8),
@@ -136,6 +136,7 @@ Description: Xorg X server - development files
Package: xdmx
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-common
+Recommends: xfonts-base
Description: distributed multihead X server
Xdmx is a proxy X server that uses one or more other X servers as its
display device(s). It provides multi-head X functionality for displays that
@@ -171,7 +172,7 @@ Description: Distributed Multihead X tools
Package: xnest
Architecture: any
Depends: xserver-common, ${shlibs:Depends}, ${misc:Depends}
-Recommends: libgl1-mesa-dri (>= 7.1~rc1)
+Recommends: libgl1-mesa-dri (>= 7.1~rc1), xfonts-base
Description: Nested X server
Xnest is a nested X server that simply relays all its requests to another
X server, where it runs as a client. This means that it appears as another
@@ -190,7 +191,7 @@ Description: Nested X server
Package: xvfb
Architecture: any
Depends: xserver-common, ${shlibs:Depends}, ${misc:Depends}
-Recommends: xauth
+Recommends: xauth, xfonts-base
Description: Virtual Framebuffer 'fake' X server
Xvfb provides an X server that can run on machines with no display hardware
and no physical input devices. It emulates a dumb framebuffer using virtual
@@ -217,7 +218,7 @@ Description: Virtual Framebuffer 'fake' X server
Package: xserver-xephyr
Architecture: any
Depends: xserver-common, ${shlibs:Depends}, ${misc:Depends}
-Recommends: xbase-clients, libgl1-mesa-dri (>= 7.1~rc1)
+Recommends: xbase-clients, libgl1-mesa-dri (>= 7.1~rc1), xfonts-base
Description: nested X server
Xephyr is an X server that can be run inside another X server,
much like Xnest. It is based on the kdrive X server, and as a
@@ -234,7 +235,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, ${shlibs:Depends}, ${misc:Depends}
-Recommends: xbase-clients
+Recommends: xbase-clients, xfonts-base
Description: Linux framebuffer device tiny X server
xserver-xfbdev is a Linux framebuffer device tiny X server based on the
kdrive X server.
Reply to: