[subversion-commit] SVN tetex commit + diffs: r118 -
tetex-base/trunk/debian
Frank Küster
frank at costa.debian.org
Fri Aug 5 08:21:22 UTC 2005
Author: frank
Date: 2005-08-05 08:21:22 +0000 (Fri, 05 Aug 2005)
New Revision: 118
Modified:
tetex-base/trunk/debian/changelog
tetex-base/trunk/debian/control
tetex-base/trunk/debian/postinst.functions
tetex-base/trunk/debian/postinst.in
tetex-base/trunk/debian/preinst.in
tetex-base/trunk/debian/rules
Log:
* Check files that used to be conffiles and are now unused, remove them
if unchanged. Furthermore, Install config.antt into /etc/texmf/dvips
again (closes: #320074). Thanks to Ralf Stubner again.
* 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)
- make postinst.functions and preinst.functions eperl_sourcefiles
Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog 2005-08-05 08:18:07 UTC (rev 117)
+++ tetex-base/trunk/debian/changelog 2005-08-05 08:21:22 UTC (rev 118)
@@ -1,8 +1,14 @@
tetex-base (3.0-7) experimental; urgency=low
- * Install config.antt into /etc/texmf/dvips again, see bug #320074
+ * Check files that used to be conffiles and are now unused, remove them
+ if unchanged. Furthermore, Install config.antt into /etc/texmf/dvips
+ again (closes: #320074). Thanks to Ralf Stubner again.
+ * 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)
- -- Frank Küster <frank at debian.org> Thu, 28 Jul 2005 19:36:54 +0200
+ -- Frank Küster <frank at debian.org> Fri, 5 Aug 2005 10:19:42 +0200
tetex-base (3.0-6) experimental; urgency=low
Modified: tetex-base/trunk/debian/control
===================================================================
--- tetex-base/trunk/debian/control 2005-08-05 08:18:07 UTC (rev 117)
+++ tetex-base/trunk/debian/control 2005-08-05 08:21:22 UTC (rev 118)
@@ -8,7 +8,7 @@
Package: tetex-base
Architecture: all
-Depends: texinfo (>= 4.0b-1), debconf, ucf (>= 1.02), tex-common (>= 0.2)
+Depends: texinfo (>= 4.0b-1), debconf, ucf (>= 1.02), tex-common (>= 0.4)
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)
Modified: tetex-base/trunk/debian/postinst.functions
===================================================================
--- tetex-base/trunk/debian/postinst.functions 2005-08-05 08:18:07 UTC (rev 117)
+++ tetex-base/trunk/debian/postinst.functions 2005-08-05 08:21:22 UTC (rev 118)
@@ -73,10 +73,44 @@
rm $pdf_tempfile
- mv $oldfile $oldfile$POSTINST_MOVE_EXT
+ mv $oldfile $oldfile.$POSTINST_MOVE_EXT
echo "done."
}
+check_ini_md5sum(){
+ set "$@"
+
+ while [ $# -gt 0 ]; do
+ 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"
+ rm $file
+ else
+ echo "Moving unused, locally changed conffile $file to $OLDSTUFFDIR"
+ test -d $OLDSTUFFDIR || mkdir $OLDSTUFFDIR
+ mv $file $OLDSTUFFDIR/
+ fi
+ done
+ # remove if now empty
+ for dir in $REMOVE_DIRS; do rmdir --ignore-fail-on-non-empty /etc/texmf/$dir; done
+ # 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.
+
+If you do no longer need your local changes, this directory and its contents
+should be deleted.
+EOF
+ fi
+
+}
+
#################################################################
## End of function definitions from file postinst.functions
#################################################################
Modified: tetex-base/trunk/debian/postinst.in
===================================================================
--- tetex-base/trunk/debian/postinst.in 2005-08-05 08:18:07 UTC (rev 117)
+++ tetex-base/trunk/debian/postinst.in 2005-08-05 08:21:22 UTC (rev 118)
@@ -2,7 +2,7 @@
#!/bin/sh -e
#
# postinst maintainer script for the Debian tetex-base package.
-# $Id: postinst.in,v 1.1.2.9 2005/07/20 12:31:43 frank Exp $
+# $Id$
<:=@COPYRIGHT:>//
## Define static variables we need
@@ -20,10 +20,24 @@
NOWLINKDIRS="<:=$NOWLINKDIRS:>"
NOWDIRLINKS="<:=$NOWDIRLINKS:>"
POSTINST_MOVE_EXT="<:=$POSTINST_MOVE_EXT:>"
-LDAT_PATTERNS="<:=$LDAT_PATTERNS:>"
-LDAT_VERSION=2.0.2a-1 # this should be the version of tetex-base
- # that ships the correct language.dflt
OLD_LDAT=$etc/language.dat
+md5sumlist="
+09e4f410ade0befce1e0bacf8e272789 /etc/texmf/latex/latex.ini
+40ae6def8399827a80f3736e5fb1cdf5 /etc/texmf/cyrplain/cyrtex.ini
+797f2dae2d06396a4b40b1454609f025 /etc/texmf/cyrplain/cyrtxinf.ini
+15d4ba30419b36376851a124619e20ba /etc/texmf/cyrplain/cyramstx.ini
+eb7eeca34d4f7c338480ae2f1e95dae6 /etc/texmf/etex/etex.ini
+c865212575be3a09cbadb694a803ca55 /etc/texmf/platex/platex.ini
+c2c75aaddf59e7cd1d14ef3661578eef /etc/texmf/context/cont-de.ini
+5d7064e3adc9acdaf94e37e9bc5c1a29 /etc/texmf/context/cont-en.ini
+96366065e347eab53a30e72d9a6e4ca0 /etc/texmf/context/cont-it.ini
+25cbcc11164d749693de4eea197a9c65 /etc/texmf/context/cont-nl.ini
+a94fd43e68156f57e6bf3ac4a901af14 /etc/texmf/context/cont-ro.ini
+ee6f13cd52623786f7a13c151900ec50 /etc/texmf/context/cont-uk.ini
+984f5ed1242258775b9c6e5e8b219a26 /etc/texmf/context/cont-cz.ini
+"
+REMOVE_DIRS=etex
+OLDSTUFFDIR=/etc/texmf/oldstuff_unused
umask 022
@@ -55,7 +69,7 @@
if [ -f $OLD_LDAT ]; 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 tex-common package.
+script of the tetex-base package.
Please use the mechanism described in update-language(8) instead.
@@ -68,6 +82,10 @@
rm -rf /var/lib/texmf/dvips
pdftexconfig_transition
+
+ # remove ini files that are no longer treated as conffiles, but only if unchanged
+ check_ini_md5sum $md5sumlist
+
;;
esac
Modified: tetex-base/trunk/debian/preinst.in
===================================================================
--- tetex-base/trunk/debian/preinst.in 2005-08-05 08:18:07 UTC (rev 117)
+++ tetex-base/trunk/debian/preinst.in 2005-08-05 08:21:22 UTC (rev 118)
@@ -2,7 +2,7 @@
#!/bin/bash -e
#
# postinst maintainer script for the Debian tetex-base package.
-# $Id: preinst.in,v 1.1.2.1 2005/04/17 10:32:14 frank Exp $
+# $Id$
<:=@COPYRIGHT:>//
## Variables needed for upgrading
@@ -101,25 +101,6 @@
move_old_conffile /etc/texmf/pdftex/cmttf.map \
/etc/texmf/map/pdftex/cmttf/cmttf.map nocomment # no ucf needed?
- # is there a transition file tex-common left us?
-
- if [ -f $UPDMAP_CFG_TRANSITION ]; then
- if [ -f $UPDMAP_CFG ]; then
- echo "Found transition file, but destination already exists:"
- echo "$UPDMAP_CFG_TRANSITION"
- echo "This shouldn't happen."
- else
- cat > $UPDMAP_CFG <<EOF
-# Don't delete the following pseudo-comment unless you know what you are doing.
-# -_- DebPkgProvidedMaps -_-
-
-
-EOF
- sed -e '0,/^# Map files should be marked by/ d; 1,/^$/ d' \
- $UPDMAP_CFG_TRANSITION >> $UPDMAP_CFG
- rm $UPDMAP_CFG_TRANSITION
- fi
- fi
;;
abort-upgrade)
for dir in $NOWLINKDIRS; do
Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules 2005-08-05 08:18:07 UTC (rev 117)
+++ tetex-base/trunk/debian/rules 2005-08-05 08:21:22 UTC (rev 118)
@@ -1,7 +1,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
@@ -21,7 +21,8 @@
debian/setup-ucf debian/setup-conflinks \
debian/common.functions
eperl_sourcefiles=debian/variables debian/COPYRIGHT.scripts \
- debian/common.variables debian/common.functions
+ debian/common.variables debian/common.functions \
+ debian/postinst.functions debian/postrm.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
More information about the Pkg-tetex-commits
mailing list