Re: Suggestion for tex-common
Hi Frank, hi developers!
On Mon, 22 Aug 2005, Frank Küster wrote:
> > /var/cache/fonts
> > .../ls-R
> > .../{pk,source,tfm}
> > /var/lib/texmf
> > .../{ls-R,ls-R-LOCAL,ls-R-TEXMFMAIN}
> > /usr/share/texmf/ls-R
> > /usr/local/share/texmf/ls-R
>
> Since the configuration that defines these directories is in tex-common,
> I think it does make sense.
Here are some diffs. The code was stolen from tetex, obviously.
If we incorporate these things, we probably have to add some Replace,
COnflict << tetex blabla version, <<texlive blalba version to not get
any conflicts.
Comments welcome!
These are the changes to tex-common relative to trunk
Index: debian/postinst.in
===================================================================
--- debian/postinst.in (Revision 149)
+++ debian/postinst.in (Arbeitskopie)
@@ -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
Index: debian/rules
===================================================================
--- debian/rules (Revision 149)
+++ debian/rules (Arbeitskopie)
@@ -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
Index: debian/dirs
===================================================================
--- debian/dirs (Revision 149)
+++ debian/dirs (Arbeitskopie)
@@ -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
These are the changes to tetex, BUT RELATIVE TO debian !!!!!
(I have only checked out the debian subdir)
Index: postinst.in
===================================================================
--- postinst.in (Revision 149)
+++ postinst.in (Arbeitskopie)
@@ -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
Index: setup-conflinks.in
===================================================================
--- setup-conflinks.in (Revision 149)
+++ setup-conflinks.in (Arbeitskopie)
@@ -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
Index: rules.d/install.mk
===================================================================
--- rules.d/install.mk (Revision 149)
+++ rules.d/install.mk (Arbeitskopie)
@@ -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)/
===================================000
Best wishes
Norbert
-------------------------------------------------------------------------------
Dr. Norbert Preining <preining AT logic DOT at> Università di Siena
sip:preining@at43.tuwien.ac.at +43 (0) 59966-690018
gpg DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094
-------------------------------------------------------------------------------
NAPLES (pl.n.)
The tiny depression in a piece of Ryvita.
--- Douglas Adams, The Meaning of Liff
Reply to: