[subversion-commit] SVN tex-common commit + diffs: r1702 - in tex-common/trunk: debian scripts

[Frank Küster]

Author: frank
Date: 2006-10-08 10:00:28 +0000 (Sun, 08 Oct 2006)
New Revision: 1702

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/debian/rules
   tex-common/trunk/scripts/tetex-bin-upgrade
Log:
Provide a tetex-bin-update script.  This allows also texlive to
properly rename an old tetex-bin conffile, and add the magic comment,
and is therefore needed for a transition from teTeX to TeXlive without
upgrading teTeX to the etch version first.


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2006-10-07 23:30:12 UTC (rev 1701)
+++ tex-common/trunk/debian/changelog	2006-10-08 10:00:28 UTC (rev 1702)
@@ -1,9 +1,13 @@
-tex-common (0.32) unstable; urgency=low
+tex-common (0.32~1) UNRELEASED; urgency=medium
 
   * adapted sanity check in update-fontlang to TEXMFSYSCONFIG = /etc/texmf 
     (closes: #391348) [ralf]
+  * Provide a tetex-bin-update script.  This allows also texlive to
+    properly rename an old tetex-bin conffile, and add the magic comment,
+    and is therefore needed for a transition from teTeX to TeXlive without
+    upgrading teTeX to the etch version first.
 
- -- Ralf Stubner <ralf.stubner at web.de>  Sat,  7 Oct 2006 12:40:10 +0200
+ -- Frank Küster <frank at debian.org>  Sun,  8 Oct 2006 11:59:46 +0200
 
 tex-common (0.31) unstable; urgency=medium
 

Modified: tex-common/trunk/debian/rules
===================================================================
--- tex-common/trunk/debian/rules	2006-10-07 23:30:12 UTC (rev 1701)
+++ tex-common/trunk/debian/rules	2006-10-08 10:00:28 UTC (rev 1702)
@@ -7,7 +7,7 @@
 
 bin_scripts=dh_installtex
 sbin_scripts=update-texmf update-fontlang
-nonbin_scripts=tpm2licenses Tpm.pm FileUtils.pm
+nonbin_scripts=tpm2licenses Tpm.pm FileUtils.pm tetex-bin-upgrade 01tetex.cnf 01tetex.cnf.md5sum
 
 sbin_installfiles=$(foreach script,$(sbin_scripts), scripts/$(script))
 sbin_manpages=$(foreach script,$(sbin_scripts), scripts/$(script).8) scripts/update-fmtutil.8 scripts/update-language.8
@@ -16,6 +16,7 @@
 bin_manpages=$(foreach script,$(bin_scripts), scripts/$(script).1) scripts/update-updmap.1
 
 nonbin_installfiles=$(foreach script,$(nonbin_scripts), scripts/$(script))
+nonbin_installfiles=$(foreach script,$(nonbin_scripts), scripts/$(script))
 
 # create maintainer scripts etc.
 EPERL_FILES := debian/common.functions debian/postinst debian/postrm debian/config debian/preinst

Modified: tex-common/trunk/scripts/tetex-bin-upgrade
===================================================================
--- tex-common/trunk/scripts/tetex-bin-upgrade	2006-10-07 23:30:12 UTC (rev 1701)
+++ tex-common/trunk/scripts/tetex-bin-upgrade	2006-10-08 10:00:28 UTC (rev 1702)
@@ -5,36 +5,25 @@
 #UCF="ucf --verbose -d --debconf-ok"
 UCF="ucf --debconf-ok"
 
-# oldfile=00tetex.cnf
-# newfile=01tetex.cnf
+oldfile=00tetex.cnf
+newfile=01tetex.cnf
 
-called_from="$1"
-
-case $called_from in
-  preinst)
-    # rename 00tetex.cnf to 01tetex.cnf
-    if [ -f $fmtdir/00tetex.cnf ]; then 
-      if [ ! -f $fmtdir/01tetex.cnf ]; then
-	# not yet transitioned
-	mv $fmtdir/00tetex.cnf $fmtdir/01tetex.cnf
-      else
-	# some older experimental version has installed the new file, but not 
-	# transitioned the old one.
-	# Note: also texlive might have done that, however,
-	# successfully only if texlive-omega was already unpacked
-	current_md5sum=`md5sum $fmtdir/00tetex.cnf | cut -d ' ' -f 1`
-	if [ "$current_md5sum" = "55811af3562faf342261dbc3b5e060a2" ]; then
-	  rm $fmtdir/00tetex.cnf
-	else
-	  # we do nothing; experimental users should be able to solve this
-	  :
-	fi
-      fi
+# rename 00tetex.cnf to 01tetex.cnf
+if [ -f $fmtdir/$oldfile ]; then 
+  if [ ! -f $fmtdir/$newfile ]; then
+    # not yet transitioned
+    mv $fmtdir/$oldfile $fmtdir/$newfile
+  else
+    # some older experimental version has installed the new file, but not 
+    # transitioned the old one.
+    current_md5sum=`md5sum $fmtdir/$oldfile | cut -d ' ' -f 1`
+    if [ "$current_md5sum" = "55811af3562faf342261dbc3b5e060a2" ]; then
+      rm $fmtdir/$oldfile
+    else
+      # we do nothing; experimental users should be able to solve this
+      :
     fi
-    ;;
-  postinst)
-    # upgrade from sarge:  fmtutil snippet renamed
-      $UCF $ucf_sourcedir/01tetex.cnf $fmtdir/01tetex.cnf
-    done
-    ;;
-esac
+  fi
+fi
+
+$UCF $ucf_sourcedir/01tetex.cnf $fmtdir/01tetex.cnf