[subversion-commit] SVN tetex commit + diffs: r336 - tetex-bin/trunk/debian

[Frank Küster]

Author: frank
Date: 2005-11-14 17:04:54 +0000 (Mon, 14 Nov 2005)
New Revision: 336

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/common.functions.in
   tetex-bin/trunk/debian/postinst.in
   tetex-bin/trunk/debian/rules
Log:
 * Unset variables that might override texmf.cnf settings in postinst
   [frank] 


Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2005-11-14 17:03:48 UTC (rev 335)
+++ tetex-bin/trunk/debian/changelog	2005-11-14 17:04:54 UTC (rev 336)
@@ -14,8 +14,10 @@
     can now also use it as mktexfmt (closes: #338986) [frank]
   * Remove ancient code from libkpathsea's postinst script, thanks to
     Hilmar (closes: #207874) [frank]
+  * Unset variables that might override texmf.cnf settings in postinst
+    [frank] 
 
- -- Frank Küster <frank at debian.org>  Mon, 14 Nov 2005 16:30:44 +0100
+ -- Frank Küster <frank at debian.org>  Mon, 14 Nov 2005 18:01:21 +0100
 
 tetex-bin (3.0-10.1) unstable; urgency=low
 

Modified: tetex-bin/trunk/debian/common.functions.in
===================================================================
--- tetex-bin/trunk/debian/common.functions.in	2005-11-14 17:03:48 UTC (rev 335)
+++ tetex-bin/trunk/debian/common.functions.in	2005-11-14 17:04:54 UTC (rev 336)
@@ -8,6 +8,7 @@
 # internal variables for common.functions
 MKTMPDIR=/tmp
 SYMLINK_MOVE_EXT=<:=$SYMLINK_MOVE_EXT:>
+TEXMFSYSVAR=<:=$TEXMFSYSVAR:>
 
 savemove(){
   source="$1"
@@ -203,6 +204,23 @@
     echo $LSR
 }
 
+clean_texenvironment(){
+  envvars="AFMFONTS BIBINPUTS BSTINPUTS CMAPFONTS CWEBINPUTS ENCFONTS GFFONTS \
+GLYPHFONTS INDEXSTYLE LIGFONTS MAILCAPLIBDIR MFBASES MFINPUTS MFPOOL MFTINPUTS \
+MIMELIBDIR MISCFONTS MISSFONT_LOG MPINPUTS MPMEMS MPPOOL MPSUPPORT MPXCOMMAND \
+OCPINPUTS OFMFONTS OPENTYPEFONTS OPLFONTS OTPINPUTS OVFFONTS OVPFONTS PDFTEXCONFIG \
+PKFONTS PSHEADERS SFDFONTS SYSTEXMF T1FONTS T42FONTS T4HTINPUTS TEX4HTFONTSET \
+TEX4HTINPUTS TEXCONFIG TEXDOCEXT TEXDOCHTML TEXDOCS TEXDOCSCOMPRESS TEXDOCSSUFFIX \
+TEXFONTMAPS TEXFORMATS TEX_HUSH TEXINPUTS TEXMF TEXMFCNF TEXMFCONFIG TEXMFDBS \
+TEXMFDIST TEXMFHOME TEXMFLOCAL TEXMFMAIN TEXMFSCRIPTS TEXMFSYSCONFIG TEXMFSYSVAR \
+TEXMFVAR TEXPICTS TEXPOOL TEXPSHEADERS TEXSOURCES TFMFONTS TRFONTS TTFONTS \
+VARTEXFONTS VFFONTS WEB2C WEBINPUTS"
+  for var in $envvars; do
+    unset $var || true
+  done
+
+}
+
 #################################################################
 ##  End of function definitions from file common.functions
 #################################################################

Modified: tetex-bin/trunk/debian/postinst.in
===================================================================
--- tetex-bin/trunk/debian/postinst.in	2005-11-14 17:03:48 UTC (rev 335)
+++ tetex-bin/trunk/debian/postinst.in	2005-11-14 17:04:54 UTC (rev 336)
@@ -176,6 +176,7 @@
 
     # now create the formats.  We have to remove the old ones first, in case 
     # engines have changed
+    clean_texenvironment
     rm -f $TEXMFSYSVAR/web2c/*fmt
     create_tetex_formats --all
 

Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules	2005-11-14 17:03:48 UTC (rev 335)
+++ tetex-bin/trunk/debian/rules	2005-11-14 17:04:54 UTC (rev 336)
@@ -176,7 +176,7 @@
 configure-stamp: $(stampdir) patch-stamp
 # comment out the following line if you want to check the configure target
 # in a CVS working copy
-#	$(check-svn)
+	$(check-svn)
 	dh_testdir
 	# Make sure all of our expected symlinks are in place
 	sh debian/restore-symlinks