tag 362296 patch
thanks
* Steve Langasek [Sun, 21 May 2006 12:05:35 -0500]:
> On Sun, May 21, 2006 at 07:37:50AM -0700, Ian Zimmerman wrote:
> > With the fix by David Nusinow, systems that have not transitioned are
> > broken. Please either look in both places for the encoding directory,
> > or else introduce a versioned depend or conflict with the appropriate
> > version of xfonts-base.
> > Reopening the bug.
> Yes. Two bugs here. First, mkfontdir should be invoked as
> system('mkfontdir', ...)
This should be moot.
> The second bug is that x-ttcidfont-conf is only looking in either the new or
> the old directory for encodings.dir files, but has no dependencies which
> ensure either set are present. This can be fixed in one of three ways:
> adding a dependency on xfonts-base and only passing the old encoding paths;
> adding a dependency on xfonts-encodings and only passing the new encoding
> paths; or passing both the old and new encodings paths without an explicit
> dependency.
As for this, this is the current situation TTBOMK:
- x-ttcidfont-font already depends on xfonts-encodings, indirectly via
xutils -> xfont-utils -> xfonts-encodings. However, the package still
fails to generate a fonts.dir file because it calls mkfontdir with:
-e /usr/share/X11/fonts/encodings
instead of
-e /usr/share/fonts/X11/encodings
which is the directory xfonts-encodings ships. This should be fixed
ASAP, with the option of making the dependency on xfonts-encoding
explicit.
- now, as for compatibility with X.org 6.9 and XFree86, where the
encodings are provided by xfonts-base and are shipped in a different
path (/usr/X11R6/lib/X11/fonts/encodings), the good news is that
xfonts-encoding ships compatibility links:
/usr/X11R6/lib/X11/fonts/encodings/encodings.dir ->
../../../../../share/fonts/X11/encodings/encodings.dir
The bad news, though, is that no such link is shipped for encodings/large.
If the maintainer cares about maintaining compatibility, in my opinion
the way to go would be to ask the xfonts-encodings maintainer to add such
extra compatibility link, use the X11R6 paths in the script, and
Depend: xfonts-encodings (>= 1:1.0.0-5something) | xfonts-base (<< 1:1).
I'm attaching two patches that implement each of these solutions.
Aníbal, please apply the first of them ASAP; I'd be also happy to upload
myself if you wish so.
Thanks,
--
Adeodato Simó dato at net.com.org.es
Debian Developer adeodato at debian.org
When all is summed up, a man never speaks of himself without loss; his
accusations of himself are always believed; his praises never.
-- Michel de Montaigne
diff -u -r x-ttcidfont-conf-22/debian/changelog
x-ttcidfont-conf-22a/debian/changelog
--- x-ttcidfont-conf-22/debian/changelog 2006-04-27 06:38:02.000000000
+0200
+++ x-ttcidfont-conf-22a/debian/changelog 2006-05-28 23:07:58.000000000
+0200
@@ -1,3 +1,12 @@
+x-ttcidfont-conf (22a) unstable; urgency=low
+
+ * Handle gracefully mkfontdir not being in /usr/bin yet. (Closes: #362296)
+ * Fix encodings dir in the defoma script to point to the ones actually
+ shipped by xfonts-encodings.
+ * Add dependency on xfonts-encodings.
+
+ -- Adeodato Simó <[EMAIL PROTECTED]> Sun, 28 May 2006 23:04:03 +0200
+
x-ttcidfont-conf (22) unstable; urgency=low
* Fixed "Can't exec /usr/X11R6/bin/mkfontdir: No such file or
diff -u -r x-ttcidfont-conf-22/debian/control
x-ttcidfont-conf-22a/debian/control
--- x-ttcidfont-conf-22/debian/control 2006-04-27 06:32:16.000000000 +0200
+++ x-ttcidfont-conf-22a/debian/control 2006-05-28 23:04:32.000000000 +0200
@@ -8,7 +8,7 @@
Package: x-ttcidfont-conf
Architecture: all
-Depends: defoma (>= 0.5.0), ${misc:Depends}, xutils
+Depends: defoma (>= 0.5.0), ${misc:Depends}, xutils, xfonts-encodings
Conflicts: psfontmgr (<= 0.4.0)
Description: Configure TrueType and CID fonts for X
This package configures TrueType fonts and CID fonts (as well as CMaps)
diff -u -r x-ttcidfont-conf-22/debian/defoma x-ttcidfont-conf-22a/debian/defoma
--- x-ttcidfont-conf-22/debian/defoma 2006-04-27 05:22:57.000000000 +0200
+++ x-ttcidfont-conf-22a/debian/defoma 2006-05-28 22:57:30.000000000 +0200
@@ -249,9 +249,9 @@
close F;
- system('/usr/bin/mkfontdir',
- '-e', '/usr/share/X11/fonts/encodings',
- '-e', '/usr/share/X11/fonts/encodings/large',
+ system('mkfontdir',
+ '-e', '/usr/share/fonts/X11/encodings',
+ '-e', '/usr/share/fonts/X11/encodings/large',
"$PkgDir/dirs/$category");
return 0;
diff -u -r x-ttcidfont-conf-22/debian/changelog
x-ttcidfont-conf-22b/debian/changelog
--- x-ttcidfont-conf-22/debian/changelog 2006-04-27 06:38:02.000000000
+0200
+++ x-ttcidfont-conf-22b/debian/changelog 2006-05-28 23:12:20.000000000
+0200
@@ -1,3 +1,14 @@
+x-ttcidfont-conf (22b) unstable; urgency=low
+
+ * Handle gracefully mkfontdir not being in /usr/bin yet. (Closes: #362296)
+ * In order to maintain compatibility with X.org 6.9 and XFree86 layout, use
+ the old encodings dirs in the defoma script, for which xfonts-encodings
+ ships a compatibility symlink.
+ * Depend on the required version of xfonts-encodings, or a pre-Xorg7
+ xfonts-base.
+
+ -- Adeodato Simó <[EMAIL PROTECTED]> Sun, 28 May 2006 23:08:10 +0200
+
x-ttcidfont-conf (22) unstable; urgency=low
* Fixed "Can't exec /usr/X11R6/bin/mkfontdir: No such file or
diff -u -r x-ttcidfont-conf-22/debian/control
x-ttcidfont-conf-22b/debian/control
--- x-ttcidfont-conf-22/debian/control 2006-04-27 06:32:16.000000000 +0200
+++ x-ttcidfont-conf-22b/debian/control 2006-05-28 23:10:33.000000000 +0200
@@ -8,7 +8,7 @@
Package: x-ttcidfont-conf
Architecture: all
-Depends: defoma (>= 0.5.0), ${misc:Depends}, xutils
+Depends: defoma (>= 0.5.0), ${misc:Depends}, xutils, xfonts-encoding (>=
1:1.0.0-5__FIXME__) | xfonts-base (<< 1:1)
Conflicts: psfontmgr (<= 0.4.0)
Description: Configure TrueType and CID fonts for X
This package configures TrueType fonts and CID fonts (as well as CMaps)
diff -u -r x-ttcidfont-conf-22/debian/defoma x-ttcidfont-conf-22b/debian/defoma
--- x-ttcidfont-conf-22/debian/defoma 2006-04-27 05:22:57.000000000 +0200
+++ x-ttcidfont-conf-22b/debian/defoma 2006-05-28 22:58:06.000000000 +0200
@@ -249,9 +249,9 @@
close F;
- system('/usr/bin/mkfontdir',
- '-e', '/usr/share/X11/fonts/encodings',
- '-e', '/usr/share/X11/fonts/encodings/large',
+ system('mkfontdir',
+ '-e', '/usr/X11R6/lib/X11/fonts/encodings',
+ '-e', '/usr/X11R6/lib/X11/fonts/encodings/large',
"$PkgDir/dirs/$category");
return 0;
