Author: branden
Date: 2003-11-04 00:39:47 -0500 (Tue, 04 Nov 2003)
New Revision: 749
Modified:
people/branden/xlibs-and-xbase-clients-split/debian/changelog
people/branden/xlibs-and-xbase-clients-split/debian/control
Log:
Update package dependencies to reflect split of xlibs package.
+ libx11-6 depends on xfree86-common (>> 4.3.0) and xlibs-data; needs
xlibs-data for locale data and X error and keysym databases
+ xlibs is now a transitional package depending on the packages into
which it split: libice6, libsm6, libx11-6, libxext6, libxft1, libxi6,
libxmu6, libxmuu1, libxp6, libxpm4, libxrandr2, libxt6, libxtrap6,
libxtst6, xlibs-data
+ sanitize xlibs's conflicts and replaces relationships by removing
versioned conflicts on withdrawn packages
+ xlibs is now an architecture-independent package
+ xlibs no longer provides libxpm4
- debian/control
Modified: people/branden/xlibs-and-xbase-clients-split/debian/changelog
===================================================================
--- people/branden/xlibs-and-xbase-clients-split/debian/changelog
2003-11-03 23:55:25 UTC (rev 748)
+++ people/branden/xlibs-and-xbase-clients-split/debian/changelog
2003-11-04 05:39:47 UTC (rev 749)
@@ -90,8 +90,19 @@
directory
- debian/libxt6.links: migrated from xlibs.links for
/usr/X11R6/lib/X11/app-defaults symlink
+ - debian/control: update package dependencies to reflect split
+ + libx11-6 depends on xfree86-common (>> 4.3.0) and xlibs-data; needs
+ xlibs-data for locale data and X error and keysym databases
+ + xlibs is now a transitional package depending on the packages into
+ which it split: libice6, libsm6, libx11-6, libxext6, libxft1, libxi6,
+ libxmu6, libxmuu1, libxp6, libxpm4, libxrandr2, libxt6, libxtrap6,
+ libxtst6, xlibs-data
+ + sanitize xlibs's conflicts and replaces relationships by removing
+ versioned conflicts on withdrawn packages
+ + xlibs is now an architecture-independent package
+ + xlibs no longer provides libxpm4
- -- Branden Robinson <[EMAIL PROTECTED]> Mon, 27 Oct 2003 20:34:55 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Tue, 4 Nov 2003 00:29:58 -0500
xfree86 (4.3.0-0pre1v4) experimental; urgency=low
@@ -2388,7 +2399,7 @@
- add "libc-dev" as alternate dependency for libc6-dev in xlibs-dev
- add netbsd-i386 to list of architectures for which xserver-xfree86 and
xserver-xfree86-dbg are built
- - xfree86-common conflicts with task-x-window-system{,-core} to force
+ - xfree86-common conflicts with task-x-window-system{,-core} to force
these old potato-era packages off the system (Closes: #163927)
* debian/local/xserver-wrapper.c:
- make the nice() error handling switchable with a #define between SuSv2
@@ -2400,7 +2411,7 @@
--print-gnu-build-architecture (Closes: #149549)
- export GROFF_NO_SGR=1 to prevent corruption of specs docs in text format
(Closes: #164708)
- - (build): produce generated files in debian/local before compiling the
+ - (build): produce generated files in debian/local before compiling the
source tree; this way we know early on if the build is going to bomb due
to that stuff
- (install): rename the XF86Config.5x manpage to XF86Config-4.5x
Modified: people/branden/xlibs-and-xbase-clients-split/debian/control
===================================================================
--- people/branden/xlibs-and-xbase-clients-split/debian/control 2003-11-03
23:55:25 UTC (rev 748)
+++ people/branden/xlibs-and-xbase-clients-split/debian/control 2003-11-04
05:39:47 UTC (rev 749)
@@ -89,11 +89,10 @@
state. This protocol is layered on top of the X Consortium's ICE protocol
(see the libice6 package).
-
Package: libx11-6
Section: libs
Architecture: any
-Depends: xfree86-common (>> 4.3.0), ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common (>> 4.3.0), xlibs-data, ${shlibs:Depends},
${misc:Depends}
Conflicts: xlibs (<< 4.3.0)
Replaces: xlibs (<< 4.3.0)
Description: X Window System protocol client library
@@ -111,6 +110,9 @@
one of the many "Toolkit" libraries far more convenient to program against
than Xlib directly. Examples of popular toolkit libraries are GTK+, Qt,
XForms, LessTif, and Athena.
+ .
+ libx11-6 depends on xlibs-data for locale data and the X error and keysym
+ databases.
Package: libxaw6
Section: libs
@@ -400,7 +402,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, xlibs (<< 4.3.0),
xlibs-data (<< 4.3.0)
+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)
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
@@ -902,11 +904,10 @@
Package: xlibs
Section: libs
-Architecture: any
-Depends: xlibs-data (= ${Source-Version}), libice6, libsm6, libx11-6,
libxext6, libxft1, libxi6, libxmu6, libxmuu1, libxp6, libxpm4, libxrandr2,
libxt6, libxtrap6, libxtst6, ${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.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
+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)
Description: X Window System client libraries
This package smooths upgrades from Debian 3.0 by depending on the individual
library packages into which each shared object formerly contained in this
