[subversion-commit] SVN tetex commit + diffs: r216 - tetex-base/trunk/debian

[Frank Küster]

Author: frank
Date: 2005-10-13 13:38:46 +0000 (Thu, 13 Oct 2005)
New Revision: 216

Modified:
   tetex-base/trunk/debian/common.functions.in
   tetex-base/trunk/debian/common.variables
   tetex-base/trunk/debian/rules
   tetex-base/trunk/debian/rules.in
   tetex-base/trunk/debian/tetex-extra.preinst.in
   tetex-base/trunk/debian/variables
Log:
- [common.*] changes migrated from tex-common
- [rules*, tetex-extra.preinst.in]: again generate the preinst script, and don't do things we didn't before resurrecting it
- [variables] remove unused lines that are in common.variables

Modified: tetex-base/trunk/debian/common.functions.in
===================================================================
--- tetex-base/trunk/debian/common.functions.in	2005-10-13 13:31:57 UTC (rev 215)
+++ tetex-base/trunk/debian/common.functions.in	2005-10-13 13:38:46 UTC (rev 216)
@@ -193,11 +193,18 @@
   fi
 }
 
+select_lsrfile() {
+    case $1 in
+     main) LSR=$TEXMFSYSVAR/ls-R-TEXMFMAIN ;;
+     var)  LSR=$TEXMFSYSVAR/ls-R ;;
+     cache) LSR=/var/cache/fonts/ls-R ;;
+     *) echo "select_lsr: don't know how to set this: $1" >&2 ;;
+    esac
+    echo $LSR
+}
+
 #################################################################
 ##  End of function definitions from file common.functions
 #################################################################
 
-# local variables:
-# mode: shell-script
-# skeleton-pair: t
-# end:
+

Modified: tetex-base/trunk/debian/common.variables
===================================================================
--- tetex-base/trunk/debian/common.variables	2005-10-13 13:31:57 UTC (rev 215)
+++ tetex-base/trunk/debian/common.variables	2005-10-13 13:38:46 UTC (rev 216)
@@ -3,8 +3,8 @@
 <:# $Id$:>//
 <:# this list is from dpkg-1.10.9/include/dpkg.h.in:  :>//
 <:$DPKG_EXTENSIONS="'~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist":>//
-<:$PREINST_MOVE_EXT="preinst-bak":>//
-<:$POSTINST_MOVE_EXT="postinst-bak":>//
+<:$PREINST_MOVE_EXT=".preinst-bak":>//
+<:$POSTINST_MOVE_EXT=".postinst-bak":>//
 <:$PURGE_EXTENSIONS="$DPKG_EXTENSIONS $PREINST_MOVE_EXT $POSTINST_MOVE_EXT":>//
 <:# package specific:>//
 <:$ETC="/etc/":>//

Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules	2005-10-13 13:31:57 UTC (rev 215)
+++ tetex-base/trunk/debian/rules	2005-10-13 13:38:46 UTC (rev 216)
@@ -17,7 +17,8 @@
 
 EPERL_FILES := debian/preinst debian/postinst debian/postrm \
    debian/tetex-base.dirs \
-   debian/tetex-extra.postinst debian/tetex-extra.postrm debian/tetex-extra.dirs \
+   debian/tetex-extra.postinst debian/tetex-extra.preinst \
+   debian/tetex-extra.postrm debian/tetex-extra.dirs \
    debian/setup-ucf debian/setup-conflinks \
    debian/common.functions
 eperl_sourcefiles=debian/variables debian/COPYRIGHT.scripts \

Modified: tetex-base/trunk/debian/rules.in
===================================================================
--- tetex-base/trunk/debian/rules.in	2005-10-13 13:31:57 UTC (rev 215)
+++ tetex-base/trunk/debian/rules.in	2005-10-13 13:38:46 UTC (rev 216)
@@ -22,7 +22,8 @@
 
 EPERL_FILES := debian/preinst debian/postinst debian/postrm \
    debian/tetex-base.dirs \
-   debian/tetex-extra.postinst debian/tetex-extra.postrm debian/tetex-extra.dirs \
+   debian/tetex-extra.postinst debian/tetex-extra.preinst \
+   debian/tetex-extra.postrm debian/tetex-extra.dirs \
    debian/setup-ucf debian/setup-conflinks \
    debian/common.functions
 eperl_sourcefiles=debian/variables debian/COPYRIGHT.scripts \

Modified: tetex-base/trunk/debian/tetex-extra.preinst.in
===================================================================
--- tetex-base/trunk/debian/tetex-extra.preinst.in	2005-10-13 13:31:57 UTC (rev 215)
+++ tetex-base/trunk/debian/tetex-extra.preinst.in	2005-10-13 13:38:46 UTC (rev 216)
@@ -1,5 +1,3 @@
-# this script is currently not used
-
 #include variables
 #!/bin/sh -e
 # 
@@ -8,11 +6,6 @@
 <:=@COPYRIGHT:>//
 
 ## Define static variables we need
-updmapcfg=<:=$tetex_extra_updmapcfg:>
-CONFIG_FILE="$updmapcfg"
-CONFSTATEDIR="<:=$confstatedir:>"
-PCONFSTATEDIR="$CONFSTATEDIR/tetex-extra"
-TEMP_CONFIG_FILE="$PCONFSTATEDIR/`basename $CONFIG_FILE`.tmp"
 NOWLINKDIRS="<:=$NOWLINKDIRS:>"
 NOWDIRLINKS="<:=$NOWDIRLINKS:>"
 
@@ -26,7 +19,7 @@
 #################################################################
 
 case "$1" in
-  install)
+  install|upgrade)
     # tetex-base does this, too.  But -extra can be unpacked before it, therefore
     # we have to do the preinst and prerm stuff, too.  
     for dir in $NOWLINKDIRS; do
@@ -36,8 +29,6 @@
     for dir in $NOWDIRLINKS; do
       preinst_move_symlink /usr/share/texmf/$dir
     done
-
-    handle_stateof_configfile --preinst $updmapcfg tetex-extra
     ;;
 esac
 

Modified: tetex-base/trunk/debian/variables
===================================================================
--- tetex-base/trunk/debian/variables	2005-10-13 13:31:57 UTC (rev 215)
+++ tetex-base/trunk/debian/variables	2005-10-13 13:38:46 UTC (rev 216)
@@ -13,10 +13,6 @@
     sehyph.tex skhyph.tex sihyph23.tex sphyph.tex trhyph.tex ukrhyph.tex \\
     ukrhyph.t2a ukrhyph.lcy ukrhyph.ot2":>//
 <:# this list is from dpkg-1.10.9/include/dpkg.h.in:  :>//
-<:$DPKG_EXTENSIONS="'~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist":>//
-<:$PREINST_MOVE_EXT=".preinst-bak":>//
-<:$POSTINST_MOVE_EXT=".postinst-bak":>//
-<:$PURGE_EXTENSIONS="$DPKG_EXTENSIONS $PREINST_MOVE_EXT $POSTINST_MOVE_EXT":>//
 <:$VARTOP_GENERATED="helpindex.html ls-R ls-R-TEXMFMAIN":>//
 <:$STANDARD_INFO_TEXT="This file is no longer needed. You may safely delete it.":>//
 <:$MOVE_GENERIC_UCF="generic/fontmath.cfg generic/fonttext.cfg generic/preload.cfg":>//