diff -rNu python2.5-doc-2.5.old/debian/PVER-doc.postinst.in python2.5-doc-2.5/debian/PVER-doc.postinst.in --- python2.5-doc-2.5.old/debian/PVER-doc.postinst.in 2006-11-05 11:49:14.000000000 +0100 +++ python2.5-doc-2.5/debian/PVER-doc.postinst.in 2006-11-05 12:46:14.000000000 +0100 @@ -2,9 +2,9 @@ info=@INFO@ if [ -n "$info" ] && [ -x /usr/sbin/install-info ]; then - #install-info --quiet --section "Python" "Python" \ - # --description="Python @VER@ Library Reference" \ - # /usr/share/info/@PVER@-lib.info + install-info --quiet --section "Python" "Python" \ + --description="Python @VER@ Library Reference" \ + /usr/share/info/@PVER@-lib.info #install-info --quiet --section "Python" "Python" \ # --description="Python @VER@ Macintosh Modules" \ # /usr/share/info/@PVER@-mac.info diff -rNu python2.5-doc-2.5.old/debian/PVER-doc.prerm.in python2.5-doc-2.5/debian/PVER-doc.prerm.in --- python2.5-doc-2.5.old/debian/PVER-doc.prerm.in 2006-11-05 11:49:14.000000000 +0100 +++ python2.5-doc-2.5/debian/PVER-doc.prerm.in 2006-11-05 12:46:23.000000000 +0100 @@ -2,7 +2,7 @@ info=@INFO@ if [ -n "$info" ] && [ -x /usr/sbin/install-info ]; then - #install-info --quiet --remove /usr/share/info/@PVER@-lib.info + install-info --quiet --remove /usr/share/info/@PVER@-lib.info #install-info --quiet --remove /usr/share/info/@PVER@-mac.info install-info --quiet --remove /usr/share/info/@PVER@-ref.info install-info --quiet --remove /usr/share/info/@PVER@-api.info diff -rNu python2.5-doc-2.5.old/debian/patches/doc-libinfo.dpatch python2.5-doc-2.5/debian/patches/doc-libinfo.dpatch --- python2.5-doc-2.5.old/debian/patches/doc-libinfo.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ python2.5-doc-2.5/debian/patches/doc-libinfo.dpatch 2006-11-05 13:59:09.000000000 +0100 @@ -0,0 +1,182 @@ +#! /bin/sh -e + +# DP: Fix the build of the library reference info page + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p1 < $0 + #cd ${dir}gcc && autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 + #rm ${dir}gcc/configure + ;; + *) + echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" + exit 1 +esac +exit 0 + + +diff -rNu python2.5-doc-2.5.old/Doc/lib/libmsilib.tex python2.5-doc-2.5/Doc/lib/libmsilib.tex +--- python2.5-doc-2.5.old/Doc/lib/libmsilib.tex 2006-05-03 06:52:04.000000000 +0200 ++++ python2.5-doc-2.5/Doc/lib/libmsilib.tex 2006-11-05 11:49:44.000000000 +0100 +@@ -344,8 +344,8 @@ + \subsection{Features\label{features}} + + \begin{classdesc}{Feature}{database, id, title, desc, display\optional{, +- level=1\optional{, parent\optional\{, directory\optional{, +- attributes=0}}}} ++ level=1\optional{, parent\optional{, directory\optional{, ++ attributes=0}}}}} + + Add a new record to the \code{Feature} table, using the values + \var{id}, \var{parent.id}, \var{title}, \var{desc}, \var{display}, +diff -rNu python2.5-doc-2.5.old/Doc/tools/py2texi.el python2.5-doc-2.5/Doc/tools/py2texi.el +--- python2.5-doc-2.5.old/Doc/tools/py2texi.el 2005-03-10 06:02:18.000000000 +0100 ++++ python2.5-doc-2.5/Doc/tools/py2texi.el 2006-11-05 11:49:44.000000000 +0100 +@@ -1,5 +1,6 @@ + ;;; py2texi.el -- Conversion of Python LaTeX documentation to Texinfo + ++;; Copyright (C) 2006 Jeroen Dekkers + ;; Copyright (C) 1998, 1999, 2001, 2002 Milan Zamazal + + ;; Author: Milan Zamazal +@@ -168,6 +169,7 @@ + "@end table\n") + ("productionlist" 0 "\n@table @code\n" "@end table\n") + ("quotation" 0 "@quotation" "@end quotation") ++ ("quote" 0 "@quotation" "@end quotation") + ("seealso" 0 "See also:\n@table @emph\n" "@end table\n") + ("seealso*" 0 "@table @emph\n" "@end table\n") + ("sloppypar" 0 "" "") +@@ -246,11 +248,12 @@ + ("env" 1 "@code{\\1}") + ("EOF" 0 "@code{EOF}") + ("email" 1 "@email{\\1}") ++ ("em" 1 "@emph{\\1}") + ("emph" 1 "@emph{\\1}") + ("envvar" 1 "@env{\\1}") + ("exception" 1 "@code{\\1}") + ("exindex" 1 (progn (setq obindex t) "@obindex{\\1}")) +- ("fi" 0 (concat "@end " last-if)) ++ ("fi" 0 (if (equal last-if "ifx") "" (concat "@end " last-if))) + ("file" 1 "@file{\\1}") + ("filenq" 1 "@file{\\1}") + ("filevar" 1 "@file{@var{\\1}}") +@@ -262,6 +265,7 @@ + ("grammartoken" 1 "@code{\\1}") + ("guilabel" 1 "@strong{\\1}") + ("hline" 0 "") ++ ("ifx" 0 (progn (setq last-if "ifx") "")) + ("ifhtml" 0 (concat "@" (setq last-if "ifinfo"))) + ("iftexi" 0 (concat "@" (setq last-if "ifinfo"))) + ("index" 1 (progn (setq cindex t) "@cindex{\\1}")) +@@ -284,6 +288,7 @@ + ("lineiii" 3 "@item \\1 @tab \\2 @tab \\3") + ("lineiv" 4 "@item \\1 @tab \\2 @tab \\3 @tab \\4") + ("linev" 5 "@item \\1 @tab \\2 @tab \\3 @tab \\4 @tab \\5") ++ ("locallinewidth" 0 "") + ("localmoduletable" 0 "") + ("longprogramopt" 1 "@option{--\\1}") + ("macro" 1 "@code{@backslash{}\\1}") +@@ -307,6 +312,7 @@ + ("moreargs" 0 "@dots{}") + ("n" 0 "@backslash{}n") + ("newcommand" 2 "") ++ ("newlength" 1 "") + ("newsgroup" 1 "@samp{\\1}") + ("nodename" 1 + (save-excursion +@@ -322,6 +328,7 @@ + ("opindex" 1 (progn (setq cindex t) "@cindex{\\1}")) + ("option" 1 "@option{\\1}") + ("optional" 1 "[\\1]") ++ ("paragraph" 1 "@subsubheading \\1") + ("pep" 1 (progn (setq cindex t) "PEP@ \\1@cindex PEP \\1\n")) + ("pi" 0 "pi") + ("platform" 1 "") +@@ -363,6 +370,7 @@ + ("seetitle" 1 "@cite{\\1}") + ("seeurl" 2 "\n@table @url\n@item \\1\n\\2\n@end table\n") + ("setindexsubitem" 1 (progn (setq cindex t) "@cindex \\1")) ++ ("setlength" 2 "") + ("setreleaseinfo" 1 (progn (setq py2texi-releaseinfo ""))) + ("setshortversion" 1 + (progn (setq py2texi-python-short-version (match-string 1 string)) "")) +@@ -382,8 +390,8 @@ + ("textasciicircum" 0 "^") + ("textbackslash" 0 "@backslash{}") + ("textbar" 0 "|") +- ; Some common versions of Texinfo don't support @euro yet: +- ; ("texteuro" 0 "@euro{}") ++ ("textbf" 1 "@strong{\\1}") ++ ("texteuro" 0 "@euro{}") + ; Unfortunately, this alternate spelling doesn't actually apply to + ; the usage found in Python Tutorial, which actually requires a + ; Euro symbol to make sense, so this is commented out as well. +@@ -394,6 +402,7 @@ + ("textrm" 1 "\\1") + ("texttt" 1 "@code{\\1}") + ("textunderscore" 0 "_") ++ ("tilde" 0 "~") + ("title" 1 (progn (setq title (match-string 1 string)) "@settitle \\1")) + ("today" 0 "@today{}") + ("token" 1 "@code{\\1}") +@@ -402,6 +411,7 @@ + ("u" 0 "@backslash{}u") + ("ulink" 2 "\\1") + ("UNIX" 0 "UNIX") ++ ("undefined" 0 "") + ("unspecified" 0 "@dots{}") + ("url" 1 "@url{\\1}") + ("usepackage" 1 "") +@@ -534,15 +544,20 @@ + beg + end) + (py2texi-search-safe "\\\\begin{\\(verbatim\\|displaymath\\)}" +- (replace-match "@example") +- (setq beg (copy-marker (point) nil)) +- (re-search-forward "\\\\end{\\(verbatim\\|displaymath\\)}") +- (setq end (copy-marker (match-beginning 0) nil)) +- (replace-match "@end example") +- (py2texi-texinfo-escape beg end) +- (put-text-property (- beg (length "@example")) +- (+ end (length "@end example")) +- 'py2texi-protected t)) ++ (when (save-excursion ++ ; Make sure we aren't looking at a commented out version ++ ; of a verbatim environment ++ (beginning-of-line) ++ (not (looking-at "%"))) ++ (replace-match "@example ") ++ (setq beg (copy-marker (point) nil)) ++ (re-search-forward "\\\\end{\\(verbatim\\|displaymath\\)}") ++ (setq end (copy-marker (match-beginning 0) nil)) ++ (replace-match "@end example") ++ (py2texi-texinfo-escape beg end) ++ (put-text-property (- beg (length "@example ")) ++ (+ end (length "@end example")) ++ 'py2texi-protected t))) + (py2texi-search-safe "\\\\verb\\([^a-z]\\)" + (setq delimiter (match-string 1)) + (replace-match "@code{") +@@ -883,6 +898,10 @@ + + (defun py2texi-fix-braces () + "Escape braces for Texinfo." ++ (py2texi-search "{@{}" ++ (replace-match "@{")) ++ (py2texi-search "{@}}" ++ (replace-match "@}")) + (let (string) + (py2texi-search "{" + (unless (or (py2texi-protected) diff -rNu python2.5-doc-2.5.old/debian/patches/doc-no-libinfo.dpatch python2.5-doc-2.5/debian/patches/doc-no-libinfo.dpatch --- python2.5-doc-2.5.old/debian/patches/doc-no-libinfo.dpatch 2006-11-05 11:49:14.000000000 +0100 +++ python2.5-doc-2.5/debian/patches/doc-no-libinfo.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -#! /bin/sh -e - -# DP: Disable building the python-lib info docs (fail to build) - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" - exit 1 -esac -exit 0 - ---- Doc/info/Makefile~ 2003-07-16 06:02:58.000000000 +0200 -+++ Doc/info/Makefile 2006-08-10 16:54:12.492999192 +0200 -@@ -17,7 +17,7 @@ - - all: check-emacs-version \ - api dist ext mac ref tut whatsnew \ -- lib -+# lib - # doc inst - - api: python$(VERSION)-api.info diff -rNu python2.5-doc-2.5.old/debian/rules python2.5-doc-2.5/debian/rules --- python2.5-doc-2.5.old/debian/rules 2006-11-05 11:49:14.000000000 +0100 +++ python2.5-doc-2.5/debian/rules 2006-11-05 13:44:44.000000000 +0100 @@ -846,7 +846,7 @@ patchlevel \ doc-faq \ profile-doc \ - doc-no-libinfo \ + doc-libinfo \ # which patches should be applied? debian_patches = \