[subversion-commit] SVN tetex commit + diffs: r214 -
tetex-base/trunk/debian
Frank Küster
frank at costa.debian.org
Wed Oct 12 11:37:55 UTC 2005
Author: frank
Date: 2005-10-12 11:37:54 +0000 (Wed, 12 Oct 2005)
New Revision: 214
Modified:
tetex-base/trunk/debian/changelog
tetex-base/trunk/debian/postinst.functions
tetex-base/trunk/debian/postinst.in
tetex-base/trunk/debian/rules
tetex-base/trunk/debian/setup-conflinks.in
tetex-base/trunk/debian/tetex-extra.postrm.in
tetex-base/trunk/debian/tetex-extra.preinst.in
tetex-base/trunk/debian/variables
Log:
* The transition code for changing symlinks to directories and vice
versa is now in tetex-extra, too, at least for preinst and postrm.
The postinst stuff can be in tetex-base only. [frank]
* Fixed code for handling obsolete conffiles
- quilt stuff has migrated from rules.in to rules
- [setup-conflinks.in] one fix for ls-R move
- purge oldstuffdir correctly
Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog 2005-10-12 07:47:31 UTC (rev 213)
+++ tetex-base/trunk/debian/changelog 2005-10-12 11:37:54 UTC (rev 214)
@@ -8,11 +8,16 @@
Ralf Stubner (closes: #325891) [frank]
* Don't act on the obsolete pdftex.cfg file when it hasn't been changed
at all (closes: #324826) [frank]
- * The ls-R files and respective symlinks now belong to tex-common.
+ * The ls-R files and respective symlinks now belong to
+ tex-common. [frank]
* Drop the dependency on texinfo, as already done in sid in 2.0.2c-9
[frank]
+ * The transition code for changing symlinks to directories and vice
+ versa is now in tetex-extra, too, at least for preinst and postrm.
+ The postinst stuff can be in tetex-base only. [frank]
+ * Fixed code for handling obsolete conffiles
- -- Frank Küster <frank at debian.org> Wed, 5 Oct 2005 15:54:53 +0200
+ -- Frank Küster <frank at debian.org> Wed, 12 Oct 2005 13:34:59 +0200
tetex-base (3.0-7) experimental; urgency=low
Modified: tetex-base/trunk/debian/postinst.functions
===================================================================
--- tetex-base/trunk/debian/postinst.functions 2005-10-12 07:47:31 UTC (rev 213)
+++ tetex-base/trunk/debian/postinst.functions 2005-10-12 11:37:54 UTC (rev 214)
@@ -88,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
@@ -110,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/trunk/debian/postinst.in
===================================================================
--- tetex-base/trunk/debian/postinst.in 2005-10-12 07:47:31 UTC (rev 213)
+++ tetex-base/trunk/debian/postinst.in 2005-10-12 11:37:54 UTC (rev 214)
@@ -37,7 +37,7 @@
984f5ed1242258775b9c6e5e8b219a26 /etc/texmf/context/cont-cz.ini
"
REMOVE_DIRS=etex
-OLDSTUFFDIR=/etc/texmf/oldstuff_unused
+OLDSTUFFDIR=<:=$OLDSTUFFDIR:>
umask 022
Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules 2005-10-12 07:47:31 UTC (rev 213)
+++ tetex-base/trunk/debian/rules 2005-10-12 11:37:54 UTC (rev 214)
@@ -43,9 +43,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=/var/lib/tex-common/fontmap-cfg
@@ -118,7 +121,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)
@@ -126,7 +129,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
@@ -156,7 +168,7 @@
touch $(stampdir)/install-stamp
binary-indep: build install
- $(check-cvs)
+ $(check-svn)
dh_testdir
dh_testroot
# no debconf questions currently
@@ -209,7 +221,7 @@
debian/sarge-stamp:
cp debian/changelog debian/sarge/changelog.sid
- sed -e s/3.0-6.1/3.0-6.0.sarge1/ debian/sarge/changelog.sid \
+ sed -e s/3.0-7.1/3.0-7.0.sarge1/ debian/sarge/changelog.sid \
> debian/changelog && rm debian/sid-stamp
# need to remake rules
touch debian/rules.in
@@ -224,9 +236,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/trunk/debian/setup-conflinks.in
===================================================================
--- tetex-base/trunk/debian/setup-conflinks.in 2005-10-12 07:47:31 UTC (rev 213)
+++ tetex-base/trunk/debian/setup-conflinks.in 2005-10-12 11:37:54 UTC (rev 214)
@@ -146,10 +146,9 @@
#
# 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
+# 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
# texdoctk stuff
Modified: tetex-base/trunk/debian/tetex-extra.postrm.in
===================================================================
--- tetex-base/trunk/debian/tetex-extra.postrm.in 2005-10-12 07:47:31 UTC (rev 213)
+++ tetex-base/trunk/debian/tetex-extra.postrm.in 2005-10-12 11:37:54 UTC (rev 214)
@@ -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/trunk/debian/tetex-extra.preinst.in
===================================================================
--- tetex-base/trunk/debian/tetex-extra.preinst.in 2005-10-12 07:47:31 UTC (rev 213)
+++ tetex-base/trunk/debian/tetex-extra.preinst.in 2005-10-12 11:37:54 UTC (rev 214)
@@ -4,7 +4,7 @@
#!/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
@@ -13,8 +13,11 @@
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:>//
@@ -24,6 +27,16 @@
case "$1" in
install)
+ # 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
+
handle_stateof_configfile --preinst $updmapcfg tetex-extra
;;
esac
Modified: tetex-base/trunk/debian/variables
===================================================================
--- tetex-base/trunk/debian/variables 2005-10-12 07:47:31 UTC (rev 213)
+++ tetex-base/trunk/debian/variables 2005-10-12 11:37:54 UTC (rev 214)
@@ -35,7 +35,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