[subversion-commit] SVN tetex commit + diffs: r121 - in
tetex-base/trunk/debian: . patches rules.d
Frank Küster
frank at costa.debian.org
Sun Aug 7 16:49:44 UTC 2005
Author: frank
Date: 2005-08-07 16:49:43 +0000 (Sun, 07 Aug 2005)
New Revision: 121
Added:
tetex-base/trunk/debian/index-tetexdoc.1
Removed:
tetex-base/trunk/debian/README.debian
Modified:
tetex-base/trunk/debian/common.functions.in
tetex-base/trunk/debian/common.variables
tetex-base/trunk/debian/patches/patch-doc
tetex-base/trunk/debian/patches/patch-doc.files
tetex-base/trunk/debian/patches/patch-doc.old
tetex-base/trunk/debian/rules
tetex-base/trunk/debian/rules.d/install.mk
tetex-base/trunk/debian/tetex-doc.dirs
tetex-base/trunk/debian/tetex-doc.postinst
Log:
- deleted README.Debian, no longer needed
- install mkthml.nawd in /usr/bin (as index-tetexdoc), and create helpindex.html in tetex-doc's postinst
Deleted: tetex-base/trunk/debian/README.debian
===================================================================
--- tetex-base/trunk/debian/README.debian 2005-08-07 16:47:27 UTC (rev 120)
+++ tetex-base/trunk/debian/README.debian 2005-08-07 16:49:43 UTC (rev 121)
@@ -1,237 +0,0 @@
-README file of tetex-base for DEBIAN
-------------------------------------
-
-Table of Contents:
-
-1. Differences between Upstream: Added and removed files
-2. Changes in handling of map files (unneeded files in /etc/texmf/dvips)
-3. Construction of tetex-base_2.0.2a.orig.tar.gz from the upstream
- tarball
-
- * * * * *
-
-Most of the topics relevant for users and developers, like how to
-install and register additional (La)TeX packages, fonts etc., are
-covered in the README files of the sister package, tetex-bin, in
-/usr/share/doc/tetex-bin/.
-
-1. Differences between Upstream: Added and removed files
-========================================================
-
-Since the release of teTeX 2.0.2, some of the files in the upstream
-tarball where found to have no proper license statement, or a license
-that does not meet the criteria of the Debian Free Software Guidelines
-(DFSG). Therefore we cannot distribute those files. Usually the files
-were promptly removed from the binary packages (the *deb files). In
-July 2004 we decided to also remove them from the orig.tar.gz file,
-because we didn't want to release non-free files into sarge, even not
-in the source package.
-
-We are working with the upstream teTeX author (Thomas Esser) and with
-the authors of these packages to resolve these issues so that these
-files can be included in future Debian teTeX packages - the fact that
-some could be re-added now is an indication that this makes sense :-)
-
-Luckily, the criteria upstream (Thomas Esser) uses are consistent with
-the DFSG. Therefore we could backport the changes made to the
-(unreleased) upstream tarball in the meantime. Some files had to be
-removed completely. Others could be replaced by updated ones from CTAN
-that now have their license clarified or adjusted. In the case of
-updates, either only the license was changed, or there were only minor
-bugfixes. In some cases, we could add back files that were in the
-upstream tarball, but removed by Debian before the first release of
-2.0.2, and are free now. As a goody, we have added one hyphenation
-file, the patterns for catalan, although they never were in the 2.0.2
-upstream tarball.
-
-Below is a list of files that have been removed, updated and re-added
-in 2004. Detailed information on each removal can be found in the bug
-reports indicated. Further below you can find a list of files that
-had been removed before even in the first Debian package of tetex-2.0.2
-
-Removed files:
-
-- #175623: Pandora - a non-free font family?
-
- tetex-base-2.0.2/texmf/doc/latex/mfnfss/pandora.dvi
- tetex-base-2.0.2/texmf/tex/latex/mfnfss/pandora.sty
- tetex-base-2.0.2/texmf/fonts/source/public/pandora
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/caps.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/fligs.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/ligs.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/number.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/panaccent.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/pandor.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/pangreeku.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/panlowers.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/panpunct.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/pnb10.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/pnr10.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/pnsl10.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/pnss10.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/pnssb10.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/pnssi10.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/pntt9.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/punctr.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/puncts.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/punctt.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/rotext.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/ttchar.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/tttext.mf
- tetex-base-2.0.2/texmf/fonts/source/public/pandora/widths.mf
- tetex-base-2.0.2/texmf/fonts/tfm/public/pandora
- tetex-base-2.0.2/texmf/fonts/tfm/public/pandora/pnb10.tfm
- tetex-base-2.0.2/texmf/fonts/tfm/public/pandora/pnr10.tfm
- tetex-base-2.0.2/texmf/fonts/tfm/public/pandora/pnsl10.tfm
- tetex-base-2.0.2/texmf/fonts/tfm/public/pandora/pnss10.tfm
- tetex-base-2.0.2/texmf/fonts/tfm/public/pandora/pnssb10.tfm
- tetex-base-2.0.2/texmf/fonts/tfm/public/pandora/pnssi10.tfm
- tetex-base-2.0.2/texmf/fonts/tfm/public/pandora/pntt9.tfm
-
-- #182324: please remove psfig.sty
-
- tetex-base-2.0.2/texmf/tex/generic/misc/psfig.sty
-
-- #139900: Contains non-free hyphenation files
-
- tetex-base-2.0.2/texmf/tex/generic/hyphen/ukhyphen.tex
-
-- #186869: pdfcrypt support has been removed from in pdftex
- (no license problem!)
-
- /usr/share/texmf/tex/latex/oberdiek/pdfcrypt.sty
-
-- #274868: letterspacing.tex is non-free
- usr/share/texmf/tex/generic/misc/letterspacing.tex
-
-Updated/added files:
-
-- #139900: Add now-free hyphenation files
- and
- #219294, #247046: Please include (now free) cahyph.tex
- #223912: Please include Icelandic hyphenation tables
-
- tex/generic/ruhyphen/ruhyphas.tex
- tex/generic/ruhyphen/ruhyphzn.tex
- tex/generic/hyphen/sehyph.tex
- tex/generic/hyphen/cahyph.tex
- tex/generic/hyphen/gahyph.tex
- tex/generic/hyphen/icehyph.tex
-
-- #176153: g-brief depends on europs.sty which is not included
- (fixed by updating of the now-free g-brief package)
-
- doc/latex/g-brief/
- doc/latex/g-brief/g-brief.dvi
- doc/latex/g-brief/beispiel.tex
- doc/latex/g-brief/beispiel2.tex
- tex/latex/g-brief/
- tex/latex/g-brief/g-brief2.cls
- tex/latex/g-brief/g-brief2.sty
- tex/latex/g-brief/g-brief.cls
- tex/latex/g-brief/g-brief.sty
-
-- #251761: caption.sty still missing despite license change
-
- tex/latex/caption/caption.sty
- tex/latex/caption/caption2.sty
- doc/latex/caption/caption.pdf
- doc/latex/caption/caption2.pdf
- doc/latex/caption/anleitung.pdf
-
-- #177401: Missing fvrb-ex (fancy verbatim example environments) package
-
- doc/latex/fancyvrb/fvrb-ex.pdf
- doc/latex/fancyvrb/t-fvrbex.tex
- tex/latex/fancyvrb/fvrb-ex.sty
-
-- euler.sty which was previously added in diff.gz is in the
- orig.tar.gz now (version is up-to-date).
-
-- The listings package (previously added in diff.gz) has been
- updated, because the old version had a problematic license, and is now
- in the orig.tar.gz again.
-
-
-
-2. Changes in handling of map files (unneeded files in /etc/texmf/dvips)
------------------------------------------------------------------------
-
-Font map files previously were installed as conffiles (i.e.,
-configuration files managed by dpkg) in older versions of tetex-base
-and tetex-extra (e.g. in woody) in /etc/texmf/dvips. Since it is in
-fact not necessary to change them, they are now treated as ordinary
-files and installed below /usr/share/texmf/dvips. Because of Debian
-Policy (and the way dpkg handles conffiles), the copies in
-/etc/texmf/dvips will not be removed when you upgrade, although they
-are useless. You can quite safely delete them (but then you won't be
-able to downgrade any more unless you purge the packages). Any changes
-you made previously in these files will no longer have any effect.
-
-It is usually a good idea to remove those files if you have not
-changed them. You can use the script
-/usr/share/doc/tetex-base/remove-oldmaps to do this. The list of files
-is:
-
-antp.cfg antt.cfg pl.cfg
-config.qf
-ar-ext-adobe-bi.map ar-ext-adobe-kb.map ar-ext-urw-kb.map
-ar-ext-urw-urw.map ar-std-adobe-bi.map ar-std-adobe-kb.map
-ar-std-urw-kb.map ar-std-urw-urw.map bakoma-extra.map
-bsr.map bsr-interpolated.map
-lw35extra-adobe-bi.map lw35extra-adobe-kb.map lw35extra-urw-kb.map
-lw35extra-urw-urw.map mathpple-ext.map mtsupp-ext-adobe-bi.map
-mtsupp-ext-adobe-kb.map mtsupp-ext-urw-kb.map mtsupp-ext-urw-urw.map
-mtsupp-std-adobe-bi.map mtsupp-std-adobe-kb.map mtsupp-std-urw-kb.map
-mtsupp-std-urw-urw.map raw-ar-ext-adobe-bi.map raw-ar-ext-adobe-kb.map
-raw-ar-ext-urw-kb.map raw-ar-ext-urw-urw.map raw-ar-std-adobe-bi.map
-raw-ar-std-adobe-kb.map raw-ar-std-urw-kb.map raw-ar-std-urw-urw.map
-raw-lw35extra-adobe-bi.map raw-lw35extra-adobe-kb.map
-raw-lw35extra-urw-kb.map raw-lw35extra-urw-urw.map utopia.map
-
-Some intermediate versions of tetex deleted those files in maintainer
-scripts (which was a bug). Therefore, if you used testing, unstable or
-some backports after woody's release, they might not exist on your
-system.
-
-Do NOT delete other files in the directory, they are still required.
-
-
-
-3. Construction of tetex-base_2.0.2a.orig.tar.gz from the upstream
- tarball
-
-The tarball as upstream provides it is not suitable for inclusion in a
-debian package, because it does not unpack in it's own directory, but
-rather in the current directory (assuming that the current directory
-is a TEXMF directory). We therefore had to reconstruct the orig.tar.gz
-
-This is what needs to be done to construct the orig.tar.gz from the
-upstream tarball:
-
-a) create a directory tetex-base-2.0.2a/texmf/
-
-b) unpack the upstream tetex-texmf tarball into this directory
-
-c) Use the script "remove-bad-license-files -src" to remove bad
- license files from orig.tar.gz. This should also be done again if we
- upgrade the upstream version. The script reports filenames of already
- removed files in upstream source.
-
-d) Since we keep the sources in a CVS repository, which cannot handle
- symlinks, those have been removed from the orig.tar.gz. To do this,
- run "restore-symlinks -rm" in the original source tree. The same
- script is called in the build process to restore the symlinks.
-
-We maintain our teTeX packages with CVS and anyone can check out the
-latest CVS tree with the following command cvs
-
--d:pserver:anonymous at cvs.debian.org:/cvs/tetex co tetex-base
-
-and a blank password.
-
-
- -- Frank Küster <frank at debian.org>, Sat Jul 10 13:57:25 2004
-
-(using older text from Atsuhito KOHDA <kohda at debian.org> and Adrian
-Bunk).
Modified: tetex-base/trunk/debian/common.functions.in
===================================================================
--- tetex-base/trunk/debian/common.functions.in 2005-08-07 16:47:27 UTC (rev 120)
+++ tetex-base/trunk/debian/common.functions.in 2005-08-07 16:49:43 UTC (rev 121)
@@ -3,7 +3,7 @@
## Function definitions - included from file common.functions
#################################################################
# Copyright (C) 2004 by Frank Küster <frank at debian.org>.
-# $Id: common.functions.in,v 1.1.1.1 2005/06/13 17:21:58 frank Exp $
+# $Id$
# internal variables for common.functions
MKTMPDIR=/tmp
Modified: tetex-base/trunk/debian/common.variables
===================================================================
--- tetex-base/trunk/debian/common.variables 2005-08-07 16:47:27 UTC (rev 120)
+++ tetex-base/trunk/debian/common.variables 2005-08-07 16:49:43 UTC (rev 121)
@@ -1,20 +1,11 @@
<:# Copyright (C) 1999, 2000, 01, 02 by Davide Giovanni Maria Salvetti <salve at debian.org>.:>//
<:# Copyright (C) 2004, 05 by Frank Küster <frank at debian.org>.:>//
-<:# $Id: common.variables,v 1.4 2005/07/18 15:44:36 frank Exp $:>//
-<:# 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":>//
-<:$POSTINST_MOVE_EXT="postinst-bak":>//
-<:$PURGE_EXTENSIONS="$DPKG_EXTENSIONS $PREINST_MOVE_EXT $POSTINST_MOVE_EXT":>//
+<:# $Id$:>//
<:# package specific:>//
<:$ETC="/etc/":>//
<:$etc="/etc/texmf/":>//
<:$doc="/usr/share/doc/$PACKAGE/":>//
-<:$TEXMFSYSVAR="/var/lib/texmf":>//
<:$MKTMPDIR="/tmp":>//
-<:$FONTMAP_MEMORY_DIR="/var/lib/tex-common/fontmap-cfg":>//
-<:$LANGUAGE_MEMORY_DIR="/var/lib/tex-common/language-cnf":>//
-<:$LANGUAGE_DIR="$etc/language.d":>//
<:$LDAT_PATTERNS="inhyph.tex bahyph.tex cahyph.tex hrhyph.tex czhyph.tex \\
dehypht.tex dehyphn.tex dkhyphen.tex nehyph.tex fi8hyph.tex frhyph.tex \\
gahyph.tex grhyph.tex icehyph.tex ithyph.tex lahyph.tex huhyph.tex nohyph.tex \\
@@ -22,9 +13,6 @@
sehyph.tex skhyph.tex sihyph23.tex sphyph.tex trhyph.tex ukrhyph.tex \\
ukrhyph.t2a ukrhyph.lcy ukrhyph.ot2":>//
<:$TEXMF_CNF="/etc/texmf/texmf.cnf":>//
-<:$TEXMF_PARTS="05TeXMF 15Plain 45TeXinputs 55Fonts 65BibTeX 75DviPS 85Misc 90TeXDoc 95NonPath":>//
-<:for (@TEXMF_PARTS_FULLNAME=split(/ /,$TEXMF_PARTS)){s{(.*)}{texmf.d/$1.cnf}}:>//
-<:$TEX_COMMON_UCF_FILES="@TEXMF_PARTS_FULLNAME updmap.d/00updmap.cfg":>//
<:$confstatedir="/var/lib/tetex":>//
<:$no_config_prefix="admin-wants-no":>//
<:# get the package version:>//
@@ -39,7 +27,6 @@
$sarge_rev=$rev-1;
($SARGEVERSION=$VERSION)=~s/(.*-)$rev(.*)/$1$sarge_rev.sarge$2/;
}:>//
-<:$FIRST_BASE_VERSION_WITH_COMMON="3.0-4":>//
<:$README_sarge=''; $README_sarge='sarge/README.sarge' if -e 'sarge-stamp':>//
<:# upgrading stuff:>//
<:$SYMLINK_MOVE_EXT="moved-by-preinst":>//
Added: tetex-base/trunk/debian/index-tetexdoc.1
===================================================================
--- tetex-base/trunk/debian/index-tetexdoc.1 2005-08-07 16:47:27 UTC (rev 120)
+++ tetex-base/trunk/debian/index-tetexdoc.1 2005-08-07 16:49:43 UTC (rev 121)
@@ -0,0 +1,32 @@
+.TH INDEX-TETEXDOC 8
+.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.SH NAME
+index-tetexdoc \- shell script to generate an index of all TeX documentation files
+.SH SYNOPSIS
+.B index-tetexdoc
+.I "[options]"
+.br
+.SH DESCRIPTION
+This manual page documents briefly the
+.BR index-tetexdoc
+command.
+.PP
+.B index-tetexdoc
+is a shell script to generate a html file that contains links to all
+TeX documentation files in TEXMF/doc. The default output file is
+/var/lib/texmf/helpindex.html
+.PP
+.PP
+.SH OPTIONS
+.B \-o, \-\-output\-file
+.I "[filename]"
+.br
+.PP
+Output to
+.I filename
+instead.
+.PP
+.SH AUTHOR
+This manual page was written by Frank Küster <frank at debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
Modified: tetex-base/trunk/debian/patches/patch-doc
===================================================================
--- tetex-base/trunk/debian/patches/patch-doc 2005-08-07 16:47:27 UTC (rev 120)
+++ tetex-base/trunk/debian/patches/patch-doc 2005-08-07 16:49:43 UTC (rev 121)
@@ -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-05 18:53:31.000000000 +0200
++++ doc/index.html 2005-08-05 18:53:31.000000000 +0200
@@ -95,15 +95,17 @@
</form>
</td></tr></table><br/><br/>
@@ -1114,3 +1114,26 @@
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 @@
+
+ : ${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>'
+
Modified: tetex-base/trunk/debian/patches/patch-doc.files
===================================================================
--- tetex-base/trunk/debian/patches/patch-doc.files 2005-08-07 16:47:27 UTC (rev 120)
+++ tetex-base/trunk/debian/patches/patch-doc.files 2005-08-07 16:49:43 UTC (rev 121)
@@ -1,3 +1,3 @@
doc/index.html
+doc/mkhtml.nawk
-
Modified: tetex-base/trunk/debian/patches/patch-doc.old
===================================================================
--- tetex-base/trunk/debian/patches/patch-doc.old 2005-08-07 16:47:27 UTC (rev 120)
+++ tetex-base/trunk/debian/patches/patch-doc.old 2005-08-07 16:49:43 UTC (rev 121)
@@ -1,5 +1,5 @@
---- doc/index.html.orig 2005-06-23 16:55:13.133709074 +0200
-+++ doc/index.html 2005-06-23 16:55:52.242402681 +0200
+--- doc/index.html.orig 2005-07-29 18:16:57.892008701 +0200
++++ doc/index.html 2005-07-29 18:16:57.954001903 +0200
@@ -95,15 +95,17 @@
</form>
</td></tr></table><br/><br/>
Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules 2005-08-07 16:47:27 UTC (rev 120)
+++ tetex-base/trunk/debian/rules 2005-08-07 16:49:43 UTC (rev 121)
@@ -21,8 +21,7 @@
debian/setup-ucf debian/setup-conflinks \
debian/common.functions
eperl_sourcefiles=debian/variables debian/COPYRIGHT.scripts \
- debian/common.variables debian/common.functions \
- debian/postinst.functions debian/postrm.functions
+ debian/common.variables debian/common.functions
tex_common_dir = ../../tex-common/tex-common
real_common_variables=$(tex_common_dir)/teTeX-build/common.variables
real_common_functions_in=$(tex_common_dir)/teTeX-build/common.functions.in
@@ -48,7 +47,7 @@
include /usr/share/dsfp/dsf-patch.mk
### variables from eperl that need to be passed to the static helper makefiles
-FONTMAP_MEMORY_DIR=/var/lib/tex-common/fontmap-cfg
+FONTMAP_MEMORY_DIR=
###############
# Main targets
Modified: tetex-base/trunk/debian/rules.d/install.mk
===================================================================
--- tetex-base/trunk/debian/rules.d/install.mk 2005-08-07 16:47:27 UTC (rev 120)
+++ tetex-base/trunk/debian/rules.d/install.mk 2005-08-07 16:49:43 UTC (rev 121)
@@ -134,6 +134,9 @@
# provide a file that allows to access documentation via http://localhost/doc/texmf/texdoc.php
cp debian/tetex-doc.apache2.sites-available debian/$(docpack)/etc/apache2/sites-available/tetex-doc
ln -s ../sites-available/tetex-doc debian/$(docpack)/etc/apache2/sites-enabled/050-tetex-doc
+ mv debian/$(docpack)/usr/share/doc/texmf/mkhtml.nawk debian/$(docpack)/usr/bin/index-tetexdoc
+ chmod a+x debian/$(docpack)/usr/bin/index-tetexdoc
+ cp debian/index-tetexdoc.1 debian/$(docpack)/usr/share/man/man1/
touch $@
Modified: tetex-base/trunk/debian/tetex-doc.dirs
===================================================================
--- tetex-base/trunk/debian/tetex-doc.dirs 2005-08-07 16:47:27 UTC (rev 120)
+++ tetex-base/trunk/debian/tetex-doc.dirs 2005-08-07 16:49:43 UTC (rev 121)
@@ -1,4 +1,6 @@
usr/share/doc
var/lib/texmf
+usr/bin
+usr/share/man/man1
etc/apache2/sites-available
etc/apache2/sites-enabled
Modified: tetex-base/trunk/debian/tetex-doc.postinst
===================================================================
--- tetex-base/trunk/debian/tetex-doc.postinst 2005-08-07 16:47:27 UTC (rev 120)
+++ tetex-base/trunk/debian/tetex-doc.postinst 2005-08-07 16:49:43 UTC (rev 121)
@@ -1,9 +1,13 @@
#!/bin/sh
set -e
-if [ x"$1" = "xconfigure" -a -x /usr/bin/mktexlsr ]
-then
- /usr/bin/mktexlsr
-fi
+case "$1" in
+ configure|reconfigure)
+ test -x "`which mktexlsr`" && mktexlsr || true
+ index-tetexdoc
+ ;;
+ *)
+ ;;
+esac
#DEBHELPER#
More information about the Pkg-tetex-commits
mailing list