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

[Frank Küster]

Author: frank
Date: 2005-12-06 09:25:21 +0000 (Tue, 06 Dec 2005)
New Revision: 376

Modified:
   tetex-base/trunk/debian/postinst.in
   tetex-base/trunk/debian/preinst.in
   tetex-base/trunk/debian/tetex-extra.dirs.in
   tetex-base/trunk/debian/tetex-extra.postrm.in
Log:
remove all unneeded symlink-to-dir transitions

Modified: tetex-base/trunk/debian/postinst.in
===================================================================
--- tetex-base/trunk/debian/postinst.in	2005-12-05 18:39:28 UTC (rev 375)
+++ tetex-base/trunk/debian/postinst.in	2005-12-06 09:25:21 UTC (rev 376)
@@ -17,8 +17,6 @@
 
 ## Variables needed for upgrading
 obsolete_dirs="/usr/lib/texmf/local, /usr/share/texmf/local"
-NOWLINKDIRS="<:=$NOWLINKDIRS:>"
-NOWDIRLINKS="<:=$NOWDIRLINKS:>"
 POSTINST_MOVE_EXT="<:=$POSTINST_MOVE_EXT:>"
 OLD_LDAT=$etc/language.dat
 md5sumlist="
@@ -92,16 +90,6 @@
 ## common installation and upgrading tasks
 case "$1" in
   configure)
-    # upgrading from pre-release sarge: it is now safe to remove obsolete dirs
-    for dir in $NOWLINKDIRS; do
-      postinst_remove_saveddir /usr/share/texmf/$dir
-      postinst_remove_saveddir /usr/share/texmf-tetex/$dir
-    done
-    # this change is from 2.0.2 to 3.0
-    for link in $NOWDIRLINKS; do
-      postinst_remove_savedlink /usr/share/texmf/$link
-      postinst_remove_savedlink /usr/share/texmf-tetex/$link
-    done
 
 # rename unused conffiles. This must be done after moving (in
 # preinst), because some are first moved with their "cousins" to the

Modified: tetex-base/trunk/debian/preinst.in
===================================================================
--- tetex-base/trunk/debian/preinst.in	2005-12-05 18:39:28 UTC (rev 375)
+++ tetex-base/trunk/debian/preinst.in	2005-12-06 09:25:21 UTC (rev 376)
@@ -67,16 +67,6 @@
 case "$1" in
   # install is also used if the old package is in state rc
   upgrade|install)
-# change directories to symlinks in a safe way, thanks to Branden Robinson:
-# dpkg won't change a directory to a symlink; therefore we first move it out of the way      
-#     for dir in $NOWLINKDIRS; do
-#       preinst_move_dir /usr/share/texmf/$dir
-#     done
-# same in the other direction, once in /usr/share/texmf and once in /usr/share/texmf-tetex
-    for dir in $NOWDIRLINKS; do
-      preinst_move_symlink /usr/share/texmf/$dir
-      preinst_move_symlink /usr/share/texmf-tetex/$dir
-    done
 
 # force removal of a file diversion of dvipdfm
     if [ -f ${dvipdfmdef}.tetex ]; then
@@ -84,34 +74,10 @@
       dpkg-divert --package dvipdfm --remove --rename \
 	--divert ${dvipdfmdef}.tetex ${dvipdfmdef}
     fi
-# move conffiles from their 2.0.2 locations
-#     for conffile in $MOVE_GENERIC_UCF; do
-#       dest=/etc/texmf/generic/`basename $conffile`
-#       source=/etc/texmf/latex/`basename $conffile`
-#       move_old_conffile $source $dest
-#     done
-#     for conffile in $MOVE_CONTEXT_UCF $MOVE_CONTEXT_NOUCF; do
-#       source=/etc/texmf/<:=$contextmaps_oldplace:>/`basename $conffile`
-#       dest=/etc/texmf/<:=$contextmaps_newplace:>/`basename $conffile`
-#       move_old_conffile $source $dest nocomment
-#     done
-#     move_old_conffile /etc/texmf/dvips/context.map \
-#       /etc/texmf/map/dvips/tetex/contnav.map
-#     move_old_conffile /etc/texmf/etex/language.def \
-#       /etc/texmf/plain/language.def nocomment # no ucf needed?
-#     move_old_conffile /etc/texmf/pdftex/cmttf.map \
-#       /etc/texmf/map/pdftex/cmttf/cmttf.map nocomment # no ucf needed?
 
     ;;
   abort-upgrade)
-    for dir in $NOWLINKDIRS; do
-      preinst_restore_dir /usr/share/texmf/$dir
-      preinst_restore_dir /usr/share/texmf-tetex/$dir
-    done
-    for dir in $NOWDIRLINKS; do
-      preinst_restore_symlink /usr/share/texmf/$dir
-      preinst_restore_symlink /usr/share/texmf-tetex/$dir
-    done
+    :
     ;;
 esac
 

Modified: tetex-base/trunk/debian/tetex-extra.dirs.in
===================================================================
--- tetex-base/trunk/debian/tetex-extra.dirs.in	2005-12-05 18:39:28 UTC (rev 375)
+++ tetex-base/trunk/debian/tetex-extra.dirs.in	2005-12-06 09:25:21 UTC (rev 376)
@@ -1,7 +1,4 @@
 #include variables
-etc/texmf/latex
-etc/texmf/dvips
 etc/texmf/updmap.d
-usr/share/texmf/dvips/tetex
 usr/share/tetex-extra
 <:=$FONTMAP_MEMORY_DIR:>

Modified: tetex-base/trunk/debian/tetex-extra.postrm.in
===================================================================
--- tetex-base/trunk/debian/tetex-extra.postrm.in	2005-12-05 18:39:28 UTC (rev 375)
+++ tetex-base/trunk/debian/tetex-extra.postrm.in	2005-12-06 09:25:21 UTC (rev 376)
@@ -50,16 +50,8 @@
     run_if_exist mktexlsr
     ;;
   abort-install|abort-upgrade)
-    # tetex-base does this, too.  But -extra can be unpacked before it (and fail),
-    # therefore we have to do the preinst and prerm stuff, too.  
-
-    # we put the directories back that we moved out of the way.
-    for dir in $NOWLINKDIRS; do
-      if [ -d /usr/share/texmf/$dir.moved-by-preinst -a -L /usr/share/texmf/$dir ]; then
-	rm /usr/share/texmf/$dir
-	mv /usr/share/texmf/$dir.moved-by-preinst /usr/share/texmf/$dir
-      fi
-    done
+    :
+    ;;
 esac
 
 #DEBHELPER#