[Debian-tex-commits] SVN tetex-base commit + diffs: r2087 - tetex-base/trunk/debian

[Frank Küster]

Author: frank
Date: 2006-12-19 13:42:02 +0100 (Tue, 19 Dec 2006)
New Revision: 2087

Modified:
   tetex-base/trunk/debian/changelog
   tetex-base/trunk/debian/postrm.functions
   tetex-base/trunk/debian/postrm.in
   tetex-base/trunk/debian/rules
   tetex-base/trunk/debian/tetex-extra.postrm.in
Log:
Do not assume that tex-common is configured when postrm is called with
"remove" (closes: #403641).  This is a RC bug, hence the urgency.


Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog	2006-12-18 16:05:47 UTC (rev 2086)
+++ tetex-base/trunk/debian/changelog	2006-12-19 12:42:02 UTC (rev 2087)
@@ -1,10 +1,12 @@
-tetex-base (3.0.dfsg.3-4~1) UNRELEASED; urgency=low
+tetex-base (3.0.dfsg.3-4~1) UNRELEASED; urgency=high
 
+  * Do not assume that tex-common is configured when postrm is called with
+    "remove" (closes: #403641).  This is a RC bug, hence the urgency.
   * 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 at debian.org>  Thu, 14 Dec 2006 15:29:56 +0100
+ -- Frank Küster <frank at debian.org>  Tue, 19 Dec 2006 13:41:00 +0100
 
 tetex-base (3.0.dfsg.3-3) unstable; urgency=low
 

Modified: tetex-base/trunk/debian/postrm.functions
===================================================================
--- tetex-base/trunk/debian/postrm.functions	2006-12-18 16:05:47 UTC (rev 2086)
+++ tetex-base/trunk/debian/postrm.functions	2006-12-19 12:42:02 UTC (rev 2087)
@@ -95,3 +95,35 @@
     fi
   fi
 }
+
+# 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
+}

Modified: tetex-base/trunk/debian/postrm.in
===================================================================
--- tetex-base/trunk/debian/postrm.in	2006-12-18 16:05:47 UTC (rev 2086)
+++ tetex-base/trunk/debian/postrm.in	2006-12-19 12:42:02 UTC (rev 2087)
@@ -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

Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules	2006-12-18 16:05:47 UTC (rev 2086)
+++ tetex-base/trunk/debian/rules	2006-12-19 12:42:02 UTC (rev 2087)
@@ -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-4~1~bpo.1 "Recompiled for sarge."
 	debchange --append "No source changes."
 
 	# need to remake rules

Modified: tetex-base/trunk/debian/tetex-extra.postrm.in
===================================================================
--- tetex-base/trunk/debian/tetex-extra.postrm.in	2006-12-18 16:05:47 UTC (rev 2086)
+++ tetex-base/trunk/debian/tetex-extra.postrm.in	2006-12-19 12:42:02 UTC (rev 2087)
@@ -41,7 +41,7 @@
     # 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
+    dhit_check_run_without_errors -silent update-updmap --quiet
     if run_if_exist --check-only updmap; then create_fontmaps; fi
     # now play it again, Sam
     run_if_exist mktexlsr