Author: branden
Date: 2004-04-14 11:31:23 -0500 (Wed, 14 Apr 2004)
New Revision: 1249
Modified:
trunk/debian/changelog
trunk/debian/control
Log:
Tidy up relationships with now-vanished xlib6g and xlib6g-dev packages.
This enables people to keep the versions of these packages that were
harmless pseudopackages on the system.
+ version xfree86-common's and xutils's replacement of xlib6g-dev at <<
4.0 (xlib6g-dev shipped no files after that)
+ version xlibs's conflict with and replacement of xlib6g and xlib6g-dev
at << 4.0 (Closes: #233818)
+ version xlibs-static-dev's conflict with and replacement of xlib6g-dev
at << 4.0
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-14 08:12:40 UTC (rev 1248)
+++ trunk/debian/changelog 2004-04-14 16:31:23 UTC (rev 1249)
@@ -178,8 +178,18 @@
mouse port. Document and justify migration in NEWS file.
(Closes: #233933)
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 14 Apr 2004 02:40:15 -0500
+ * Tidy up relationships with now-vanished xlib6g and xlib6g-dev packages.
+ This enables people to keep the versions of these packages that were
+ harmless pseudopackages on the system.
+ + version xfree86-common's and xutils's replacement of xlib6g-dev at <<
+ 4.0 (xlib6g-dev shipped no files after that)
+ + version xlibs's conflict with and replacement of xlib6g and xlib6g-dev
+ at << 4.0 (Closes: #233818)
+ + version xlibs-static-dev's conflict with and replacement of xlib6g-dev
+ at << 4.0
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 14 Apr 2004 11:20:31 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2004-04-14 08:12:40 UTC (rev 1248)
+++ trunk/debian/control 2004-04-14 16:31:23 UTC (rev 1249)
@@ -1180,7 +1180,7 @@
Depends: debconf (>= 1.2.9), debianutils (>= 1.13)
Suggests: x-window-system-core | x-window-system
Conflicts: xbase (<< 3.3.2.3a-2), task-x-window-system-core,
task-x-window-system
-Replaces: xbase (<< 3.3.2.3a-9), xlib6g-dev, xmanpages (<< 3.3.4), xstd,
xserver-common (<< 4.0)
+Replaces: xbase (<< 3.3.2.3a-9), xlib6g-dev (<< 4.0), xmanpages (<< 3.3.4),
xstd, xserver-common (<< 4.0)
Description: X Window System (XFree86) infrastructure
xfree86-common contains the filesystem infrastructure required for further
installation of the X Window System in any configuration.
@@ -1418,8 +1418,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, xlib6g, xlib6g-dev, xpm4g, fvwm-common, qcad (<<
1.4.6-1), xbase-clients (<< 4.0), xcontrib (<< 4.0), xsm (<< 4.0)
-Replaces: xbase, xlib, xlib6g, xlib6g-dev, xpm4g, fvwm-common, qcad (<<
1.4.6-1), xbase-clients (<< 4.0), xcontrib (<< 4.0), xsm (<< 4.0)
+Conflicts: xbase, xlib, xpm4g, fvwm-common, qcad (<< 1.4.6-1), xbase-clients
(<< 4.0), xcontrib (<< 4.0), xlib6g (<< 4.0), xlib6g-dev (<< 4.0), xsm (<< 4.0)
+Replaces: xbase, xlib, xpm4g, fvwm-common, qcad (<< 1.4.6-1), xbase-clients
(<< 4.0), xcontrib (<< 4.0), xlib6g (<< 4.0), xlib6g-dev (<< 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
@@ -1451,8 +1451,8 @@
Architecture: any
Depends: x-dev, libxext-dev, libxv-dev, libx11-dev, zlib1g-dev | libz-dev,
libc6-dev | libc-dev
Suggests: xspecs
-Conflicts: xdevel, xlib6g-dev, xlib6g-static, xpm4g-dev, xmanpages,
libxfont-xtt-dev
-Replaces: xbase (<< 3.3.2.3a-2), xdevel, xpm4g-dev, xmanpages, xlib6g-dev,
xlib6g-static, libxfont-xtt-dev, xfs-xtt (<< 1:1.3.0.1-15)
+Conflicts: xdevel, xlib6g-dev (<< 4.0), xlib6g-static, xpm4g-dev, xmanpages,
libxfont-xtt-dev
+Replaces: xbase (<< 3.3.2.3a-2), xdevel, xpm4g-dev, xmanpages, xlib6g-dev (<<
4.0), xlib6g-static, libxfont-xtt-dev, xfs-xtt (<< 1:1.3.0.1-15)
Provides: libxpm4-dev, xmanpages
Description: X Window System client library development files
xlibs-static-dev provides static versions of the X Window System libraries
@@ -1724,7 +1724,7 @@
Depends: xfree86-common (>> 4.3), cpp, ${shlibs:Depends}, ${misc:Depends}
Suggests: ssh | rsh-server, ssh | rsh-client, xlibs-data
Conflicts: rstart, rstartd, xbase-clients (<< 4.0), xserver-common (<< 4.0),
xbase (<< 3.3.2.3a-2), cpp-3.3 (<< 1:3.3.3-0pre1)
-Replaces: rstart, rstartd, xbase-clients (<= 4.0.1-8), xserver-common (<<
4.0), xbase (<< 3.3.2.3a-2), xlibs-dev (<< 4.1.0-12), xlib6g-dev, dpsclient,
xcontrib
+Replaces: rstart, rstartd, xbase-clients (<= 4.0.1-8), xserver-common (<<
4.0), xbase (<< 3.3.2.3a-2), xlibs-dev (<< 4.1.0-12), xlib6g-dev (<< 4.0),
dpsclient, xcontrib
Description: X Window System utility programs
xutils provides a set of utility programs shipped with the X Window System
that do not require the X libraries; many of these programs are useful
