X Strike Force XFree86 SVN commit: rev 743 - trunk/debian
Author: branden
Date: 2003-11-01 17:09:37 -0500 (Sat, 01 Nov 2003)
New Revision: 743
Modified:
trunk/debian/changelog
trunk/debian/control
Log:
Merge revision 742 from branches/4.3.0/sid.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-11-01 22:05:13 UTC (rev 742)
+++ trunk/debian/changelog 2003-11-01 22:09:37 UTC (rev 743)
@@ -1,3 +1,12 @@
+xfree86 (4.2.1-14) unstable; urgency=low
+
+ * 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:07:50 -0500
+
xfree86 (4.2.1-13) unstable; urgency=low
* Acknowledge bug fixed in NMU. Thanks, LaMont! (Closes: #213774)
@@ -2400,12 +2409,12 @@
the ELF loader isn't yet working on those platforms, per Guido Guenther
* patch #075: new; don't ship the XIE headers if we're not building the
library
- * patch #076: new; xterm now works around hateful lies from GNU libc's
+ * patch #076: new; xterm now works around hateful lies from GNU libc's
getpt() function (see #121899)
* patch #077: new; define DriverManSuffix as 4x and MiscManSuffix as 7x on
GNU and Linux systems per suggestion from Colin Watson (see #157020)
(Closes: #85297)
- * patch #313: new; tell xdm that more architectures have "fragile" /dev/mem
+ * patch #313: new; tell xdm that more architectures have "fragile" /dev/mem
devices (i.e., only read above 1MB) (might fix #107311)
* patch #600: new; patch from Guido Guenther to fix some newport driver
bugs:
@@ -4288,3 +4297,6 @@
$Id$
vim:set ai et sts=2 sw=2 tw=78:
+<<<<<<< .working
+=======
+>>>>>>> .merge-right.r742
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2003-11-01 22:05:13 UTC (rev 742)
+++ trunk/debian/control 2003-11-01 22:09:37 UTC (rev 743)
@@ -99,8 +99,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.
@@ -150,8 +150,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: