X Strike Force X.Org X11 SVN commit: r4160 - trunk/debian/xorg/debian
Author: julien
Date: 2006-12-19 21:15:06 -0500 (Tue, 19 Dec 2006)
New Revision: 4160
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/control
Log:
* Bump x11-common's conflict on xtel to <= 3.3.0-5.4, as that version
installs fonts in /usr/lib/X11/fonts, which x11-common includes as a
symlink.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-12-20 02:09:56 UTC (rev 4159)
+++ trunk/debian/xorg/debian/changelog 2006-12-20 02:15:06 UTC (rev 4160)
@@ -9,8 +9,13 @@
* Mistake in explanation about lspci in french translation fixed.
Closes: #403297
- -- Christian Perrier <bubulle@debian.org> Fri, 15 Dec 2006 19:30:59 +0100
+ [ Julien Cristau ]
+ * Bump x11-common's conflict on xtel to <= 3.3.0-5.4, as that version
+ installs fonts in /usr/lib/X11/fonts, which x11-common includes as a
+ symlink.
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Wed, 20 Dec 2006 03:12:56 +0100
+
xorg (1:7.1.0-8) unstable; urgency=medium
[ Debconf translations updated ]
Modified: trunk/debian/xorg/debian/control
===================================================================
--- trunk/debian/xorg/debian/control 2006-12-20 02:09:56 UTC (rev 4159)
+++ trunk/debian/xorg/debian/control 2006-12-20 02:15:06 UTC (rev 4160)
@@ -49,7 +49,7 @@
xlbiff (<< 4.1-4), xli (<= 1.17.0-21), xlockmore (<= 1:5.21-1),
xlockmore-gl (<= 1:5.21-1), xmeter (<= 1.15-6), xmix (<= 2.1-5),
xmon (<= 1.5.6-1.3), xpostit (<= 3.3.1-8.2), xprint (<= 1:0.1.0.alpha1-13),
- xrn (<= 9.02-7.1), xsysinfo (<= 1.7-2), xtel (<= 3.3.0-5.2),
+ xrn (<= 9.02-7.1), xsysinfo (<= 1.7-2), xtel (<= 3.3.0-5.4),
xtoolwait (<= 1.3-6), xtrlock (<= 2.0-11), xview-clients (<= 3.2p1.4-21),
xviewg (<= 3.2p1.4-21), xviewg-dev (<= 3.2p1.4-21), xvkbd (<= 2.6-2.1),
xxkb (<= 1.10-2.1), xzoom (<= 0.3-17), pgaccess (<= 1:0.98.8.20030520-2),
Reply to: