freeze exception for texlive-bin 2009-7
Dear release managers,
I would like to ask for a freeze exception for texlive-bin 2009-7.
The changes to the version in testing/unstable are two changes, one
being trivial, one being less trivial but still a good idea:
* add ed, perl, texlive-common to the dependencies of texlive-binaries
this was lost during the passage from 2007 -> 2009
* since TeX Live 2005 we patch fmtutil to give a warning/error that
editing the fmtutil.cnf file with one of the options
fmtutil enableFormat
etc is not supported and tell users to read the documentation
and use the files in /etc/texmf/fmt.d/
TeX Live 2009 now includes a very similar check within the texconfig
utility and informs the user to use tlmgr (the TeX Live Manager)
which is not shipped with Debian (as it is responsible for upgrades,
format/hyphen/font map management which we do differently).
The attached patch removes this check from the texconfig utility
(which btw is hardly used nowadays) and relies on the fact that
fmtutil is already patched.
Full patch follows.
I hope you accept both of these for testing. Thanks.
Best wishes
Norbert
diff -u texlive-bin-2009/debian/changelog texlive-bin-2009/debian/changelog
--- texlive-bin-2009/debian/changelog
+++ texlive-bin-2009/debian/changelog
@@ -1,3 +1,12 @@
+texlive-bin (2009-7) unstable; urgency=low
+
+ * add ed (and perl, texlive-common) to the list of dependencies (LP: #577305)
+ (Closes: #580732)
+ * remove texconfig warning/exit (with tlmgr link) statement and rely
+ on fmtutil being debianized (Closes: #588731)
+
+ -- Norbert Preining <preining@debian.org> Tue, 10 Aug 2010 17:09:47 +0900
+
texlive-bin (2009-6) unstable; urgency=high
[ Frank Küster ]
@@ -95,7 +104,7 @@
somewhat broken files
- closes: #518536, fresh upstream of pdftex is needed (latest stable
pdftex is 1.40.9 available)
- - #532074, 'man pdftex': missing .ds WB
+ - closes: #532074, 'man pdftex': missing .ds WB
- closes: #446617, texlive-metapost: Omits font encoding from output
- closes: #457711, texlive-metapost: mpost man page does not match reality
diff -u texlive-bin-2009/debian/control texlive-bin-2009/debian/control
--- texlive-bin-2009/debian/control
+++ texlive-bin-2009/debian/control
@@ -9,7 +9,7 @@
Package: texlive-binaries
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tex-common (>= 2.00)
+Depends: ${shlibs:Depends}, ${misc:Depends}, texlive-common (>= 2009), tex-common (>= 2.00), ed, perl
Conflicts: texlive-base-bin, dvi2tty
Replaces: texlive-base-bin, texlive-omega (<< 2008), dvipdfmx, texlive-extra-utils (<< 2008), texlive-font-utils (<< 2008), texlive-lang-cyrillic (<< 2008), texlive-xetex (<< 2008), texlive-metapost (<< 2008), texlive-lang-indic (<< 2008), texlive-formats-extra (<< 2008), dvi2tty, freetype1-tools
Provides: texlive-base-bin, dvi2tty
diff -u texlive-bin-2009/debian/patches/55_texconfig_stuff texlive-bin-2009/debian/patches/55_texconfig_stuff
--- texlive-bin-2009/debian/patches/55_texconfig_stuff
+++ texlive-bin-2009/debian/patches/55_texconfig_stuff
@@ -1,17 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 55_texconfig_stuff.dpatch by Frank Küster
-##
-## DP: expand texconfig man page, some random texconfig fixes
+55_texconfig_stuff
+- expand texconfig man page, some random texconfig fixes
+- remove code that texconfig formats is not longer supported and refer to tlmgr
+ we rely on fmtutil being debianized and let texconfig work as before.
+--
+ texk/tetex/texconfig | 53 ++++++++++++-----------------------------------
+ texk/tetex/texconfig.man | 28 +++++++++++++++++++++++-
+ 2 files changed, 41 insertions(+), 40 deletions(-)
-@DPATCH@
- texk/tetex/texconfig | 22 ++++++++++++++--------
- texk/tetex/texconfig.man | 28 +++++++++++++++++++++++++++-
- 2 files changed, 41 insertions(+), 9 deletions(-)
-
-Index: texlive-bin-2009~svn15596/texk/tetex/texconfig
+Index: texlive-bin-2009/texk/tetex/texconfig
===================================================================
---- texlive-bin-2009~svn15596.orig/texk/tetex/texconfig 2008-07-18 05:24:39.000000000 +0900
-+++ texlive-bin-2009~svn15596/texk/tetex/texconfig 2009-10-03 23:37:02.000000000 +0900
+--- texlive-bin-2009.orig/texk/tetex/texconfig 2008-07-18 05:24:39.000000000 +0900
++++ texlive-bin-2009/texk/tetex/texconfig 2010-08-10 17:11:38.000000000 +0900
@@ -567,7 +567,7 @@
$progname help (or --help; show this help)
$progname hyphen FORMAT (edit hyphenation config for FORMAT)
@@ -54,7 +53,29 @@
rc=1
fi
;;
-@@ -1036,7 +1039,6 @@
+@@ -1006,21 +1009,6 @@
+ ;;
+
+ formats)
+- cat >&2 <<EOM
+-texconfig formats is no longer supported, because manual edits of
+-fmtutil.cnf will be overwritten by the new TeX Live package manager,
+-tlmgr, which regenerates that file as needed upon package changes.
+-Thus, to add or remove formats, the recommended method is to use tlmgr
+-to add or remove the appropriate package.
+-
+-If you need to make manual additions, you can edit the file
+-fmtutil-local.cnf under TEXMFLOCAL. Further information with
+-tlmgr --help and at http://tug.org/texlive/tlmgr.html.
+-
+-Exiting.
+-EOM
+- exit 1 # but leave the real code for posterity
+-
+ setupTmpDir
+ echo "$progname: analyzing old configuration..." >&2
+ fmtutil --catcfg > $tmpdir/pre
+@@ -1036,7 +1024,6 @@
for i in `awk '{print $1}' $tmpdir/addOrChange`; do
fmtutil --byfmt "$i" || rc=1
done
@@ -62,7 +83,30 @@
fi
;;
-@@ -1083,6 +1085,11 @@
+@@ -1046,22 +1033,6 @@
+
+ # "hyphen FORMAT"
+ hyphen)
+- cat >&2 <<EOM
+-texconfig hyphen is no longer supported, because manual edits of
+-language.dat (or language.def) will be overwritten by the new TeX Live
+-package manager, tlmgr, which regenerates those configuration files as
+-needed upon package changes. Thus, to add or remove hyphenation
+-patterns, the recommended method is to use tlmgr to add or remove the
+-appropriate package.
+-
+-If you need to make manual additions, you can edit the files
+-language-local.dat and language-local.def under TEXMFLOCAL. Further
+-information with tlmgr --help and at http://tug.org/texlive/tlmgr.html.
+-
+-Exiting.
+-EOM
+- exit 1 # but leave the real code for posterity
+-
+ tcBatchHyphenFormat=$2
+ formatsForHyphen=`getFormatsForHyphen`
+ formatsForHyphenFmt=`echo "$formatsForHyphen" | myFmt | sed 's@^@ @'`
+@@ -1083,6 +1054,11 @@
rc=1
return
;;
@@ -74,7 +118,7 @@
esac
getRelDir "$tcBatchHyphenFile"
-@@ -1110,7 +1117,7 @@
+@@ -1110,7 +1086,7 @@
fi
;;
esac
@@ -83,7 +127,7 @@
if cmp "$tcBatchHFEdit" "$tcBatchHFOrig" >/dev/null 2>&1; then
echo "$progname: configuration unchanged." >&2
else
-@@ -1160,7 +1167,6 @@
+@@ -1160,7 +1136,6 @@
case $2 in
"")
if $fmtutil --all \
@@ -91,10 +135,10 @@
&& $updmap; then
:
else
-Index: texlive-bin-2009~svn15596/texk/tetex/texconfig.man
+Index: texlive-bin-2009/texk/tetex/texconfig.man
===================================================================
---- texlive-bin-2009~svn15596.orig/texk/tetex/texconfig.man 2009-09-28 06:07:35.000000000 +0900
-+++ texlive-bin-2009~svn15596/texk/tetex/texconfig.man 2009-10-03 23:37:02.000000000 +0900
+--- texlive-bin-2009.orig/texk/tetex/texconfig.man 2009-09-28 06:07:35.000000000 +0900
++++ texlive-bin-2009/texk/tetex/texconfig.man 2010-08-06 01:03:50.000000000 +0900
@@ -38,6 +38,20 @@
.I TEXMFSYSCONFIG.
(You may need to be root to do this.)
------------------------------------------------------------------------
Norbert Preining preining@{jaist.ac.jp, logic.at, debian.org}
JAIST, Japan TeX Live & Debian Developer
DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094
------------------------------------------------------------------------
He stood up straight and looked the world squarely in the
fields and hills. To add weight to his words he stuck the
rabbit bone in his hair. He spread his arms out wide. `I
will go mad!' he announced.
--- Arthur discovering a way of coping with life on
--- Prehistoric Earth.
--- Douglas Adams, The Hitchhikers Guide to the Galaxy
Reply to: