[subversion-commit] SVN tetex commit + diffs: r151 - in tetex-base/trunk/debian: . rules.d

[Norbert Preining]

Author: preining-guest
Date: 2005-08-22 12:16:48 +0000 (Mon, 22 Aug 2005)
New Revision: 151

Modified:
   tetex-base/trunk/debian/control
   tetex-base/trunk/debian/postinst.in
   tetex-base/trunk/debian/rules.d/install.mk
   tetex-base/trunk/debian/setup-conflinks.in
Log:
do not install /var/cache/fonts/*, /usr/local/share/texmf and ls-R links
as this is done now by tex-common (>= 0.7)


Modified: tetex-base/trunk/debian/control
===================================================================
--- tetex-base/trunk/debian/control	2005-08-22 12:15:53 UTC (rev 150)
+++ tetex-base/trunk/debian/control	2005-08-22 12:16:48 UTC (rev 151)
@@ -8,7 +8,7 @@
 
 Package: tetex-base
 Architecture: all
-Depends: texinfo (>= 4.0b-1), debconf, ucf (>= 1.02), tex-common (>= 0.4)
+Depends: texinfo (>= 4.0b-1), debconf, ucf (>= 1.02), tex-common (>= 0.7)
 Replaces: texidoc, bibtex, texpsfnt, mfbasfnt, xdvik, dvipsk, mfnfss, latex, texlib, mflib, textfm, kpathsea, latex2e-doc, ltxgraph, csplain, cslatex, cstexfonts, tetex-extra (<< 2.0.2a-1), tetex-doc (<< 1.0.2+20011128), tetex-nonfree, pxfonts, txfonts, mfpic, texdoctk, tetex-bin (<< 2.99)
 Pre-Depends: dpkg (>=1.6.8)
 Conflicts: texidoc, bibtex, texpsfnt, mfbasfnt, xdvik, mfnfss, texlib, mflib, textfm, kpathsea, latex2e-doc, ltxgraph, csplain, cslatex, cstexfonts, tetex-bin (<= 2.99.7), xbase (<< 3.3.2.3a-2), tetex-nonfree (<< 1.0.2+20000804-2), pxfonts, txfonts, mfpic, cspsfonts, arabtex (<= 3.10-5)

Modified: tetex-base/trunk/debian/postinst.in
===================================================================
--- tetex-base/trunk/debian/postinst.in	2005-08-22 12:15:53 UTC (rev 150)
+++ tetex-base/trunk/debian/postinst.in	2005-08-22 12:16:48 UTC (rev 151)
@@ -116,15 +116,18 @@
 # 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
+#    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 

Modified: tetex-base/trunk/debian/rules.d/install.mk
===================================================================
--- tetex-base/trunk/debian/rules.d/install.mk	2005-08-22 12:15:53 UTC (rev 150)
+++ tetex-base/trunk/debian/rules.d/install.mk	2005-08-22 12:16:48 UTC (rev 151)
@@ -80,9 +80,10 @@
 #	chmod +x $(txmfdir)/doc/mkhtml
 
 # ship /var/cache/fonts in the tetex-base package, with proper permissions
-	mkdir --mode=1777 debian/$(package)/var/cache/fonts/pk
-	mkdir --mode=1777 debian/$(package)/var/cache/fonts/tfm
-	mkdir --mode=1777 debian/$(package)/var/cache/fonts/source
+# this is done in tex-common now
+#	mkdir --mode=1777 debian/$(package)/var/cache/fonts/pk
+#	mkdir --mode=1777 debian/$(package)/var/cache/fonts/tfm
+#	mkdir --mode=1777 debian/$(package)/var/cache/fonts/source
 
 # setup map state directory
 	cp debian/README.texmaps debian/$(package)/usr/share/$(package)/

Modified: tetex-base/trunk/debian/setup-conflinks.in
===================================================================
--- tetex-base/trunk/debian/setup-conflinks.in	2005-08-22 12:15:53 UTC (rev 150)
+++ tetex-base/trunk/debian/setup-conflinks.in	2005-08-22 12:16:48 UTC (rev 151)
@@ -143,12 +143,14 @@
   done
   ln -s /etc/texmf/mktex.cnf debian/$package/usr/share/texmf/web2c/
   ln -s /etc/texmf/dvips/config.builtin35 debian/$package/usr/share/texmf/dvips/tetex/
-
+#
+# now in tex-common
+#
 # 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 debian/$package/usr/share/texmf/ls-R
+#  rm -f debian/$package/usr/share/texmf/ls-R
+#  ln -s /var/lib/texmf/ls-R-TEXMFMAIN debian/$package/usr/share/texmf/ls-R
 
   # texdoctk stuff
   mv debian/tetex-base/usr/share/texmf/texdoctk debian/tetex-base/etc