Dear Release Team, the Debian TeX Team would like to ask you to unblock tex-common 1.11.1
Due to extended net-absence (working as a mountain guide the summer) I (we) completely forgot to upload the package, but it wouldn't been important. But just 1h ago a serious bug was discovered which breaks unrelated packages at build time by creating wrong postrm files. The changelog looks more impressive then it is, I will go through it and attach add the corresponding diff between the version currently in testing and the new version. I took the liberty to reshuffle the entries a bit by ordering them into categories tex-common (1.11.1) unstable; urgency=medium Content: 1) Documentation fixes 2) Fixes for RC bugs (reported and not reported) 3) other stuff 1) Documentation fixes ====================== * register TeX on Debian and the Policy in section Debian [hp, np] ------------------------------------------------------------------ prior, the documents were registered at Apps/TeX which does conflict with the policy, change that. Diff: --- tex-common-1.11/debian/tex-common.doc-base.tex-on-debian +++ tex-common-1.11.1/debian/tex-common.doc-base.tex-on-debian @@ -5,7 +5,7 @@ document is intended for TeX users who want to know how to change settings in the TeX system, install additional components, or deal with problems. -Section: Apps/TeX +Section: Debian Format: text Files: /usr/share/doc/tex-common/TeX-on-Debian.txt.gz --- tex-common-1.11/debian/tex-common.doc-base.tex-sub-policy +++ tex-common-1.11.1/debian/tex-common.doc-base.tex-sub-policy @@ -3,7 +3,7 @@ Author: [EMAIL PROTECTED] Abstract: Rules and information for packaging TeX add-on packages (styles, fonts, viewers, etc.). -Section: Apps/TeX +Section: Debian Format: text Files: /usr/share/doc/tex-common/Debian-TeX-Policy.txt.gz * fix wrong file link in Debian-TeX-Policy.sgml (Closes: #481038) ------------------------------------------------------------------ A simple spelling error --- tex-common-1.11/doc/Debian-TeX-Policy.sgml +++ tex-common-1.11.1/doc/Debian-TeX-Policy.sgml @@ -8,7 +8,7 @@ <name>The Debian TeX mailing list</name> <email>[EMAIL PROTECTED]</email> </author> - <version>generated from $Id: Debian-TeX-Policy.sgml 2665 2007-04-11 11:15:11Z frank $</version> + <version>generated from $Id: Debian-TeX-Policy.sgml 3366 2008-05-13 11:32:44Z preining $</version> <abstract> This document provides a set of rules for the packaging of @@ -223,7 +223,7 @@ File locations must follow the TeX Directory Structure, TDS. The TDS specification is available as <url id="file:///usr/share/doc/tex-common/tds.pdf" name="tds.pdf"> - and <url id="file:///usr/share/doc/tex-common/tdbs.html" + and <url id="file:///usr/share/doc/tex-common/tds.html" name="tds.html">, and the latest version of the TDS is available at <tt><url name="http://www.tug.org/twg/tds/" id="http://www.tug.org/twg/tds/"></tt>. It is a bug if a * Again install the README file for tpm2licenses in /usr/share/tex-common/ [fk] --------------------------------------------------- Install a file that was formerly installed, but was lost. The file itself also got some rework (diff for that part not copied here) Diff: --- tex-common-1.11/debian/rules +++ tex-common-1.11.1/debian/rules @@ -7,7 +7,7 @@ bin_scripts=dh_installtex update-fontlang sbin_scripts=update-texmf -nonbin_scripts=tpm2licenses Tpm.pm FileUtils.pm debianize-updmap +nonbin_scripts=tpm2licenses tpm2licenses.README Tpm.pm FileUtils.pm debianize-updmap sbin_installfiles=$(foreach script,$(sbin_scripts), scripts/$(script)) sbin_manpages=$(foreach script,$(sbin_scripts), scripts/$(script).8) 2) Fixes for RC bugs (reported and not reported) ================================================ * Fix dh_installtex compatibility with debhelper version >= 6 (Closes: #492604) (this is RC, so urgency=medium) [np] -------------------------------------------------------------- This is a/the serious bug. dh_installtex, which is used by most TeX related packages, creates incorrect postrm files when used with dh compat >= 6. The change from 5 to 6 brought a *reverse* (to the calling order) order of the postrm auto-parts (the stuff that is created instead of the #DEBHELPER# tokens). None of us was aware of this fact and I discovered it when sponsoring a font package and testing it, that the postrm files are broken. The reason is that we have split the postinst and postrm auto-scripts in two parts, and the first defined a function used by the second. Now if the order is reversed in the postrm that gives an error when removing. The patch to dh_installtex only checks the dh compat level, and changes the order of autoscript invocation for postrm in case the compatibility level is >= 6. This diff adjust also Diff: --- tex-common-1.11/scripts/dh_installtex +++ tex-common-1.11.1/scripts/dh_installtex @@ -635,14 +635,27 @@ # we should NOT check whether files are actually installed # because we have to update the ls-R db for disappearing files, too. autoscript($package, "postinst", "postinst-texlsr", "s|#TEXMFTREES#|@foo|"); - autoscript($package, "postrm", "postrm-texlsr", "s|#TEXMFTREES#|@foo|"); if ($dothefullstuff) { autoscript($package, "postinst", "postinst-tex", "s|#FORMATSFILES#|@fmtconffiles|; s|#WHATTODO#|@whattodo|"); + } + + # postrm stuff + # we have to take care for the debhelper compat level. With + # debhelper >= 6 the different parts are reverse ordered. + if (compat(5)) { + # for compat level <= 5 do the texlsr stuff now + autoscript($package, "postrm", "postrm-texlsr", "s|#TEXMFTREES#|@foo|"); + } + if ($dothefullstuff) { autoscript($package, "postrm", "postrm-tex", "s|#FORMATS#|@postrmfmtdata|; s|#WHATTODO#|@whattodo|"); } + if (!compat(5)) { + # for compat level >> 5 do it now + autoscript($package, "postrm", "postrm-texlsr", "s|#TEXMFTREES#|@foo|"); + } } also part of this diff is the fix for another thing which is completely harmless: * bump version of tex-common packages built with dh_installtex to 1.11 otherwise the conflict with tetex-base is not included properly. This really would close #467330, but due to the disappearance of 1.10 the last version is also sufficient [np] -------------------------------------------------------------------------- - addsubstvar($package, "misc:Depends", "tex-common", ">= 1.10"); + addsubstvar($package, "misc:Depends", "tex-common", ">= 1.11"); } =head1 SEE ALSO the changelog entry is obvious, there is no 1.10, so depend on 1.11 * use the local keyword in a policy-compliant way [np] ------------------------------------------------------- THis does not have a reported bug, but still is against policy which does not allow local foo="something" This patch only splits that in two lines. Diff: --- tex-common-1.11/debian/postrm.functions +++ tex-common-1.11.1/debian/postrm.functions @@ -3,14 +3,16 @@ ################################################################# purge_file () { - local conffile="$1" + local conffile + conffile="$1" for ext in $PURGE_EXTENSIONS; do rm -f "${conffile}.${ext}" done rm -f "${conffile}" } purge_ucf_file () { - local conffile="$1" + local conffile + conffile="$1" purge_file $conffile if [ -x /usr/bin/ucf ]; then ucf --purge "${conffile}" 3) other stuff =============== * Create empty /usr/local/share/texmf in postinst, remove in prerm if empty, with code taken from the Policy manual. The decision whether local documentation should be in the texmf tree or in /usr/local/share/doc and accessed via a symlink is left to the local admin (closes: 475077) [fk] --------------------------------------------------------------------- This was a regression from the tetex package which generated /usr/local/share/texmf. The newer packages didn't do that which made some scripts (get-nonfreefonts) not to work. The current code is taken from the policy to safely install and remove that directory. Diff: --- tex-common-1.11/debian/postinst.in +++ tex-common-1.11.1/debian/postinst.in @@ -2,7 +2,7 @@ #!/bin/sh -e # # postinst maintainer script for the Debian <:=${PACKAGE}:> package. -# $Id: postinst.in 2701 2007-04-16 14:08:48Z preining $ +# $Id: postinst.in 3338 2008-04-18 19:13:47Z frank $ #include variables <:[EMAIL PROTECTED]:>// @@ -202,6 +202,16 @@ # first pass, it sets a special flag, which must now be reset. # db_fset tex-common/managecache firstrundone false || true +# create empty dirs in /usr/local/share/ + if [ ! -e /usr/local/share/texmf ] + then + if mkdir -p /usr/local/share/texmf 2>/dev/null + then + chown root:staff /usr/local/texmf/emacs + chmod 2775 /usr/local/share/texmf + fi + fi + ;; *) ;; --- tex-common-1.11/debian/prerm +++ tex-common-1.11.1/debian/prerm @@ -0,0 +1,15 @@ +#!/bin/sh -e +# +# postinst maintainer script for the Debian tex-common package. +# $Id$ + +# remove dirs in /usr/local if empty + +case $1 in + remove) + rmdir /usr/local/share/texmf 2>/dev/null || true + ;; +esac + +#DEBHELPER# + * add debhelper token to debian/prerm [np] ------------------------------------------- a bogus entry since the prerm script was only added in this release (sorry for that) * Removed the tetex-bin-upgrade script from the source, it is not needed nor installed, anyway [fk] ------------------------------------------------------------------------- This simply removes a script that was used long time ago but isn't since ages. I do not add the diff. * remove double definition of OPENTYPEFONTS in texmf.d [np] ----------------------------------------------------------- THis texmf.cnf variable is defined two times. The definition in 85Misc.cnf is superfluos, since the one in 75DviPS.cnf is more general: OPENTYPEFONTS = .;$TEXMF/fonts/opentype//;$OSFONTDIR// --- tex-common-1.11/conf/texmf.d/85Misc.cnf +++ tex-common-1.11.1/conf/texmf.d/85Misc.cnf @@ -10,9 +10,6 @@ % Subfont definition files. SFDFONTS = .;$TEXMF/fonts/sfd// -% OpenType outline fonts. -OPENTYPEFONTS = .;$TEXMF/fonts/opentype// - % pdftex config files: PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}// * bump standards version to 3.8, no changes necessary [np] ---------------------------------------------------------- no comment, no changes necessary. All these changes but the one for dh_installtex have been in the experimantal version (which also introduced trigger support, but we didn't want to have them in lenny, too dangerous for now) for quite some time. The dh_installtex fix was tested by me with a font package with all dh compat levels 4 <= l <= 7, always generating the correct postrm. We hope that you unblock this package. If you have any further questions please contact [EMAIL PROTECTED] I attach the full diff between the versions in case you want to do another check. Thanks a lot and all the best Norbert ------------------------------------------------------------------------------- Dr. Norbert Preining <[EMAIL PROTECTED]> Vienna University of Technology Debian Developer <[EMAIL PROTECTED]> Debian TeX Group gpg DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094 ------------------------------------------------------------------------------- SHANKLIN (n.) The hoop of skin around a single slice of salami. --- Douglas Adams, The Meaning of Liff
diff -urN tex-common-1.11/conf/texmf.d/85Misc.cnf ../../branches/build-area/tex-common-1.11.1/conf/texmf.d/85Misc.cnf --- tex-common-1.11/conf/texmf.d/85Misc.cnf 2007-11-13 08:47:20.000000000 +0100 +++ ../../branches/build-area/tex-common-1.11.1/conf/texmf.d/85Misc.cnf 2008-05-11 22:50:48.000000000 +0200 @@ -10,9 +10,6 @@ % Subfont definition files. SFDFONTS = .;$TEXMF/fonts/sfd// -% OpenType outline fonts. -OPENTYPEFONTS = .;$TEXMF/fonts/opentype// - % pdftex config files: PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}// diff -urN tex-common-1.11/debian/changelog ../../branches/build-area/tex-common-1.11.1/debian/changelog --- tex-common-1.11/debian/changelog 2008-04-16 21:49:26.000000000 +0200 +++ ../../branches/build-area/tex-common-1.11.1/debian/changelog 2008-07-27 20:14:58.000000000 +0200 @@ -1,9 +1,35 @@ +tex-common (1.11.1) unstable; urgency=medium + + * bump version of tex-common packages built with dh_installtex to 1.11 + otherwise the conflict with tetex-base is not included properly. This really + would close #467330, but due to the disappearance of 1.10 the last + version is also sufficient [np] + * Create empty /usr/local/share/texmf in postinst, remove in prerm if + empty, with code taken from the Policy manual. The decision whether + local documentation should be in the texmf tree or in + /usr/local/share/doc and accessed via a symlink is left to the local + admin (closes: 475077) [fk] + * Removed the tetex-bin-upgrade script from the source, it is not needed + nor installed, anyway [fk] + * register TeX on Debian and the Policy in section Debian [hp, np] + * remove double definition of OPENTYPEFONTS in texmf.d [np] + * fix wrong file link in Debian-TeX-Policy.sgml (Closes: #481038) + * Again install the README file for tpm2licenses in + /usr/share/tex-common/ [fk] + * Fix dh_installtex compatibility with debhelper version >= 6 + (Closes: #492604) (this is RC, so urgency=medium) [np] + * add debhelper token to debian/prerm [np] + * bump standards version to 3.8, no changes necessary [np] + * use the local keyword in a policy-compliant way [np] + + -- Norbert Preining <[EMAIL PROTECTED]> Sun, 27 Jul 2008 20:14:28 +0200 + tex-common (1.11) unstable; urgency=medium * bump version of tex-common packages built with dh_installtex to 1.10 since it is the version that removes the tetex part (see #466036) [np] * And Conflict with tetex-base (<< 2007), in order to force a /complete/ - transition to texlive in lenny (closes #467330). At the same time, + transition to texlive in lenny (closes: #467330). At the same time, drop the conflict with tetex-bin, since tetex-base already does that. However, when and if we remove the tetex-base package, we need to find a different solution for this [fk] diff -urN tex-common-1.11/debian/control ../../branches/build-area/tex-common-1.11.1/debian/control --- tex-common-1.11/debian/control 2008-02-27 22:29:38.000000000 +0100 +++ ../../branches/build-area/tex-common-1.11.1/debian/control 2008-07-27 20:05:18.000000000 +0200 @@ -5,7 +5,7 @@ Uploaders: Julian Gilbey <[EMAIL PROTECTED]>, C.M. Connelly <[EMAIL PROTECTED]>, Atsuhito KOHDA <[EMAIL PROTECTED]>, Frank KÃŒster <[EMAIL PROTECTED]>, Florent Rougon <[EMAIL PROTECTED]>, Norbert Preining <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 4.0.0), po-debconf Build-Depends-Indep: debiandoc-sgml, eperl -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Vcs-Svn: svn://svn.debian.org/svn/debian-tex/tex-common/trunk Vcs-Browser: http://svn.debian.org/wsvn/debian-tex/tex-common/trunk/ diff -urN tex-common-1.11/debian/po/templates.pot ../../branches/build-area/tex-common-1.11.1/debian/po/templates.pot --- tex-common-1.11/debian/po/templates.pot 2008-07-27 20:38:12.000000000 +0200 +++ ../../branches/build-area/tex-common-1.11.1/debian/po/templates.pot 2008-07-27 20:15:14.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2008-07-27 20:38+0200\n" +"POT-Creation-Date: 2008-07-27 20:15+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n" "Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n" diff -urN tex-common-1.11/debian/postinst.in ../../branches/build-area/tex-common-1.11.1/debian/postinst.in --- tex-common-1.11/debian/postinst.in 2007-04-16 16:08:48.000000000 +0200 +++ ../../branches/build-area/tex-common-1.11.1/debian/postinst.in 2008-04-18 21:13:47.000000000 +0200 @@ -2,7 +2,7 @@ #!/bin/sh -e # # postinst maintainer script for the Debian <:=${PACKAGE}:> package. -# $Id: postinst.in 2701 2007-04-16 14:08:48Z preining $ +# $Id: postinst.in 3338 2008-04-18 19:13:47Z frank $ #include variables <:[EMAIL PROTECTED]:>// @@ -202,6 +202,16 @@ # first pass, it sets a special flag, which must now be reset. # db_fset tex-common/managecache firstrundone false || true +# create empty dirs in /usr/local/share/ + if [ ! -e /usr/local/share/texmf ] + then + if mkdir -p /usr/local/share/texmf 2>/dev/null + then + chown root:staff /usr/local/texmf/emacs + chmod 2775 /usr/local/share/texmf + fi + fi + ;; *) ;; diff -urN tex-common-1.11/debian/postrm.functions ../../branches/build-area/tex-common-1.11.1/debian/postrm.functions --- tex-common-1.11/debian/postrm.functions 2006-12-06 17:24:10.000000000 +0100 +++ ../../branches/build-area/tex-common-1.11.1/debian/postrm.functions 2008-07-27 20:14:22.000000000 +0200 @@ -3,14 +3,16 @@ ################################################################# purge_file () { - local conffile="$1" + local conffile + conffile="$1" for ext in $PURGE_EXTENSIONS; do rm -f "${conffile}.${ext}" done rm -f "${conffile}" } purge_ucf_file () { - local conffile="$1" + local conffile + conffile="$1" purge_file $conffile if [ -x /usr/bin/ucf ]; then ucf --purge "${conffile}" diff -urN tex-common-1.11/debian/prerm ../../branches/build-area/tex-common-1.11.1/debian/prerm --- tex-common-1.11/debian/prerm 1970-01-01 01:00:00.000000000 +0100 +++ ../../branches/build-area/tex-common-1.11.1/debian/prerm 2008-07-27 20:03:08.000000000 +0200 @@ -0,0 +1,15 @@ +#!/bin/sh -e +# +# postinst maintainer script for the Debian tex-common package. +# $Id$ + +# remove dirs in /usr/local if empty + +case $1 in + remove) + rmdir /usr/local/share/texmf 2>/dev/null || true + ;; +esac + +#DEBHELPER# + diff -urN tex-common-1.11/debian/rules ../../branches/build-area/tex-common-1.11.1/debian/rules --- tex-common-1.11/debian/rules 2008-02-20 09:19:21.000000000 +0100 +++ ../../branches/build-area/tex-common-1.11.1/debian/rules 2008-05-25 22:21:01.000000000 +0200 @@ -7,7 +7,7 @@ bin_scripts=dh_installtex update-fontlang sbin_scripts=update-texmf -nonbin_scripts=tpm2licenses Tpm.pm FileUtils.pm debianize-updmap +nonbin_scripts=tpm2licenses tpm2licenses.README Tpm.pm FileUtils.pm debianize-updmap sbin_installfiles=$(foreach script,$(sbin_scripts), scripts/$(script)) sbin_manpages=$(foreach script,$(sbin_scripts), scripts/$(script).8) diff -urN tex-common-1.11/debian/tex-common.doc-base.tex-on-debian ../../branches/build-area/tex-common-1.11.1/debian/tex-common.doc-base.tex-on-debian --- tex-common-1.11/debian/tex-common.doc-base.tex-on-debian 2006-12-14 15:32:00.000000000 +0100 +++ ../../branches/build-area/tex-common-1.11.1/debian/tex-common.doc-base.tex-on-debian 2008-04-21 19:38:52.000000000 +0200 @@ -5,7 +5,7 @@ document is intended for TeX users who want to know how to change settings in the TeX system, install additional components, or deal with problems. -Section: Apps/TeX +Section: Debian Format: text Files: /usr/share/doc/tex-common/TeX-on-Debian.txt.gz diff -urN tex-common-1.11/debian/tex-common.doc-base.tex-sub-policy ../../branches/build-area/tex-common-1.11.1/debian/tex-common.doc-base.tex-sub-policy --- tex-common-1.11/debian/tex-common.doc-base.tex-sub-policy 2006-12-14 15:32:00.000000000 +0100 +++ ../../branches/build-area/tex-common-1.11.1/debian/tex-common.doc-base.tex-sub-policy 2008-04-21 19:38:52.000000000 +0200 @@ -3,7 +3,7 @@ Author: [EMAIL PROTECTED] Abstract: Rules and information for packaging TeX add-on packages (styles, fonts, viewers, etc.). -Section: Apps/TeX +Section: Debian Format: text Files: /usr/share/doc/tex-common/Debian-TeX-Policy.txt.gz Binary files tex-common-1.11/doc/Debian-TeX-Policy.pdf and ../../branches/build-area/tex-common-1.11.1/doc/Debian-TeX-Policy.pdf differ diff -urN tex-common-1.11/doc/Debian-TeX-Policy.sgml ../../branches/build-area/tex-common-1.11.1/doc/Debian-TeX-Policy.sgml --- tex-common-1.11/doc/Debian-TeX-Policy.sgml 2007-04-11 13:15:11.000000000 +0200 +++ ../../branches/build-area/tex-common-1.11.1/doc/Debian-TeX-Policy.sgml 2008-05-13 13:32:44.000000000 +0200 @@ -8,7 +8,7 @@ <name>The Debian TeX mailing list</name> <email>[EMAIL PROTECTED]</email> </author> - <version>generated from $Id: Debian-TeX-Policy.sgml 2665 2007-04-11 11:15:11Z frank $</version> + <version>generated from $Id: Debian-TeX-Policy.sgml 3366 2008-05-13 11:32:44Z preining $</version> <abstract> This document provides a set of rules for the packaging of @@ -223,7 +223,7 @@ File locations must follow the TeX Directory Structure, TDS. The TDS specification is available as <url id="file:///usr/share/doc/tex-common/tds.pdf" name="tds.pdf"> - and <url id="file:///usr/share/doc/tex-common/tdbs.html" + and <url id="file:///usr/share/doc/tex-common/tds.html" name="tds.html">, and the latest version of the TDS is available at <tt><url name="http://www.tug.org/twg/tds/" id="http://www.tug.org/twg/tds/"></tt>. It is a bug if a diff -urN tex-common-1.11/scripts/dh_installtex ../../branches/build-area/tex-common-1.11.1/scripts/dh_installtex --- tex-common-1.11/scripts/dh_installtex 2008-02-20 09:06:42.000000000 +0100 +++ ../../branches/build-area/tex-common-1.11.1/scripts/dh_installtex 2008-07-27 19:58:35.000000000 +0200 @@ -635,14 +635,27 @@ # we should NOT check whether files are actually installed # because we have to update the ls-R db for disappearing files, too. autoscript($package, "postinst", "postinst-texlsr", "s|#TEXMFTREES#|@foo|"); - autoscript($package, "postrm", "postrm-texlsr", "s|#TEXMFTREES#|@foo|"); if ($dothefullstuff) { autoscript($package, "postinst", "postinst-tex", "s|#FORMATSFILES#|@fmtconffiles|; s|#WHATTODO#|@whattodo|"); + } + + # postrm stuff + # we have to take care for the debhelper compat level. With + # debhelper >= 6 the different parts are reverse ordered. + if (compat(5)) { + # for compat level <= 5 do the texlsr stuff now + autoscript($package, "postrm", "postrm-texlsr", "s|#TEXMFTREES#|@foo|"); + } + if ($dothefullstuff) { autoscript($package, "postrm", "postrm-tex", "s|#FORMATS#|@postrmfmtdata|; s|#WHATTODO#|@whattodo|"); } + if (!compat(5)) { + # for compat level >> 5 do it now + autoscript($package, "postrm", "postrm-texlsr", "s|#TEXMFTREES#|@foo|"); + } } - addsubstvar($package, "misc:Depends", "tex-common", ">= 1.10"); + addsubstvar($package, "misc:Depends", "tex-common", ">= 1.11"); } =head1 SEE ALSO diff -urN tex-common-1.11/scripts/tetex-bin-upgrade ../../branches/build-area/tex-common-1.11.1/scripts/tetex-bin-upgrade --- tex-common-1.11/scripts/tetex-bin-upgrade 2006-10-10 09:05:16.000000000 +0200 +++ ../../branches/build-area/tex-common-1.11.1/scripts/tetex-bin-upgrade 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -#!/bin/sh - -fmtdir=/etc/texmf/fmt.d -ucf_sourcedir=/usr/share/tex-common -#UCF="ucf --verbose -d --debconf-ok" -UCF="ucf --debconf-ok" - -oldfile=00tetex.cnf -newfile=01tetex.cnf - -# rename 00tetex.cnf to 01tetex.cnf -if [ -f $fmtdir/$oldfile ]; then - if [ ! -f $fmtdir/$newfile ]; then - # not yet transitioned - mv $fmtdir/$oldfile $fmtdir/$newfile - else - # some older experimental version has installed the new file, but not - # transitioned the old one. - current_md5sum=`md5sum $fmtdir/$oldfile | cut -d ' ' -f 1` - if [ "$current_md5sum" = "55811af3562faf342261dbc3b5e060a2" ]; then - rm $fmtdir/$oldfile - else - # we do nothing; experimental users should be able to solve this - : - fi - fi -fi - -# an older version of tetex-bin ucf-registered the file with double -# slashes, this breaks ucf -if grep -q "/etc/texmf/fmt.d//01tetex.cnf" /var/lib/ucf/hashfile; then - $UCF --purge "/etc/texmf/fmt.d//01tetex.cnf" -fi - -$UCF $ucf_sourcedir/$newfile $fmtdir/$newfile diff -urN tex-common-1.11/scripts/tpm2licenses.README ../../branches/build-area/tex-common-1.11.1/scripts/tpm2licenses.README --- tex-common-1.11/scripts/tpm2licenses.README 2006-05-17 16:38:13.000000000 +0200 +++ ../../branches/build-area/tex-common-1.11.1/scripts/tpm2licenses.README 2008-05-25 22:53:47.000000000 +0200 @@ -12,23 +12,23 @@ 1. Purpose =========== -Both teTeX and TeXlive are big collections, itself distributions put -together from individual packages on CTAN -(ftp://cam.ctan.org/tex-archive/). Upstream (Thomas Esser who put -together teTeX, and the TeXLive team) do share Debian's view on Free -Software (except maybe for documentation issues), but there might -still be files included that are non-free or are intended to be free, -but don't have a proper license statement. The reason is mostly -historical - in the old days, both upstream and individual package -authors didn't care about these things as they should have. And TeX -has grown for a long time... - -In the past, the Debian teTeX packages have been audited for license -freeness at least once. However, this has been done on a per-CTAN- -package basis (and even that, perhaps, not too systematically), not on -a per-file basis. Furthermore, the process of auditing has not been -documented. Therefore, it is not possible today to check which parts -were included and checked back then. +TeXlive is a big collection, itself a distribution put together from +individual packages on CTAN (ftp://cam.ctan.org/tex-archive/). +Upstream (the TeXLive team) do share Debian's view on Free Software +(except maybe for documentation issues), but there might still be +files included that are non-free or are intended to be free, but don't +have a proper license statement. The reason is mostly historical - in +the old days, both upstream and individual package authors didn't care +about these things as they should have. And TeX has grown for a long +time... + +In the past, the Debian teTeX packages (the predecessor of TeXLive) +have been audited for license freeness at least once. However, this +has been done on a per-CTAN- package basis (and even that, perhaps, +not too systematically), not on a per-file basis. Furthermore, the +process of auditing has not been documented. Therefore, it is not +possible today to check which parts were included and checked back +then. As a consequence, we have decided to do it systematically this time, and to keep information about which files are associated with a @@ -40,8 +40,8 @@ more structured files at different locations, re-using already existing infrastructure in the TeXlive package building mechanisms and the TeX Catalogue. This script is used to verify whether this -existing information is correct and applies to teTeX, and to merge the -information into the copyright file. +existing information is correct and applies to the current TeXLive +packages, and to merge the information into the copyright file. 2. Requirements ====================== @@ -77,7 +77,8 @@ /usr/share/tex-common/tpm2licenses [ options ] [ tpm file(s) ] The script must be run from the root directory of an unpacked source -package (e.g. tetex-base-3.0/) and understands the following options: +package (e.g. tetex-base-3.0/) [FIXME: texlive runs it on installed +files?] and understands the following options: --catalogue <directory> --catalogue file:<file>