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

[Frank Küster]

Author: frank
Date: 2006-09-29 11:15:05 +0000 (Fri, 29 Sep 2006)
New Revision: 1646

Modified:
   tetex-base/trunk/debian/changelog
   tetex-base/trunk/debian/copyright.header
   tetex-base/trunk/debian/postinst.in
   tetex-base/trunk/debian/rules
Log:
- fix echo'ing logic in postinst
- fix serious flaw in postinst, see changelog
- update Stefan Ulrich's address in copyright.header


Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog	2006-09-28 23:30:35 UTC (rev 1645)
+++ tetex-base/trunk/debian/changelog	2006-09-29 11:15:05 UTC (rev 1646)
@@ -1,8 +1,11 @@
-tetex-base (3.0-23) unstable; urgency=low
+tetex-base (3.0-23) unstable; urgency=medium
 
   * Let tetex-extra Recommend separately packaged parts of teTeX. [ralf]   
+  * Always call tex-common's update scripts in our postinst - previously
+    this was missed when tetex-bin was not yet configured.  This resulted
+    in no hyphenation being available at all (closes: #nnn) [frank]
 
- -- Ralf Stubner <ralf.stubner at web.de>  Thu, 28 Sep 2006 20:54:53 +0200
+ -- Frank Küster <frank at debian.org>  Fri, 29 Sep 2006 13:14:50 +0200
 
 tetex-base (3.0-22) unstable; urgency=high
 

Modified: tetex-base/trunk/debian/copyright.header
===================================================================
--- tetex-base/trunk/debian/copyright.header	2006-09-28 23:30:35 UTC (rev 1645)
+++ tetex-base/trunk/debian/copyright.header	2006-09-29 11:15:05 UTC (rev 1646)
@@ -20,7 +20,7 @@
     C.M. Connelly <cmc at debian.org> (2002)
     Atsuhito KOHDA <kohda at debian.org> (2002-)
     Hilmar Preusse <hille42 at web.de> (2003-)
-    Stefan Ulrich <stefan-ulrich.nntp at zen.co.uk> (2003-)
+    Stefan Ulrich <stefanulrich at users.sourceforge.net> (2003-)
     Frank Küster <frank at kuesterei.ch> (2003-)
     Florent Rougon <f.rougon at free.fr> (2004)
     Norbert Preining <preining at logic.at> (2005)

Modified: tetex-base/trunk/debian/postinst.in
===================================================================
--- tetex-base/trunk/debian/postinst.in	2006-09-28 23:30:35 UTC (rev 1645)
+++ tetex-base/trunk/debian/postinst.in	2006-09-29 11:15:05 UTC (rev 1646)
@@ -104,7 +104,7 @@
       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
-    if [ -z "$2" ] || dpkg --compare-versions "$2" le 3.0-10 ; then
+    if [ -z "$2" ] && dpkg --compare-versions "$2" le 3.0-10 ; then
       echo "done"
     fi
 
@@ -113,6 +113,14 @@
       $UCF /usr/share/tetex-base/`basename $file` $file
     done
 
+
+    mktexlsr
+    # Update files generated from configuration files
+    update-texmf
+    update-updmap
+    update-language
+    update-fmtutil
+
 # if tetex-base is upgraded while tetex-bin is already installed, we must 
 # call mktexlr, and regenerate the formats and font maps.
     clean_texenvironment
@@ -124,12 +132,6 @@
       kpsewhich --format='web2c files' fmtutil.cnf >/dev/null && \
       kpsewhich --expand-var='$TEXMF' | grep -q "/usr/share/texmf"  2> /dev/null
       then
-      mktexlsr
-      # Update files generated from configuration files
-      update-texmf
-      update-updmap
-      update-language
-      update-fmtutil
       # now call updmap
       create_fontmaps
       # create formats

Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules	2006-09-28 23:30:35 UTC (rev 1645)
+++ tetex-base/trunk/debian/rules	2006-09-29 11:15:05 UTC (rev 1646)
@@ -255,7 +255,7 @@
 	done
 
 	# needs devscripts in etch or from backports.org
-	debchange --distribution sarge-backports -b --newversion 3.0-22~1~bpo.1 "Recompiled for sarge."
+	debchange --distribution sarge-backports -b --newversion 3.0-22~bpo.1 "Recompiled for sarge."
 	debchange --append "No source changes."
 
 	# need to remake rules