[subversion-commit] SVN tetex commit + diffs: r263 - in
tetex-base/branches/changelog-for-unstable/debian: . patches
Frank Küster
frank at costa.debian.org
Tue Oct 18 14:45:33 UTC 2005
Author: frank
Date: 2005-10-18 14:45:32 +0000 (Tue, 18 Oct 2005)
New Revision: 263
Modified:
tetex-base/branches/changelog-for-unstable/debian/TODO
tetex-base/branches/changelog-for-unstable/debian/common.functions.in
tetex-base/branches/changelog-for-unstable/debian/common.variables
tetex-base/branches/changelog-for-unstable/debian/control
tetex-base/branches/changelog-for-unstable/debian/patches/patch-deb
tetex-base/branches/changelog-for-unstable/debian/patches/patch-licenseinfo
tetex-base/branches/changelog-for-unstable/debian/patches/patch-texdocphp
tetex-base/branches/changelog-for-unstable/debian/postinst.functions
tetex-base/branches/changelog-for-unstable/debian/postinst.in
tetex-base/branches/changelog-for-unstable/debian/rules.in
tetex-base/branches/changelog-for-unstable/debian/setup-conflinks.in
tetex-base/branches/changelog-for-unstable/debian/tetex-extra.postrm.in
tetex-base/branches/changelog-for-unstable/debian/tetex-extra.preinst.in
tetex-base/branches/changelog-for-unstable/debian/variables
Log:
merging changes from HEAD to changelog-for-unstable branch
Modified: tetex-base/branches/changelog-for-unstable/debian/TODO
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/TODO 2005-10-18 11:36:53 UTC (rev 262)
+++ tetex-base/branches/changelog-for-unstable/debian/TODO 2005-10-18 14:45:32 UTC (rev 263)
@@ -18,7 +18,9 @@
- needs a transition from 00updmap.cfg to 00tetex-base.cfg and language.dat
-- after upgrade, with tetex-extra, lambda.ini is left over
+- after upgrade, with tetex-extra, lambda.ini is left over (only when
+ purging package by package?) Also, 00tetex.cnf in fmt.d seems to
+ be left
- are there already TDS upgrade instructions in NEWS.Debian?
Modified: tetex-base/branches/changelog-for-unstable/debian/common.functions.in
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/common.functions.in 2005-10-18 11:36:53 UTC (rev 262)
+++ tetex-base/branches/changelog-for-unstable/debian/common.functions.in 2005-10-18 14:45:32 UTC (rev 263)
@@ -193,11 +193,18 @@
fi
}
+select_lsrfile() {
+ case $1 in
+ main) LSR=$TEXMFSYSVAR/ls-R-TEXMFMAIN ;;
+ var) LSR=$TEXMFSYSVAR/ls-R ;;
+ cache) LSR=/var/cache/fonts/ls-R ;;
+ *) echo "select_lsr: don't know how to set this: $1" >&2 ;;
+ esac
+ echo $LSR
+}
+
#################################################################
## End of function definitions from file common.functions
#################################################################
-# local variables:
-# mode: shell-script
-# skeleton-pair: t
-# end:
+
Modified: tetex-base/branches/changelog-for-unstable/debian/common.variables
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/common.variables 2005-10-18 11:36:53 UTC (rev 262)
+++ tetex-base/branches/changelog-for-unstable/debian/common.variables 2005-10-18 14:45:32 UTC (rev 263)
@@ -3,8 +3,8 @@
<:# $Id$:>//
<:# 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":>//
+<:$PREINST_MOVE_EXT=".preinst-bak":>//
+<:$POSTINST_MOVE_EXT=".postinst-bak":>//
<:$PURGE_EXTENSIONS="$DPKG_EXTENSIONS $PREINST_MOVE_EXT $POSTINST_MOVE_EXT":>//
<:# package specific:>//
<:$ETC="/etc/":>//
Modified: tetex-base/branches/changelog-for-unstable/debian/control
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/control 2005-10-18 11:36:53 UTC (rev 262)
+++ tetex-base/branches/changelog-for-unstable/debian/control 2005-10-18 14:45:32 UTC (rev 263)
@@ -1,14 +1,14 @@
Source: tetex-base
Section: tex
Priority: optional
-Build-Depends-Indep: debhelper (>= 4.1.16), eperl, sharutils, tex-common
+Build-Depends-Indep: debhelper (>= 4.1.16), eperl, sharutils, quilt
Maintainer: teTeX maintainers <debian-tetex-maint at lists.debian.org>
Uploaders: Julian Gilbey <jdg at debian.org>, C.M. Connelly <cmc at debian.org>, Atsuhito KOHDA <kohda at debian.org>, Frank Küster <frank at debian.org>
Standards-Version: 3.5.6
Package: tetex-base
Architecture: all
-Depends: texinfo (>= 4.0b-1), debconf, ucf (>= 1.02), tex-common (>= 0.4)
+Depends: ${misc:Depends}, 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)
@@ -26,7 +26,7 @@
Pre-Depends: dpkg (>=1.6.8)
Conflicts: kpathsea, texlib, textfm, bibtex, texpsfnt, mfbasfnt, mfnfss, xdvik, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, hyperref, tetex-french, cspsfonts, tetex-nonfree, pb-diagram, revtex4 (<= 4.0-2), tetex-eurosym, tetex-base (<< 2.0.2a)
Replaces: kpathsea, texlib, textfm, latex, bibtex, texidoc, texpsfnt, mfbasfnt, mfnfss, xdvik, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, hyperref, cspsfonts, tetex-bin (<< 1.0.7+20021025-3), tetex-french, tetex-nonfree, pb-diagram, tetex-eurosym, tetex-base (<= 1.0.2+20011202-4)
-Depends: tetex-base, tetex-bin (>= 2.99), gsfonts, ucf (>= 1.02)
+Depends: tetex-base, tetex-bin (>= 2.99), ucf (>= 1.02)
Provides: tetex-nonfree, pb-diagram, tetex-eurosym
Description: Additional library files of teTeX
This package contains some additional parts of teTeX that some users
Modified: tetex-base/branches/changelog-for-unstable/debian/patches/patch-deb
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/patches/patch-deb 2005-10-18 11:36:53 UTC (rev 262)
+++ tetex-base/branches/changelog-for-unstable/debian/patches/patch-deb 2005-10-18 14:45:32 UTC (rev 263)
@@ -1,5 +1,17 @@
---- dvips/config/config.ps.orig 2005-07-22 16:24:24.591031133 +0200
-+++ dvips/config/config.ps 2005-07-22 16:24:24.723017144 +0200
+ dvips/config/config.ps | 16 +++++++++----
+ fonts/map/dvips/context/original-context-symbol.map | 2 -
+ fonts/map/dvips/omega/omega.map | 3 ++
+ scripts/context/perl/texfind.pl | 23 ++++++++++++++++++-
+ scripts/context/perl/texshow.pl | 23 ++++++++++++++++++-
+ tex/generic/config/language.dat | 24 +++++++++++++++++---
+ texdoctk/texdocrc.defaults | 18 +++++++--------
+ web2c/mktex.cnf | 4 +--
+ 8 files changed, 91 insertions(+), 22 deletions(-)
+
+Index: tetex-base-3.0/dvips/config/config.ps
+===================================================================
+--- tetex-base-3.0.orig/dvips/config/config.ps 2005-10-06 14:55:14.041733069 +0200
++++ tetex-base-3.0/dvips/config/config.ps 2005-10-06 15:02:50.068720439 +0200
@@ -7,13 +7,19 @@
% to determine this number. (It will be the only thing printed.)
m 3500000
@@ -25,8 +37,10 @@
% Default resolution of this device, in dots per inch.
D 600
---- texdoctk/texdocrc.defaults.orig 2005-07-22 16:24:24.594030815 +0200
-+++ texdoctk/texdocrc.defaults 2005-07-22 16:24:24.723017144 +0200
+Index: tetex-base-3.0/texdoctk/texdocrc.defaults
+===================================================================
+--- tetex-base-3.0.orig/texdoctk/texdocrc.defaults 2005-10-06 14:55:14.041733069 +0200
++++ tetex-base-3.0/texdoctk/texdocrc.defaults 2005-10-06 15:02:50.069720332 +0200
@@ -8,7 +8,7 @@
# want/need to leave empty.
@@ -73,8 +87,10 @@
+PRINT_CMD=lpr -h
# end of config
---- web2c/mktex.cnf.orig 2005-07-22 16:24:24.612028908 +0200
-+++ web2c/mktex.cnf 2005-07-22 16:24:24.724017038 +0200
+Index: tetex-base-3.0/web2c/mktex.cnf
+===================================================================
+--- tetex-base-3.0.orig/web2c/mktex.cnf 2005-10-06 14:55:14.041733069 +0200
++++ tetex-base-3.0/web2c/mktex.cnf 2005-10-06 15:02:50.069720332 +0200
@@ -1,5 +1,5 @@
: ${MT_FEATURES=appendonlydir:varfonts}
-: ${MODE=ljfour}
@@ -83,8 +99,10 @@
+#: ${BDPI=600}
# uncomment the following line to use ps2pk instead of gsftopk:
# : ${ps_to_pk=ps2pk}
---- tex/generic/config/language.dat.orig 2005-07-22 16:24:24.623027742 +0200
-+++ tex/generic/config/language.dat 2005-07-22 16:24:24.725016932 +0200
+Index: tetex-base-3.0/tex/generic/config/language.dat
+===================================================================
+--- tetex-base-3.0.orig/tex/generic/config/language.dat 2005-10-06 14:55:14.042732962 +0200
++++ tetex-base-3.0/tex/generic/config/language.dat 2005-10-06 15:02:50.070720225 +0200
@@ -5,6 +5,16 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -136,8 +154,10 @@
+%% checked by postinst 2.0.2a-1 %%
+%% do not remove this comment! %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
---- scripts/context/perl/texfind.pl.orig 2005-07-22 16:24:24.651024774 +0200
-+++ scripts/context/perl/texfind.pl 2005-07-22 16:24:24.745014812 +0200
+Index: tetex-base-3.0/scripts/context/perl/texfind.pl
+===================================================================
+--- tetex-base-3.0.orig/scripts/context/perl/texfind.pl 2005-10-06 14:55:14.042732962 +0200
++++ tetex-base-3.0/scripts/context/perl/texfind.pl 2005-10-06 15:02:50.071720117 +0200
@@ -20,7 +20,28 @@
use Getopt::Long ;
use File::Find ;
@@ -168,8 +188,10 @@
use Tk::widgets ;
use Tk::ROText ;
---- scripts/context/perl/texshow.pl.orig 2005-07-22 16:24:24.674022337 +0200
-+++ scripts/context/perl/texshow.pl 2005-07-22 16:24:24.747014600 +0200
+Index: tetex-base-3.0/scripts/context/perl/texshow.pl
+===================================================================
+--- tetex-base-3.0.orig/scripts/context/perl/texshow.pl 2005-10-06 14:55:14.042732962 +0200
++++ tetex-base-3.0/scripts/context/perl/texshow.pl 2005-10-06 15:02:50.072720010 +0200
@@ -28,7 +28,28 @@
use Getopt::Long ;
use XML::Parser;
@@ -200,8 +222,10 @@
use Tk::ROText ;
use Config;
use Time::HiRes;
---- fonts/map/dvips/omega/omega.map.orig 2005-07-22 16:24:24.683021383 +0200
-+++ fonts/map/dvips/omega/omega.map 2005-07-22 16:24:24.747014600 +0200
+Index: tetex-base-3.0/fonts/map/dvips/omega/omega.map
+===================================================================
+--- tetex-base-3.0.orig/fonts/map/dvips/omega/omega.map 2005-10-06 14:55:14.043732855 +0200
++++ tetex-base-3.0/fonts/map/dvips/omega/omega.map 2005-10-06 15:02:50.072720010 +0200
@@ -1,3 +1,6 @@
+% map comment changed, so that Debian's dpkg will try to
+% reinstall it after deletion in versions prior to 2.0.2-9
@@ -209,8 +233,10 @@
omseco OmegaSerifCommon <omseco.pfb
omsecob OmegaSerifCommon-Bold <omsecob.pfb
omsecoi OmegaSerifCommon-Italic <omsecoi.pfb
---- fonts/map/dvips/context/original-context-symbol.map.orig 2005-07-22 16:24:24.686021065 +0200
-+++ fonts/map/dvips/context/original-context-symbol.map 2005-07-22 16:24:24.748014494 +0200
+Index: tetex-base-3.0/fonts/map/dvips/context/original-context-symbol.map
+===================================================================
+--- tetex-base-3.0.orig/fonts/map/dvips/context/original-context-symbol.map 2005-10-06 14:55:14.043732855 +0200
++++ tetex-base-3.0/fonts/map/dvips/context/original-context-symbol.map 2005-10-06 15:02:50.073719903 +0200
@@ -1 +1 @@
-contnav ContextNavigation <contnav.pfb
\ No newline at end of file
Modified: tetex-base/branches/changelog-for-unstable/debian/patches/patch-licenseinfo
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/patches/patch-licenseinfo 2005-10-18 11:36:53 UTC (rev 262)
+++ tetex-base/branches/changelog-for-unstable/debian/patches/patch-licenseinfo 2005-10-18 14:45:32 UTC (rev 263)
@@ -1,5 +1,10 @@
---- doc/generic/pstricks/README.pst-osci.orig 2005-08-16 13:49:50.573229178 +0200
-+++ doc/generic/pstricks/README.pst-osci 2005-08-16 13:49:50.729211868 +0200
+ doc/generic/pstricks/README.pst-osci | 3 +++
+ 1 files changed, 3 insertions(+)
+
+Index: tetex-base-3.0/doc/generic/pstricks/README.pst-osci
+===================================================================
+--- tetex-base-3.0.orig/doc/generic/pstricks/README.pst-osci 2005-10-06 14:55:14.151721292 +0200
++++ tetex-base-3.0/doc/generic/pstricks/README.pst-osci 2005-10-06 15:02:31.989543970 +0200
@@ -14,5 +14,8 @@
* Web page is http://www.tug.org/applications/PSTricks/Physics/Oscilloscopes
Modified: tetex-base/branches/changelog-for-unstable/debian/patches/patch-texdocphp
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/patches/patch-texdocphp 2005-10-18 11:36:53 UTC (rev 262)
+++ tetex-base/branches/changelog-for-unstable/debian/patches/patch-texdocphp 2005-10-18 14:45:32 UTC (rev 263)
@@ -1,5 +1,11 @@
---- doc/tdphp/config.php.orig 2005-06-22 18:10:14.569825693 +0200
-+++ doc/tdphp/config.php 2005-06-22 18:10:14.590823371 +0200
+ doc/tdphp/config.php | 10 ++++------
+ doc/tdphp/texdocfooter.php | 2 +-
+ 2 files changed, 5 insertions(+), 7 deletions(-)
+
+Index: tetex-base-3.0/doc/tdphp/config.php
+===================================================================
+--- tetex-base-3.0.orig/doc/tdphp/config.php 2005-10-06 14:55:14.117724932 +0200
++++ tetex-base-3.0/doc/tdphp/config.php 2005-10-06 15:02:42.213446514 +0200
@@ -18,12 +18,10 @@
### End paths with slashes /
### Always start with dist tree so that its section order is preserved
@@ -17,8 +23,10 @@
### Support for variable names in the *.dat files.
### One might argue that several names may be admissible
### in each of one or more trees; then values should be arrays
---- doc/tdphp/texdocfooter.php.orig 2005-06-22 18:10:14.572825361 +0200
-+++ doc/tdphp/texdocfooter.php 2005-06-22 18:10:14.590823371 +0200
+Index: tetex-base-3.0/doc/tdphp/texdocfooter.php
+===================================================================
+--- tetex-base-3.0.orig/doc/tdphp/texdocfooter.php 2005-10-06 14:55:14.117724932 +0200
++++ tetex-base-3.0/doc/tdphp/texdocfooter.php 2005-10-06 15:02:42.214446407 +0200
@@ -7,7 +7,7 @@
<p valign="top" style="font-size:smaller"><img src="teTeXsmall.png" />A PHP version of texdoctk. Underlying texmf trees from teTeX <em>
<?php
Modified: tetex-base/branches/changelog-for-unstable/debian/postinst.functions
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/postinst.functions 2005-10-18 11:36:53 UTC (rev 262)
+++ tetex-base/branches/changelog-for-unstable/debian/postinst.functions 2005-10-18 14:45:32 UTC (rev 263)
@@ -33,7 +33,14 @@
newfile=/etc/texmf/generic/pdftexconfig.tex
template=/usr/share/tetex-base/pdftexconfig.tex
+ # only act if the old file is there, and the new one not yet:
test -f $oldfile && test ! -f $newfile || return 0
+ # also stop if the old file is unchanged
+ dpkg_md5sum=`grep $oldfile /var/lib/dpkg/status | cut -f 3 -d ' '`
+ actual_md5sum=`md5sum $oldfile | cut -f 1 -d ' '`
+ test "$dpkg_md5sum" != "$actual_md5sum" || return 0
+
+ # start the work
echo -n "Using obsolete pdftex.cfg to generate pdftexconfig.tex ... "
cp $template $newfile
@@ -81,16 +88,17 @@
set "$@"
while [ $# -gt 0 ]; do
+ oldmd5sum=$1
file=$2
shift 2
test -f $file || continue
newmd5sum=`md5sum $file | cut -d ' ' -f 1`
if [ "$newmd5sum" = "$oldmd5sum" ]; then
- echo "Removing unused, unchanged conffile $file"
+ echo "Removing obsolete, unchanged conffile $file"
rm $file
else
- echo "Moving unused, locally changed conffile $file to $OLDSTUFFDIR"
+ echo "Moving obsolete, locally changed conffile $file to $OLDSTUFFDIR"
test -d $OLDSTUFFDIR || mkdir $OLDSTUFFDIR
mv $file $OLDSTUFFDIR/
fi
@@ -103,9 +111,10 @@
# add a comment file
if [ -d $OLDSTUFFDIR ]; then
cat > $OLDSTUFFDIR/README <<EOF
-Files in this directory used to be conffiles, but are no longer treated as
-such, because they should not be changed. Instead, use copies with a different
-name.
+Files in this directory used to be conffiles, but are obsolete and unused now.
+Some *.ini files gathered here are still used, but they are no longer treated
+as conffiles, because they should not be changed. Instead, use copies with a
+different name.
If you do no longer need your local changes, this directory and its contents
should be deleted.
Modified: tetex-base/branches/changelog-for-unstable/debian/postinst.in
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/postinst.in 2005-10-18 11:36:53 UTC (rev 262)
+++ tetex-base/branches/changelog-for-unstable/debian/postinst.in 2005-10-18 14:45:32 UTC (rev 263)
@@ -37,7 +37,7 @@
984f5ed1242258775b9c6e5e8b219a26 /etc/texmf/context/cont-cz.ini
"
REMOVE_DIRS=etex
-OLDSTUFFDIR=/etc/texmf/oldstuff_unused
+OLDSTUFFDIR=<:=$OLDSTUFFDIR:>
umask 022
@@ -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/branches/changelog-for-unstable/debian/rules.in
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/rules.in 2005-10-18 11:36:53 UTC (rev 262)
+++ tetex-base/branches/changelog-for-unstable/debian/rules.in 2005-10-18 14:45:32 UTC (rev 263)
@@ -10,7 +10,7 @@
# The debian/rules(.in) file was nearly completely rewritten by
# Frank Küster frank at debian.org in 2004, with patches by
-# Florian Rougon <florent.rougon at free.fr>, 2005,
+# Florent Rougon <f.rougon at free.fr>, 2005,
#
# who share the copyright.
@@ -22,7 +22,8 @@
EPERL_FILES := debian/preinst debian/postinst debian/postrm \
debian/tetex-base.dirs \
- debian/tetex-extra.postinst debian/tetex-extra.postrm debian/tetex-extra.dirs \
+ debian/tetex-extra.postinst debian/tetex-extra.preinst \
+ debian/tetex-extra.postrm debian/tetex-extra.dirs \
debian/setup-ucf debian/setup-conflinks \
debian/common.functions
eperl_sourcefiles=debian/variables debian/COPYRIGHT.scripts \
@@ -48,9 +49,12 @@
include debian/rules.d/filelists.mk
include debian/rules.d/install.mk
-export DSF-PATCHLIST=debian/patches/patchlist.mk
-include /usr/share/dsfp/dsf-patch.mk
+# export DSF-PATCHLIST=debian/patches/patchlist.mk
+# include /usr/share/dsfp/dsf-patch.mk
+# needed for quilt:
+export QUILT_PATCHES=./debian/patches
+
### variables from eperl that need to be passed to the static helper makefiles
FONTMAP_MEMORY_DIR=<:=$FONTMAP_MEMORY_DIR:>
@@ -123,7 +127,7 @@
touch $@
$(stampdir)/build-stamp: $(stampdir) patch-stamp
- $(check-cvs)
+ $(check-svn)
dh_testdir
# Make sure that our build scripts are executable.
# (only needed after upstream changes)
@@ -131,7 +135,16 @@
touch $(stampdir)/build-stamp
+# quilt patch targets
+clean-patches:
+ -quilt pop -a
+ rm -f patch-stamp
+patch-stamp:
+ quilt push -a
+ touch $@
+
+
### Clean up the source tree.
clean: clean-patches
dh_testdir
@@ -161,7 +174,7 @@
touch $(stampdir)/install-stamp
binary-indep: build install
- $(check-cvs)
+ $(check-svn)
dh_testdir
dh_testroot
# no debconf questions currently
@@ -229,9 +242,9 @@
.PHONY: build clean binary-indep binary-arch binary install sarge sid
.PHONY: commonstuff_update
-define check-cvs
- test -d debian/CVS && \
- (echo "please clean CVS directories"; exit 1) || true
+define check-svn
+ test -d debian/.svn && \
+ (echo "please clean subversion directories"; exit 1) || true
endef
# Local Variables:
Modified: tetex-base/branches/changelog-for-unstable/debian/setup-conflinks.in
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/setup-conflinks.in 2005-10-18 11:36:53 UTC (rev 262)
+++ tetex-base/branches/changelog-for-unstable/debian/setup-conflinks.in 2005-10-18 14:45:32 UTC (rev 263)
@@ -143,13 +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. The symlink
+# to one is in tex-common
+ rm -f debian/$package/usr/share/texmf/ls-R
+# ln -s /var/lib/texmf/ls-R-TEXMFMAIN debian/$package/usr/share/texmf/ls-R
-# 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
-
# texdoctk stuff
mv debian/tetex-base/usr/share/texmf/texdoctk debian/tetex-base/etc
ln -s /etc/texdoctk debian/tetex-base/usr/share/texmf
Modified: tetex-base/branches/changelog-for-unstable/debian/tetex-extra.postrm.in
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/tetex-extra.postrm.in 2005-10-18 11:36:53 UTC (rev 262)
+++ tetex-base/branches/changelog-for-unstable/debian/tetex-extra.postrm.in 2005-10-18 14:45:32 UTC (rev 263)
@@ -2,7 +2,7 @@
#!/bin/sh -e
#
# postrm maintainer script for the Debian tetex-extra package.
-# $Id: tetex-extra.postrm.in,v 1.1.2.3 2005/02/23 18:59:24 frank Exp $
+# $Id$
<:=@COPYRIGHT:>//
<:open(FUNCTIONS,'postrm.functions');@FUNCTIONS=<FUNCTIONS>;close(FUNCTIONS):>//
@@ -13,6 +13,8 @@
## Static variable definitions
BLUESKY_UCF="<:=$BLUESKY_UCF:>"
+NOWLINKDIRS="<:=$NOWLINKDIRS:>"
+NOWDIRLINKS="<:=$NOWDIRLINKS:>"
#################################################################
# local function definition
@@ -45,6 +47,17 @@
ucf_purge -d /etc/texmf/dvips $BLUESKY_UCF
run_if_exist mktexlsr
;;
+ abort-install|abort-upgrade)
+ # tetex-base does this, too. But -extra can be unpacked before it (and fail),
+ # therefore we have to do the preinst and prerm stuff, too.
+
+ # we put the directories back that we moved out of the way.
+ for dir in $NOWLINKDIRS; do
+ if [ -d /usr/share/texmf/$dir.moved-by-preinst -a -L /usr/share/texmf/$dir ]; then
+ rm /usr/share/texmf/$dir
+ mv /usr/share/texmf/$dir.moved-by-preinst /usr/share/texmf/$dir
+ fi
+ done
esac
#DEBHELPER#
Modified: tetex-base/branches/changelog-for-unstable/debian/tetex-extra.preinst.in
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/tetex-extra.preinst.in 2005-10-18 11:36:53 UTC (rev 262)
+++ tetex-base/branches/changelog-for-unstable/debian/tetex-extra.preinst.in 2005-10-18 14:45:32 UTC (rev 263)
@@ -1,20 +1,16 @@
-# this script is currently not used
-
#include variables
#!/bin/sh -e
#
# preinst maintainer script for the Debian tetex-extra package.
-# $Id: tetex-extra.preinst.in,v 1.1.2.2 2004/12/30 14:05:20 frank Exp $
+# $Id$
<:=@COPYRIGHT:>//
## Define static variables we need
-updmapcfg=<:=$tetex_extra_updmapcfg:>
-CONFIG_FILE="$updmapcfg"
-CONFSTATEDIR="<:=$confstatedir:>"
-PCONFSTATEDIR="$CONFSTATEDIR/tetex-extra"
-TEMP_CONFIG_FILE="$PCONFSTATEDIR/`basename $CONFIG_FILE`.tmp"
+NOWLINKDIRS="<:=$NOWLINKDIRS:>"
+NOWDIRLINKS="<:=$NOWDIRLINKS:>"
+
<:open(FUNCTIONS,'common.functions');@FUNCTIONS=<FUNCTIONS>;close(FUNCTIONS):>//
<:=@FUNCTIONS:>//
@@ -23,8 +19,16 @@
#################################################################
case "$1" in
- install)
- handle_stateof_configfile --preinst $updmapcfg tetex-extra
+ install|upgrade)
+ # tetex-base does this, too. But -extra can be unpacked before it, therefore
+ # we have to do the preinst and prerm stuff, too.
+ for dir in $NOWLINKDIRS; do
+ preinst_move_dir /usr/share/texmf/$dir
+ done
+# same in the other direction
+ for dir in $NOWDIRLINKS; do
+ preinst_move_symlink /usr/share/texmf/$dir
+ done
;;
esac
Modified: tetex-base/branches/changelog-for-unstable/debian/variables
===================================================================
--- tetex-base/branches/changelog-for-unstable/debian/variables 2005-10-18 11:36:53 UTC (rev 262)
+++ tetex-base/branches/changelog-for-unstable/debian/variables 2005-10-18 14:45:32 UTC (rev 263)
@@ -13,10 +13,6 @@
sehyph.tex skhyph.tex sihyph23.tex sphyph.tex trhyph.tex ukrhyph.tex \\
ukrhyph.t2a ukrhyph.lcy ukrhyph.ot2":>//
<:# 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":>//
<:$VARTOP_GENERATED="helpindex.html ls-R ls-R-TEXMFMAIN":>//
<:$STANDARD_INFO_TEXT="This file is no longer needed. You may safely delete it.":>//
<:$MOVE_GENERIC_UCF="generic/fontmath.cfg generic/fonttext.cfg generic/preload.cfg":>//
@@ -35,7 +31,8 @@
<:$UNUSED_CONFFILES_BASE="@unused_contextmaps_newplace $unused_inifiles":>//
<:#unused confdirs are not in fact necessarily unused; they just need:>//
<:#to be removed upon purge, after deleting files in them.:>//
-<:$UNUSED_CONFDIRS_BASE="etex pdftex":>//
+<:$OLDSTUFFDIR="/etc/texmf/oldstuff_unused":>//
+<:$UNUSED_CONFDIRS_BASE="etex pdftex $OLDSTUFFDIR":>//
<:#$BASE_UCF contains a list of files with their destination directories below /etc/texmf/:>//
<:$BASE_UCF="mktex.cnf dvips/config.builtin35 dvipdfm/config \\
map/dvips/tetex/contnav.map generic/pdftexconfig.tex \\
More information about the Pkg-tetex-commits
mailing list