[subversion-commit] SVN tetex-bin commit + diffs: r1726 - tetex-bin/trunk/debian

[Frank Küster]

Author: frank
Date: 2006-10-09 08:28:35 +0000 (Mon, 09 Oct 2006)
New Revision: 1726

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/control
   tetex-bin/trunk/debian/postinst.in
   tetex-bin/trunk/debian/preinst.in
Log:
- handle 00tetex.cnf/01tetex.cnf with the script provided by
  tex-common
- load fixed debianize-updmap from tex-common
- final changelog entry


Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2006-10-09 08:21:59 UTC (rev 1725)
+++ tetex-bin/trunk/debian/changelog	2006-10-09 08:28:35 UTC (rev 1726)
@@ -1,11 +1,15 @@
-tetex-bin (3.0-19~1) UNRELEASED; urgency=medium
+tetex-bin (3.0-20) unstable; urgency=medium
 
   * In postinst, generate language.dat every time before recreating
     formats.  This is needed to prevent failures in format creation when a
     package with language information is installed or upgraded in the same
     dpkg run.  Thanks to Ralf Stubner for noticing [frank]
+  * Fix updmap to properly work with --enable and --disable, and load the
+    debianize-updmap script from tex-common [frank]
+  * The postinst script now uses a script in tex-common to handle the
+    configuration file for format generation [frank]
 
- -- Frank Küster <frank at debian.org>  Fri, 29 Sep 2006 20:06:00 +0200
+ -- Frank Küster <frank at debian.org>  Mon,  9 Oct 2006 10:28:11 +0200
 
 tetex-bin (3.0-19) unstable; urgency=low
 

Modified: tetex-bin/trunk/debian/control
===================================================================
--- tetex-bin/trunk/debian/control	2006-10-09 08:21:59 UTC (rev 1725)
+++ tetex-bin/trunk/debian/control	2006-10-09 08:28:35 UTC (rev 1726)
@@ -13,7 +13,7 @@
 Conflicts: dvipdfm, alml (<< 2002.08.29-4), jbibtex-bin (<< 3.0.5+0.04-2), jtex-bin (<= 1.8-5.1), passivetex (<< 1.21-5), ptex-bin (<< 3.0.5+0.04-2), xmltex (<< 1.9-4), cweb (<< 3.64.debian-1), ctie (<< 1.1.debian.1), arabtex (<= 3.10-5), tetex-base (<< 2.96.1), tetex-extra (<< 2.96.1), jadetex (<= 3.13-3), aleph (<< 1:0), xmltex (<= 1.9-10)
 Provides: dvipdfm, cweb, ctie, texdoctk
 Pre-Depends: dpkg (>= 1.6.8)
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, tetex-base (>= 3.0-4), ed, debianutils (>= 1.13.1), mime-support, sed (>= 4.0.5), ucf (>= 1.02), dialog | whiptail
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, tetex-base (>= 3.0-4), ed, debianutils (>= 1.13.1), mime-support, sed (>= 4.0.5), ucf (>= 1.02), dialog | whiptail, tex-common (>= 0.32)
 Suggests: gs-gpl | gs-esp | gs-afpl, gv | postscript-viewer, xpdf-reader | pdf-viewer, tetex-extra, texinfo, texi2html, dvipng, chktex | lacheck, rubber, sam2p, xbase-clients
 Recommends: psutils, perl-tk, libxml-parser-perl
 Description: The teTeX programs

Modified: tetex-bin/trunk/debian/postinst.in
===================================================================
--- tetex-bin/trunk/debian/postinst.in	2006-10-09 08:21:59 UTC (rev 1725)
+++ tetex-bin/trunk/debian/postinst.in	2006-10-09 08:28:35 UTC (rev 1726)
@@ -13,13 +13,13 @@
 DFLT=/usr/share/tetex-base/language.dflt
 LSRS="<:=$LSRS:>"
 TEXMFCNF=<:=$TEXMF_CNF:>
-#UCF="ucf --verbose -d --debconf-ok"
-UCF="ucf --debconf-ok"
+# #UCF="ucf --verbose -d --debconf-ok"
+# UCF="ucf --debconf-ok"
 
 
 # Variables needed for upgrading
-UCF_FILES=<:=$UCF_FILES:>
-UCF_SOURCEDIR=/usr/share/tetex-bin
+# UCF_FILES=<:=$UCF_FILES:>
+# UCF_SOURCEDIR=/usr/share/tetex-bin
 OLD_WEB2C=<:=$OLD_WEB2C:>
 SYMLINK_MOVE_EXT=<:=$SYMLINK_MOVE_EXT:>
 WOODY_FMTCNF=<:=$WOODY_FMTCNF:>
@@ -98,10 +98,11 @@
     sanitize_texmfcnf
 
 # upgrade from sarge:  fmtutil snippet renamed
-    for name in $UCF_FILES; do
-      filename=`basename $name`
-      $UCF $UCF_SOURCEDIR/$filename /etc/texmf/$name
-    done
+    /usr/share/tex-common/tetex-bin-upgrade
+#     for name in $UCF_FILES; do
+#       filename=`basename $name`
+#       $UCF $UCF_SOURCEDIR/$filename /etc/texmf/$name
+#     done
 
 
 # upgrade from woody    
@@ -166,7 +167,6 @@
 
 # upgrade from some experimental versions
     obsolete_fmtf=/etc/texmf/fmt.d/00tetex.cnf
-    # TODO: needs a transition to 01tetex.cnf, including ucf and all that
 
 # normal install
     update-alternatives --install /usr/bin/xdvi.bin xdvi.bin /usr/bin/xdvi.real 30

Modified: tetex-bin/trunk/debian/preinst.in
===================================================================
--- tetex-bin/trunk/debian/preinst.in	2006-10-09 08:21:59 UTC (rev 1725)
+++ tetex-bin/trunk/debian/preinst.in	2006-10-09 08:28:35 UTC (rev 1726)
@@ -38,25 +38,6 @@
   install|upgrade)
     # make sure we don't end up without a texmf.cnf
     ucf_purge_texmf_maybe
-    # rename 00tetex.cnf to 01tetex.cnf
-    if [ -f $ETCTEXMF/fmt.d/00tetex.cnf ]; then 
-      if [ ! -f $ETCTEXMF/fmt.d/01tetex.cnf ]; then
-	# not yet transitioned
-	mv $ETCTEXMF/fmt.d/00tetex.cnf $ETCTEXMF/fmt.d/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 $ETCTEXMF/fmt.d/00tetex.cnf | cut -d ' ' -f 1`
-	if [ "$current_md5sum" = "55811af3562faf342261dbc3b5e060a2" ]; then
-	  rm $ETCTEXMF/fmt.d/00tetex.cnf
-	else
-	  # we do nothing; experimental users should be able to solve this
-	  :
-	fi
-      fi
-    fi
 
     # dpkg won't change a symlink to a directory; therefore we first move it out
     # of the way