diff -u texinfo-4.13a.dfsg.1/debian/control texinfo-4.13a.dfsg.1/debian/control --- texinfo-4.13a.dfsg.1/debian/control +++ texinfo-4.13a.dfsg.1/debian/control @@ -1,7 +1,8 @@ Source: texinfo Section: doc Priority: standard -Maintainer: Debian TeX maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian TeX maintainers Uploaders: Norbert Preining , Frank Küster Build-Depends: debhelper (>= 5), quilt, libncurses5-dev | libncurses-dev, gettext Standards-Version: 3.8.3 diff -u texinfo-4.13a.dfsg.1/debian/changelog texinfo-4.13a.dfsg.1/debian/changelog --- texinfo-4.13a.dfsg.1/debian/changelog +++ texinfo-4.13a.dfsg.1/debian/changelog @@ -1,3 +1,12 @@ +texinfo (4.13a.dfsg.1-5ubuntu1) lucid; urgency=low + + * Merge from debian testing (LP: #499671), remaining changes: + - debian/patches/int2size_t-fix-page-truncation: Cherrypick upstream + variable size fix which manifested as info pages being truncated + on a tab character. + + -- Artur Rona Wed, 23 Dec 2009 04:00:59 +0100 + texinfo (4.13a.dfsg.1-5) unstable; urgency=low * update-info-dir: reset $LANGUAGE to the system wide setting in @@ -11,6 +20,13 @@ -- Norbert Preining Thu, 24 Sep 2009 01:56:19 +0200 +texinfo (4.13a.dfsg.1-4ubuntu1) karmic; urgency=low + + * Cherrypick upstream variable size fix which manifested as info pages being + truncated on a tab character. (LP: #394808) + + -- Max Bowsher Tue, 20 Oct 2009 18:28:40 +0100 + texinfo (4.13a.dfsg.1-4) unstable; urgency=low * upload to unstable @@ -646,104 +662,100 @@ - * Added architecture fields - -- Erick Branderhorst Tue Mar 12 16:26:41 MET 1996 -texinfo (3.7-0); priority=LOW +Texinfo 3.1 Debian 6 - iwj +* Install texinfo.tex in /usr/lib/texmf/tex/misc/ instead. +Texinfo 3.1 Debian 5 - iwj +* Move cursor to bottom of screen before exiting `info'. +* Install texinfo.tex in /usr/lib/tex/inputs/. +Texinfo 3.1 Debian 4 - iwj +* Added Package_Revision field to `control' files. +Texinfo 3.1 Debian 3 - iwj +* Arrange for `h' to give (Info-stnd)Top instead if (Info)Help or + (Info)Help-Small-Screen isn't available. +* Added this Changelog. +* Fixed typo in debian.README (= /usr/doc/copyright/texinfo). +* Fixed invocations of install-info, and added --quiet option. +* Specified version numbering scheme, version number now in filenames. +Texinfo 3.1 Debian 2 - iwj +* Fixed bug that prevents `info' from recognising .gz as a gzipped file. +* Split into three packages, texidoc, texinfo and info. +Texinfo 3.1 Debian 1 - iwj +Initial release, completely untested. +# vim:set termencoding=iso8859-15 encoding=utf-8 fileencoding=utf-8: # +Local Variables: +coding: utf-8 +mode: debian-changelog +End: +texinfo (3.7-0); priority=LOW * Texinfo no longer recommends texidoc, it is suggested now (Bug#1692). * Upgraded to latest FSF version, texinfo 3.7 (Bug#2467). * Version and Revision fields -> one Version field in all control files. * New maintainer: Erick Branderhorst. - -- Erick Branderhorst Fri, 8 Mar 1996 10:13:49 texinfo (3.6-11); priority=MEDIUM - * converted to ELF, - -- David Engel Tue, 16 Jan 1996 20:00:00 -0500 texinfo (3.6-5); priority=MEDIUM - * serious problem in texinfo.tex fixed (reported by Nils Rennebarth and Bill Mitchell, patch supplied by Richard Stallman). - -- Ian Jackson Fri, 13 Oct 1995 02:04:44 +0100 texinfo (3.6-4); priority=LOW - * texidoc's info dir entry for /usr/info/texinfo fixed (Bug#1514). - -- Ian Jackson Sat, 30 Sep 1995 18:23:31 +0100 texinfo (3.6-3); priority=MEDIUM - * Fix null pointer dereference in makeinfo (Bug#1493). * `info-browser' virtual package name used in control files (Bug#1427, Bug#1434, Bug#1469) - -- Ian Jackson Thu, 28 Sep 1995 02:23:54 +0100 texinfo (3.6-2); priority=LOW - * Do not build *.elc files, rather than building them, putting them in debian-tmp, and then deleting them before package construction. Now you can build the package without emacs. - * Added `Source: texinfo' to binary package control files. - -- Ian Jackson Sun, 16 Jul 1995 15:03:53 +0100 texinfo (3.6-1); priority=HIGH - * Upgraded to latest FSF version, texinfo 3.6. Notable changes alleged are many bugfixes and general improvements, and the capability in `info' to display man pages. The Emacs Lisp files for formatting Texinfo documents are *not* included, as they are in Debian's Emacs package. - -- Ian Jackson Thu, 13 Jul 1995 03:21:32 +0100 texinfo (3.1-7); priority=LOW - * Default INFOPATH for standalone info browser is now `/usr/info:/usr/local/info:.' (Bug#889, 2nd point). * Extended descriptions provided for all three binary packages. - -- Ian Jackson Thu, 18 May 1995 01:39:27 +0100 Texinfo 3.1 Debian 6 - iwj - * Install texinfo.tex in /usr/lib/texmf/tex/misc/ instead. - Texinfo 3.1 Debian 5 - iwj - * Move cursor to bottom of screen before exiting `info'. * Install texinfo.tex in /usr/lib/tex/inputs/. - Texinfo 3.1 Debian 4 - iwj - * Added Package_Revision field to `control' files. - Texinfo 3.1 Debian 3 - iwj - * Arrange for `h' to give (Info-stnd)Top instead if (Info)Help or (Info)Help-Small-Screen isn't available. * Added this Changelog. * Fixed typo in debian.README (= /usr/doc/copyright/texinfo). * Fixed invocations of install-info, and added --quiet option. * Specified version numbering scheme, version number now in filenames. - Texinfo 3.1 Debian 2 - iwj - * Fixed bug that prevents `info' from recognising .gz as a gzipped file. * Split into three packages, texidoc, texinfo and info. - Texinfo 3.1 Debian 1 - iwj Initial release, completely untested. - # vim:set termencoding=iso8859-15 encoding=utf-8 fileencoding=utf-8: # Local Variables: coding: utf-8 mode: debian-changelog End: + diff -u texinfo-4.13a.dfsg.1/debian/patches/series texinfo-4.13a.dfsg.1/debian/patches/series --- texinfo-4.13a.dfsg.1/debian/patches/series +++ texinfo-4.13a.dfsg.1/debian/patches/series @@ -5,0 +6 @@ +int2size_t-fix-page-truncation only in patch2: unchanged: --- texinfo-4.13a.dfsg.1.orig/debian/patches/int2size_t-fix-page-truncation +++ texinfo-4.13a.dfsg.1/debian/patches/int2size_t-fix-page-truncation @@ -0,0 +1,31 @@ +diff --git a/info/window.c b/info/window.c +index a94ee78..6bc73a2 100644 +--- a/info/window.c ++++ b/info/window.c +@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *start, + const char *carried_over_ptr; + size_t carried_over_len, carried_over_count; + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + int replen; + int delim = 0; + int rc; +@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage) + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + + if (cur_len == 1) + { +@@ -1852,7 +1852,7 @@ window_scan_line (WINDOW *win, int line, int phys, + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + int replen; + + if (cur_ptr >= endp)