X Strike Force XFree86 SVN commit: rev 742 - branches/4.3.0/sid/debian
Author: branden
Date: 2003-11-01 17:05:13 -0500 (Sat, 01 Nov 2003)
New Revision: 742
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/control
Log:
Make libxaw6-dev and libxaw7-dev conflict with and replace libxaw-dev (<<
4.0.3); the latter existed as a real package in pre-woody unstable, and
this permits smooth upgrades from such systems.
- debian/control
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-11-01 22:00:16 UTC (rev 741)
+++ branches/4.3.0/sid/debian/changelog 2003-11-01 22:05:13 UTC (rev 742)
@@ -80,8 +80,13 @@
- debian/patches/453_ia64_fix_radeon_dri_deadlock.diff: deleted;
superseded by upstream patch
- -- Branden Robinson <branden@debian.org> Sat, 1 Nov 2003 16:56:13 -0500
+ * Make libxaw6-dev and libxaw7-dev conflict with and replace libxaw-dev (<<
+ 4.0.3); the latter existed as a real package in pre-woody unstable, and
+ this permits smooth upgrades from such systems.
+ - debian/control
+ -- Branden Robinson <branden@debian.org> Sat, 1 Nov 2003 17:03:39 -0500
+
xfree86 (4.3.0-0pre1v4) experimental; urgency=low
* Add missing symbolic links for libXTrap. [ISHIKAWA Mutsumi]
@@ -2441,11 +2446,11 @@
- Avoid redefining abort(), a well known C library function. This can
cause errors when the abort() prototype from stdlib.h is included
later by Xos.h. (Matthieu Herrb)
- - A "hammer" approach at ensuring font properties are freed properly.
+ - A "hammer" approach at ensuring font properties are freed properly.
(Marc La France)
- Modify Type1 font RAM allocation heuristics to allow for larger fonts.
(#A.1121, Melchior Franz)
- + Fix a typo in the s3 driver which prevented virtual display sizes.
+ + Fix a typo in the s3 driver which prevented virtual display sizes.
(#A.965, Stef Voltz).
+ Fix input size of character strings used in lib/X11/lcGetConv.c
(#A.828, Yong-Jhen Hong).
Modified: branches/4.3.0/sid/debian/control
===================================================================
--- branches/4.3.0/sid/debian/control 2003-11-01 22:00:16 UTC (rev 741)
+++ branches/4.3.0/sid/debian/control 2003-11-01 22:05:13 UTC (rev 742)
@@ -100,8 +100,8 @@
Priority: extra
Architecture: any
Depends: xlibs-dev, libxaw6, libc6-dev | libc-dev
-Conflicts: xlib6g-dev (<< 4.0), libxaw7-dev
-Replaces: xlib6g-dev (<< 4.0), libxaw7-dev
+Conflicts: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw7-dev
+Replaces: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw7-dev
Description: X Athena widget set library development files (version 6)
Xaw header files and a static version of the Athena widget library are
provided by this package, which supports Xaw6-based clients.
@@ -151,8 +151,8 @@
Section: libdevel
Architecture: any
Depends: xlibs-dev, libxaw7, libc6-dev | libc-dev
-Conflicts: xlib6g-dev (<< 4.0), libxaw6-dev
-Replaces: xlib6g-dev (<< 4.0), libxaw6-dev
+Conflicts: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw6-dev
+Replaces: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw6-dev
Description: X Athena widget set library development files
Xaw header files, a static library, and a manual page documenting new
features in version 7 of the Athena widget library are provided by this
Reply to: