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

[Norbert Preining]

Author: preining
Date: 2012-03-10 01:49:54 +0000 (Sat, 10 Mar 2012)
New Revision: 5196

Modified:
   tex-common/branches/v3/debian/changelog
   tex-common/branches/v3/debian/postinst
   tex-common/branches/v3/scripts/update-texmf
Log:
fix some nasty bugs


Modified: tex-common/branches/v3/debian/changelog
===================================================================
--- tex-common/branches/v3/debian/changelog	2012-03-10 00:25:12 UTC (rev 5195)
+++ tex-common/branches/v3/debian/changelog	2012-03-10 01:49:54 UTC (rev 5196)
@@ -1,9 +1,10 @@
 tex-common (3.2) experimental; urgency=low
 
-  * UNRELEASED
   * clean up 3.1 changelog entry
+  * don't run upgrade code on new install
+  * don't create and remove texmf.cnf if no texmf.d conffiles are present
 
- -- Norbert Preining <preining at debian.org>  Sat, 10 Mar 2012 09:24:12 +0900
+ -- Norbert Preining <preining at debian.org>  Sat, 10 Mar 2012 10:49:30 +0900
 
 tex-common (3.1) experimental; urgency=low
 

Modified: tex-common/branches/v3/debian/postinst
===================================================================
--- tex-common/branches/v3/debian/postinst	2012-03-10 00:25:12 UTC (rev 5195)
+++ tex-common/branches/v3/debian/postinst	2012-03-10 01:49:54 UTC (rev 5196)
@@ -380,10 +380,12 @@
         rm /etc/texmf/language.dat
     fi
 
-    # if we are upgrading from a version < 3 we do the full upgrade stuff
-    # we saved the second argument into $trigger, which contains now
+    # if we are upgrading from a 1 < version < 3 we do the full upgrade stuff
+    # we saved the second argument into $trigger, which contains now 
     # the version
-    if dpkg --compare-versions "$2" lt "3"; then
+    # using the double check also guarantees that the code is NOT executed
+    # on new installs, where $trigger is empty
+    if dpkg --compare-versions "$trigger" lt "3" && dpkg --compare-versions "$trigger" gt 1 ; then
         #
         # whatever we do, we remove the updmap.cfg file in /var/lib/texmf/web2c!!
         # it was created by former versions of update-updmap and disturbs the 

Modified: tex-common/branches/v3/scripts/update-texmf
===================================================================
--- tex-common/branches/v3/scripts/update-texmf	2012-03-10 00:25:12 UTC (rev 5195)
+++ tex-common/branches/v3/scripts/update-texmf	2012-03-10 01:49:54 UTC (rev 5196)
@@ -44,6 +44,12 @@
   done
 fi
 
+if [ -z "$CNFFILES" ] ; then
+  # no config files are found, remove texmf.cnf if it is there
+  rm -rf /etc/texmf/web2c/texmf.cnf
+  exit 0
+fi
+
 if [ "${VERBOSE}" = "true" ]; then
   if [ -f "${TXMF_CNF}" ]; then
     echo -n "Merging information from /etc/texmf/texmf.d/ into ${TXMF_CNF} ... " >&2