[subversion-commit] SVN tex-common commit + diffs: r1565 - tex-common/trunk/debian

[Frank Küster]

Author: frank
Date: 2006-08-15 11:34:05 +0000 (Tue, 15 Aug 2006)
New Revision: 1565

Modified:
   tex-common/trunk/debian/NEWS
   tex-common/trunk/debian/README.Debian
   tex-common/trunk/debian/config.in
   tex-common/trunk/debian/rules
Log:
commit Norberts patch to treat mktex.cnf as a conffile


Modified: tex-common/trunk/debian/NEWS
===================================================================
--- tex-common/trunk/debian/NEWS	2006-08-15 11:28:32 UTC (rev 1564)
+++ tex-common/trunk/debian/NEWS	2006-08-15 11:34:05 UTC (rev 1565)
@@ -8,14 +8,6 @@
     where $HOME is not writable, fonts will be temporarily cached in
     /tmp/texfonts. 
   
-  * mktex.cnf change
-  
-    The change described above has been implemented by installing
-    /usr/share/texmf/web2c/mktex.cnf.  If you have a mktex.cnf in
-    TEXMFSYSCONFIG or TEXMFCONFIG with local additions, it would shadow
-    the new file, and font caching may not work until you transfer the
-    setting of MT_FEATURES to your configuration file.
-  
   * Breakage with TeXLive
   
     The texlive packages as of version 2005-2 do not automatically create

Modified: tex-common/trunk/debian/README.Debian
===================================================================
--- tex-common/trunk/debian/README.Debian	2006-08-15 11:28:32 UTC (rev 1564)
+++ tex-common/trunk/debian/README.Debian	2006-08-15 11:34:05 UTC (rev 1565)
@@ -12,20 +12,19 @@
 
  On multi-user machines, it might be advisable that the local
  administrator enables a site-wide font cache and sets VARTEXFONTS to
- a persistent directory, e.g. /var/cache/fonts.  The variable is set in
- /etc/texmf/texmf.d/05TeXMF.cnf and can either be changed there or 
- overwritten in a file that sorts before 05TeXMF.cnf, e.g.  
+ a persistent directory, e.g. /var/cache/fonts.  The variable is set
+ in /etc/texmf/texmf.d/05TeXMF.cnf and can either be changed there or
+ preferrably overwritten in a file that sorts before 05TeXMF.cnf, e.g.
  /etc/texmf/texmf.d/04VARTEXFONTS.cnf.  Do not forget to run
  update-texmf after making the change.  To enable a side-wide font
- caching the admin should copy /usr/share/texmf/web2c/mktex.cnf to
- /etc/texmf/web2c/mktex.cnf and use 'varfonts' instead of 'texmfvar' in
- MT_FEATURES.  Care should be taken to specifiy appropriate permissions
- for the directory containing the font cache.  Either the local admin
- should create all available font data and not allow write access, or
- else write access should be limited to trusted users.  Yet an other
- alternative is to bind-mount /var/cache/fonts from a separate
- partition, so that users are not able to fill up the /var partition
- with font data.
+ caching the admin should edit /etc/texmf/web2c/mktex.cnf and use
+ 'varfonts' instead of 'texmfvar' in MT_FEATURES.  Care should be
+ taken to specifiy appropriate permissions for the directory
+ containing the font cache.  Either the local admin should create all
+ available font data and not allow write access, or else write access
+ should be limited to trusted users.  Yet an other alternative is to
+ bind-mount /var/cache/fonts from a separate partition, so that users
+ are not able to fill up the /var partition with font data.
 
 
- -- Frank Küster <frank at debian.org>, Mon,  3 Jul 2006 14:54:46 +0200
+ -- Frank Küster <frank at debian.org>, Tue, 15 Aug 2006 13:31:59 +0200

Modified: tex-common/trunk/debian/config.in
===================================================================
--- tex-common/trunk/debian/config.in	2006-08-15 11:28:32 UTC (rev 1564)
+++ tex-common/trunk/debian/config.in	2006-08-15 11:34:05 UTC (rev 1565)
@@ -51,10 +51,12 @@
 # test whether mktex.cnf exists in TEXMFSYSCONFIG and warn the user
 # mktex.cnf in TEXMFCONFIG will have the same effect, but all we can provide
 # in this case is the message in NEWS.Debian
-if [ -f /etc/texmf/web2c/mktex.cnf ]; then
-  db_input medium tex-common/warn_mktexcnf || true
-  db_go
-fi
+#
+# disabled, we ship mktex.cnf again in /etc/texmf/web2c/, see bug 379089
+#if [ -f /etc/texmf/web2c/mktex.cnf ]; then
+#  db_input medium tex-common/warn_mktexcnf || true
+#  db_go
+#fi
 
 
 

Modified: tex-common/trunk/debian/rules
===================================================================
--- tex-common/trunk/debian/rules	2006-08-15 11:28:32 UTC (rev 1564)
+++ tex-common/trunk/debian/rules	2006-08-15 11:34:05 UTC (rev 1565)
@@ -91,8 +91,8 @@
 	grep -v '^[ \t]*#' scripts/postinst-tex > $(INSTDIR)/usr/share/debhelper/autoscripts/postinst-tex
 
         # fontcache stuff with proper permissions
-	install -d $(INSTDIR)/usr/share/texmf/web2c/
-	install -m 644 texmf/web2c/mktex.cnf $(INSTDIR)/usr/share/texmf/web2c/
+	install -d $(INSTDIR)/etc/texmf/web2c/
+	install -m 644 texmf/web2c/mktex.cnf $(INSTDIR)/etc/texmf/web2c/
 # 	mkdir --mode=1777 $(INSTDIR)/var/cache/fonts/pk
 # 	mkdir --mode=1777 $(INSTDIR)/var/cache/fonts/tfm
 # 	mkdir --mode=1777 $(INSTDIR)/var/cache/fonts/source