[subversion-commit] SVN tetex commit + diffs: r159 - tex-common/trunk/scripts

[Ralf Stubner]

Author: stubner-guest
Date: 2005-08-24 09:51:20 +0000 (Wed, 24 Aug 2005)
New Revision: 159

Modified:
   tex-common/trunk/scripts/mk-tex-fontpack
Log:
scripts/mk-tex-fontpack
	register fonts with X11
	fix bug in name retrival
	some code clean-up and documentation


Modified: tex-common/trunk/scripts/mk-tex-fontpack
===================================================================
--- tex-common/trunk/scripts/mk-tex-fontpack	2005-08-23 15:18:37 UTC (rev 158)
+++ tex-common/trunk/scripts/mk-tex-fontpack	2005-08-24 09:51:20 UTC (rev 159)
@@ -12,7 +12,7 @@
 if [ "$DEBFULLNAME" ] ; then
     name=$DEBFULLNAME
 else
-    name=`awk -F : "/$LOGNAME/ {print \$5}" /etc/passwd`
+    name=`awk -F : "/$LOGNAME/ {print \\$5}" /etc/passwd`
 fi
 
 if [ "$DEBEMAIL" ] ; then
@@ -48,25 +48,37 @@
 mkdir -p $tmpdir/debian/$packname/usr/share/texmf
 
 mapfiles=""
+fontfiles=""
+afmfiles=""
 for f in `find $tdsdir -type f` ; do
+    # $nn: final location of $f without leading slash
+    # $mapfiles: list of .map files
+    # $fontfiles, $afmfiles: list of font and .afm files *with path*
+    #     relative to TEXMF
     case $f in
       $tdsdir/fonts/map/*)
-      		nn=`echo $f | sed -e "s|$tdsdir/fonts|/etc/texmf|"`
-		mkdir -p `dirname "$tmpdir/debian/$packname/$nn"`
-		cp -p $f `dirname "$tmpdir/debian/$packname/$nn"`
+      		nn=`echo $f | sed -e "s|$tdsdir/fonts|etc/texmf|"`
 		mapfiles="$mapfiles `basename $f`"
 		;;
+      $tdsdir/fonts/type1/*)
+      		nn=`echo $f | sed -e "s|$tdsdir/||"`
+		fontfiles="$fontfiles $nn"
+                nn="usr/share/texmf/$nn"
+		;;
+      $tdsdir/fonts/afm/*)
+      		nn=`echo $f | sed -e "s|$tdsdir/||"`
+		afmfiles="$afmfiles $nn"
+                nn="usr/share/texmf/$nn"
+		;;
       $tdsdir/doc/*)
-      		nn=`echo $f | sed -e "s|$tdsdir/doc|/usr/share/doc/texmf|"`
-		mkdir -p `dirname "$tmpdir/debian/$packname/$nn"`
-		cp -p $f `dirname "$tmpdir/debian/$packname/$nn"`
+      		nn=`echo $f | sed -e "s|$tdsdir/doc|usr/share/doc/texmf|"`
 		;;
       *)
-      		nn=`echo $f | sed -e "s|$tdsdir|/usr/share/texmf|"`
-		mkdir -p `dirname "$tmpdir/debian/$packname/$nn"`
-		cp -p $f `dirname "$tmpdir/debian/$packname/$nn"`
+      		nn=`echo $f | sed -e "s|$tdsdir|usr/share/texmf|"`
 		;;
     esac
+    mkdir -p `dirname "$tmpdir/debian/$packname/$nn"`
+    cp -p $f `dirname "$tmpdir/debian/$packname/$nn"`
 done
 
 # configure map files for Debian
@@ -91,6 +103,21 @@
     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
+    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 \
+        $tmpdir/debian/$packname/etc/X11/fonts/Type1/$packname.scale
+fi
+
+# create essential debian/* files
+
 cat > $tmpdir/debian/copyright <<EOF
 This package was debianized by $name <$email> 
 on `date -R` with the help of `basename $0`.
@@ -118,7 +145,7 @@
 
 Package: $packname
 Architecture: all
-Depends: tex-common, tetex-base | texlive-basic
+Depends: tex-common, tetex-base | texlive-basic, xutils (>= 4.0.3)
 Description: Font Pack $2
  This package provides the fonts from font pack $2.
 EOF
@@ -127,7 +154,8 @@
 #!/bin/sh
 test -e /usr/bin/mktexlsr && mktexlsr /usr/share/texmf
 update-updmap --quiet
-updmap-sys
+updmap-sys --quiet
+#DEBHELPER#
 exit 0
 EOF
 
@@ -135,9 +163,12 @@
 #!/bin/sh
 test -e /usr/bin/mktexlsr && mktexlsr /usr/share/texmf
 if [ ! "X$1" = "Xupgrade" ] ; then
-        update-updmap --quiet
-	updmap-sys
+    update-updmap --quiet
+    echo -n "Running updmap... "
+    updmap-sys --quiet
+    echo "done."
 fi
+#DEBHELPER#
 exit 0
 EOF
 
@@ -145,6 +176,7 @@
 cd $tmpdir
 fakeroot dh_testdir
 fakeroot dh_testroot
+fakeroot dh_installxfonts
 fakeroot dh_installdocs
 fakeroot dh_installchangelogs
 fakeroot dh_compress