Bug#225004: tetex-extra: Type1 fonts should be in a separate package
On 10.02.04 Florent Rougon (f.rougon@free.fr) wrote:
> Hilmar Preusse <hille42@web.de> wrote:
Hi,
> > I call dh_installxfonts during debian/rules, which gives me an
> > update-fonts-dir in postinst and postrm and a Depend on xutils.
> > Do I need to do anything more? Do I need update-fonts-scale (if
> > yes, where do I get that fonts.scale file from?) and
> > update-fonts-alias (if yes, where do I get that fonts.alias file
> > from?)?
>
> You need to provide a fonts.scale as explained by the Policy
> section I mentioned in my previous mail. For instance, for
> lmodern-x11:
>
Well, I've read that passage, but I couldn't found anything about,
that I have to. Only what I have to do, if I want to.
> /etc/X11/fonts/Type1/lmodern-x11.scale
>
> (the name lmodern-x11 was chosen because of gsfonts/gsfonts-x11, but I
> see there are also a lot of xfonts-foo packages that are not built from
> the xfree86 source package...)
>
Well, there are a lot of packages.
drachi:[hille] >dpkg -l xfonts*|more +6|wc -l
101
I found that name xfonts-* reasonable.
> You need to provide it yourself. In the lmodern case, I extract it
> from lmodern.defoma-hints, which I wrote manually (well,
> defoma-hints can give you a template for an arbitrary font and help
> you find the available/common values for hints when the defoma
> manual does not say much).
>
> Also, there are tools to generate fonts.scale files automatically (at
> least type1inst is mentioned here:
>
> http://www.tldp.org/HOWTO/Font-HOWTO/xfonts.html#AEN223
>
OK, I'll have a look at that.
> > Well, I don't care in the moment about defoma. Wasn't there some
> > rumour, that this thing will be abolished?
>
> I'm not aware of such a rumour. Do you have any pointer?
>
No, sorry. Has been in my mind for a while, cause I believe that I
heard it once.
> Before you add defoma support, please compare your screenshots in
> GNOME 2 applications like gnome-character-map and epiphany with the one
> I provided on:
>
> http://people.via.ecp.fr/~flo/tmp/lmodern-screenshots/
>
*grummel* I can't run unstable and I don't have Gnome 2 handy. If
anybody else is willing to add defoma support I'd appreciate it.
> > Last problem: I /usr/share/doc/tetex-fonts-extra I get a file
> > "copyright" which tells me that the license is GPL. But I guess,
> > these fonts aren't GPL at all. This needs still work.
>
> Ugh. I don't know how you generated your package, but rest assured
> that copyright files don't pop up magically...
>
Well, at any time debian/rules calls "dh_installdocs -i". I've
excluded my package now. I guess, I have to write a proper copyright
file for that package.
Do I have to include the Debian-changelog into tetex-extra-fonts?
> Some comments on your patch:
>
> +Package: tetex-extra-fonts
> +Architecture: all
> +Conflicts: kpathsea, texlib, textfm, bibtex, texpsfnt, mfbasfnt, mfnfss, xdvik, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, pandora, hyperref, tetex-french, cspsfonts, tetex-nonfree, pb-diagram, revtex4 (<= 4.0-2), tetex-eurosym, texdoctk, tetex-extra (<= 2.0.2-x.x)
> +Replaces: kpathsea, texlib, textfm, latex, bibtex, texidoc, texpsfnt, mfbasfnt, mfnfss, xdvik, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, pandora, hyperref, cspsfonts, tetex-bin (<< 1.0.7+20021025-3), tetex-french, tetex-nonfree, pb-diagram, tetex-base (<< 2.0-2), tetex-eurosym, texdoctk
>
> Does tetex-extra-fonts really replace all these packages???
>
Nope. I've just taken the line from tetex-extra. I guess I should
clean up there too...
As there are many package, which seems to be from the pre-teTeX era,
I can't do so much about it as I don't know these.
> +Description: Additional Type1-fonts for teTeX
> + This package contains the afm- and pfb-files of some postscript fonts
>
> foo- and bar-baz is German, I believe. :)
>
It is.
> Also, PostScript is written PostScript.
>
Should I add [TM]? SCNR.
> +Package: xfonts-tetex
> +Architecture: all
> +Depends: tetex-extra-fonts, ${misc:Depends}
>
> You may have a look at bug #112140 and explicitely depend on xutils
> (>= 4.1.0-12). Of course, all this can be found in the lmodern source
> package that is available here, as you know:
>
dh_installxfonts brings in a dependency on xutils (>= 4.0.3-xx) as
described in the policy. If this is not sufficient I'd rather swap
over that bug to debhelper and update the policy too.
xfree86 (4.1.0-12) unstable; urgency=low
[...]
* debian/local/update-fonts-{alias,dir,scale}: issue more warnings when
these commands are misused
don't look very critical, as the post{in,rm} skript will look for
the existence of update-fonts-dir before trying to call it.
> http://people.via.ecp.fr/~flo/debian/sid/source/
>
> + This package contains a collection of soft links sitting in
> + /usr/X11R6/lib/X11/fonts/Type1/ and pointing to the respective font
> + files provided by a separate package.
> +
>
> Only technically-oriented users will know what it is useful for.
> The purpose of this package is to make the fonts availabe to the X
> Window System.
>
Well, I said preliminary patch. Suggestions for the descriptions,
packages names, build system etc. are welcome.
> +# now split off Type1-files
> + grep pfb$$ debian/tetex-extra.files > debian/tetex-extra-fonts.files
> + grep afm$$ debian/tetex-extra.files >> debian/tetex-extra-fonts.files
>
> grep -E '\.(afm|pfb)$$'
>
OK, thanks.
> + sort debian/tetex-extra.files debian/tetex-extra-fonts.files | uniq -u > tetex-extra.tmp
> + mv -f tetex-extra.tmp debian/tetex-extra.files
>
> IMHO, debian/tetex-extra-fonts.files has nothing to do here. I think you
> wanted to uniq -u tetex-extra-fonts.files for fear of files listed
> several times, but this is not was is performed.
>
As Frank already pointed out:
drachi:[] >grep -E '\.(afm|pfb)$' debian/tetex-extra.files > debian/tetex-extra-fonts.files
drachi:[] >sort debian/tetex-extra.files debian/tetex-extra-fonts.files | uniq -u > tetex-extra.tmp
drachi:[] >wc -l tetex-extra.tmp debian/tetex-extra.files debian/tetex-extra-fonts.files
3119 tetex-extra.tmp
3465 debian/tetex-extra.files
346 debian/tetex-extra-fonts.files
6930 total
drachi:[] >bc
bc 1.06
Copyright 1991-1994, 1997, 1998, 2000 Free Software Foundation, Inc.
This is free software with ABSOLUTELY NO WARRANTY.
For details type `warranty'.
346+3119
3465
> +# create soft links in usr/X11R6/lib/X11/fonts/Type1/ and list these files
> +# in xfonts-tetex
> + ln -s `cat debian/tetex-extra-fonts.files|sed s#^u#\/u#g` debian/tetex-base/usr/X11R6/lib/X11/fonts/Type1/
> + echo "usr/X11R6/lib/X11/fonts/Type1/*" > debian/xfonts-tetex.files
>
> These links are not Policy-compliant.
>
AFAICS dh_link needs either the source destination files on the
Command line or in a file. The file already halve exist. I would have
to paste at the end of each line an usr/X11R6/lib/X11/fonts/Type1/.
To me that sed-script construct looked easier. If that is really not
policy compliant I'll change it.
10.5. Symbolic links
--------------------
In general, symbolic links within a top-level directory should
be relative, and symbolic links pointing from one top-level
directory into another should be absolute. (A top-level
directory is a sub-directory of the root directory /'.)
For us the latter is the case. AFAICS.
Note that when creating a relative link using `ln' it is not
necessary for the target of the link to exist relative to the
working directory you're running `ln' from, nor is it necessary
to change directory to the directory where the link is to be
made. Simply include the string that should appear as the
target of the link (this will be a pathname relative to the
directory in which the link resides) as the first argument to
`ln'.
For example, in your `Makefile' or `Debian/rules', you can do
things like:
ln -fs gcc $(prefix)/bin/cc
ln -fs gcc debian/tmp/usr/bin/cc
So I can't see any contradiction to the policy. Maybe I didn't
understand the word top-level directory correct.
Latest version attached.
Hilmar
--
sigmentation fault
diff -urN debian.orig/control debian/control
--- debian.orig/control Wed Feb 11 10:22:38 2004
+++ debian/control Wed Feb 11 11:31:52 2004
@@ -9,9 +9,9 @@
Package: tetex-base
Architecture: all
Depends: texinfo (>= 4.0b-1), debconf
-Replaces: texidoc, bibtex, texpsfnt, mfbasfnt, xdvik, dvipsk, mfnfss, latex, texlib, mflib, textfm, kpathsea, latex2e-doc, ltxgraph, csplain, cslatex, cstexfonts, tetex-extra (<< 2.0-2), tetex-doc (<< 1.0.2+20011128), tetex-nonfree, pxfonts, txfonts, mfpic, tetex-bin (<< 2.0.2-2), dvipdfm
+Replaces: texidoc, bibtex, texpsfnt, mfbasfnt, mfnfss, latex, mflib, textfm, latex2e-doc, ltxgraph, csplain, cslatex, cstexfonts, tetex-extra (<< 2.0-2), tetex-doc (<< 1.0.2+20011128), tetex-nonfree, pxfonts, txfonts, mfpic, tetex-bin (<< 2.0.2-2), dvipdfm
Pre-Depends: dpkg (>=1.6.8)
-Conflicts: texidoc, bibtex, texpsfnt, mfbasfnt, xdvik, mfnfss, texlib, mflib, textfm, kpathsea, latex2e-doc, ltxgraph, csplain, cslatex, cstexfonts, tetex-bin (<= 2.0.2-3), xbase (<< 3.3.2.3a-2), tetex-nonfree (<< 1.0.2+20000804-2), pxfonts, txfonts, mfpic, cspsfonts
+Conflicts: texidoc, bibtex, texpsfnt, mfbasfnt, mfnfss, texlib, mflib, textfm, latex2e-doc, ltxgraph, csplain, cslatex, cstexfonts, tetex-bin (<= 2.0.2-3), xbase (<< 3.3.2.3a-2), tetex-nonfree (<< 1.0.2+20000804-2), pxfonts, txfonts, mfpic, cspsfonts
Recommends: tetex-doc (>> 2.0)
Suggests: tetex-extra
Description: Basic library files of teTeX
@@ -24,20 +24,38 @@
Package: tetex-extra
Architecture: all
Pre-Depends: dpkg (>=1.6.8)
-Conflicts: kpathsea, texlib, textfm, bibtex, texpsfnt, mfbasfnt, mfnfss, xdvik, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, pandora, hyperref, tetex-french, cspsfonts, tetex-nonfree, pb-diagram, revtex4 (<= 4.0-2), tetex-eurosym, texdoctk
-Replaces: kpathsea, texlib, textfm, latex, bibtex, texidoc, texpsfnt, mfbasfnt, mfnfss, xdvik, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, pandora, hyperref, cspsfonts, tetex-bin (<< 1.0.7+20021025-3), tetex-french, tetex-nonfree, pb-diagram, tetex-base (<< 2.0-2), tetex-eurosym, texdoctk
-Depends: tetex-base (>= 2.0), tetex-bin (>> 2.0.2-3), gsfonts, perl-tk
+Conflicts: textfm, bibtex, texpsfnt, mfbasfnt, mfnfss, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, pandora, hyperref, tetex-french, cspsfonts, tetex-nonfree, pb-diagram, revtex4 (<= 4.0-2), tetex-eurosym, texdoctk
+Replaces: textfm, bibtex, texpsfnt, mfbasfnt, mfnfss, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, pandora, hyperref, latex, texidoc, cspsfonts, tetex-nonfree, pb-diagram, tetex-bin (<< 1.0.7+20021025-3), tetex-french, tetex-base (<< 2.0-2), tetex-eurosym, texdoctk
+Depends: tetex-base (>= 2.0), tetex-bin (>> 2.0.2-3), gsfonts, perl-tk, tetex-extra-fonts
Provides: tetex-nonfree, pb-diagram, tetex-eurosym, texdoctk
Description: Additional library files of teTeX
This package contains some additional parts of teTeX that some users
- might not need. This includes some PostScript fonts from Adobe,
- Bitstream, URW etc. It contains fonts like EC, some from the AMS,
+ might not need. It contains fonts like EC, some from the AMS,
and some decorative fonts. Furthermore, there are additional support
- files for BibTeX, Omega, PSTricks, pdfTeX, LaTeX etc.
+ files for BibTeX, Omega, PSTricks, pdfTeX, LaTeX etc. Some additional
+ Postscript-Type1 fonts were split off into a separate package.
.
Together with tetex-bin and tetex-base, this will give you a
complete teTeX installation.
+Package: tetex-extra-fonts
+Architecture: all
+Conflicts: textfm, texpsfnt, mfbasfnt, mfnfss, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, pandora, hyperref, tetex-french, cspsfonts, tetex-nonfree, pb-diagram, revtex4 (<= 4.0-2), tetex-eurosym, texdoctk, tetex-extra (<= 2.0.2-x.x)
+Replaces: textfm, latex, texidoc, texpsfnt, mfbasfnt, mfnfss, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, pandora, hyperref, cspsfonts, tetex-bin (<< 1.0.7+20021025-3), tetex-french, tetex-nonfree, pb-diagram, tetex-base (<< 2.0-2), tetex-eurosym
+Description: Additional Type1-fonts for teTeX
+ This package contains the afm and pfb-files of some PostScript fonts
+ from Adobe, Bitstream, URW etc. It was split off, to provide other
+ packages with these fonts.
+
+Package: xfonts-tetex
+Architecture: all
+Depends: tetex-extra-fonts, ${misc:Depends}
+Description: TeX-Type1-fonts for XFree
+ This package makes it possible to use the Type1 Postscript fonts,
+ provided by teTeX, in XFree. This includes Bluesky Computer Modern,
+ URW Standard Postscript Fonts, Hoekwater symbol Fonts, Omega Unicode
+ Fonts, and Euro symbol fonts.
+
Package: tetex-doc
Section: doc
Architecture: all
diff -urN debian.orig/copyr.type1 debian/copyr.type1
--- debian.orig/copyr.type1 Thu Jan 1 01:00:00 1970
+++ debian/copyr.type1 Wed Feb 11 10:54:49 2004
@@ -0,0 +1,2 @@
+The Type1-fonts in that package bear an unknown copyright. The correct
+statements will be added later.
diff -urN debian.orig/dirs debian/dirs
--- debian.orig/dirs Wed Feb 11 10:22:38 2004
+++ debian/dirs Wed Feb 11 10:23:14 2004
@@ -6,3 +6,4 @@
var/cache/fonts
etc/texmf/etex
etc/texmf/platex
+usr/X11R6/lib/X11/fonts/Type1
diff -urN debian.orig/rules debian/rules
--- debian.orig/rules Wed Feb 11 10:22:38 2004
+++ debian/rules Wed Feb 11 12:42:28 2004
@@ -156,6 +156,15 @@
sed -e "s#^\.#usr/share#" files.extra > debian/tetex-extra.files
+# now split off Type1-files
+ grep -E '\.(afm|pfb)$$' debian/tetex-extra.files > debian/tetex-extra-fonts.files
+ sort debian/tetex-extra.files debian/tetex-extra-fonts.files | uniq -u > tetex-extra.tmp
+ mv -f tetex-extra.tmp debian/tetex-extra.files
+
+# create soft links in usr/X11R6/lib/X11/fonts/Type1/ and list these files
+# in xfonts-tetex
+ ln -s `cat debian/tetex-extra-fonts.files|sed s#^u#\/u#g` debian/tetex-base/usr/X11R6/lib/X11/fonts/Type1/
+ echo "usr/X11R6/lib/X11/fonts/Type1/*" > debian/xfonts-tetex.files
### Install tetex-base.
@@ -296,15 +305,19 @@
# Install documentation (also creates /usr/share/doc/<package>
# directories).
- dh_installdocs -i
+ dh_installdocs -i -N tetex-extra-fonts
+ dh_installdocs -p tetex-extra-fonts debian/copyr.type1 debian/changelog -X copyright
# Remove the /usr/share/doc/{tetex-extra,tetex-doc} directories and
# replace them with links to the /usr/share/doc/tetex-base directory
# (so all are identical).
rm -rf debian/$(docpack)/usr/share/doc/$(docpack)
rm -rf debian/$(extra)/usr/share/doc/$(extra)
+ rm -rf debian/xfonts-tetex/usr/share/doc/xfonts-tetex
(cd debian/$(extra)/usr/share/doc/; ln -s tetex-base tetex-extra)
(cd debian/$(docpack)/usr/share/doc/; ln -s tetex-base tetex-doc)
+ (cd debian/xfonts-tetex/usr/share/doc/; ln -s tetex-extra-fonts xfonts-tetex)
+
# Install any example files.
# dh_installexamples -i
@@ -332,6 +345,9 @@
# dh_installman -i
# dh_undocumented -i
#
+# register the fonts in xfonts-tetex
+ dh_installxfonts -p xfonts-tetex
+
# Install any info files.
dh_installinfo -i
Reply to: