X Strike Force X.Org X11 SVN commit: r1547 - branches/modular/debian/xorg/debian
Author: dnusinow
Date: 2006-03-26 19:10:49 -0500 (Sun, 26 Mar 2006)
New Revision: 1547
Modified:
branches/modular/debian/xorg/debian/changelog
branches/modular/debian/xorg/debian/control
Log:
* Add x11-common conflicts with monolithic versions of xserver-xorg. This
will prevent the modular packages from screwing up old installations due
to a partial install. Thanks Steve Langasek.
Modified: branches/modular/debian/xorg/debian/changelog
===================================================================
--- branches/modular/debian/xorg/debian/changelog 2006-03-24 03:24:48 UTC (rev 1546)
+++ branches/modular/debian/xorg/debian/changelog 2006-03-27 00:10:49 UTC (rev 1547)
@@ -1,3 +1,11 @@
+xorg (1:7.0.7) experimental; urgency=low
+
+ * Add x11-common conflicts with monolithic versions of xserver-xorg. This
+ will prevent the modular packages from screwing up old installations due
+ to a partial install. Thanks Steve Langasek.
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 26 Mar 2006 19:09:14 -0500
+
xorg (1:7.0.6) experimental; urgency=low
* At the urgent request of the release and ftp teams, xlibs must die. Have
Modified: branches/modular/debian/xorg/debian/control
===================================================================
--- branches/modular/debian/xorg/debian/control 2006-03-24 03:24:48 UTC (rev 1546)
+++ branches/modular/debian/xorg/debian/control 2006-03-27 00:10:49 UTC (rev 1547)
@@ -9,7 +9,7 @@
Package: x11-common
Architecture: any
Depends: ${misc:Depends}, debianutils (>= 1.13), lsb-base (>= 1.3-9ubuntu2), laptop-detect
-Conflicts: xfree86-common, xorg-common, xserver-common, x-common
+Conflicts: xfree86-common, xorg-common, xserver-common, x-common, xserver-xorg (<< 1:7.0.0)
Replaces: xfree86-common, xorg-common, xserver-common, x-common
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
Reply to: