[subversion-commit] SVN tetex commit + diffs: r335 - tetex-base/trunk/debian

[Frank Küster]

Author: frank
Date: 2005-11-14 17:03:48 +0000 (Mon, 14 Nov 2005)
New Revision: 335

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


Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog	2005-11-14 16:28:18 UTC (rev 334)
+++ tetex-base/trunk/debian/changelog	2005-11-14 17:03:48 UTC (rev 335)
@@ -1,8 +1,10 @@
 tetex-base (3.0-10.1) unreleased; urgency=low
 
   * Install changelog.Debian in tetex-doc, too (closes: #338334)
+  * Unset variables that might override texmf.cnf settings in postinst
+    [frank] 
 
- -- Frank Küster <frank at debian.org>  Thu, 10 Nov 2005 12:33:20 +0100
+ -- Frank Küster <frank at debian.org>  Mon, 14 Nov 2005 18:01:53 +0100
 
 tetex-base (3.0-10) unstable; urgency=low
 

Modified: tetex-base/trunk/debian/common.functions.in
===================================================================
--- tetex-base/trunk/debian/common.functions.in	2005-11-14 16:28:18 UTC (rev 334)
+++ tetex-base/trunk/debian/common.functions.in	2005-11-14 17:03:48 UTC (rev 335)
@@ -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-base/trunk/debian/postinst.in
===================================================================
--- tetex-base/trunk/debian/postinst.in	2005-11-14 16:28:18 UTC (rev 334)
+++ tetex-base/trunk/debian/postinst.in	2005-11-14 17:03:48 UTC (rev 335)
@@ -116,22 +116,9 @@
 # Update language.dat (update-language is in tex-common on which we depend)
     update-language
 
-#
-# now in tex-common
-#
-    # create /usr/local/share/texmf, unless the filesystem is read-only:
-#    TEXMFLOCAL=/usr/local/share/texmf
-#    if [ ! -e $TEXMFLOCAL ]; then
-#      if mkdir $TEXMFLOCAL 2>/dev/null; then
-#	chmod 2775 $TEXMFLOCAL 2>/dev/null || true
-#	chown root:staff $TEXMFLOCAL 2>/dev/null || true
-#	ln -s /var/lib/texmf/ls-R-LOCAL /$TEXMFLOCAL/ls-R
-#      fi
-#    fi
-
-
-# if tetex-base is upgraded while tetex-bin is yet installed, we must 
+# if tetex-base is upgraded while tetex-bin is already installed, we must 
 # call mktexlr, and regenerate the formats and font maps.
+    clean_texenvironment
     TEXINIT_P=""
     TEXLINKS_P=""
     KPSEWHICH=""

Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules	2005-11-14 16:28:18 UTC (rev 334)
+++ tetex-base/trunk/debian/rules	2005-11-14 17:03:48 UTC (rev 335)
@@ -15,7 +15,7 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=3
 
-EPERL_FILES := debian/preinst debian/postinst debian/postrm \
+EPERL_FILES := debian/preinst debian/postinst debian/prerm debian/postrm \
    debian/tetex-base.dirs \
    debian/tetex-extra.postinst debian/tetex-extra.preinst \
    debian/tetex-extra.postrm debian/tetex-extra.dirs \
@@ -186,7 +186,9 @@
 #	(cd debian/xfonts-tetex/usr/share/doc/; ln -s tetex-extra-fonts xfonts-tetex)
 	ln -s ../texmf debian/$(docpack)/usr/share/doc/$(docpack)/
 
-	dh_installchangelogs ChangeLog -p tetex-base
+	dh_installchangelogs ChangeLog -p tetex-base -p tetex-doc
+	cp debian/changelog.Debian.experimental debian/$(package)/usr/share/doc/$(package)/
+	cp debian/changelog.Debian.experimental debian/$(docpack)/usr/share/doc/$(docpack)/
 	dh_compress -Xhelpfile
 	dh_installinfo
 
@@ -222,7 +224,7 @@
 
 debian/sarge-stamp: 
 	cp debian/changelog debian/sarge/changelog.sid
-	sed -e s/3.0-9/3.0-9.0.sarge1/ debian/sarge/changelog.sid \
+	sed -e s/3.0-10.1/3.0-10.0.sarge1/ debian/sarge/changelog.sid \
 	  > debian/changelog && rm debian/sid-stamp
 	# need to remake rules
 	touch debian/rules.in