X Strike Force SVN commit: rev 560 - branches/4.3.0/sid/debian
Author: branden
Date: 2003-09-21 13:28:55 -0500 (Sun, 21 Sep 2003)
New Revision: 560
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/control
Log:
The XKB implementation in XFree86 4.3.0 has changed in a
non-backward-compatible manner; update package relationships accordingly.
* debian/control:
- xbase-clients conflicts with xlibs (<< 4.3.0) and xlibs-data (<< 4.3.0)
- xlibs conflicts with xbase-clients (<< 4.3.0) and xlibs-data (<< 4.3.0)
- xlibs-data conflicts with xbase-clients (<< 4.3.0)
(xlibs-data already conflicted with xlibs (<< 4.3.0) due to file migration)
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-09-21 18:20:05 UTC (rev 559)
+++ branches/4.3.0/sid/debian/changelog 2003-09-21 18:28:55 UTC (rev 560)
@@ -165,8 +165,14 @@
* debian/po/ja.po: update Japanese translations (thanks, Kenshi Muto and
Takeo Nakano)
- -- Branden Robinson <branden@debian.org> Thu, 18 Sep 2003 11:39:10 -0500
+ * debian/control: the XKB implementation in XFree86 4.3.0 has changed in a
+ non-backward-compatible manner; update package relationships accordingly
+ - xbase-clients conflicts with xlibs (<< 4.3.0) and xlibs-data (<< 4.3.0)
+ - xlibs conflicts with xbase-clients (<< 4.3.0) and xlibs-data (<< 4.3.0)
+ - xlibs-data conflicts with xbase-clients (<< 4.3.0)
+ -- Branden Robinson <branden@debian.org> Sun, 21 Sep 2003 13:22:54 -0500
+
xfree86 (4.3.0-0pre1v1) experimental; urgency=low
* new upstream release
Modified: branches/4.3.0/sid/debian/control
===================================================================
--- branches/4.3.0/sid/debian/control 2003-09-21 18:20:05 UTC (rev 559)
+++ branches/4.3.0/sid/debian/control 2003-09-21 18:28:55 UTC (rev 560)
@@ -184,7 +184,7 @@
Package: xbase-clients
Architecture: any
Depends: cpp-3.2, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: xbase (<< 3.3.2.3a-2), xserver-common (<< 3.3.2.3a-9), xmodmap, xaw-wrappers (<< 0.90), xfonts-100dpi (<< 3.3.3.1-3), xfonts-75dpi (<< 3.3.3.1-3), xfonts-base (<< 3.3.3.1-3), xfonts-cyrillic (<< 3.3.3.1-3), xfonts-scalable (<< 3.3.3.1-3), xfnt100 (<= 3.3.2.3a-1), xfnt75 (<= 3.3.2.3a-1), xfntbase (<= 3.3.2.3a-1), xfntcyr (<= 3.3.2.3a-1), xfntscl (<= 3.3.2.3a-1), xdm (<< 4.0), xsm, xcontrib, xpm4g-dev, xpm-bin
+Conflicts: xbase (<< 3.3.2.3a-2), xserver-common (<< 3.3.2.3a-9), xmodmap, xaw-wrappers (<< 0.90), xfonts-100dpi (<< 3.3.3.1-3), xfonts-75dpi (<< 3.3.3.1-3), xfonts-base (<< 3.3.3.1-3), xfonts-cyrillic (<< 3.3.3.1-3), xfonts-scalable (<< 3.3.3.1-3), xfnt100 (<= 3.3.2.3a-1), xfnt75 (<= 3.3.2.3a-1), xfntbase (<= 3.3.2.3a-1), xfntcyr (<= 3.3.2.3a-1), xfntscl (<= 3.3.2.3a-1), xdm (<< 4.0), xsm, xcontrib, xpm4g-dev, xpm-bin, xlibs (<< 4.3.0), xlibs-data (<< 4.3.0)
Replaces: xbase (<< 3.3.2.3a-2), xf86setup (<< 3.3.2.3a-9), xserver-common (<< 4.0), xmodmap, xcontrib, xpm4g-dev, xpm-bin, xsm
Provides: xmodmap, xcontrib, xpm-bin, xsm
Description: miscellaneous X clients
@@ -700,7 +700,7 @@
Section: libs
Architecture: any
Depends: xfree86-common (>> 4.3), xlibs-data (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: xlib, xlib6 (<< 3.3.2.3-2), xlib6g (<< 4.0), xlib6g-dev, xbase-clients (<< 4.0), xcontrib (<< 4.0), xsm (<< 4.0), xpm4g, fvwm-common, qcad (<< 1.4.6-1), xbase-clients (<< 4.2.0)
+Conflicts: xlib, xlib6 (<< 3.3.2.3-2), xlib6g (<< 4.0), xlib6g-dev, xbase-clients (<< 4.0), xcontrib (<< 4.0), xsm (<< 4.0), xpm4g, fvwm-common, qcad (<< 1.4.6-1), xbase-clients (<< 4.3.0), xlibs-data (<< 4.3.0)
Replaces: xlib, xbase (<< 3.3.2.3a-2), xlib6 (<< 3.3.2.3-2), xbase-clients (<< 4.0), xlib6g (<< 4.0), xlib6g-dev, xpm4g, fvwm-common, xcontrib, xsm, qcad (<< 1.4.6-1)
Provides: libxpm4
Description: X Window System client libraries
@@ -825,7 +825,7 @@
Section: libs
Priority: optional
Architecture: all
-Conflicts: xlibs (<< 4.3.0)
+Conflicts: xlibs (<< 4.3.0), xbase-clients (<< 4.3.0)
Replaces: xlibs (<< 4.3.0)
Description: X Window System client data
This package provides architecture-independent data for the X Window System,
Reply to: