[SCM] Debian packaging of texlive-nonbin) branch, master, updated. ce68eb2e32ef9f8967b8351dd3113a49b6562cd0
The following commit has been merged in the master branch:
commit 725fc7acf61f7db36a5f4792a6765d2feb7eeee8
Author: Norbert Preining <preining@debian.org>
Date: Wed Oct 17 20:57:42 2012 +0900
apply svn changes for texlive-base 2012.20120611-5, svn r5646.
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index 2fb2ff3..6aaa27f 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -50,7 +50,7 @@ latest-version;texlive-lang;2012.20120516
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 @@ linkedscript;texmf-dist/scripts/lua2dox/lua2dox_lua;lua2dox_lua
#
# 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
diff --git a/texlive-base/debian/changelog b/texlive-base/debian/changelog
index 0b5679f..33cd0e4 100644
--- a/texlive-base/debian/changelog
+++ b/texlive-base/debian/changelog
@@ -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 --git a/texlive-base/debian/patches/series b/texlive-base/debian/patches/series
index ee46168..bb7c70a 100644
--- a/texlive-base/debian/patches/series
+++ b/texlive-base/debian/patches/series
@@ -23,3 +23,4 @@ debian_updmap-search-path
texdoc-see-and-zip
fix-natbib-add-spaces
upstream_updmap-ignoring-settings
+upstream_fix_babel_french_days
diff --git a/texlive-base/debian/patches/upstream_fix_babel_french_days b/texlive-base/debian/patches/upstream_fix_babel_french_days
new file mode 100644
index 0000000..4645738
--- /dev/null
+++ b/texlive-base/debian/patches/upstream_fix_babel_french_days
@@ -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 --git a/texlive-base/debian/texlive-base.postinst.pre b/texlive-base/debian/texlive-base.postinst.pre
index 043d576..6614a36 100644
--- a/texlive-base/debian/texlive-base.postinst.pre
+++ b/texlive-base/debian/texlive-base.postinst.pre
@@ -30,19 +30,9 @@ case "$1" in
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
--
Debian packaging of texlive-nonbin)
Reply to: