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

Ralf Stubner stubner-guest at costa.debian.org
Sun Oct 2 20:46:18 UTC 2005


Author: stubner-guest
Date: 2005-10-02 20:46:17 +0000 (Sun, 02 Oct 2005)
New Revision: 192

Modified:
   make-texfontpkg/trunk/scripts/mk-tex-fontpack
Log:
* defoma integration
* use type1inst for fonts.scale (exp)
* don't install map files at TDS 1.0 location
* use only map files for dvips
* postinst and postrm updated (mainly from lmodern for teTeX 3.0)
* changed Depends: line
    - for teTeX tetex-bin depends on tetex-base
    - for TeX Live texlive-basic depends on texlive-basicbin
* some cleanup


Modified: make-texfontpkg/trunk/scripts/mk-tex-fontpack
===================================================================
--- make-texfontpkg/trunk/scripts/mk-tex-fontpack	2005-09-29 18:00:20 UTC (rev 191)
+++ make-texfontpkg/trunk/scripts/mk-tex-fontpack	2005-10-02 20:46:17 UTC (rev 192)
@@ -5,20 +5,22 @@
 # generate a debian package of a font pack, i.e. from a TDS 1.1 compliant tree
 # of fonts
 #
-# (C) 2005 Norbert Preining
+# Copyright 2005 Norbert Preining, Ralf Stubner
 # GPL
 #
 
+set -e
+
 if [ "$DEBFULLNAME" ] ; then
     name=$DEBFULLNAME
 else
-    name=`awk -F : "/$LOGNAME/ {print \\$5}" /etc/passwd`
+    name=`awk --field-separator : "/$LOGNAME/ {print \\$5}" /etc/passwd`
 fi
 
 if [ "$DEBEMAIL" ] ; then
     email=$DEBEMAIL
 else
-    email="$LOGNAME@`hostname`"
+    email="$LOGNAME@`hostname --fqdn`"
 fi
 
 shopt -s nullglob
@@ -43,9 +45,10 @@
 	exit 1
 fi
 
-
+# working directory
 tmpdir=`mktemp -d`
-mkdir -p $tmpdir/debian/$packname/usr/share/texmf
+tmproot=$tmpdir/debian/$packname
+mkdir -p $tmproot/usr/share/texmf
 
 mapfiles=""
 fontfiles=""
@@ -56,7 +59,7 @@
     # $fontfiles, $afmfiles: list of font and .afm files *with path*
     #     relative to TEXMF
     case $f in
-      $tdsdir/fonts/map/*)
+      $tdsdir/fonts/map/dvips/*)
       		nn=`echo $f | sed -e "s|$tdsdir/fonts|etc/texmf|"`
 		mapfiles="$mapfiles `basename $f`"
 		;;
@@ -73,18 +76,22 @@
       $tdsdir/doc/*)
       		nn=`echo $f | sed -e "s|$tdsdir/doc|usr/share/doc/texmf|"`
 		;;
+      # don't include map files at TDS 1.0 location
+      $tdsdir/dvips/config/*.map)
+      		break
+		;;
       *)
       		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"`
+    mkdir -p `dirname "$tmproot/$nn"`
+    cp -p $f `dirname "$tmproot/$nn"`
 done
 
 # configure map files for Debian
 if [ ! "X$mapfiles" = "X" ] ; then
-    mkdir -p $tmpdir/debian/$packname/etc/texmf/updmap.d
-    cat > $tmpdir/debian/$packname/etc/texmf/updmap.d/50$packname.cfg <<EOF 
+    mkdir -p $tmproot/etc/texmf/updmap.d
+    cat > $tmproot/etc/texmf/updmap.d/50$packname.cfg <<EOF 
 #
 # 50$packname.cfg
 # You can change/add entries to this file and changes will be preserved
@@ -96,11 +103,11 @@
 EOF
 
     for m in $mapfiles ; do
-        echo "Map $m" >> $tmpdir/debian/$packname/etc/texmf/updmap.d/50$packname.cfg
+        echo "Map $m" >> $tmproot/etc/texmf/updmap.d/50$packname.cfg
     done
 
-    mkdir -p $tmpdir/debian/$packname/var/lib/tex-common/fontmap-cfg
-    echo "50$packname" > $tmpdir/debian/$packname/var/lib/tex-common/fontmap-cfg/$packname.list 
+    mkdir -p $tmproot/var/lib/tex-common/fontmap-cfg
+    echo "50$packname" > $tmproot/var/lib/tex-common/fontmap-cfg/$packname.list 
 fi
 
 if [ ! "X$fontfiles" = "X" ] ; then
@@ -112,11 +119,24 @@
 /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
-    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
+    mkdir -p $tmproot/etc/X11/fonts/Type1
+
+    # generate fonts.scale using mkfontscale
+    # mkfontscale $tmproot/usr/share/fonts/type1/$packname
+    # generate fonts.scale using type1inst
+    (cd $tmproot/usr/share/fonts/type1/$packname; \
+        type1inst -quiet -nogs -nolog)
+    rm $tmproot/usr/share/fonts/type1/$packname/fonts.dir
+    chmod 644 $tmproot/usr/share/fonts/type1/$packname/fonts.scale 
+    # move fonts.scale into place
+    mv $tmproot/usr/share/fonts/type1/$packname/fonts.scale \
+        $tmproot/etc/X11/fonts/Type1/$packname.scale
+
+    # create defoma-hints file
+    mkdir -p $tmproot/etc/defoma/hints/
+    defoma-hints --no-question type1 \
+        $tmproot/usr/share/fonts/type1/$packname/*.pf[ab] | \
+        sed -e "s|$tmproot||" > $tmpdir/debian/$packname.defoma-hints
 fi
 
 # create essential debian/* files
@@ -148,29 +168,78 @@
 
 Package: $packname
 Architecture: all
-Depends: tex-common, tetex-base | texlive-basic, xutils (>= 4.0.3)
+Depends: tex-common, tetex-bin | texlive-basicbin , tetex-base | texlive-basic, defoma (>= 0.7.0), xutils (>= 4.0.3)
 Description: Font Pack $2
  This package provides the fonts from font pack $2.
 EOF
 
 cat > $tmpdir/debian/postinst <<EOF
 #!/bin/sh
-test -e /usr/bin/mktexlsr && mktexlsr /usr/share/texmf
-update-updmap --quiet
-updmap-sys --quiet
+set -e
+
+update_fontmaps()
+{
+    update-updmap --quiet
+    mktexlsr /usr/share/texmf
+    echo -n "Running updmap... "
+    updmap-sys --quiet
+    echo "done."
+
+    return 0
+}
+
+case "\$1" in
+    configure|abort-upgrade|abort-remove|abort-deconfigure)
+        update_fontmaps
+    ;;
+
+    *)
+        echo "postinst called with unknown argument '\$1'" >&2
+        exit 1
+    ;;
+esac
+
 #DEBHELPER#
 exit 0
 EOF
 
 cat > $tmpdir/debian/postrm <<EOF
 #!/bin/sh
-test -e /usr/bin/mktexlsr && mktexlsr /usr/share/texmf
-if [ ! "X$1" = "Xupgrade" ] ; then
-    update-updmap --quiet
+set -e
+
+try_to_update_fontmaps()
+{
+    update-updmap --quiet || true
+    mktexlsr /usr/share/texmf || true
     echo -n "Running updmap... "
-    updmap-sys --quiet
+    updmap-sys --quiet || true
     echo "done."
-fi
+
+    return 0
+}
+
+case "\$1" in
+    remove|disappear)
+        try_to_update_fontmaps
+    ;;
+
+    purge)
+        # Supposing updmap.cfg & Co are clean (which I think is a reasonable
+        # assumption), we don't need to call try_to_update_fontmaps().
+        # Calling it on remove _and_ on purge just for hypothetical users
+        # who would break their config before purging this package seems to
+        # be more annoying than useful (it takes a lot of time).
+    ;;
+
+    upgrade|failed-upgrade|abort-upgrade|abort-install)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument '\$1'" >&2
+        exit 1
+    ;;
+esac
+
 #DEBHELPER#
 exit 0
 EOF
@@ -181,6 +250,7 @@
 fakeroot dh_testroot
 fakeroot dh_link
 fakeroot dh_installxfonts
+fakeroot dh_installdefoma
 fakeroot dh_installdocs
 fakeroot dh_installchangelogs
 fakeroot dh_compress




More information about the Pkg-tetex-commits mailing list