[subversion-commit] SVN tetex commit + diffs: r461 -
tetex-base/trunk/debian
Frank Küster
frank at costa.debian.org
Tue Jan 17 12:13:38 UTC 2006
Author: frank
Date: 2006-01-17 12:13:37 +0000 (Tue, 17 Jan 2006)
New Revision: 461
Modified:
tetex-base/trunk/debian/NEWS.Debian
tetex-base/trunk/debian/changelog
tetex-base/trunk/debian/common.variables
tetex-base/trunk/debian/config.in
tetex-base/trunk/debian/postinst.in
tetex-base/trunk/debian/preinst.in
Log:
* Do not keep a copy of the static language.dat if it is the version
shipped with woody or sarge (closes: #321804) [frank]
* Don't claim to remove unchanged conffiles if no conffiles are on the
system at all [frank]
* Unregister obsolete debconf questions (closes: #334723) [frank]
* Document in NEWS.Debian that we cannot migrate user's changes from old
00updmap.cfg to 10tetex-base.cfg and 10tetex-extra.cfg (closes:
#321257) [frank]
* Do not let the preinst fail just because the previously installed
version is pre-sarge, as we did deliberately during experimental
development.
Modified: tetex-base/trunk/debian/NEWS.Debian
===================================================================
--- tetex-base/trunk/debian/NEWS.Debian 2006-01-17 12:01:50 UTC (rev 460)
+++ tetex-base/trunk/debian/NEWS.Debian 2006-01-17 12:13:37 UTC (rev 461)
@@ -1,3 +1,18 @@
+tetex-base (3.0-12) unstable; urgency=low
+
+ * Customisation in 00updmap.cfg
+
+ Parts of the file /etc/texmf/updmap.d/00updmap.cfg have been taken
+ over by the tex-common package; the rest has been moved to
+ 10tetex-base.cfg and 10tetex-extra.cfg. Since some map files have
+ changed name or have been split, automatic migration isn't possible.
+ If you have previously disabled or added font map files in this file,
+ you should manually transfer your changes to 10tetex-base.cfg,
+ 10tetex-extra.cfg or (in case of additions) something like
+ 99local.cfg.
+
+ -- Frank Küster <frank at debian.org> Fri, 13 Jan 2006 17:42:34 +0100
+
tetex-base (3.0-11) unstable; urgency=low
* Configuration file handling:
Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog 2006-01-17 12:01:50 UTC (rev 460)
+++ tetex-base/trunk/debian/changelog 2006-01-17 12:13:37 UTC (rev 461)
@@ -1,4 +1,4 @@
-tetex-base (3.0-11.1) UNRELEASED; urgency=low
+tetex-base (3.0-12) unstable; urgency=low
* add magic comment to language.d/00tetex.cnf [preining]
* tetex-extra now depends on tetex-base (>= 3.0-11), in order to prevent
@@ -8,15 +8,26 @@
* Add two missing md5sums to the list in common.functions (closes:
#344212) [frank]
* Bump standards-version to 3.6.2 (no changes needed except the
- outstanding fixes for #139353) [frank]
+ still outstanding fixes for #139353) [frank]
* When handling obsolete conffiles, also cater for files from woody,
- necessary if tetex has been in state rc throughout sarge (closes:
- #347355) [frank]
- * Again add the watchfile which was lost in sid; update it's syntax to
- work on sarge, too.
+ necessary if tetex-extra has been in state rc throughout sarge
+ (closes: #347355) [frank]
+ * Again add the watchfile which was lost in sid; update it's syntax a
+ little. [frank]
+ * Do not keep a copy of the static language.dat if it is the version
+ shipped with woody or sarge (closes: #321804) [frank]
+ * Don't claim to remove unchanged conffiles if no conffiles are on the
+ system at all [frank]
+ * Unregister obsolete debconf questions (closes: #334723) [frank]
+ * Document in NEWS.Debian that we cannot migrate user's changes from old
+ 00updmap.cfg to 10tetex-base.cfg and 10tetex-extra.cfg (closes:
+ #321257) [frank]
+ * Do not let the preinst fail just because the previously installed
+ version is pre-sarge, as we did deliberately during experimental
+ development.
* Fix reportbug script handling [preining]
- -- Norbert Preining <preining at logic.at> Fri, 13 Jan 2006 09:57:59 +0100
+ -- Frank Küster <frank at debian.org> Tue, 17 Jan 2006 13:14:15 +0100
tetex-base (3.0-11) unstable; urgency=low
Modified: tetex-base/trunk/debian/common.variables
===================================================================
--- tetex-base/trunk/debian/common.variables 2006-01-17 12:01:50 UTC (rev 460)
+++ tetex-base/trunk/debian/common.variables 2006-01-17 12:13:37 UTC (rev 461)
@@ -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/trunk/debian/config.in
===================================================================
--- tetex-base/trunk/debian/config.in 2006-01-17 12:01:50 UTC (rev 460)
+++ tetex-base/trunk/debian/config.in 2006-01-17 12:13:37 UTC (rev 461)
@@ -2,7 +2,7 @@
#!/bin/sh -e
#
# config maintainer script for the Debian tetex-base package.
-# $Id: config.in,v 1.1.2.1 2004/12/21 09:49:56 frank Exp $
+# $Id$
# Copyright (C) 200? by ?
# Copyright (C) 2004 by Frank Küster <frank at kuesterei.ch>.
#
@@ -51,6 +51,9 @@
fi
fi
+# purge obsolete questions
+db_unregister tetex-base/fmtutil-failed || true
+db_unregister tetex-base/updmap-failed || true
# Local Variables:
# mode: shell-script
Modified: tetex-base/trunk/debian/postinst.in
===================================================================
--- tetex-base/trunk/debian/postinst.in 2006-01-17 12:01:50 UTC (rev 460)
+++ tetex-base/trunk/debian/postinst.in 2006-01-17 12:13:37 UTC (rev 461)
@@ -55,14 +55,19 @@
configure|reconfigure)
# is there a file /etc/texmf/language.dat already? Move it out of the way
if [ -f $OLD_LDAT ]; then
- cat > $OLD_LDAT.$POSTINST_MOVE_EXT <<EOF
+ old_ldat_md5sum=`md5sum $OLD_LDAT`
+ # do nothing if the md5sum matches sarge's or woody's default:
+ if [ ! "$old_ldat_md5sum" = fe9baf0768ade79a585a9df568dac5f6 ] && \
+ [ ! "$old_ldat_md5sum" = 1d2d9b25a41ab1cec892bd3382af7645 ]; then
+ cat > $OLD_LDAT.$POSTINST_MOVE_EXT <<EOF
This file is no longer used and has therefore been renamed by the postinst
script of the tetex-base package.
Please use the mechanism described in update-language(8) instead.
EOF
- cat $OLD_LDAT >> $OLD_LDAT.$POSTINST_MOVE_EXT
+ cat $OLD_LDAT >> $OLD_LDAT.$POSTINST_MOVE_EXT
+ fi
rm $OLD_LDAT
fi
@@ -76,12 +81,12 @@
## common installation and upgrading tasks
case "$1" in
- configure)
+ configure|reconfigure)
# remove backup files from preinst
- if [ -z "$2" ] || dpkg --compare-versions "$2" le 3.0-10 ; then
+ if [ -n "$2" ] && dpkg --compare-versions "$2" le 3.0-10 ; then
# we should echo only if there are actual files. But this would require
- # to put the echo command in the loop, with checks to ech only once.
+ # to put the echo command in the loop, with checks to echo only once.
# Instead, we just prevent it from being displayed if a version has
# been configured that already had the confiles removed.
echo -n "Removing unchanged obsolete conffiles ... "
Modified: tetex-base/trunk/debian/preinst.in
===================================================================
--- tetex-base/trunk/debian/preinst.in 2006-01-17 12:01:50 UTC (rev 460)
+++ tetex-base/trunk/debian/preinst.in 2006-01-17 12:13:37 UTC (rev 461)
@@ -1,7 +1,7 @@
#include variables
#!/bin/bash -e
#
-# postinst maintainer script for the Debian tetex-base package.
+# preinst maintainer script for the Debian tetex-base package.
# $Id$
# don't try to understand this generated script as installed with the package.
# instead, look at the source files in the source package
@@ -31,16 +31,6 @@
# Here starts the real action
#################################################################
-if [ $# -eq 2 ] && [ $1 = install -o $1 = upgrade ]; then
- if dpkg --compare-versions $2 lt 2.0.2c-3; then
- cat >2 <<EOF
-Upgrade from versions older than the current version in sid is not
-supported during experimental development. Exiting.
-EOF
- exit 1
- fi
-fi
-
case "$1" in
# install is also used if the old package is in state rc
upgrade|install)
More information about the Pkg-tetex-commits
mailing list