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

[Norbert Preining]

Author: preining
Date: 2012-03-04 12:36:15 +0000 (Sun, 04 Mar 2012)
New Revision: 5122

Added:
   tex-common/branches/v3/debian/preinst
Modified:
   tex-common/branches/v3/debian/changelog
   tex-common/branches/v3/debian/postinst.in
   tex-common/branches/v3/debian/postrm.in
   tex-common/branches/v3/scripts/update-texmf
Log:
remove old conf files, and ignore them for safety in update-texmf


Modified: tex-common/branches/v3/debian/changelog
===================================================================
--- tex-common/branches/v3/debian/changelog	2012-03-03 14:27:21 UTC (rev 5121)
+++ tex-common/branches/v3/debian/changelog	2012-03-04 12:36:15 UTC (rev 5122)
@@ -1,8 +1,9 @@
 tex-common (3.0-1~7) unstable; urgency=low
 
-  * reintroduce update-texmf
+  * reintroduce update-texmf, skip old texmf.d files
+  * remove all texmf.d conf files
 
- -- Norbert Preining <preining at debian.org>  Sat, 03 Mar 2012 23:26:46 +0900
+ -- Norbert Preining <preining at debian.org>  Sun, 04 Mar 2012 21:35:05 +0900
 
 tex-common (3.0-1~6) unstable; urgency=low
 

Modified: tex-common/branches/v3/debian/postinst.in
===================================================================
--- tex-common/branches/v3/debian/postinst.in	2012-03-03 14:27:21 UTC (rev 5121)
+++ tex-common/branches/v3/debian/postinst.in	2012-03-04 12:36:15 UTC (rev 5122)
@@ -25,6 +25,23 @@
 action=$1
 trigger=$2
 
+
+# remove all the old files
+if dpkg-maintscript-helper supports rm_conffile; then
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/05TeXMF.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/15Plain.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/45TeXinputs.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/55Fonts.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/65BibTeX.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/75DviPS.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/80DVIPDFMx.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/85Misc.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/90TeXDoc.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/95NonPath.cnf 2.11 -- "$@"
+  # also from very old
+  dpkg-maintscript-helper rm_conffile /etc/texmf/language.d/00tex.cnf 2.11 -- "$@"
+fi
+
 . <:=${CONFMODULE}:>
 db_version 2.0
 

Modified: tex-common/branches/v3/debian/postrm.in
===================================================================
--- tex-common/branches/v3/debian/postrm.in	2012-03-03 14:27:21 UTC (rev 5121)
+++ tex-common/branches/v3/debian/postrm.in	2012-03-04 12:36:15 UTC (rev 5122)
@@ -15,6 +15,22 @@
 # give commandline args a name
 action=$1 # remove, purge, upgrade, failed-upgrade, abort-install, abort-upgrade, disappear
 
+# remove all the old files
+if dpkg-maintscript-helper supports rm_conffile; then
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/05TeXMF.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/15Plain.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/45TeXinputs.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/55Fonts.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/65BibTeX.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/75DviPS.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/80DVIPDFMx.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/85Misc.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/90TeXDoc.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/95NonPath.cnf 2.11 -- "$@"
+  # also from very old
+  dpkg-maintscript-helper rm_conffile /etc/texmf/language.d/00tex.cnf 2.11 -- "$@"
+fi
+
 <:open(FUNCTIONS,'debian/postrm.functions');@FUNCTIONS=<FUNCTIONS>;close(FUNCTIONS):>//
 <:=@FUNCTIONS:>//
 

Added: tex-common/branches/v3/debian/preinst
===================================================================
--- tex-common/branches/v3/debian/preinst	                        (rev 0)
+++ tex-common/branches/v3/debian/preinst	2012-03-04 12:36:15 UTC (rev 5122)
@@ -0,0 +1,25 @@
+#!/bin/sh -e
+# 
+# preinst maintainer script for the Debian tex-common package.
+# $Id$
+
+# remove all the old files
+if dpkg-maintscript-helper supports rm_conffile; then
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/05TeXMF.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/15Plain.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/45TeXinputs.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/55Fonts.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/65BibTeX.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/75DviPS.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/80DVIPDFMx.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/85Misc.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/90TeXDoc.cnf 2.11 -- "$@"
+  dpkg-maintscript-helper rm_conffile /etc/texmf/texmf.d/95NonPath.cnf 2.11 -- "$@"
+
+  # also from very old
+  dpkg-maintscript-helper rm_conffile /etc/texmf/language.d/00tex.cnf 2.11 -- "$@"
+fi
+
+#DEBHELPER#
+
+

Modified: tex-common/branches/v3/scripts/update-texmf
===================================================================
--- tex-common/branches/v3/scripts/update-texmf	2012-03-03 14:27:21 UTC (rev 5121)
+++ tex-common/branches/v3/scripts/update-texmf	2012-03-04 12:36:15 UTC (rev 5122)
@@ -68,6 +68,20 @@
 EOF
 
 for i in ${CNFFILES}; do
+    if [ $i == "/etc/texmf/texmf.d/05TeXMF.cnf" ] ||
+       [ $i == "/etc/texmf/texmf.d/15Plain.cnf" ] ||
+       [ $i == "/etc/texmf/texmf.d/45TeXinputs.cnf" ] ||
+       [ $i == "/etc/texmf/texmf.d/55Fonts.cnf" ] ||
+       [ $i == "/etc/texmf/texmf.d/65BibTeX.cnf" ] ||
+       [ $i == "/etc/texmf/texmf.d/75DviPS.cnf" ] ||
+       [ $i == "/etc/texmf/texmf.d/80DVIPDFMx.cnf" ] ||
+       [ $i == "/etc/texmf/texmf.d/85Misc.cnf" ] ||
+       [ $i == "/etc/texmf/texmf.d/90TeXDoc.cnf" ] ||
+       [ $i == "/etc/texmf/texmf.d/95NonPath.cnf" ] ; then
+       echo "Ignoring $i during generation of texmf.cnf, please remove manually!" >&2
+       echo "%%% IGNORED: $i" >> ${TMPTXMF}
+       continue
+    fi
     echo "%%% From file: $i" >> ${TMPTXMF}
     cat $i >> ${TMPTXMF}
     echo "%%% End of file: $i" >> ${TMPTXMF}