Hi all! AFAIR I have taken all suggestions into account and generated a new incarnation of texinfo_4.8-0.1
As with the previous versions, all files can be found at http://www.tug.org/texlive/Debian/texinfo/ or deb http://www.tug.org/texlive/Debian/ texinfo/ deb-src http://www.tug.org/texlive/Debian/ texinfo/ Frank, can you sponsor this package, i.e. take it and upload it when you think it is time for teTeX, i.e. in advance of your upload to unstable? Attached is a patch from 4.7-2.2/debian to 4.8-0.1/debian. Best wishes Norbert ------------------------------------------------------------------------------- Dr. Norbert Preining <preining AT logic DOT at> Università di Siena sip:[EMAIL PROTECTED] +43 (0) 59966-690018 gpg DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094 ------------------------------------------------------------------------------- AIGBURTH (n.) Any piece of readily identifiable anatomy found amongst cooked meat. --- Douglas Adams, The Meaning of Liff
diff -urN texinfo_4.7-2.2-debian/changelog texinfo-4.8/debian/changelog --- texinfo_4.7-2.2-debian/changelog 2005-08-20 02:16:46.000000000 +0200 +++ texinfo-4.8/debian/changelog 2005-08-19 13:07:04.000000000 +0200 @@ -1,3 +1,29 @@ +texinfo (4.8-0.1) unstable; urgency=low + + * NMU to address a series of bugs, especially Bug #320413 + * new upstream release + - provides texi2pdf (Closes: #320413) + - fixes loss of pipe character in TeX verbatim mode (Closes: #181793) + - fixes incorrect html output (Closes: #204202, #205022) + - output correct XML (Closes: #221988) + - adds commands for serif fonts (Closes: #277754) + * install texinfo HTML documentation (Closes: #277921) + * include changes by Pierre Machard for Replaces (Closes: #261742) + * make postinst script POSIX-compliant, don't use command (Closes: #293053) + * fix de.po, thanks Jens Seidel (Closes: #313844) + * uses new tex-common and install fmtutil-config files, + but disables fmt file building as suggested by Karl Berry and + Thomas Esser. Also do not install symlinks, but mention in the fmt.d + config file that symlinks have to be created in case the user wants + to activate these formats (Closes: #253124) + * install install-info as ginstall-info (Closes: #285983) + * bumped Standards-Version to 3.6.2.1 (no changes necessary) + * change debian compat version to 4 + * dump most patches from previous versions as they are incorporated + upstream, and change to dpatch system, adding Build-Depends on dpatch + + -- Norbert Preining <[EMAIL PROTECTED]> Thu, 18 Aug 2005 18:52:55 +0200 + texinfo (4.7-2.2) unstable; urgency=high * NMU with maintainer's blessing diff -urN texinfo_4.7-2.2-debian/conf/50texinfo.cnf texinfo-4.8/debian/conf/50texinfo.cnf --- texinfo_4.7-2.2-debian/conf/50texinfo.cnf 1970-01-01 01:00:00.000000000 +0100 +++ texinfo-4.8/debian/conf/50texinfo.cnf 2005-08-19 12:37:59.000000000 +0200 @@ -0,0 +1,18 @@ +# +# 50texinfo.cnf +# +# You really can change stuff in this file, but it is NOT RECOMMENDED +# to play around with this file if you do not know what you are doing! +# Please leave this comment! +# -_- DebPkgProvidedMaps -_- +# +# Texinfo formats +# These formats are per default disabled as it is useless to have them +# texi2dvi and texi2pdf do *not* use these formats. +# If you want to enable the formats you have to uncomment the two lines +# AND(!!!) create symlinks +# texinfo -> tex +# pdftexinfo -> pdfetex +# in /usr/bin +#texinfo tex - -translate-file=cp227.tcx texinfo.ini +#pdftexinfo pdfetex - -translate-file=cp227.tcx *texinfo.ini diff -urN texinfo_4.7-2.2-debian/conf/texinfo.ini texinfo-4.8/debian/conf/texinfo.ini --- texinfo_4.7-2.2-debian/conf/texinfo.ini 1970-01-01 01:00:00.000000000 +0100 +++ texinfo-4.8/debian/conf/texinfo.ini 2005-08-19 12:30:40.000000000 +0200 @@ -0,0 +1,14 @@ +% Thomas Esser, 1998, 2004. public domain. +\ifx\pdfoutput\undefined +\else + \ifx\pdfoutput\relax + \else + \input pdftexconfig + \pdfoutput=0 + \fi +\fi + +\input plain.tex +\input texinfo.tex [EMAIL PROTECTED] [EMAIL PROTECTED] diff -urN texinfo_4.7-2.2-debian/conf/texinfo.list texinfo-4.8/debian/conf/texinfo.list --- texinfo_4.7-2.2-debian/conf/texinfo.list 1970-01-01 01:00:00.000000000 +0100 +++ texinfo-4.8/debian/conf/texinfo.list 2005-08-18 18:52:01.000000000 +0200 @@ -0,0 +1 @@ +50texinfo diff -urN texinfo_4.7-2.2-debian/control texinfo-4.8/debian/control --- texinfo_4.7-2.2-debian/control 2005-08-20 02:16:46.000000000 +0200 +++ texinfo-4.8/debian/control 2005-08-19 15:51:42.000000000 +0200 @@ -2,17 +2,17 @@ Section: doc Priority: standard Maintainer: Josip Rodin <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 2), libncurses5-dev | libncurses-dev, gettext -Standards-Version: 3.6.0 +Build-Depends: debhelper (>= 4), dpatch, libncurses5-dev | libncurses-dev, gettext +Standards-Version: 3.6.2.1 Package: texinfo Section: text Priority: standard Architecture: any -Depends: ${shlibs:Depends} -Suggests: tetex-bin +Depends: ${shlibs:Depends}, tex-common +Suggests: tetex-bin | texlive-basic Conflicts: tetex-bin (<< 1.0), tetex-base (<< 1.0-3), ja-trans (<= 0.7-3.1) -Replaces: tetex-base (<< 1.0.2+20000804-9) +Replaces: tetex-base (<< 1.0.2+20000804-9), tetex-bin (<< 3.0) Description: Documentation system for on-line information and printed output Texinfo is a documentation system that uses a single source file to produce both on-line information and printed output. diff -urN texinfo_4.7-2.2-debian/info.info texinfo-4.8/debian/info.info --- texinfo_4.7-2.2-debian/info.info 1970-01-01 01:00:00.000000000 +0100 +++ texinfo-4.8/debian/info.info 2005-08-18 18:52:01.000000000 +0200 @@ -0,0 +1,2 @@ +debian/tmp/usr/share/info/info-stnd.info +debian/tmp/usr/share/info/info.info diff -urN texinfo_4.7-2.2-debian/info.install texinfo-4.8/debian/info.install --- texinfo_4.7-2.2-debian/info.install 1970-01-01 01:00:00.000000000 +0100 +++ texinfo-4.8/debian/info.install 2005-08-18 18:52:01.000000000 +0200 @@ -0,0 +1,3 @@ +usr/bin/info* +usr/share/man/man1/info* +usr/share/man/man5/info* diff -urN texinfo_4.7-2.2-debian/info.menu texinfo-4.8/debian/info.menu --- texinfo_4.7-2.2-debian/info.menu 2005-08-20 02:16:46.000000000 +0200 +++ texinfo-4.8/debian/info.menu 2005-08-18 18:52:01.000000000 +0200 @@ -1,2 +1,2 @@ -?package(info): needs=text title="Info" section="Help" \ +?package(info): needs="text" title="Info" section="Help" \ longtitle="GNU Info browser" command="info" diff -urN texinfo_4.7-2.2-debian/info.postinst texinfo-4.8/debian/info.postinst --- texinfo_4.7-2.2-debian/info.postinst 2005-08-20 02:16:46.000000000 +0200 +++ texinfo-4.8/debian/info.postinst 2005-08-18 18:52:01.000000000 +0200 @@ -5,8 +5,6 @@ /usr/bin/info 60 \ --slave /usr/share/man/man1/infobrowser.1.gz infobrowser.1.gz \ /usr/share/man/man1/info.1.gz - install-info --quiet /usr/share/info/info-stnd.info - install-info --quiet /usr/share/info/info.info fi #DEBHELPER# diff -urN texinfo_4.7-2.2-debian/info.prerm texinfo-4.8/debian/info.prerm --- texinfo_4.7-2.2-debian/info.prerm 2005-08-20 02:16:46.000000000 +0200 +++ texinfo-4.8/debian/info.prerm 2005-08-18 18:52:01.000000000 +0200 @@ -4,9 +4,4 @@ update-alternatives --remove infobrowser /usr/bin/info fi -if [ "$1" = "remove" -o "$1" = "upgrade" ]; then - install-info --remove --quiet /usr/share/info/info-stnd.info - install-info --remove --quiet /usr/share/info/info.info -fi - #DEBHELPER# diff -urN texinfo_4.7-2.2-debian/patches/00list texinfo-4.8/debian/patches/00list --- texinfo_4.7-2.2-debian/patches/00list 1970-01-01 01:00:00.000000000 +0100 +++ texinfo-4.8/debian/patches/00list 2005-08-19 13:05:59.000000000 +0200 @@ -0,0 +1,2 @@ +10_po_fixes.dpatch +20_warn_missing_tex.dpatch diff -urN texinfo_4.7-2.2-debian/patches/10_po_fixes.dpatch texinfo-4.8/debian/patches/10_po_fixes.dpatch --- texinfo_4.7-2.2-debian/patches/10_po_fixes.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ texinfo-4.8/debian/patches/10_po_fixes.dpatch 2005-08-18 18:52:01.000000000 +0200 @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_po_fixes.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + [EMAIL PROTECTED]@ +diff -urNad --exclude=CVS --exclude=.svn ./po/de.po /tmp/dpep-work.vo1izc/texinfo-4.8-texlive/po/de.po +--- ./po/de.po 2004-12-22 01:20:23.000000000 +0100 ++++ /tmp/dpep-work.vo1izc/texinfo-4.8-texlive/po/de.po 2005-08-18 12:27:55.000000000 +0200 +@@ -1038,7 +1038,7 @@ + " --help display this help and exit.\n" + " --version display version information and exit.\n" + msgstr "" +-"Auruf: %s [OPTION]... [EINGABE-DATEI]\n" ++"Aufruf: %s [OPTION]... [EINGABE-DATEI]\n" + "\n" + "Infokey-Quelldatei in Infokey-Datei kompilieren. Liest EINGABE-DATEI\n" + "(Voreinstellung $HOME/.infokey) und schreibt kompilierte Tastaturdatei\n" +@@ -2952,7 +2952,7 @@ + #: makeinfo/sectioning.c:639 + #, c-format + msgid "Node with %ctop as a section already exists" +-msgstr "Knoten mit %ctop als Abschnitt exisiert bereits" ++msgstr "Knoten mit %ctop als Abschnitt existiert bereits" + + #: makeinfo/sectioning.c:647 + #, c-format diff -urN texinfo_4.7-2.2-debian/patches/20_warn_missing_tex.dpatch texinfo-4.8/debian/patches/20_warn_missing_tex.dpatch --- texinfo_4.7-2.2-debian/patches/20_warn_missing_tex.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ texinfo-4.8/debian/patches/20_warn_missing_tex.dpatch 2005-08-19 13:05:29.000000000 +0200 @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_warn_missing_tex.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + [EMAIL PROTECTED]@ +diff -urNad --exclude=CVS --exclude=.svn ./util/texi2dvi /tmp/dpep-work.19TjB7/texinfo-4.8/util/texi2dvi +--- ./util/texi2dvi 2005-08-19 13:04:27.000000000 +0200 ++++ /tmp/dpep-work.19TjB7/texinfo-4.8/util/texi2dvi 2005-08-19 13:05:17.000000000 +0200 +@@ -26,6 +26,17 @@ + # If possible, please send a copy of the output of the script called with + # the `--debug' option when making a bug report. + ++if ! command -v tex >/dev/null 2>&1; then ++ cat <<%EOM% ++You don't have a working TeX binary installed, but the texi2dvi script ++can't proceed without it. If you want to use this script, you have to ++install some kind of TeX, for example teTeX Debian packages. You can do ++that with this command: ++ apt-get install tetex-bin ++%EOM% ++ exit 1 ++fi ++ + # This string is expanded by rcs automatically when this file is checked out. + rcs_revision='$Revision: 1.34 $' + rcs_version=`set - $rcs_revision; echo $2` diff -urN texinfo_4.7-2.2-debian/postinst texinfo-4.8/debian/postinst --- texinfo_4.7-2.2-debian/postinst 2005-08-20 02:16:46.000000000 +0200 +++ texinfo-4.8/debian/postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = "configure" -o "$1" = "upgrade" ]; then - install-info --quiet /usr/share/info/texinfo -fi - -if [ "$1" = "configure" -a -z "$2" ] && command -v mktexlsr >/dev/null 2>&1; then - mktexlsr /usr/share/texmf >/dev/null -fi - -#DEBHELPER# diff -urN texinfo_4.7-2.2-debian/prerm texinfo-4.8/debian/prerm --- texinfo_4.7-2.2-debian/prerm 2005-08-20 02:16:46.000000000 +0200 +++ texinfo-4.8/debian/prerm 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = "remove" -o "$1" = "upgrade" ]; then - install-info --quiet --remove /usr/share/info/texinfo -fi - -#DEBHELPER# diff -urN texinfo_4.7-2.2-debian/rules texinfo-4.8/debian/rules --- texinfo_4.7-2.2-debian/rules 2005-08-20 02:16:46.000000000 +0200 +++ texinfo-4.8/debian/rules 2005-08-19 12:55:48.000000000 +0200 @@ -2,9 +2,11 @@ # Derived from debhelper/dh_make example and previous hello-based rules file. #export DH_VERBOSE=1 -export DH_COMPAT=2 +export DH_COMPAT=4 export DH_OPTIONS +include /usr/share/dpatch/dpatch.make + CFLAGS := -g -Wall ifneq "$(findstring noopt,$(DEB_BUILD_OPTIONS))" "" CFLAGS += -O0 @@ -13,34 +15,56 @@ endif texinfo := $(CURDIR)/debian/texinfo +tmpdir := $(CURDIR)/debian/tmp build: build-stamp -build-stamp: +build-stamp: patch-stamp dh_testdir CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \ --infodir='$${prefix}/share/info' --mandir='$${prefix}/share/man' $(MAKE) + (cd doc; $(MAKE) texinfo.html) touch $@ -clean: +clean: unpatch dh_testdir dh_testroot [ ! -f Makefile ] || $(MAKE) distclean - dh_clean build-stamp intl/libintl.h + dh_clean install-stamp build-stamp intl/libintl.h config.log + +install: install-stamp -install: DH_OPTIONS= -install: build-stamp +install-stamp: DH_OPTIONS= +install-stamp: build-stamp dh_testdir dh_testroot dh_clean -k - $(MAKE) install install-tex prefix=$(texinfo)/usr \ - TEXMF=$(texinfo)/usr/share/texmf - find $(texinfo) -type f -name dir -or -name install-info* | xargs rm -f -# rm -rf $(texinfo)/usr/share/texmf/tex/generic # epsf.tex is in tetex-base - rm -rf $(texinfo)/usr/share/texmf/pdftex # remove the broken epsf.tex - dh_movefiles --sourcedir=debian/texinfo -pinfo usr/bin/info* \ - usr/share/info/info*.info* usr/share/man/man1/info* \ - usr/share/man/man5/info* + dh_installdirs + $(MAKE) install install-tex prefix=$(tmpdir)/usr \ + TEXMF=$(tmpdir)/usr/share/texmf + find $(tmpdir) -type f -name dir | xargs rm -f + # pdfcolor and epsf.tex are in tetex and texlive + rm -rf $(tmpdir)/usr/share/texmf/tex/plain + rm -rf $(tmpdir)/usr/share/texmf/tex/generic + #mkdir -p $(tmpdir)/usr/share/texmf/tex/texinfo/base + #mv $(tmpdir)/usr/share/texmf/tex/texinfo/*.tex $(tmpdir)/usr/share/texmf/tex/texinfo/base + dh_install --list-missing --sourcedir=debian/tmp -X share/info + dh_installinfo + # do not install texinfo and pdftexinfo links + #dh_link + cp -a doc/texinfo.html $(texinfo)/usr/share/doc/texinfo/html + mv $(texinfo)/usr/bin/install-info $(texinfo)/usr/bin/ginstall-info + sed -e "s/install-info/g&/g" \ + < $(texinfo)/usr/share/man/man1/install-info.1 \ + > $(texinfo)/usr/share/man/man1/ginstall-info.1 + rm -f $(texinfo)/usr/share/man/man1/install-info.1 + mkdir -p $(texinfo)/etc/texmf/fmt.d + cp debian/conf/50texinfo.cnf $(texinfo)/etc/texmf/fmt.d + mkdir -p $(texinfo)/var/lib/tex-common/fmtutil-cnf + cp debian/conf/texinfo.list $(texinfo)/var/lib/tex-common/fmtutil-cnf + mkdir -p $(texinfo)/usr/share/texmf/tex/texinfo/config + cp debian/conf/texinfo.ini $(texinfo)/usr/share/texmf/tex/texinfo/ + touch install-stamp binary-indep: # There aren't any architecture independent packages here. diff -urN texinfo_4.7-2.2-debian/texinfo.dirs texinfo-4.8/debian/texinfo.dirs --- texinfo_4.7-2.2-debian/texinfo.dirs 1970-01-01 01:00:00.000000000 +0100 +++ texinfo-4.8/debian/texinfo.dirs 2005-08-18 18:52:01.000000000 +0200 @@ -0,0 +1 @@ +usr/share/doc/texinfo diff -urN texinfo_4.7-2.2-debian/texinfo.info texinfo-4.8/debian/texinfo.info --- texinfo_4.7-2.2-debian/texinfo.info 1970-01-01 01:00:00.000000000 +0100 +++ texinfo-4.8/debian/texinfo.info 2005-08-18 18:52:01.000000000 +0200 @@ -0,0 +1,4 @@ +debian/tmp/usr/share/info/texinfo +debian/tmp/usr/share/info/texinfo-1 +debian/tmp/usr/share/info/texinfo-2 +debian/tmp/usr/share/info/texinfo-3 diff -urN texinfo_4.7-2.2-debian/texinfo.install texinfo-4.8/debian/texinfo.install --- texinfo_4.7-2.2-debian/texinfo.install 1970-01-01 01:00:00.000000000 +0100 +++ texinfo-4.8/debian/texinfo.install 2005-08-19 13:12:04.000000000 +0200 @@ -0,0 +1,44 @@ +usr/bin/makeinfo +usr/bin/install-info +usr/bin/texindex +usr/bin/texi2dvi +usr/bin/texi2pdf +usr/share/locale/cs/LC_MESSAGES/texinfo.mo +usr/share/locale/da/LC_MESSAGES/texinfo.mo +usr/share/locale/de/LC_MESSAGES/texinfo.mo +usr/share/locale/de_AT/LC_MESSAGES/texinfo.mo +usr/share/locale/eo/LC_MESSAGES/texinfo.mo +usr/share/locale/fr/LC_MESSAGES/texinfo.mo +usr/share/locale/he/LC_MESSAGES/texinfo.mo +usr/share/locale/hr/LC_MESSAGES/texinfo.mo +usr/share/locale/ja/LC_MESSAGES/texinfo.mo +usr/share/locale/nl/LC_MESSAGES/texinfo.mo +usr/share/locale/nb/LC_MESSAGES/texinfo.mo +usr/share/locale/no/LC_MESSAGES/texinfo.mo +usr/share/locale/pl/LC_MESSAGES/texinfo.mo +usr/share/locale/ro/LC_MESSAGES/texinfo.mo +usr/share/locale/ru/LC_MESSAGES/texinfo.mo +usr/share/locale/sv/LC_MESSAGES/texinfo.mo +usr/share/locale/tr/LC_MESSAGES/texinfo.mo +usr/share/locale/zh_CN/LC_MESSAGES/texinfo.mo +usr/share/locale/zh_TW/LC_MESSAGES/texinfo.mo +usr/share/texinfo/texinfo.dtd +usr/share/texinfo/texinfo.xsl +usr/share/texinfo/texinfo.cat +usr/share/man/man1/install-info.1 +usr/share/man/man1/makeinfo.1 +usr/share/man/man1/texindex.1 +usr/share/man/man1/texi2dvi.1 +usr/share/man/man5/texinfo.5 +usr/share/texmf/tex/texinfo/texinfo.tex +usr/share/texmf/tex/texinfo/txi-cs.tex +usr/share/texmf/tex/texinfo/txi-de.tex +usr/share/texmf/tex/texinfo/txi-en.tex +usr/share/texmf/tex/texinfo/txi-es.tex +usr/share/texmf/tex/texinfo/txi-fr.tex +usr/share/texmf/tex/texinfo/txi-it.tex +usr/share/texmf/tex/texinfo/txi-nl.tex +usr/share/texmf/tex/texinfo/txi-no.tex +usr/share/texmf/tex/texinfo/txi-pl.tex +usr/share/texmf/tex/texinfo/txi-pt.tex +usr/share/texmf/tex/texinfo/txi-tr.tex diff -urN texinfo_4.7-2.2-debian/texinfo.links texinfo-4.8/debian/texinfo.links --- texinfo_4.7-2.2-debian/texinfo.links 1970-01-01 01:00:00.000000000 +0100 +++ texinfo-4.8/debian/texinfo.links 2005-08-19 12:34:00.000000000 +0200 @@ -0,0 +1,2 @@ +usr/bin/tex usr/bin/texinfo +usr/bin/pdfetex usr/bin/pdftexinfo diff -urN texinfo_4.7-2.2-debian/texinfo.postinst texinfo-4.8/debian/texinfo.postinst --- texinfo_4.7-2.2-debian/texinfo.postinst 1970-01-01 01:00:00.000000000 +0100 +++ texinfo-4.8/debian/texinfo.postinst 2005-08-18 18:52:01.000000000 +0200 @@ -0,0 +1,15 @@ +#!/bin/sh -e + +if [ "$1" = "configure" -a -z "$2" ] ; then + if test -x /usr/bin/mktexlsr ; then + mktexlsr /usr/share/texmf >/dev/null + fi + update-fmtutil + if test -x /usr/bin/fmtutil-sys ; then + fmtutil-sys --byfmt texinfo + fmtutil-sys --byfmt pdftexinfo + fi +fi + + +#DEBHELPER# diff -urN texinfo_4.7-2.2-debian/texinfo.postrm texinfo-4.8/debian/texinfo.postrm --- texinfo_4.7-2.2-debian/texinfo.postrm 1970-01-01 01:00:00.000000000 +0100 +++ texinfo-4.8/debian/texinfo.postrm 2005-08-20 02:20:15.000000000 +0200 @@ -0,0 +1,8 @@ +#!/bin/sh -e + +if test -x /usr/bin/mktexlsr; then + mktexlsr /usr/share/texmf >/dev/null +fi +update-fmtutil + +#DEBHELPER# diff -urN texinfo_4.7-2.2-debian/texinfo.prerm texinfo-4.8/debian/texinfo.prerm --- texinfo_4.7-2.2-debian/texinfo.prerm 1970-01-01 01:00:00.000000000 +0100 +++ texinfo-4.8/debian/texinfo.prerm 2005-08-18 18:52:01.000000000 +0200 @@ -0,0 +1,3 @@ +#!/bin/sh -e + +#DEBHELPER#