[subversion-commit] SVN tetex commit + diffs: r169 - make-texfontpkg/trunk/scripts

[Ralf Stubner]

Author: stubner-guest
Date: 2005-08-24 18:01:59 +0000 (Wed, 24 Aug 2005)
New Revision: 169

Modified:
   make-texfontpkg/trunk/scripts/mk-tex-fontpack
Log:
scripts/mk-tex-fontpack
	install fonts in /usr/share/fonts
	use dh_link to provide links for TeX and X11


Modified: make-texfontpkg/trunk/scripts/mk-tex-fontpack
===================================================================
--- make-texfontpkg/trunk/scripts/mk-tex-fontpack	2005-08-24 16:02:54 UTC (rev 168)
+++ make-texfontpkg/trunk/scripts/mk-tex-fontpack	2005-08-24 18:01:59 UTC (rev 169)
@@ -63,12 +63,12 @@
       $tdsdir/fonts/type1/*)
       		nn=`echo $f | sed -e "s|$tdsdir/||"`
 		fontfiles="$fontfiles $nn"
-                nn="usr/share/texmf/$nn"
+                nn="usr/share/fonts/type1/$packname/`basename $nn`"
 		;;
       $tdsdir/fonts/afm/*)
       		nn=`echo $f | sed -e "s|$tdsdir/||"`
 		afmfiles="$afmfiles $nn"
-                nn="usr/share/texmf/$nn"
+                nn="usr/share/fonts/type1/$packname/`basename $nn`"
 		;;
       $tdsdir/doc/*)
       		nn=`echo $f | sed -e "s|$tdsdir/doc|usr/share/doc/texmf|"`
@@ -103,16 +103,19 @@
     echo "50$packname" > $tmpdir/debian/$packname/var/lib/tex-common/fontmap-cfg/$packname.list 
 fi
 
-# create links in /usr/X11R6/lib/X11/fonts/Type1 and fonts.scale
 if [ ! "X$fontfiles" = "X" ] ; then
-    mkdir -p $tmpdir/debian/$packname/usr/X11R6/lib/X11/fonts/Type1
+    # create links for TeX and X11
+    for texmffile in $fontfiles $afmfiles ; do
+        f=`basename $texmffile`
+        cat >> $tmpdir/debian/$packname.links <<EOF
+/usr/share/fonts/type1/$packname/$f  /usr/share/texmf/$texmffile
+/usr/share/fonts/type1/$packname/$f /usr/X11R6/lib/X11/fonts/Type1/$f
+EOF
+    done
+    # generate fonts.scale
     mkdir -p $tmpdir/debian/$packname/etc/X11/fonts/Type1
-    for f in $fontfiles $afmfiles ; do
-        ln -s ../../../../../share/texmf/$f \
-            $tmpdir/debian/$packname/usr/X11R6/lib/X11/fonts/Type1
-    done
-    mkfontscale $tmpdir/debian/$packname/usr/X11R6/lib/X11/fonts/Type1
-    mv $tmpdir/debian/$packname/usr/X11R6/lib/X11/fonts/Type1/fonts.scale \
+    mkfontscale $tmpdir/debian/$packname/usr/share/fonts/type1/$packname
+    mv $tmpdir/debian/$packname/usr/share/fonts/type1/$packname/fonts.scale \
         $tmpdir/debian/$packname/etc/X11/fonts/Type1/$packname.scale
 fi
 
@@ -176,6 +179,7 @@
 cd $tmpdir
 fakeroot dh_testdir
 fakeroot dh_testroot
+fakeroot dh_link
 fakeroot dh_installxfonts
 fakeroot dh_installdocs
 fakeroot dh_installchangelogs