Bug#690012: unblock: texlive-base/2012.20120611-5
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear release team,
I would like to ask for an unblock of
texlive-base/2012.20120611-5
This release attacks mainly fixes regarding the handling of
conffiles. During the passage form 2009 to 2012 many conffiles
have become unnecessary and should be properly removed, but
some of these removal actions have been forgotten.
The changelog states:
* properly purge some conffiles (Closes: #688382)
* fix typo in babel french ldf file, upstream fix (Closes: #689450)
* remove conffiles even if upgrading from intermediate packages
(Closes: #686487)
The first bug was found by Andreas Beckmann during his piupart
upgrade tests. We forgot to add the proper rm_conffile lines to
the maintscript files.
The third/last bug is only dealing with files that were not properly
removed during some intermediate package releases in unstable.
Finally the middle bug is not related, but a very obvious and easy to
fix for a babel bug.
Here the documented debdiff of the main changes, the full debdiff is
also attached.
The following patch adds a new quilt patch to fix a simple typo
in the babel ldf file for spanish, where some arguments were lost.
It is obvious from the lines for the other abbreviated months that
the code was simply lost.
diff -Nru texlive-base-2012.20120611/debian/patches/upstream_fix_babel_french_days texlive-base-2012.20120611/debian/patches/upstream_fix_babel_french_days
--- texlive-base-2012.20120611/debian/patches/upstream_fix_babel_french_days 1970-01-01 09:00:00.000000000 +0900
+++ texlive-base-2012.20120611/debian/patches/upstream_fix_babel_french_days 2012-10-03 20:51:14.000000000 +0900
@@ -0,0 +1,19 @@
+---
+ texmf-dist/tex/latex/babelbib/spanish.bdf | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- texlive-base-2012.20120611.orig/texmf-dist/tex/latex/babelbib/spanish.bdf
++++ texlive-base-2012.20120611/texmf-dist/tex/latex/babelbib/spanish.bdf
+@@ -73,9 +73,9 @@
+ \def\btxmonfebshort##1{\protect\foreignlanguage{#1}{Feb##1{}}}%
+ \def\btxmonmarshort##1{\protect\foreignlanguage{#1}{Mar##1{}}}%
+ \def\btxmonaprshort##1{\protect\foreignlanguage{#1}{Abr##1{}}}%
+- \def\btxmonmayshort##1{\protect\foreignlanguage{#1}{May}}%
+- \def\btxmonjunshort##1{\protect\foreignlanguage{#1}{Jun}}%
+- \def\btxmonjulshort##1{\protect\foreignlanguage{#1}{Jul}}%
++ \def\btxmonmayshort##1{\protect\foreignlanguage{#1}{May##1{}}}%
++ \def\btxmonjunshort##1{\protect\foreignlanguage{#1}{Jun##1{}}}%
++ \def\btxmonjulshort##1{\protect\foreignlanguage{#1}{Jul##1{}}}%
+ \def\btxmonaugshort##1{\protect\foreignlanguage{#1}{Ago##1{}}}%
+ \def\btxmonsepshort##1{\protect\foreignlanguage{#1}{Sep##1{}}}%
+ \def\btxmonoctshort##1{\protect\foreignlanguage{#1}{Oct##1{}}}%
The "libpaper_files" are the files that got "lost" according to
the first bug report. We tried to remove them via ucf, but they
have been proper conffiles, so that didn't work and although the
files were physically removed, the reference in the dpkg conffile
database was still present.
In the first part we remove all the code for handling backups and ucf
cleaning (but the removal of temporary ucf files), since we are using
the rm_conffile directive (see below)
diff -Nru texlive-base-2012.20120611/debian/texlive-base.postinst.pre texlive-base-2012.20120611/debian/texlive-base.postinst.pre
--- texlive-base-2012.20120611/debian/texlive-base.postinst.pre 2012-08-02 12:16:34.000000000 +0900
+++ texlive-base-2012.20120611/debian/texlive-base.postinst.pre 2012-10-02 20:43:35.000000000 +0900
@@ -30,19 +30,9 @@
old_version=$2
for file in $libpaper_files ; do
- if [ -r $file ] ; then
- if ucf_is_changed $file ; then
- cat > $file.postinst-bak <<EOF
-This file is no longer used and has therefore been renamed by the postinst
-script of the texlive-base package.
-EOF
- cat $file >> $file.postinst-bak
- fi
- rm $file
- rm -f $file.ucf-old
- rm -f $file.ucf-new
- rm -f $file.ucf-dist
- fi
+ rm -f $file.ucf-old
+ rm -f $file.ucf-new
+ rm -f $file.ucf-dist
ucf --purge $file
if test -x "`which ucfr`" ; then
ucfr --purge texlive-base $file
The already mentioned changes (adding rm_conffile lines) are triggered
by changes in the package configuration file tpm2deb.cfg:
diff -Nru texlive-base-2012.20120611/debian/tpm2deb.cfg texlive-base-2012.20120611/debian/tpm2deb.cfg
--- texlive-base-2012.20120611/debian/tpm2deb.cfg 2012-09-01 09:20:23.000000000 +0900
+++ texlive-base-2012.20120611/debian/tpm2deb.cfg 2012-10-03 20:59:51.000000000 +0900
svn id changed
@@ -2,7 +2,7 @@
# tpm2deb.cfg
# (c) 2005-2012 Norbert Preining
#
-# $Id: tpm2deb.cfg 5580 2012-06-24 09:30:56Z preining $
+# $Id: tpm2deb.cfg 5643 2012-10-02 11:51:36Z preining $
#
# describe relations between texlive and other debian packages, but als
# which packages and files should be blacklisted
Third/last bug: remove files not only when upgrading from stable release,
but also from intermediate releases, so that we don't have left overs.
@@ -52,7 +52,7 @@
old-version;texlive-lang;2009-3
old-version;texlive-extra;2009-10
old-version;texlive-doc;2009-2
-old-version;texlive-base;2009-15
+old-version;texlive-base;2012.20120611-4
#
# texlive-base needs newer texlive-binaries than "latest-version" because
# of the libpaper patches. No need to rebuild and update the rest
Make sure that the four libpaper files are properly removed via
dpkg maintscript handler.
@@ -978,6 +978,10 @@
#
# REMOVAL OF CONFIG FILES
#
+removeconffile;texlive-base;/etc/texmf/dvips/config/config.ps
+removeconffile;texlive-base;/etc/texmf/tex/generic/config/pdftexconfig.tex
+removeconffile;texlive-base;/etc/texmf/dvipdfmx/dvipdfmx.cfg
+removeconffile;texlive-base;/etc/texmf/xdvi/XDvi
removeconffile;texlive-base;/etc/texmf/dvips/config/alt-rule.pro
removeconffile;texlive-base;/etc/texmf/dvips/config/canonex.cfg
removeconffile;texlive-base;/etc/texmf/dvips/config/config.bakoma
The new packages have been piuparts tested by Andreas Beckmann with
upgrades from stable/testing/unstable to this version.
Thus I hope the release team will unblock these packages.
If there are any other questions, please let me know.
unblock texlive-base/2012.20120611-5
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.6.0-wl+ (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -Nru texlive-base-2012.20120611/debian/changelog texlive-base-2012.20120611/debian/changelog
--- texlive-base-2012.20120611/debian/changelog 2012-09-01 08:38:20.000000000 +0900
+++ texlive-base-2012.20120611/debian/changelog 2012-10-03 21:01:59.000000000 +0900
@@ -1,3 +1,12 @@
+texlive-base (2012.20120611-5) unstable; urgency=low
+
+ * properly purge some conffiles (Closes: #688382)
+ * fix typo in babel french ldf file, upstream fix (Closes: #689450)
+ * remove conffiles even if upgrading from intermediate packages
+ (Closes: #686487)
+
+ -- Norbert Preining <preining@debian.org> Wed, 03 Oct 2012 21:01:18 +0900
+
texlive-base (2012.20120611-4) unstable; urgency=low
* fix wrong format of zip list for texdoc, which broke searching for
diff -Nru texlive-base-2012.20120611/debian/patches/series texlive-base-2012.20120611/debian/patches/series
--- texlive-base-2012.20120611/debian/patches/series 2012-09-01 08:35:50.000000000 +0900
+++ texlive-base-2012.20120611/debian/patches/series 2012-10-03 20:51:14.000000000 +0900
@@ -23,3 +23,4 @@
texdoc-see-and-zip
fix-natbib-add-spaces
upstream_updmap-ignoring-settings
+upstream_fix_babel_french_days
diff -Nru texlive-base-2012.20120611/debian/patches/upstream_fix_babel_french_days texlive-base-2012.20120611/debian/patches/upstream_fix_babel_french_days
--- texlive-base-2012.20120611/debian/patches/upstream_fix_babel_french_days 1970-01-01 09:00:00.000000000 +0900
+++ texlive-base-2012.20120611/debian/patches/upstream_fix_babel_french_days 2012-10-03 20:51:14.000000000 +0900
@@ -0,0 +1,19 @@
+---
+ texmf-dist/tex/latex/babelbib/spanish.bdf | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- texlive-base-2012.20120611.orig/texmf-dist/tex/latex/babelbib/spanish.bdf
++++ texlive-base-2012.20120611/texmf-dist/tex/latex/babelbib/spanish.bdf
+@@ -73,9 +73,9 @@
+ \def\btxmonfebshort##1{\protect\foreignlanguage{#1}{Feb##1{}}}%
+ \def\btxmonmarshort##1{\protect\foreignlanguage{#1}{Mar##1{}}}%
+ \def\btxmonaprshort##1{\protect\foreignlanguage{#1}{Abr##1{}}}%
+- \def\btxmonmayshort##1{\protect\foreignlanguage{#1}{May}}%
+- \def\btxmonjunshort##1{\protect\foreignlanguage{#1}{Jun}}%
+- \def\btxmonjulshort##1{\protect\foreignlanguage{#1}{Jul}}%
++ \def\btxmonmayshort##1{\protect\foreignlanguage{#1}{May##1{}}}%
++ \def\btxmonjunshort##1{\protect\foreignlanguage{#1}{Jun##1{}}}%
++ \def\btxmonjulshort##1{\protect\foreignlanguage{#1}{Jul##1{}}}%
+ \def\btxmonaugshort##1{\protect\foreignlanguage{#1}{Ago##1{}}}%
+ \def\btxmonsepshort##1{\protect\foreignlanguage{#1}{Sep##1{}}}%
+ \def\btxmonoctshort##1{\protect\foreignlanguage{#1}{Oct##1{}}}%
diff -Nru texlive-base-2012.20120611/debian/texlive-base.postinst.pre texlive-base-2012.20120611/debian/texlive-base.postinst.pre
--- texlive-base-2012.20120611/debian/texlive-base.postinst.pre 2012-08-02 12:16:34.000000000 +0900
+++ texlive-base-2012.20120611/debian/texlive-base.postinst.pre 2012-10-02 20:43:35.000000000 +0900
@@ -30,19 +30,9 @@
old_version=$2
for file in $libpaper_files ; do
- if [ -r $file ] ; then
- if ucf_is_changed $file ; then
- cat > $file.postinst-bak <<EOF
-This file is no longer used and has therefore been renamed by the postinst
-script of the texlive-base package.
-EOF
- cat $file >> $file.postinst-bak
- fi
- rm $file
- rm -f $file.ucf-old
- rm -f $file.ucf-new
- rm -f $file.ucf-dist
- fi
+ rm -f $file.ucf-old
+ rm -f $file.ucf-new
+ rm -f $file.ucf-dist
ucf --purge $file
if test -x "`which ucfr`" ; then
ucfr --purge texlive-base $file
diff -Nru texlive-base-2012.20120611/debian/tpm2deb.cfg texlive-base-2012.20120611/debian/tpm2deb.cfg
--- texlive-base-2012.20120611/debian/tpm2deb.cfg 2012-09-01 09:20:23.000000000 +0900
+++ texlive-base-2012.20120611/debian/tpm2deb.cfg 2012-10-03 20:59:51.000000000 +0900
@@ -2,7 +2,7 @@
# tpm2deb.cfg
# (c) 2005-2012 Norbert Preining
#
-# $Id: tpm2deb.cfg 5580 2012-06-24 09:30:56Z preining $
+# $Id: tpm2deb.cfg 5643 2012-10-02 11:51:36Z preining $
#
# describe relations between texlive and other debian packages, but als
# which packages and files should be blacklisted
@@ -52,7 +52,7 @@
old-version;texlive-lang;2009-3
old-version;texlive-extra;2009-10
old-version;texlive-doc;2009-2
-old-version;texlive-base;2009-15
+old-version;texlive-base;2012.20120611-4
#
# texlive-base needs newer texlive-binaries than "latest-version" because
# of the libpaper patches. No need to rebuild and update the rest
@@ -978,6 +978,10 @@
#
# REMOVAL OF CONFIG FILES
#
+removeconffile;texlive-base;/etc/texmf/dvips/config/config.ps
+removeconffile;texlive-base;/etc/texmf/tex/generic/config/pdftexconfig.tex
+removeconffile;texlive-base;/etc/texmf/dvipdfmx/dvipdfmx.cfg
+removeconffile;texlive-base;/etc/texmf/xdvi/XDvi
removeconffile;texlive-base;/etc/texmf/dvips/config/alt-rule.pro
removeconffile;texlive-base;/etc/texmf/dvips/config/canonex.cfg
removeconffile;texlive-base;/etc/texmf/dvips/config/config.bakoma
Reply to: