X Strike Force XFree86 SVN commit: r1459 - trunk/debian
Author: branden
Date: 2004-05-28 12:24:29 -0500 (Fri, 28 May 2004)
New Revision: 1459
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/control
trunk/debian/libx11-dev.install
trunk/debian/libxi-dev.install
Log:
Move XDeviceTimeCoord(3x) manpage from libx11-dev to libxi-dev, where it
belongs. Make libxi-dev conflict/replace libx11-dev (<< 4.3.0.dfsg.1-3)
so that upgrades proceed smoothly. Thanks to Stephen Kitt for identifying
this problem. (Closes: #233839)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-05-28 17:07:17 UTC (rev 1458)
+++ trunk/debian/CHANGESETS 2004-05-28 17:24:29 UTC (rev 1459)
@@ -27,4 +27,10 @@
BusID.
1454
+Move XDeviceTimeCoord(3x) manpage from libx11-dev to libxi-dev, where it
+belongs. Make libxi-dev conflict/replace libx11-dev (<< 4.3.0.dfsg.1-3)
+so that upgrades proceed smoothly. Thanks to Stephen Kitt for identifying
+this problem. (Closes: #233839)
+ 1459
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-05-28 17:07:17 UTC (rev 1458)
+++ trunk/debian/TODO 2004-05-28 17:24:29 UTC (rev 1459)
@@ -12,9 +12,6 @@
These items are listed in descending order of priority; that is, the most
important items come first.
-* #233839: Move usr/X11R6/man/man3/XDeviceTimeCoord.3x from libx11-dev to
- libxi-dev.
-
4.3.0.dfsg.1-4
--------------
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-05-28 17:07:17 UTC (rev 1458)
+++ trunk/debian/changelog 2004-05-28 17:24:29 UTC (rev 1459)
@@ -21,8 +21,13 @@
+ Update template description to tell SGI Indigo2 XL users to specify "1"
for the BusID.
- -- Branden Robinson <branden@debian.org> Thu, 27 May 2004 14:07:59 -0500
+ * Move XDeviceTimeCoord(3x) manpage from libx11-dev to libxi-dev, where it
+ belongs. Make libxi-dev conflict/replace libx11-dev (<< 4.3.0.dfsg.1-3)
+ so that upgrades proceed smoothly. Thanks to Stephen Kitt for identifying
+ this problem. (Closes: #233839)
+ -- Branden Robinson <branden@debian.org> Fri, 28 May 2004 12:15:50 -0500
+
xfree86 (4.3.0.dfsg.1-2) unstable; urgency=low
Changes by Branden Robinson:
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2004-05-28 17:07:17 UTC (rev 1458)
+++ trunk/debian/control 2004-05-28 17:24:29 UTC (rev 1459)
@@ -456,13 +456,17 @@
Section: libdevel
Architecture: any
Depends: libxi6 (= ${Source-Version}), x-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
-Conflicts: xlibs-dev (<< 4.3.0)
-Replaces: xlibs-dev (<< 4.3.0)
+Conflicts: xlibs-dev (<< 4.3.0), libx11-dev (<< 4.3.0.dfsg.1-3)
+Replaces: xlibs-dev (<< 4.3.0), libx11-dev (<< 4.3.0.dfsg.1-3)
Description: X Window System Input extension library development files
Header files and a static version of the Xi library are provided by this
package.
.
See the libxi6 package for further information.
+ .
+ This package declares a versioned conflict with and replacement of
+ libx11-dev because some versions of the latter package mistakenly shipped
+ a maual page that should have been in this package intead.
Package: libxmu6
Section: libs
Modified: trunk/debian/libx11-dev.install
===================================================================
--- trunk/debian/libx11-dev.install 2004-05-28 17:07:17 UTC (rev 1458)
+++ trunk/debian/libx11-dev.install 2004-05-28 17:24:29 UTC (rev 1459)
@@ -163,7 +163,6 @@
usr/X11R6/man/man3/XDestroySubwindows.3x
usr/X11R6/man/man3/XDestroyWindow.3x
usr/X11R6/man/man3/XDestroyWindowEvent.3x
-usr/X11R6/man/man3/XDeviceTimeCoord.3x
usr/X11R6/man/man3/XDirectionalDependentDrawing.3x
usr/X11R6/man/man3/XDisableAccessControl.3x
usr/X11R6/man/man3/XDisplayKeycodes.3x
Modified: trunk/debian/libxi-dev.install
===================================================================
--- trunk/debian/libxi-dev.install 2004-05-28 17:07:17 UTC (rev 1458)
+++ trunk/debian/libxi-dev.install 2004-05-28 17:24:29 UTC (rev 1459)
@@ -11,6 +11,7 @@
usr/X11R6/man/man3/XChangePointerDevice.3x
usr/X11R6/man/man3/XCloseDevice.3x
usr/X11R6/man/man3/XDeviceBell.3x
+usr/X11R6/man/man3/XDeviceTimeCoord.3x
usr/X11R6/man/man3/XFreeDeviceList.3x
usr/X11R6/man/man3/XGetDeviceButtonMapping.3x
usr/X11R6/man/man3/XGetDeviceControl.3x
Reply to: