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

[Frank Küster]

Author: frank
Date: 2005-12-07 09:38:32 +0000 (Wed, 07 Dec 2005)
New Revision: 379

Modified:
   tetex-base/trunk/debian/postinst.in
   tetex-base/trunk/debian/postrm.functions
   tetex-base/trunk/debian/preinst.in
   tetex-base/trunk/debian/variables
Log:
upgrade from 3.0-10 is now tested for tetex-base

Modified: tetex-base/trunk/debian/postinst.in
===================================================================
--- tetex-base/trunk/debian/postinst.in	2005-12-06 19:44:38 UTC (rev 378)
+++ tetex-base/trunk/debian/postinst.in	2005-12-07 09:38:32 UTC (rev 379)
@@ -82,12 +82,13 @@
 
     # remove backup files from preinst
     for file in $UNUSED_CONFFILES; do
-      rm -f /etc/texmf/$oldstuff_dir/`basename $file`.$PREINST_MOVE_EXT
+      rm -f $oldstuff_dir/`basename $file`.$PREINST_MOVE_EXT
     done
     for file in $FORMER_UCF; do
-      rm -f /etc/texmf/$oldstuff_dir/`basename $file`.$PREINST_MOVE_EXT
+      rm -f $oldstuff_dir/`basename $file`.$PREINST_MOVE_EXT
       if [ -x /usr/bin/ucf ]; then ucf --purge /etc/texmf/$file; fi
     done
+    rmdir $oldstuff_dir 2>/dev/null || true # ignore errors if nonexistent or non-empty
 
 # Update language.dat (update-language is in tex-common on which we depend)
     update-language

Modified: tetex-base/trunk/debian/postrm.functions
===================================================================
--- tetex-base/trunk/debian/postrm.functions	2005-12-06 19:44:38 UTC (rev 378)
+++ tetex-base/trunk/debian/postrm.functions	2005-12-07 09:38:32 UTC (rev 379)
@@ -58,10 +58,12 @@
   fi
 }
 
-#debug(){true "$*"}
 debug(){
-  echo -en "$*"
+  true "$*"
 }
+# debug(){
+#   echo -en "$*"
+# }
 
 postrm_abort_restore_file(){
   file=/etc/texmf/$1
@@ -87,6 +89,7 @@
     mv $file.$PREINST_MOVE_EXT $file
   else
     if [ -e /etc/texmf/$newname ]; then
+      mkdir /etc/texmf/`dirname $newname`
       ucf /etc/texmf/$newname $file 
       rm /etc/texmf/$newname
     fi

Modified: tetex-base/trunk/debian/preinst.in
===================================================================
--- tetex-base/trunk/debian/preinst.in	2005-12-06 19:44:38 UTC (rev 378)
+++ tetex-base/trunk/debian/preinst.in	2005-12-07 09:38:32 UTC (rev 379)
@@ -26,7 +26,9 @@
 <:open(FUNCTIONS,'common.functions');@FUNCTIONS=<FUNCTIONS>;close(FUNCTIONS):>//
 <:=@FUNCTIONS:>//
 
-debug(){true "$*"}
+debug(){
+  true "$*"
+}
 # debug(){
 #   echo -en "$*"
 # }
@@ -40,7 +42,7 @@
   oldmd5sum=`dpkg_md5sum $file`
   currmd5sum=`md5sum $file | cut -d ' ' -f 1`
   if [ "$oldmd5sum" = "$currmd5sum" ]; then
-    mv $file /etc/texmf/$oldstuff_dir/`basename $file`.$PREINST_MOVE_EXT
+    mv $file $oldstuff_dir/`basename $file`.$PREINST_MOVE_EXT
   else
     newdir=`dirname /etc/texmf/$newname`
     mkdir -p $newdir
@@ -57,7 +59,7 @@
   oldmd5sum=`ucf_md5sum $file`
   currmd5sum=`md5sum $file | cut -d ' ' -f 1`
   if [ "$oldmd5sum" = "$currmd5sum" ]; then
-    mv $file /etc/texmf/$oldstuff_dir/`basename $file`.$PREINST_MOVE_EXT
+    mv $file $oldstuff_dir/`basename $file`.$PREINST_MOVE_EXT
   else
     mv $file /etc/texmf/$newname
     if [ -x /usr/bin/ucf ]; then ucf --purge $file; fi
@@ -91,13 +93,14 @@
 
 # remove obsolete conffiles if they are unchanged, 
 # otherwise move them to the appropriate place
+    mkdir $oldstuff_dir
     for file in $UNUSED_CONFFILES; do
       preinst_remove_or_move $file
     done
     for file in $FORMER_UCF; do
       preinst_remove_or_move_ucf $file
     done
-    for dir in $UNUSED_CONFDIRS; do
+    for dir in $UNUSED_CONFDIRS $oldstuff_dir; do
       test -d $dir && rmdir --ignore-fail-on-non-empty $dir || true
     done
 

Modified: tetex-base/trunk/debian/variables
===================================================================
--- tetex-base/trunk/debian/variables	2005-12-06 19:44:38 UTC (rev 378)
+++ tetex-base/trunk/debian/variables	2005-12-07 09:38:32 UTC (rev 379)
@@ -18,7 +18,7 @@
 <:$MOVE_GENERIC_UCF="generic/fontmath.cfg generic/fonttext.cfg generic/preload.cfg":>//
 <:$MOVE_CONTEXT_NOUCF="original-adobe-euro.map original-context-symbol.map original-vogel-symbol.map":>//
 <:$MOVE_CONTEXT_UCF="original-ams-euler.map original-ams-cmr.map original-youngryu-tx.map original-youngryu-px.map":>//
-<:$unused_contextmaps="il2-ams-cmr.map pl0-ams-cmr.map original-adobe-euro.map original-ams-cmr.map original-ams-euler.map original-context-symbol.map original-vogel-symbol.map original-youngryu-px.map original-youngryu-tx.map":>//
+<:$unused_contextmaps="il2-ams-cmr.map pl0-ams-cmr.map original-adobe-euro original-context-symbol.map original-vogel-symbol.map":>//
 <:$contextmaps_oldplace="pdftex/context":>//
 <:$contextmaps_newplace="map/dvips/context":>//
 <:#for (@unused_contextmaps_oldplace=split(/ /,$unused_contextmaps)){s{(.*)}{$contextmaps_oldplace/$1}}:>//