X Strike Force XFree86 SVN commit: r1676 - trunk/debian
Author: branden
Date: 2004-07-20 23:34:48 -0500 (Tue, 20 Jul 2004)
New Revision: 1676
Modified:
trunk/debian/CHANGESETS
trunk/debian/MANIFEST.all
trunk/debian/MANIFEST.alpha.in
trunk/debian/MANIFEST.amd64.in
trunk/debian/MANIFEST.arm.in
trunk/debian/MANIFEST.hppa.in
trunk/debian/MANIFEST.hurd-i386.all
trunk/debian/MANIFEST.hurd-i386.in
trunk/debian/MANIFEST.i386.in
trunk/debian/MANIFEST.ia64.in
trunk/debian/MANIFEST.m68k.in
trunk/debian/MANIFEST.mips.in
trunk/debian/MANIFEST.mipsel.in
trunk/debian/MANIFEST.powerpc.in
trunk/debian/MANIFEST.s390.in
trunk/debian/MANIFEST.sparc.in
trunk/debian/changelog
trunk/debian/control
trunk/debian/xfonts-base.install
trunk/debian/xutils.install
trunk/debian/xutils.install.s390
Log:
Move BDF font character set conversion files from xfonts-base package to
xutils (these files are used and needed by the ucs2any tool in the latter
package, and not by anything else). Update MANIFEST and .install files
accordingly. Make xutils declare that it replaces xfonts-base (<<
4.3.0.dfsg.1-7).
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/CHANGESETS 2004-07-21 04:34:48 UTC (rev 1676)
@@ -133,4 +133,11 @@
that the FAQ is already gzipped.
1665
+Move BDF font character set conversion files from xfonts-base package to
+xutils (these files are used and needed by the ucs2any tool in the latter
+package, and not by anything else). Update MANIFEST and .install files
+accordingly. Make xutils declare that it replaces xfonts-base (<<
+4.3.0.dfsg.1-7).
+ 1676
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/MANIFEST.all
===================================================================
--- trunk/debian/MANIFEST.all 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/MANIFEST.all 2004-07-21 04:34:48 UTC (rev 1676)
@@ -4490,19 +4490,3 @@
usr/X11R6/lib/X11/fonts/misc/olgl12.pcf.gz
usr/X11R6/lib/X11/fonts/misc/olgl14.pcf.gz
usr/X11R6/lib/X11/fonts/misc/olgl19.pcf.gz
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
-usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
-usr/X11R6/lib/X11/fonts/util/map-KOI8-R
Modified: trunk/debian/MANIFEST.alpha.in
===================================================================
--- trunk/debian/MANIFEST.alpha.in 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/MANIFEST.alpha.in 2004-07-21 04:34:48 UTC (rev 1676)
@@ -1126,6 +1126,22 @@
usr/X11R6/lib/X11/etc/xmodmap.std
usr/X11R6/lib/X11/etc/xterm.termcap
usr/X11R6/lib/X11/etc/xterm.terminfo
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
+usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+usr/X11R6/lib/X11/fonts/util/map-KOI8-R
usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
Modified: trunk/debian/MANIFEST.amd64.in
===================================================================
--- trunk/debian/MANIFEST.amd64.in 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/MANIFEST.amd64.in 2004-07-21 04:34:48 UTC (rev 1676)
@@ -1126,6 +1126,22 @@
usr/X11R6/lib/X11/etc/xmodmap.std
usr/X11R6/lib/X11/etc/xterm.termcap
usr/X11R6/lib/X11/etc/xterm.terminfo
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
+usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+usr/X11R6/lib/X11/fonts/util/map-KOI8-R
usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
Modified: trunk/debian/MANIFEST.arm.in
===================================================================
--- trunk/debian/MANIFEST.arm.in 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/MANIFEST.arm.in 2004-07-21 04:34:48 UTC (rev 1676)
@@ -1125,6 +1125,22 @@
usr/X11R6/lib/X11/etc/xmodmap.std
usr/X11R6/lib/X11/etc/xterm.termcap
usr/X11R6/lib/X11/etc/xterm.terminfo
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
+usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+usr/X11R6/lib/X11/fonts/util/map-KOI8-R
usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
Modified: trunk/debian/MANIFEST.hppa.in
===================================================================
--- trunk/debian/MANIFEST.hppa.in 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/MANIFEST.hppa.in 2004-07-21 04:34:48 UTC (rev 1676)
@@ -1125,6 +1125,22 @@
usr/X11R6/lib/X11/etc/xmodmap.std
usr/X11R6/lib/X11/etc/xterm.termcap
usr/X11R6/lib/X11/etc/xterm.terminfo
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
+usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+usr/X11R6/lib/X11/fonts/util/map-KOI8-R
usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
Modified: trunk/debian/MANIFEST.hurd-i386.all
===================================================================
--- trunk/debian/MANIFEST.hurd-i386.all 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/MANIFEST.hurd-i386.all 2004-07-21 04:34:48 UTC (rev 1676)
@@ -4447,19 +4447,3 @@
usr/X11R6/lib/X11/fonts/misc/olgl12.pcf.gz
usr/X11R6/lib/X11/fonts/misc/olgl14.pcf.gz
usr/X11R6/lib/X11/fonts/misc/olgl19.pcf.gz
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
-usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
-usr/X11R6/lib/X11/fonts/util/map-KOI8-R
Modified: trunk/debian/MANIFEST.hurd-i386.in
===================================================================
--- trunk/debian/MANIFEST.hurd-i386.in 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/MANIFEST.hurd-i386.in 2004-07-21 04:34:48 UTC (rev 1676)
@@ -1126,6 +1126,22 @@
usr/X11R6/lib/X11/etc/xmodmap.std
usr/X11R6/lib/X11/etc/xterm.termcap
usr/X11R6/lib/X11/etc/xterm.terminfo
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
+usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+usr/X11R6/lib/X11/fonts/util/map-KOI8-R
usr/X11R6/lib/X11/locale/C/XI18N_OBJS
usr/X11R6/lib/X11/locale/C/XLC_LOCALE
usr/X11R6/lib/X11/locale/armscii-8/Compose
Modified: trunk/debian/MANIFEST.i386.in
===================================================================
--- trunk/debian/MANIFEST.i386.in 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/MANIFEST.i386.in 2004-07-21 04:34:48 UTC (rev 1676)
@@ -1127,6 +1127,22 @@
usr/X11R6/lib/X11/etc/xmodmap.std
usr/X11R6/lib/X11/etc/xterm.termcap
usr/X11R6/lib/X11/etc/xterm.terminfo
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
+usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+usr/X11R6/lib/X11/fonts/util/map-KOI8-R
usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
Modified: trunk/debian/MANIFEST.ia64.in
===================================================================
--- trunk/debian/MANIFEST.ia64.in 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/MANIFEST.ia64.in 2004-07-21 04:34:48 UTC (rev 1676)
@@ -1127,6 +1127,22 @@
usr/X11R6/lib/X11/etc/xmodmap.std
usr/X11R6/lib/X11/etc/xterm.termcap
usr/X11R6/lib/X11/etc/xterm.terminfo
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
+usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+usr/X11R6/lib/X11/fonts/util/map-KOI8-R
usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
Modified: trunk/debian/MANIFEST.m68k.in
===================================================================
--- trunk/debian/MANIFEST.m68k.in 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/MANIFEST.m68k.in 2004-07-21 04:34:48 UTC (rev 1676)
@@ -1125,6 +1125,22 @@
usr/X11R6/lib/X11/etc/xmodmap.std
usr/X11R6/lib/X11/etc/xterm.termcap
usr/X11R6/lib/X11/etc/xterm.terminfo
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
+usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+usr/X11R6/lib/X11/fonts/util/map-KOI8-R
usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
Modified: trunk/debian/MANIFEST.mips.in
===================================================================
--- trunk/debian/MANIFEST.mips.in 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/MANIFEST.mips.in 2004-07-21 04:34:48 UTC (rev 1676)
@@ -1126,6 +1126,22 @@
usr/X11R6/lib/X11/etc/xmodmap.std
usr/X11R6/lib/X11/etc/xterm.termcap
usr/X11R6/lib/X11/etc/xterm.terminfo
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
+usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+usr/X11R6/lib/X11/fonts/util/map-KOI8-R
usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
Modified: trunk/debian/MANIFEST.mipsel.in
===================================================================
--- trunk/debian/MANIFEST.mipsel.in 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/MANIFEST.mipsel.in 2004-07-21 04:34:48 UTC (rev 1676)
@@ -1126,6 +1126,22 @@
usr/X11R6/lib/X11/etc/xmodmap.std
usr/X11R6/lib/X11/etc/xterm.termcap
usr/X11R6/lib/X11/etc/xterm.terminfo
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
+usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+usr/X11R6/lib/X11/fonts/util/map-KOI8-R
usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
Modified: trunk/debian/MANIFEST.powerpc.in
===================================================================
--- trunk/debian/MANIFEST.powerpc.in 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/MANIFEST.powerpc.in 2004-07-21 04:34:48 UTC (rev 1676)
@@ -1125,6 +1125,22 @@
usr/X11R6/lib/X11/etc/xmodmap.std
usr/X11R6/lib/X11/etc/xterm.termcap
usr/X11R6/lib/X11/etc/xterm.terminfo
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
+usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+usr/X11R6/lib/X11/fonts/util/map-KOI8-R
usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
Modified: trunk/debian/MANIFEST.s390.in
===================================================================
--- trunk/debian/MANIFEST.s390.in 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/MANIFEST.s390.in 2004-07-21 04:34:48 UTC (rev 1676)
@@ -1055,6 +1055,22 @@
usr/X11R6/lib/X11/doc/README.fonts
usr/X11R6/lib/X11/etc/xterm.termcap
usr/X11R6/lib/X11/etc/xterm.terminfo
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
+usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+usr/X11R6/lib/X11/fonts/util/map-KOI8-R
usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
Modified: trunk/debian/MANIFEST.sparc.in
===================================================================
--- trunk/debian/MANIFEST.sparc.in 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/MANIFEST.sparc.in 2004-07-21 04:34:48 UTC (rev 1676)
@@ -1125,6 +1125,22 @@
usr/X11R6/lib/X11/etc/xmodmap.std
usr/X11R6/lib/X11/etc/xterm.termcap
usr/X11R6/lib/X11/etc/xterm.terminfo
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
+usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+usr/X11R6/lib/X11/fonts/util/map-KOI8-R
usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/changelog 2004-07-21 04:34:48 UTC (rev 1676)
@@ -102,6 +102,12 @@
s390-specific version of xfree86-common dh_installdocs file to recognize
that the FAQ is already gzipped.
+ * Move BDF font character set conversion files from xfonts-base package to
+ xutils (these files are used and needed by the ucs2any tool in the latter
+ package, and not by anything else). Update MANIFEST and .install files
+ accordingly. Make xutils declare that it replaces xfonts-base (<<
+ 4.3.0.dfsg.1-7).
+
Changes by Fabio M. Di Nitto:
* Split binary-arch and binary-indep targets in debian/rules.
@@ -114,7 +120,7 @@
dependent.
+ Make buildd's admins hate us less.
- -- Branden Robinson <branden@debian.org> Fri, 16 Jul 2004 13:08:01 -0500
+ -- Branden Robinson <branden@debian.org> Tue, 20 Jul 2004 19:20:39 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/control 2004-07-21 04:34:48 UTC (rev 1676)
@@ -1743,7 +1743,7 @@
Depends: xfree86-common (>> 4.3), cpp, ${shlibs:Depends}, ${misc:Depends}
Suggests: ssh | rsh-server, ssh | rsh-client, xlibs-data
Conflicts: rstart, rstartd, xbase-clients (<< 4.0), xserver-common (<< 4.0), xbase (<< 3.3.2.3a-2), cpp-3.3 (<< 1:3.3.3-0pre1)
-Replaces: rstart, rstartd, xbase-clients (<= 4.0.1-8), xserver-common (<< 4.0), xbase (<< 3.3.2.3a-2), xlibs-dev (<< 4.1.0-12), xlib6g-dev (<< 4.0), dpsclient, xcontrib
+Replaces: rstart, rstartd, xbase-clients (<= 4.0.1-8), xserver-common (<< 4.0), xfonts-base (<< 4.3.0.dfsg.1-7), xbase (<< 3.3.2.3a-2), xlibs-dev (<< 4.1.0-12), xlib6g-dev (<< 4.0), dpsclient, xcontrib
Description: X Window System utility programs
xutils provides a set of utility programs shipped with the X Window System
that do not require the X libraries; many of these programs are useful
Modified: trunk/debian/xfonts-base.install
===================================================================
--- trunk/debian/xfonts-base.install 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/xfonts-base.install 2004-07-21 04:34:48 UTC (rev 1676)
@@ -207,19 +207,3 @@
usr/X11R6/lib/X11/fonts/misc/olgl12.pcf.gz
usr/X11R6/lib/X11/fonts/misc/olgl14.pcf.gz
usr/X11R6/lib/X11/fonts/misc/olgl19.pcf.gz
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
-usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
-usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
-usr/X11R6/lib/X11/fonts/util/map-KOI8-R
Modified: trunk/debian/xutils.install
===================================================================
--- trunk/debian/xutils.install 2004-07-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/xutils.install 2004-07-21 04:34:48 UTC (rev 1676)
@@ -146,6 +146,22 @@
usr/X11R6/lib/X11/config/xf86.tmpl
usr/X11R6/lib/X11/config/xf86site.def
usr/X11R6/lib/X11/config/xfree86.cf
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
+usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+usr/X11R6/lib/X11/fonts/util/map-KOI8-R
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-20 06:42:08 UTC (rev 1675)
+++ trunk/debian/xutils.install.s390 2004-07-21 04:34:48 UTC (rev 1676)
@@ -144,6 +144,22 @@
usr/X11R6/lib/X11/config/xf86.tmpl
usr/X11R6/lib/X11/config/xf86site.def
usr/X11R6/lib/X11/config/xfree86.cf
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-1
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-10
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-11
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-13
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-14
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-15
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-16
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-2
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-3
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-4
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-5
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-7
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-8
+usr/X11R6/lib/X11/fonts/util/map-ISO8859-9
+usr/X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+usr/X11R6/lib/X11/fonts/util/map-KOI8-R
usr/X11R6/man/man1/bdftopcf.1x
usr/X11R6/man/man1/bdftruncate.1x
usr/X11R6/man/man1/ccmakedep.1x
Reply to: