[Debian-tex-commits] SVN tex-common commit + diffs: r5112 - in tex-common/branches/v3: debian scripts

[Norbert Preining]

Author: preining
Date: 2012-03-02 05:25:20 +0000 (Fri, 02 Mar 2012)
New Revision: 5112

Modified:
   tex-common/branches/v3/debian/changelog
   tex-common/branches/v3/scripts/update-updmap
Log:
revert compatibility changes


Modified: tex-common/branches/v3/debian/changelog
===================================================================
--- tex-common/branches/v3/debian/changelog	2012-03-02 00:26:22 UTC (rev 5111)
+++ tex-common/branches/v3/debian/changelog	2012-03-02 05:25:20 UTC (rev 5112)
@@ -1,3 +1,10 @@
+tex-common (3.0-1~6) unstable; urgency=low
+
+  * revert the backward compatibility mode, we cannot
+    include the files safely on upgrades
+
+ -- Norbert Preining <preining at debian.org>  Fri, 02 Mar 2012 14:23:53 +0900
+
 tex-common (3.0-1~5) unstable; urgency=low
 
   * add backward compatibility to update-updmap, so that it reads

Modified: tex-common/branches/v3/scripts/update-updmap
===================================================================
--- tex-common/branches/v3/scripts/update-updmap	2012-03-02 00:26:22 UTC (rev 5111)
+++ tex-common/branches/v3/scripts/update-updmap	2012-03-02 05:25:20 UTC (rev 5112)
@@ -124,18 +124,12 @@
 
 updated_files=""
 for tree in $COMPONENTS ; do
-    if [ $tree = "texlive" ] && [ ! -d "$SNIPPET_BASE/$tree" ] ; then
+    if [ ! -d "$SNIPPET_BASE/$tree" ] ; then
         if [ $quiet = 0 ]; then
             printf "$progname: skipping $tree\n";
         fi
         continue;
     fi
-    if [ $tree = "texmf" ] && [ ! -d "$SNIPPET_BASE/$tree" ] && [ ! -d "$SNIPPET_OLD_BASE" ] ; 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
@@ -181,23 +175,9 @@
     # From now on, $tempfile must be deleted on exit; therefore, cleanup() should
     # be used.
 
-    if [ -d "$SNIPPET_BASE/$tree" ] ; then
-        find "$SNIPPET_BASE/$tree"  -maxdepth 1 -type f -name '*.cfg' \
-            -exec cat '{}' \; >> "$tempfile"
-    fi
+    find "$SNIPPET_BASE/$tree"  -maxdepth 1 -type f -name '*.cfg' \
+        -exec cat '{}' \; >> "$tempfile"
 
-    # backward compatibility with old snippets in /etc/texmf/updmap.d
-    if [ $tree = "texmf" ] && [ -d $SNIPPET_OLD_BASE ] ; then
-        echo ""
-        echo "Warning: old configuration style found in $SNIPPET_OLD_BASE" >&2
-        echo "Warning: these packages should be rebuild with tex-common >= 3" >&2
-        if [ -r "$SNIPPET_OLD_BASE/99local.cfg" ] ; then
-            echo "Warning: local adaptions in $SNIPPET_OLD_BASE/99local.cfg should be moved to /etc/texmf/web2c/updmap.cfg (probably!)" >&2
-        fi
-        echo ""
-        find $SNIPPET_OLD_BASE -maxdepth 1 -type f -name '*.cfg' \
-            -and -not -name '*99local.cfg' -exec cat '{}' \; >> "$tempfile"
-    fi
     # This is atomic.
     mv "$tempfile" "$output_file"
     updated_files="$updated_files\t$output_file\n";
@@ -213,6 +193,13 @@
 
 done
 
+if [ -d $SNIPPET_OLD_BASE ] ; then
+    echo ""
+    echo "Warning: old configuration style found in $SNIPPET_OLD_BASE" >&2
+    echo "Warning: these packages should be rebuild with tex-common >= 3" >&2
+    echo ""
+fi
+
 if [ $quiet = 0 ] && [ -n "$updated_files" ] ; then
     echo "$progname has updated the following file(s):"
     printf "$updated_files\n"