X Strike Force XFree86 SVN commit: r1617 - trunk/debian
Author: branden
Date: 2004-07-10 12:14:19 -0500 (Sat, 10 Jul 2004)
New Revision: 1617
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/control
trunk/debian/xbase-clients.install
trunk/debian/xbase-clients.install.s390
trunk/debian/xutils.install
trunk/debian/xutils.install.s390
Log:
Move atobm and its manpage from xutils to xbase-clients; this shuts up
dangling symlink warning mails from cron on systems with xutils installed
but not xbase-clients. Make xbase-clients declare that it replaces xutils
(<< 4.3.0.dfsg.1-7). (Closes: #200061)
NOTE: if the next release is not called 4.3.0.dfsg.1-7, the control file
will need to be fixed.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-07-10 17:03:15 UTC (rev 1616)
+++ trunk/debian/CHANGESETS 2004-07-10 17:14:19 UTC (rev 1617)
@@ -31,4 +31,11 @@
Thanks to Daniel Schelper for pointing this out. (Closes: #256420)
1615
+Move atobm and its manpage from xutils to xbase-clients; this shuts up
+dangling symlink warning mails from cron on systems with xutils installed
+but not xbase-clients. Make xbase-clients declare that it replaces xutils
+(<< 4.3.0.dfsg.1-7). (Closes: #200061) NOTE: if the next release is not called
+4.3.0.dfsg.1-7, the control file will need to be fixed.
+ 1616
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-07-10 17:03:15 UTC (rev 1616)
+++ trunk/debian/TODO 2004-07-10 17:14:19 UTC (rev 1617)
@@ -71,8 +71,6 @@
cycle with simon@nuit.ca
* #255371: fix typos in XKB README.config document [Branden has a patch
prepared]
-* #200061: stop cron spam caused by atobm(1x) being a broken symlink on systems
- without xbase-clients installed
Post 4.3.0-1
------------
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-07-10 17:03:15 UTC (rev 1616)
+++ trunk/debian/changelog 2004-07-10 17:14:19 UTC (rev 1617)
@@ -17,8 +17,13 @@
* Make libxpm-dev rather than xlibs-static-dev provide libxpm4-dev.
Thanks to Daniel Schelper for pointing this out. (Closes: #256420)
- -- Branden Robinson <branden@debian.org> Sat, 10 Jul 2004 11:36:04 -0500
+ * Move atobm and its manpage from xutils to xbase-clients; this shuts up
+ dangling symlink warning mails from cron on systems with xutils installed
+ but not xbase-clients. Make xbase-clients declare that it replaces xutils
+ (<< 4.3.0.dfsg.1-7). (Closes: #200061)
+ -- Branden Robinson <branden@debian.org> Sat, 10 Jul 2004 12:09:31 -0500
+
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Changes by Branden Robinson:
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2004-07-10 17:03:15 UTC (rev 1616)
+++ trunk/debian/control 2004-07-10 17:14:19 UTC (rev 1617)
@@ -890,7 +890,7 @@
Architecture: any
Depends: cpp, xlibs-data, ${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), cpp-3.3 (<< 1:3.3.3-0pre1)
-Replaces: xbase (<< 3.3.2.3a-2), xf86setup (<< 3.3.2.3a-9), xserver-common (<< 4.0), xmodmap, xcontrib, xpm4g-dev, xpm-bin, xsm
+Replaces: xbase (<< 3.3.2.3a-2), xf86setup (<< 3.3.2.3a-9), xserver-common (<< 4.0), xutils (<< 4.3.0.dfsg.1-7), xmodmap, xcontrib, xpm4g-dev, xpm-bin, xsm
Provides: xmodmap, xcontrib, xpm-bin, xsm
Description: miscellaneous X clients
An X client is a program that interfaces with an X server (almost always via
@@ -928,6 +928,7 @@
- xwud, a viewer for window dumps created by xwd;
- oclock and xclock, graphical clocks;
- beforelight, a screen saver;
+ - atobm, a converter from ASCII to X bitmap (.xbm) files;
- bitmap, a monochrome bitmap file editor;
- bmtoa, a tool that converts a monochrome bitmap to ASCII text;
- cxpm and sxpm, tools for checking and viewing X pixmap files;
@@ -982,6 +983,10 @@
xrdb requires the C preprocessor (cpp) to process X resource files. The GNU
C preprocessor's "-traditional" support misbehaves in early releases of the
GCC 3.3 series; therefore, this package conflicts with those versions.
+ .
+ (Strictly speaking, atobm does not depend on any X libraries, but it shares a
+ manual page with bitmap and bmtoa, and so is grouped with them in this
+ package.)
Package: xdm
Architecture: any
@@ -1742,7 +1747,6 @@
even on a system that does not have any X clients or X servers installed.
.
The programs in this package include:
- - atobm, a converter from ASCII to X bitmap (.xbm) files;
- bdftopcf, which converts BDF fonts to PCF fonts;
- bdftruncate and ucs2any, tools to generate fonts with various encodings
from ISO 10646-encoded fonts
Modified: trunk/debian/xbase-clients.install
===================================================================
--- trunk/debian/xbase-clients.install 2004-07-10 17:03:15 UTC (rev 1616)
+++ trunk/debian/xbase-clients.install 2004-07-10 17:14:19 UTC (rev 1617)
@@ -33,6 +33,7 @@
etc/X11/xsm/system.xsm
usr/X11R6/bin/Xmark
usr/X11R6/bin/appres
+usr/X11R6/bin/atobm
usr/X11R6/bin/beforelight
usr/X11R6/bin/bitmap
usr/X11R6/bin/bmtoa
@@ -142,6 +143,7 @@
usr/X11R6/lib/X11/xman.help
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/appres.1x
+usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/beforelight.1x
usr/X11R6/man/man1/bitmap.1x
usr/X11R6/man/man1/bmtoa.1x
Modified: trunk/debian/xbase-clients.install.s390
===================================================================
--- trunk/debian/xbase-clients.install.s390 2004-07-10 17:03:15 UTC (rev 1616)
+++ trunk/debian/xbase-clients.install.s390 2004-07-10 17:14:19 UTC (rev 1617)
@@ -32,6 +32,7 @@
etc/X11/xsm/system.xsm
usr/X11R6/bin/Xmark
usr/X11R6/bin/appres
+usr/X11R6/bin/atobm
usr/X11R6/bin/beforelight
usr/X11R6/bin/bitmap
usr/X11R6/bin/bmtoa
@@ -137,6 +138,7 @@
usr/X11R6/lib/X11/xman.help
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/appres.1x
+usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/beforelight.1x
usr/X11R6/man/man1/bitmap.1x
usr/X11R6/man/man1/bmtoa.1x
Modified: trunk/debian/xutils.install
===================================================================
--- trunk/debian/xutils.install 2004-07-10 17:03:15 UTC (rev 1616)
+++ trunk/debian/xutils.install 2004-07-10 17:14:19 UTC (rev 1617)
@@ -8,7 +8,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
usr/X11R6/bin/bdftruncate
usr/X11R6/bin/ccmakedep
@@ -147,7 +146,6 @@
usr/X11R6/lib/X11/config/xf86.tmpl
usr/X11R6/lib/X11/config/xf86site.def
usr/X11R6/lib/X11/config/xfree86.cf
-usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/bdftopcf.1x
usr/X11R6/man/man1/bdftruncate.1x
usr/X11R6/man/man1/ccmakedep.1x
Modified: trunk/debian/xutils.install.s390
===================================================================
--- trunk/debian/xutils.install.s390 2004-07-10 17:03:15 UTC (rev 1616)
+++ trunk/debian/xutils.install.s390 2004-07-10 17:14:19 UTC (rev 1617)
@@ -8,7 +8,6 @@
etc/X11/rstart/contexts/@List
etc/X11/rstart/contexts/default
etc/X11/rstart/contexts/x11r6
-usr/X11R6/bin/atobm
usr/X11R6/bin/bdftopcf
usr/X11R6/bin/bdftruncate
usr/X11R6/bin/ccmakedep
@@ -145,7 +144,6 @@
usr/X11R6/lib/X11/config/xf86.tmpl
usr/X11R6/lib/X11/config/xf86site.def
usr/X11R6/lib/X11/config/xfree86.cf
-usr/X11R6/man/man1/atobm.1x
usr/X11R6/man/man1/bdftopcf.1x
usr/X11R6/man/man1/bdftruncate.1x
usr/X11R6/man/man1/ccmakedep.1x
Reply to: