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

[Norbert Preining]

Author: preining
Date: 2012-03-05 06:24:43 +0000 (Mon, 05 Mar 2012)
New Revision: 5145

Modified:
   tex-common/branches/v3/debian/maintscript
   tex-common/branches/v3/debian/postinst.in
Log:
fixes for double mtxrun and wrong version in conffile removal


Modified: tex-common/branches/v3/debian/maintscript
===================================================================
--- tex-common/branches/v3/debian/maintscript	2012-03-05 03:31:45 UTC (rev 5144)
+++ tex-common/branches/v3/debian/maintscript	2012-03-05 06:24:43 UTC (rev 5145)
@@ -1,7 +1,7 @@
 rm_conffile /etc/texmf/texmf.d/05TeXMF.cnf 2.11
 rm_conffile /etc/texmf/texmf.d/15Plain.cnf 2.11
 rm_conffile /etc/texmf/texmf.d/45TeXinputs.cnf 2.11
-rm_conffile /etc/texmf/texmf.d/55Fonts.cnf 2.1
+rm_conffile /etc/texmf/texmf.d/55Fonts.cnf 2.11
 rm_conffile /etc/texmf/texmf.d/65BibTeX.cnf 2.11
 rm_conffile /etc/texmf/texmf.d/75DviPS.cnf 2.11
 rm_conffile /etc/texmf/texmf.d/80DVIPDFMx.cnf 2.11

Modified: tex-common/branches/v3/debian/postinst.in
===================================================================
--- tex-common/branches/v3/debian/postinst.in	2012-03-05 03:31:45 UTC (rev 5144)
+++ tex-common/branches/v3/debian/postinst.in	2012-03-05 06:24:43 UTC (rev 5145)
@@ -79,7 +79,10 @@
 
 do_triggers() 
 {
+    # vars used to record what we have done already, not to make
+    # it two times
     DONE_FULL_LSR=0
+    DONE_MTXRUN=0
     # currently we only support only triggers for updmap.d and
     # language.d changes
     # because all the other calls are quite fast 
@@ -120,7 +123,10 @@
                     fi
                 fi
             fi
-            run_mtxrun_if_possible
+            if [ $DONE_MTXRUN = 0 ] ; then
+                run_mtxrun_if_possible
+                DONE_MTXRUN=1
+            fi
         ;;
     esac
     # do NOT merge these two cases into one, from dpkg's trigger.txt:
@@ -151,7 +157,10 @@
                 fi
             fi
           fi
-          run_mtxrun_if_possible
+          if [ $DONE_MTXRUN = 0 ] ; then
+              run_mtxrun_if_possible
+              DONE_MTXRUN=1
+          fi
         ;;
     esac
     # do NOT merge these two cases into one, from dpkg's trigger.txt: