X Strike Force X.Org X11 SVN commit: r999 - trunk/debian
Author: dnusinow
Date: 2006-01-02 18:53:45 -0500 (Mon, 02 Jan 2006)
New Revision: 999
Modified:
trunk/debian/changelog
trunk/debian/control
Log:
* Make xlibs conflict and replace xlibs-data (= 6.9.0.dfsg.1-1) to prevent
upgrade errors
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-01-02 23:45:53 UTC (rev 998)
+++ trunk/debian/changelog 2006-01-02 23:53:45 UTC (rev 999)
@@ -14,12 +14,14 @@
Thanks Daniel 'NebuchadnezzaR' Dehennin. (closes: #345446)
* Move all the xkb stuff that was mistakenly put in to xlibs-data to xlibs
where it belongs. Sorry everyone. (closes: #345387)
+ + Make xlibs conflict and replace xlibs-data (= 6.9.0.dfsg.1-1) to prevent
+ upgrade errors
[ David Martínez Moreno ]
* Added -n in order to avoid newline in xdm script (closes: #310000).
* While at it, removed another extra space in debian/905_debian_xdm.diff.
- -- David Nusinow <dnusinow@debian.org> Mon, 2 Jan 2006 18:43:31 -0500
+ -- David Nusinow <dnusinow@debian.org> Mon, 2 Jan 2006 18:52:19 -0500
xorg-x11 (6.9.0.dfsg.1-1) unstable; urgency=low
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2006-01-02 23:45:53 UTC (rev 998)
+++ trunk/debian/control 2006-01-02 23:53:45 UTC (rev 999)
@@ -2353,6 +2353,8 @@
Section: libs
Architecture: all
Depends: libice6, libsm6, libx11-6, libxext6, libxi6, libxmu6, libxmuu1, libxp6, libxpm4, libxrandr2, libxt6, libxtrap6, libxtst6, xlibs-data, ${misc:Depends}
+Conflicts: xlibs-data (= 6.9.0.dfsg.1-1)
+Replaces: xlibs-data (= 6.9.0.dfsg.1-1)
Description: X Window System client libraries metapackage and XKB data
This package smooths upgrades from Debian 3.0 by depending on the individual
library packages into which each shared object formerly contained in this
Reply to: