[Debian-tex-commits] SVN tex-common commit + diffs: r5571 - in tex-common/trunk: debian scripts

[Norbert Preining]

Author: preining
Date: 2012-06-18 01:21:31 +0000 (Mon, 18 Jun 2012)
New Revision: 5571

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/scripts/update-updmap
Log:
* rebuild all updmap.cfg files regardless of presence of snippets
  this is necessary to make sure that after the last package in
  TEXFMDEBIAN has disappeared, the updmap.cfg file is empty
  (Closes: #677698) (urgency high, as this is actually a critical
  bug since users cannot easily fix the updmap.cfg file without
  manual intervention)


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2012-06-13 23:54:52 UTC (rev 5570)
+++ tex-common/trunk/debian/changelog	2012-06-18 01:21:31 UTC (rev 5571)
@@ -1,3 +1,14 @@
+tex-common (3.13) unstable; urgency=high
+
+  * rebuild all updmap.cfg files regardless of presence of snippets
+    this is necessary to make sure that after the last package in
+    TEXFMDEBIAN has disappeared, the updmap.cfg file is empty
+    (Closes: #677698) (urgency high, as this is actually a critical
+    bug since users cannot easily fix the updmap.cfg file without
+    manual intervention)
+
+ -- Norbert Preining <preining at debian.org>  Mon, 18 Jun 2012 10:19:41 +0900
+
 tex-common (3.12) unstable; urgency=low
 
   * mention NEWS.Debian in the update-updmap warning

Modified: tex-common/trunk/scripts/update-updmap
===================================================================
--- tex-common/trunk/scripts/update-updmap	2012-06-13 23:54:52 UTC (rev 5570)
+++ tex-common/trunk/scripts/update-updmap	2012-06-18 01:21:31 UTC (rev 5571)
@@ -191,12 +191,6 @@
 
 updated_files=""
 for tree in $COMPONENTS ; do
-    if [ ! -d "$SNIPPET_BASE/$tree" ] ; then
-        if [ $quiet = 0 ]; then
-            printf "$progname: skipping $tree\n";
-        fi
-        continue;
-    fi
     if [ $tree = "texmf" ] ; then
         # output_file=/usr/share/texmf/web2c/updmap.cfg
         output_file=/var/lib/texmf/updmap.cfg-DEBIAN
@@ -207,7 +201,7 @@
         echo "$progname: that cannot happen!" >&2
         exit 1
     fi
-    # TODO TODO
+
     # create output dir in any case ...
     mkdir -p $(dirname $output_file)
 
@@ -243,8 +237,10 @@
     # From now on, $tempfile must be deleted on exit; therefore, cleanup() should
     # be used.
 
-    find "$SNIPPET_BASE/$tree"  -maxdepth 1 -type f -name '*.cfg' \
-        -exec cat '{}' \; >> "$tempfile"
+    if [ -d "$SNIPPET_BASE/$tree" ] ; then
+        find "$SNIPPET_BASE/$tree"  -maxdepth 1 -type f -name '*.cfg' \
+            -exec cat '{}' \; >> "$tempfile"
+    fi
 
     if [ $tree = "texmf" ] ; then
         #
@@ -284,14 +280,14 @@
         perform_contents_check "$output_file"
     fi
     if [ $quiet = 0 ]; then
-        printf "done.\n\n"
+        printf "done.\n"
     fi
 
 done
 
 if [ $quiet = 0 ] && [ -n "$updated_files" ] ; then
     echo "$progname has updated the following file(s):"
-    printf "$updated_files\n"
+    printf "$updated_files"
     echo "If you want to enable the map files with this new file,"
     echo "you should run updmap-sys or updmap."
 fi