[subversion-commit] SVN tetex commit + diffs: r125 - in
tetex-base/trunk/debian: . patches rules.d
Frank Küster
frank at costa.debian.org
Tue Aug 16 10:13:27 UTC 2005
Author: frank
Date: 2005-08-16 10:13:25 +0000 (Tue, 16 Aug 2005)
New Revision: 125
Modified:
tetex-base/trunk/debian/TODO
tetex-base/trunk/debian/changelog
tetex-base/trunk/debian/patches/patch-doc
tetex-base/trunk/debian/patches/patch-doc.old
tetex-base/trunk/debian/postinst.functions
tetex-base/trunk/debian/postinst.in
tetex-base/trunk/debian/rules
tetex-base/trunk/debian/rules.d/install.mk
tetex-base/trunk/debian/rules.in
tetex-base/trunk/debian/setup-conflinks.in
tetex-base/trunk/debian/variables
Log:
[variables] Move LSRS variable to common.variables
[postinst.in] Reintroduce the code to create /usr/local/share/texmf in postinst, and a symlink from ls-R to /var/lib/texmf/ls-R-LOCAL.
[install.mk] Really install tetex-extra's fontmap list file
[patch-doc] fix patch to mkhtml.nawk
[postinst.functions] fix for new installs
[rules.in] don't compress helpfile, for mkthml.nawk
[setup-conflinks,variables,rules.in] update $Id$
[changelog] corresponding entries, and swap two lines to where they belong
Modified: tetex-base/trunk/debian/TODO
===================================================================
--- tetex-base/trunk/debian/TODO 2005-08-16 09:59:52 UTC (rev 124)
+++ tetex-base/trunk/debian/TODO 2005-08-16 10:13:25 UTC (rev 125)
@@ -19,3 +19,13 @@
- needs a transition from 00updmap.cfg to 00tetex-base.cfg and language.dat
- after upgrade, with tetex-extra, lambda.ini is left over
+
+- are there already TDS upgrade instructions in NEWS.Debian?
+
+- the README.pst-osci with the new license information is lost
+
+- /etc/texmf/map/dvips/context/original-context-symbol.map is changed
+ (newline)
+
+- /etc/texmf/updmap.d/00updmap.cfg.dpkg-dist is created without
+ asking?
Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog 2005-08-16 09:59:52 UTC (rev 124)
+++ tetex-base/trunk/debian/changelog 2005-08-16 10:13:25 UTC (rev 125)
@@ -1,4 +1,4 @@
-tetex-base (3.0-7) experimental; urgency=low
+tetex-base (3.0-6.1) UNRELEASED; urgency=low
* Check files that used to be conffiles and are now unused, remove them
if unchanged. Furthermore, Install config.antt into /etc/texmf/dvips
@@ -6,9 +6,13 @@
* Fix extension when pdftex.cfg is saved away after taking over as much
settings as possible (closes: #320061)
* Depend on a tex-common version that provides update-language (closes:
- #321361)
+ #321361) and move the LSRS entry from our and tetex-bin's variables to
+ common.variables
+ * Reintroduce the code to create /usr/local/share/texmf in postinst, and
+ a symlink from ls-R to /var/lib/texmf/ls-R-LOCAL.
+ * Really install tetex-extra's fontmap list file
- -- Frank Küster <frank at debian.org> Fri, 5 Aug 2005 10:19:42 +0200
+ -- Frank Küster <frank at debian.org> Fri, 12 Aug 2005 17:18:41 +0200
tetex-base (3.0-6) experimental; urgency=low
@@ -34,6 +38,8 @@
updmap.cfg from the upstream sources, but rather a static file in the
debian subdirectory.
- 05tetex-extra.cfg is now 05tetex-extra.cfg
+ Both files contain the magic comment, and the memory file is at the
+ proper place. An upgrade path for 10tetex-base.cfg is still needed.
* /usr/share/texmf/lambda/config is now only a symlink in tetex-extra.
In older 3.0 versions, it was also a directory in tetex-base. Thanks
to Miles Bader <miles at lsi.nec.co.jp> for spotting this. This fix (closes:
@@ -47,9 +53,6 @@
http://localhost/texmf/doc/texdoc.php, using the data from texdoctk.
* Remove beamer documentation (already in package latex-beamer).
- Both files contain the magic comment, and the memory file is at the
- proper place. An upgrade path for 10tetex-base.cfg is still needed.
-
-- Frank Küster <frank at debian.org> Mon, 25 Jul 2005 15:40:45 +0200
tetex-base (3.0-3) experimental; urgency=low
Modified: tetex-base/trunk/debian/patches/patch-doc
===================================================================
--- tetex-base/trunk/debian/patches/patch-doc 2005-08-16 09:59:52 UTC (rev 124)
+++ tetex-base/trunk/debian/patches/patch-doc 2005-08-16 10:13:25 UTC (rev 125)
@@ -1,5 +1,5 @@
---- doc/index.html.orig 2005-08-05 18:53:31.000000000 +0200
-+++ doc/index.html 2005-08-05 18:53:31.000000000 +0200
+--- doc/index.html.orig 2005-08-07 21:14:09.372143789 +0200
++++ doc/index.html 2005-08-07 21:14:09.521127844 +0200
@@ -95,15 +95,17 @@
</form>
</td></tr></table><br/><br/>
@@ -1114,9 +1114,11 @@
info system and printed manuals. Also included is <code>texi2html</code> which will convert texinfo files to html.</p>
---- doc/mkhtml.nawk.orig 2005-08-05 18:53:31.000000000 +0200
-+++ doc/mkhtml.nawk 2005-08-05 21:07:44.431183047 +0200
-@@ -2,6 +2,20 @@
+--- doc/mkhtml.nawk.orig 2005-08-07 21:14:09.375143468 +0200
++++ doc/mkhtml.nawk 2005-08-07 21:14:09.522127737 +0200
+@@ -1,7 +1,21 @@
+-#!/bin/sh
++#!/bin/sh -e
: ${MAKE=make}
@@ -1137,3 +1139,12 @@
echo '<TITLE>The TeX System</TITLE>'
echo '<H1>The TeX System</H1>'
+@@ -78,7 +92,7 @@
+ next;
+ }
+ { print $0 }
+-' initializing=1 RS="" FS="\n" OFS="\n" helpfile initializing=0 RS="\n" FS=" " OFS=" " -
++' initializing=1 RS="" FS="\n" OFS="\n" /usr/share/doc/texmf/helpfile initializing=0 RS="\n" FS=" " OFS=" " -
+
+ # test -w help/Catalogue/ctfull.html \
+ # && (cd help/Catalogue; $MAKE) >&2
Modified: tetex-base/trunk/debian/patches/patch-doc.old
===================================================================
--- tetex-base/trunk/debian/patches/patch-doc.old 2005-08-16 09:59:52 UTC (rev 124)
+++ tetex-base/trunk/debian/patches/patch-doc.old 2005-08-16 10:13:25 UTC (rev 125)
@@ -1,5 +1,5 @@
---- doc/index.html.orig 2005-07-29 18:16:57.892008701 +0200
-+++ doc/index.html 2005-07-29 18:16:57.954001903 +0200
+--- doc/index.html.orig 2005-08-07 20:27:27.380018451 +0200
++++ doc/index.html 2005-08-07 20:27:27.512004326 +0200
@@ -95,15 +95,17 @@
</form>
</td></tr></table><br/><br/>
@@ -1114,3 +1114,37 @@
info system and printed manuals. Also included is <code>texi2html</code> which will convert texinfo files to html.</p>
+--- doc/mkhtml.nawk.orig 2005-08-07 20:27:27.383018130 +0200
++++ doc/mkhtml.nawk 2005-08-07 20:28:00.912429747 +0200
+@@ -1,7 +1,21 @@
+-#!/bin/sh
++#!/bin/sh -e
+
+ : ${MAKE=make}
+
++outfile=/var/lib/texmf/helpindex.html
++
++if [ ! "$#" -eq 0 ]; then
++ case $1 in
++ -o|--output-file)
++ outfile="$2"
++ ;;
++ *)
++ echo "Unrecognized option: $1"
++ exit 1
++ esac
++fi
++exec >$outfile
++
+ echo '<TITLE>The TeX System</TITLE>'
+ echo '<H1>The TeX System</H1>'
+
+@@ -78,7 +92,7 @@
+ next;
+ }
+ { print $0 }
+-' initializing=1 RS="" FS="\n" OFS="\n" helpfile initializing=0 RS="\n" FS=" " OFS=" " -
++' initializing=1 RS="" FS="\n" OFS="\n" /usr/share/doc/texmf/helpfile initializing=0 RS="\n" FS=" " OFS=" " -
+
+ # test -w help/Catalogue/ctfull.html \
+ # && (cd help/Catalogue; $MAKE) >&2
Modified: tetex-base/trunk/debian/postinst.functions
===================================================================
--- tetex-base/trunk/debian/postinst.functions 2005-08-16 09:59:52 UTC (rev 124)
+++ tetex-base/trunk/debian/postinst.functions 2005-08-16 10:13:25 UTC (rev 125)
@@ -96,7 +96,10 @@
fi
done
# remove if now empty
- for dir in $REMOVE_DIRS; do rmdir --ignore-fail-on-non-empty /etc/texmf/$dir; done
+ for dir in $REMOVE_DIRS; do
+ test -d /etc/texmf/$dir && \
+ rmdir --ignore-fail-on-non-empty /etc/texmf/$dir || true
+ done
# add a comment file
if [ -d $OLDSTUFFDIR ]; then
cat > $OLDSTUFFDIR/README <<EOF
Modified: tetex-base/trunk/debian/postinst.in
===================================================================
--- tetex-base/trunk/debian/postinst.in 2005-08-16 09:59:52 UTC (rev 124)
+++ tetex-base/trunk/debian/postinst.in 2005-08-16 10:13:25 UTC (rev 125)
@@ -116,6 +116,17 @@
# Update language.dat (update-language is in tex-common on which we depend)
update-language
+ # 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
# call mktexlr, and regenerate the formats and font maps.
TEXINIT_P=""
Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules 2005-08-16 09:59:52 UTC (rev 124)
+++ tetex-base/trunk/debian/rules 2005-08-16 10:13:25 UTC (rev 125)
@@ -179,7 +179,7 @@
ln -s ../texmf debian/$(docpack)/usr/share/doc/$(docpack)/
dh_installchangelogs ChangeLog -p tetex-base
- dh_compress
+ dh_compress -Xhelpfile
dh_installinfo
# Install reportbug scripts
Modified: tetex-base/trunk/debian/rules.d/install.mk
===================================================================
--- tetex-base/trunk/debian/rules.d/install.mk 2005-08-16 09:59:52 UTC (rev 124)
+++ tetex-base/trunk/debian/rules.d/install.mk 2005-08-16 10:13:25 UTC (rev 125)
@@ -101,7 +101,7 @@
$(remove-emptybasedirs)
# install font config file
cp debian/20tetex-extra.updmap.cfg debian/$(extra)/etc/texmf/updmap.d/20tetex-extra.cfg
- cp debian/tetex-extra.fontmap.list debian/$(package)$(FONTMAP_MEMORY_DIR)/tetex-extra.list
+ cp debian/tetex-extra.fontmap.list debian/$(extra)$(FONTMAP_MEMORY_DIR)/tetex-extra.list
# cweb stuff
Modified: tetex-base/trunk/debian/rules.in
===================================================================
--- tetex-base/trunk/debian/rules.in 2005-08-16 09:59:52 UTC (rev 124)
+++ tetex-base/trunk/debian/rules.in 2005-08-16 10:13:25 UTC (rev 125)
@@ -6,7 +6,7 @@
#!/usr/bin/make -f
#
# do not edit this file, instead edit rules.in!
-# $Id: rules.in,v 1.1.2.5 2005/07/01 14:24:23 frank Exp $
+# $Id$
# The debian/rules(.in) file was nearly completely rewritten by
# Frank Küster frank at debian.org in 2004, with patches by
@@ -184,7 +184,7 @@
ln -s ../texmf debian/$(docpack)/usr/share/doc/$(docpack)/
dh_installchangelogs ChangeLog -p tetex-base
- dh_compress
+ dh_compress -Xhelpfile
dh_installinfo
# Install reportbug scripts
Modified: tetex-base/trunk/debian/setup-conflinks.in
===================================================================
--- tetex-base/trunk/debian/setup-conflinks.in 2005-08-16 09:59:52 UTC (rev 124)
+++ tetex-base/trunk/debian/setup-conflinks.in 2005-08-16 10:13:25 UTC (rev 125)
@@ -2,7 +2,7 @@
#!/bin/bash -e
#
# setup-conflinks, internal packaging script for tetex-base and -extra.
-# $Id: setup-conflinks.in,v 1.1.2.11 2005/07/20 12:31:43 frank Exp $
+# $Id$
<:=@COPYRIGHT:>//
###################################
Modified: tetex-base/trunk/debian/variables
===================================================================
--- tetex-base/trunk/debian/variables 2005-08-16 09:59:52 UTC (rev 124)
+++ tetex-base/trunk/debian/variables 2005-08-16 10:13:25 UTC (rev 125)
@@ -1,6 +1,6 @@
<:# Copyright (C) 1999, 2000, 01, 02, 03, 04 by Davide Giovanni Maria Salvetti.:>//
<:# Copyright (C) 2004 by Frank Küster <frank at kuesterei.ch>.:>//
-<:# $Id: variables,v 1.1.2.7 2005/07/20 12:31:43 frank Exp $:>//
+<:# $Id$:>//
<:use File::Basename:>//
<:$PACKAGE="tetex-base":>//
<:open(CHANGELOG,"changelog");($_=<CHANGELOG>)=~/tetex-bin \((.*)\)/;$VERSION="$1":>//
@@ -12,7 +12,6 @@
nohyphb.tex nohyphbc.tex plhyph.tex pt8hyph.tex rohyphen.tex ruhyphen.tex \\
sehyph.tex skhyph.tex sihyph23.tex sphyph.tex trhyph.tex ukrhyph.tex \\
ukrhyph.t2a ukrhyph.lcy ukrhyph.ot2":>//
-<:$LSRS="/var/lib/texmf/ls-R /var/lib/texmf/ls-R-TEXMFMAIN /var/lib/texmf/ls-R.local /var/cache/fonts/ls-R":>//
<:# this list is from dpkg-1.10.9/include/dpkg.h.in: :>//
<:$DPKG_EXTENSIONS="'~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist":>//
<:$PREINST_MOVE_EXT=".preinst-bak":>//
More information about the Pkg-tetex-commits
mailing list