Please hint tetex-base_3.0.dfsg.3-5 into testing

[Frank Küster <frank@debian.org>]

Dear release team,

I have just uploaded this package to unstable.  It inherits urgency=high
from -4, you might want to give it more time, see below.

tetex-base (3.0.dfsg.3-5) unstable; urgency=low

  * Fix a syntax error in the code that removes the obsolete conffile of
    tetex-doc.  Thanks to Jan HÃŒlsbergen <jan-debian@huelsbergen.de> for
    report and patch (closes: #403886) [frank]

 -- Frank KÃŒster <frank@debian.org>  Wed, 20 Dec 2006 15:28:45 +0100

tetex-base (3.0.dfsg.3-4) unstable; urgency=high

  * The "King of QA release"
  * Do not assume that tex-common is configured when postrm is called with
    "remove" (closes: #403641).  This is a RC bug, hence the urgency.
    Thanks to Kurt Roeckx <kurt@roeckx.be> for reporting and for looking
    closely at an unrelated failed build log.
  * Remove obsolete conffile in the tetex-doc package if it is unchanged
    [frank] 
  * Register documentation in the TeX section (closes: #402953)

 -- Frank KÃŒster <frank@debian.org>  Tue, 19 Dec 2006 14:51:37 +0100

Version -5 Fixes a stupid syntax error in the preinst script that has
been newly added in -4, the item without a bugnumber (note to myself:
always test upgrades from etch to sid, too, not only from the old sid
package and from sarge[1]).

Version -4 mainly fixes the bug that has already been discussed here and
that Steve downgraded to important; you might want to lower the urgency
therefore.  This has been done by copying tested code from tex-common,
and it has been tested extensively in chroots.

Additionally, -4 does a couple of s/Text/TeX/ in doc-base files, that's
the last changelog item.

The complete debdiff is attached.  I'd be glad if you would allow that
into etch.

Regards, Frank



[1] this time I've done that, including from one of the outdated etch
versions that this code is supposed to clean up after.
-- 
Dr. Frank Küster
Single Molecule Spectroscopy, Protein Folding @ Inst. f. Biochemie, Univ. Zürich
Debian Developer (teTeX/TeXLive)

diff -u tetex-base-3.0.dfsg.3/debian/postrm.in tetex-base-3.0.dfsg.3/debian/postrm.in
--- tetex-base-3.0.dfsg.3/debian/postrm.in
+++ tetex-base-3.0.dfsg.3/debian/postrm.in
@@ -2,7 +2,7 @@
 #!/bin/sh -e
 # 
 # postrm maintainer script for the Debian tetex-base package.
-# $Id: postrm.in 1639 2006-09-26 12:52:49Z frank $
+# $Id: postrm.in 2087 2006-12-19 12:42:02Z frank $
 #
 # don't try to understand this generated script as installed with the package.
 # instead, look at the source files in the source package
@@ -43,9 +43,9 @@
   upgrade)
     ;;
   remove)
-    update-language
-    update-updmap
-    update-fmtutil
+    dhit_check_run_without_errors -silent update-language
+    dhit_check_run_without_errors -silent update-updmap --quiet
+    dhit_check_run_without_errors -silent update-fmtutil
     ;;
   purge)
     if which update-texmf >/dev/null; then
diff -u tetex-base-3.0.dfsg.3/debian/tetex-extra.postrm.in tetex-base-3.0.dfsg.3/debian/tetex-extra.postrm.in
--- tetex-base-3.0.dfsg.3/debian/tetex-extra.postrm.in
+++ tetex-base-3.0.dfsg.3/debian/tetex-extra.postrm.in
@@ -2,7 +2,7 @@
 #!/bin/sh -e
 # 
 # postrm maintainer script for the Debian tetex-extra package.
-# $Id: tetex-extra.postrm.in 1192 2006-04-11 18:09:39Z frank $
+# $Id: tetex-extra.postrm.in 2090 2006-12-19 13:29:43Z frank $
 <:=@COPYRIGHT:>//
 
 <:open(FUNCTIONS,'debian/postrm.functions');@FUNCTIONS=<FUNCTIONS>;close(FUNCTIONS):>//
@@ -41,10 +41,12 @@
     # tetex-extra that caused a corrupted format to be build, it has to be redone.
     # on abort-* it does not hurt.
     remove_formats
-    run_if_exist update-updmap --quiet
-    if run_if_exist --check-only updmap; then create_fontmaps; fi
-    # now play it again, Sam
-    run_if_exist mktexlsr
+    dhit_check_run_without_errors -silent update-updmap --quiet
+    if run_if_exist --check-only updmap; then
+      dhit_check_run_without_errors -silent create_fontmaps
+    fi
+
+    dhit_check_run_without_errors -silent mktexlsr
     ;;
   purge)
     for oldconffile in $UNUSED_CONFFILES $FORMER_UCF; do
@@ -54,7 +56,7 @@
     for oldconfdir in $UNUSED_CONFDIRS; do
       rmdir /etc/texmf/$oldconfdir 2>/dev/null || true
     done
-    run_if_exist mktexlsr
+    dhit_check_run_without_errors -silent mktexlsr
     ;;
   abort-install|abort-upgrade)
     for file in $UNUSED_CONFFILES; do
diff -u tetex-base-3.0.dfsg.3/debian/rules tetex-base-3.0.dfsg.3/debian/rules
--- tetex-base-3.0.dfsg.3/debian/rules
+++ tetex-base-3.0.dfsg.3/debian/rules
@@ -255,7 +255,7 @@
 	done
 
 	# needs devscripts in etch or from backports.org
-	debchange --distribution sarge-backports -b --newversion 3.0.dfsg.3-3~bpo.1 "Recompiled for sarge."
+	debchange --distribution sarge-backports -b --newversion 3.0.dfsg.3-5~bpo.1 "Recompiled for sarge."
 	debchange --append "No source changes."
 
 	# need to remake rules
diff -u tetex-base-3.0.dfsg.3/debian/postrm.functions tetex-base-3.0.dfsg.3/debian/postrm.functions
--- tetex-base-3.0.dfsg.3/debian/postrm.functions
+++ tetex-base-3.0.dfsg.3/debian/postrm.functions
@@ -1,7 +1,7 @@
 #################################################################
 #    Function definitions included from file postrm.functions
 #################################################################
-# $Id: postrm.functions 379 2005-12-07 09:38:32Z frank $
+# $Id: postrm.functions 2087 2006-12-19 12:42:02Z frank $
 # Copyright 2004 Frank Küster <frank@debian.org>
 
 remove_with_backups(){
@@ -97,0 +98,32 @@
+
+# taken from tex-common's postrm-texlsr
+dhit_check_run_without_errors ()
+{
+    silent=0
+    if [ "$1" = "-silent" ] ; then
+        silent=1
+	shift
+    fi
+    if which "$1" >/dev/null; then
+        tempfile=$(mktemp -p /tmp checkrun.XXXXXXXX)
+        if [ $silent = 0 ] ; then
+	    printf "Running '$*'.\nThis may take some time..."
+	fi
+        set +e
+        if "$@" > $tempfile 2>&1 ; then
+            rm -f $tempfile
+            [ $silent = 0 ] && echo " done."
+        else
+            echo
+            echo "$* failed. Output has been stored in"
+            echo "$tempfile"
+            echo "If tex-common is not configured you can ignore this error" \
+                 "message!"
+            echo "Otherwise, please include this file if you report a bug."
+            echo
+        fi
+        set -e
+    fi
+
+    return 0
+}
diff -u tetex-base-3.0.dfsg.3/debian/tetex-doc.doc-base.html tetex-base-3.0.dfsg.3/debian/tetex-doc.doc-base.html
--- tetex-base-3.0.dfsg.3/debian/tetex-doc.doc-base.html
+++ tetex-base-3.0.dfsg.3/debian/tetex-doc.doc-base.html
@@ -3,7 +3,7 @@
 Author: Thomas Esser
 Abstract: This page is an attempt at a guided tour around the TeX and
  LaTeX documentation which is distributed with teTeX.
-Section: Apps/Text
+Section: Apps/TeX
 
 Format: HTML
 Index: /usr/share/doc/tetex-doc/index.html
diff -u tetex-base-3.0.dfsg.3/debian/changelog tetex-base-3.0.dfsg.3/debian/changelog
--- tetex-base-3.0.dfsg.3/debian/changelog
+++ tetex-base-3.0.dfsg.3/debian/changelog
@@ -1,3 +1,24 @@
+tetex-base (3.0.dfsg.3-5) unstable; urgency=low
+
+  * Fix a syntax error in the code that removes the obsolete conffile of
+    tetex-doc.  Thanks to Jan Hülsbergen <jan-debian@huelsbergen.de> for
+    report and patch (closes: #403886) [frank]
+
+ -- Frank Küster <frank@debian.org>  Wed, 20 Dec 2006 15:28:45 +0100
+
+tetex-base (3.0.dfsg.3-4) unstable; urgency=high
+
+  * The "King of QA release"
+  * Do not assume that tex-common is configured when postrm is called with
+    "remove" (closes: #403641).  This is a RC bug, hence the urgency.
+    Thanks to Kurt Roeckx <kurt@roeckx.be> for reporting and for looking
+    closely at an unrelated failed build log.
+  * Remove obsolete conffile in the tetex-doc package if it is unchanged
+    [frank] 
+  * Register documentation in the TeX section (closes: #402953)
+
+ -- Frank Küster <frank@debian.org>  Tue, 19 Dec 2006 14:51:37 +0100
+
 tetex-base (3.0.dfsg.3-3) unstable; urgency=low
 
   * The "Kings of the documentation"-release
diff -u tetex-base-3.0.dfsg.3/debian/tetex-doc.doc-base.tetexdoc tetex-base-3.0.dfsg.3/debian/tetex-doc.doc-base.tetexdoc
--- tetex-base-3.0.dfsg.3/debian/tetex-doc.doc-base.tetexdoc
+++ tetex-base-3.0.dfsg.3/debian/tetex-doc.doc-base.tetexdoc
@@ -3,7 +3,7 @@
 Author: Thomas Esser
 Abstract: This document describes how to use and set up the teTeX
  system. For Debian-specific changes, see the Debian-on-TeX document.
-Section: Apps/Text
+Section: Apps/TeX
 
 Format: PDF
 Files: /usr/share/texmf-tetex/doc/tetex/TETEXDOC.pdf.gz
diff -u tetex-base-3.0.dfsg.3/debian/tetex-doc.doc-base.FAQ tetex-base-3.0.dfsg.3/debian/tetex-doc.doc-base.FAQ
--- tetex-base-3.0.dfsg.3/debian/tetex-doc.doc-base.FAQ
+++ tetex-base-3.0.dfsg.3/debian/tetex-doc.doc-base.FAQ
@@ -3,7 +3,7 @@
 Author: Thomas Esser
 Abstract: This is the FAQ for teTeX -- a TeX distribution for UNIX
  compatible systems.
-Section: Apps/Text
+Section: Apps/TeX
 
 Format: text
 Files: /usr/share/texmf-tetex/doc/tetex/teTeX-FAQ.gz
only in patch2:
unchanged:
--- tetex-base-3.0.dfsg.3.orig/debian/tetex-doc.preinst
+++ tetex-base-3.0.dfsg.3/debian/tetex-doc.preinst
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+  install|upgrade)
+    OLDCONFFILE=/etc/apache2/sites-available/tetex-doc
+    if [ -f $OLDCONFFILE ]; then
+      if [ `md5sum $OLDCONFFILE | cut -d' ' -f1` = f2b4328c1403ac91f92d8b144c1be7fe ]; then
+	rm $OLDCONFFILE
+      fi
+    fi
+    ;;
+  *)
+    ;;
+esac
+
+#DEBHELPER#