Author: branden
Date: 2003-12-05 15:39:22 -0500 (Fri, 05 Dec 2003)
New Revision: 818
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/control
Log:
Merge revision 817 from
people/branden/xlibs-and-xbase-clients-split/debian.
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-12-05 20:37:47 UTC (rev 817)
+++ branches/4.3.0/sid/debian/changelog 2003-12-05 20:39:22 UTC (rev 818)
@@ -190,7 +190,8 @@
+ xlibs is now a transitional package depending on the packages into
which it split
+ sanitize xlibs's conflicts and replaces relationships by removing
- versioned conflicts on withdrawn packages
+ versioned conflicts on withdrawn packages (except where they continue
+ to be Provided by still-existing packages)
+ xlibs is now an architecture-independent package
+ xlibs no longer provides libxpm4
+ rewrite xlibs's short and extended descriptions
Modified: branches/4.3.0/sid/debian/control
===================================================================
--- branches/4.3.0/sid/debian/control 2003-12-05 20:37:47 UTC (rev 817)
+++ branches/4.3.0/sid/debian/control 2003-12-05 20:39:22 UTC (rev 818)
@@ -1414,8 +1414,8 @@
Section: libs
Architecture: all
Depends: libice6, libsm6, libx11-6, libxext6, libxft1, libxi6, libxmu6,
libxmuu1, libxp6, libxpm4, libxrandr2, libxt6, libxtrap6, libxtst6, xlibs-data,
${misc:Depends}
-Conflicts: xbase, xlib, xlib6, xlib6g, xlib6g-dev, xcontrib, xsm, xpm4g,
fvwm-common, qcad (<< 1.4.6-1), xbase-clients (<< 4.0)
-Replaces: xbase, xlib, xlib6, xlib6g, xlib6g-dev, xcontrib, xsm, xpm4g,
fvwm-common, qcad (<< 1.4.6-1), xbase-clients (<< 4.0)
+Conflicts: xbase, xlib, xlib6, xlib6g, xlib6g-dev, xpm4g, fvwm-common, qcad
(<< 1.4.6-1), xbase-clients (<< 4.0), xcontrib (<< 4.0), xsm (<< 4.0)
+Replaces: xbase, xlib, xlib6, xlib6g, xlib6g-dev, xpm4g, fvwm-common, qcad (<<
1.4.6-1), xbase-clients (<< 4.0), xcontrib (<< 4.0), xsm (<< 4.0)
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
