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

[Norbert Preining]

Author: preining-guest
Date: 2005-08-22 12:15:53 +0000 (Mon, 22 Aug 2005)
New Revision: 150

Modified:
   tex-common/trunk/debian/control
   tex-common/trunk/debian/dirs
   tex-common/trunk/debian/postinst.in
   tex-common/trunk/debian/rules
Log:
take over the generation of /var/cache/fonts/*, /usr/local/share/texmf
and ls-R links from tetex-base and texlive-basic


Modified: tex-common/trunk/debian/control
===================================================================
--- tex-common/trunk/debian/control	2005-08-19 18:29:35 UTC (rev 149)
+++ tex-common/trunk/debian/control	2005-08-22 12:15:53 UTC (rev 150)
@@ -10,6 +10,7 @@
 Package: tex-common
 Architecture: all
 Depends: ucf, debconf
+Replaces: tetex-base
 Conflicts: tetex-bin (<= 3.0-4), tetex-base (<= 3.0-3)
 Description: Common infrastructure for using and building TeX in Debian
  This package contains a number of scripts and common configuration

Modified: tex-common/trunk/debian/dirs
===================================================================
--- tex-common/trunk/debian/dirs	2005-08-19 18:29:35 UTC (rev 149)
+++ tex-common/trunk/debian/dirs	2005-08-22 12:15:53 UTC (rev 150)
@@ -12,3 +12,4 @@
 var/lib/tex-common/fontmap-cfg
 var/lib/tex-common/language-cnf
 var/lib/tex-common/fmtutil-cnf
+var/cache/fonts

Modified: tex-common/trunk/debian/postinst.in
===================================================================
--- tex-common/trunk/debian/postinst.in	2005-08-19 18:29:35 UTC (rev 149)
+++ tex-common/trunk/debian/postinst.in	2005-08-22 12:15:53 UTC (rev 150)
@@ -2,7 +2,7 @@
 #!/bin/sh -e
 # 
 # postinst maintainer script for the Debian <:=${PACKAGE}:> package.
-# $Id: postinst.in,v 1.4 2005/07/18 15:44:36 frank Exp $
+# $Id$
 <:=@COPYRIGHT:>//
 
 ## Define static variables we need
@@ -62,6 +62,18 @@
       $UCF /usr/share/tex-common/`basename $file` /etc/texmf/$file
     done
 
+#
+# 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
+
 # run our scripts - this way we ensure that the generated files are
 # corrected, should one of the scripts have produced buggy output in 
 # a prior version

Modified: tex-common/trunk/debian/rules
===================================================================
--- tex-common/trunk/debian/rules	2005-08-19 18:29:35 UTC (rev 149)
+++ tex-common/trunk/debian/rules	2005-08-22 12:15:53 UTC (rev 150)
@@ -73,6 +73,17 @@
 	ln -s update-fontlang $(INSTDIR)/usr/sbin/update-fmtutil
 	ln -s ../sbin/update-fontlang $(INSTDIR)/usr/bin/update-updmap
 
+	# ship /var/cache/fonts with proper permissions
+	mkdir --mode=1777 $(INSTDIR)/var/cache/fonts/pk
+	mkdir --mode=1777 $(INSTDIR)/var/cache/fonts/tfm
+	mkdir --mode=1777 $(INSTDIR)/var/cache/fonts/source
+	
+	# Remove the out-of-date ls-R file from /usr/share/texmf and create a
+	# link to one in /var/lib/texmf that we can update without violating
+	# the FHS.
+	rm -f debian/$package/usr/share/texmf/ls-R
+	ln -s /var/lib/texmf/ls-R-TEXMFMAIN $(INSTDIR)/usr/share/texmf/ls-R
+	
 	cp $(teTeX_buildfiles) $(INSTDIR)/usr/share/tex-common/teTeX-build/
 
 
@@ -92,7 +103,7 @@
 	dh_installman $(sbin_manpages) $(bin_manpages)
 	dh_link
 	dh_compress
-	dh_fixperms
+	dh_fixperms --exclude=var/cache/fonts
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol