[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#327129: tetex-bin: missing links and formats



Ralf Stubner wrote:
> Frank Küster wrote:
>> Ralf Stubner <ralf.stubner@physik.uni-erlangen.de> wrote:
>> 
>>> I had a closer look at how the necessary links are created. Most links
>>> to programs (eg, texhash -> mktexlsr) are created in
>>> texk/tetex/Makefile, which seems to work correctly. The links pointing
>>> at 'omfonts' are created in texk/web2c/omegafonts/Makefile, though. No
>>> idea why that does not work.
>> 
>> Me neither, and I won't have time to look into it soon.
> 
> I'll see if I can find anything. Interestingly, these links are missing
> on SuSE 9.3, too.

I think the reason for these missing links is that the teTeX Makefile as
an optional install-extra target which creates an ls-R database, calls
texlinks etc. Within this target the links to 'omfonts' are created.
With a normal install, install-extra is executed together with the
install target. For obviuos reasons this is inhibited in the debian
package (FMU=''-patch in debian/patches/patch-deb). I tried to mimic the
behviour of teTeX's Makefile but found it easier to set the links
explicitly.

>> But we could replace the manual link creation by a call to
>> debian/tetex-bin/usr/bin/texlinks with appropriate --cnffile and
>> DIRECTORIES parameters.
>
> I will have a look at that, too.

Again, I found it easier to set the links explicitly. I did try

`pwd`/debian/$(package)/usr/bin/texlinks \
     --cnffile `pwd`/debian/$(package)/usr/share/tetex-bin/fmtutil.cnf \
               `pwd`/debian/$(package)/usr/bin/

in debian/rules just after the different debian/tetex-bin_install calls.
But this doesn't look all that nice.

Here are two patches which install the links to omfonts and clean up the
manpage and format links:

=============================================================
--- debian/tetex-bin_install.in (revision 183)
+++ debian/tetex-bin_install.in (working copy)
@@ -41,16 +41,13 @@
   --manpage-links)
     if [ $ACTION = install ]; then
       ln -s tangle.1 $sharedir/man/man1/otangle.1
-      ln -s pdfetex.1 $sharedir/man/man1/pdfelatex.1
-      ln -s pdfetex.1 $sharedir/man/man1/inipdfetex.1
-      ln -s pdfetex.1 $sharedir/man/man1/virpdfetex.1
+      # no manpage for aleph
+      #ln -s aleph.1 $sharedir/man/man1/lamed.1
       ln -s xdvi.1 $sharedir/man/man1/xdvi.bin.1
       ln -s xdvi.1 $sharedir/man/man1/xdvi.real.1
     else
       rm $sharedir/man/man1/otangle.1
-      rm $sharedir/man/man1/pdfelatex.1
-      rm $sharedir/man/man1/inipdfetex.1
-      rm $sharedir/man/man1/virpdfetex.1
+      #rm $sharedir/man/man1/lamed.1
       rm $sharedir/man/man1/xdvi.bin.1
       rm $sharedir/man/man1/xdvi.real.1
     fi
@@ -60,20 +57,18 @@
       ln -s mf.base $txmfvardir/web2c/mfw.base
       ln -s $main_engine debian/$package/usr/bin/amstex
       ln -s $main_engine debian/$package/usr/bin/latex
-      ln -s $main_engine debian/$package/usr/bin/elatex
       ln -s omega debian/$package/usr/bin/lambda
+      ln -s aleph debian/$package/usr/bin/lamed
       ln -s $main_engine debian/$package/usr/bin/pdflatex
-      ln -s $main_engine debian/$package/usr/bin/pdfelatex
       ln -s $main_engine debian/$package/usr/bin/etex
       ln -s $main_engine debian/$package/usr/bin/pdftex
     else
       rm $txmfdir/web2c/mfw.base
       rm debian/$package/usr/bin/amstex
       rm debian/$package/usr/bin/latex
-      rm debian/$package/usr/bin/elatex
       rm debian/$package/usr/bin/lambda
+      rm debian/$package/usr/bin/lamed
       rm debian/$package/usr/bin/pdflatex
-      rm debian/$package/usr/bin/pdfelatex
       rm debian/$package/usr/bin/etex
       rm debian/$package/usr/bin/pdftex
     fi
@@ -123,6 +118,19 @@
       # rm $sharedir/emacs/site-lisp/cweb.el
     fi
     ;;
+   --omfonts)
+     if [ $ACTION = install ]; then
+      ln -s omfonts debian/$package/usr/bin/ofm2opl
+      ln -s omfonts debian/$package/usr/bin/opl2ofm
+      ln -s omfonts debian/$package/usr/bin/ovf2ovp
+      ln -s omfonts debian/$package/usr/bin/ovp2ovf
+     else
+      rm debian/$package/usr/bin/ofm2opl
+      rm debian/$package/usr/bin/opl2ofm
+      rm debian/$package/usr/bin/ovf2ovp
+      rm debian/$package/usr/bin/ovp2ovf
+     fi
+     ;;
 #   --option)
 #     if [ $ACTION = install ]; then
 #     else
=============================================================

=============================================================
--- debian/rules.in     (revision 183)
+++ debian/rules.in     (working copy)
@@ -244,6 +244,7 @@
        debian/tetex-bin_install --conffiles
        debian/tetex-bin_install --xdvi
        debian/tetex-bin_install --misc
+       debian/tetex-bin_install --omfonts


 install-lib: build-stamp
=============================================================

Output from debdiff:

=============================================================
Files in second .deb but not in first
-------------------------------------
/usr/bin/lamed
/usr/bin/ofm2opl
/usr/bin/opl2ofm
/usr/bin/ovf2ovp
/usr/bin/ovp2ovf

Files in first .deb but not in second
-------------------------------------
/usr/bin/elatex
/usr/bin/pdfelatex
/usr/share/doc/tetex-bin/README.sarge
/usr/share/man/man1/inipdfetex.1.gz
/usr/share/man/man1/pdfelatex.1.gz
/usr/share/man/man1/virpdfetex.1.gz

The following lines in the control files differ (wdiff output format):
----------------------------------------------------------------------
Depends: libc6 (>= 2.3.2.ds1-21), libgcc1 (>= 1:3.4.1-3), libice6 |
xlibs (>> 4.1.0), libkpathsea4, libpaper1, libpng12-0 (>= 1.2.8rel),
libsm6 | xlibs (>> 4.1.0), libstdc++5 (>= 1:3.3.4-1), libt1-5 (>=
5.0.2), libx11-6 | xlibs (>> 4.1.0), libxaw7 (>> 4.1.0), libxext6 |
xlibs (>> 4.1.0), libxmu6 | xlibs (>> 4.1.0), {+libxp6 | xlibs (>>
4.1.0),+} libxpm4 | xlibs (>> 4.1.0), libxt6 | xlibs (>> 4.1.0), zlib1g
(>= 1:1.2.1), debconf (>= 0.5) | debconf-2.0, perl, tetex-base (>=
3.0-4), ed, debianutils (>= 1.13.1), mime-support, sed (>= 4.0.5), ucf
(>= 1.02)
Installed-Size: [-8468-] {+8464+}
=============================================================

As one can see, I don't know yet how to build a sarge backport with
svn-buildpackage. Shall I commit the changes?


cheerio
ralf




Reply to: