--- catdvi-0.14.orig/debian/changelog +++ catdvi-0.14/debian/changelog @@ -0,0 +1,199 @@ +catdvi (0.14-13) unstable; urgency=low + + * QA upload. + * Set Maintainer to Debian QA Group. (see #826917) + * debian/compat: 5 -> 7. (Closes: #965447) + + -- Adrian Bunk Tue, 04 Jan 2022 18:11:19 +0200 + +catdvi (0.14-12.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove conflicting declaration of kpathsea_version_string (closes: + #666169). Thanks to Adam D. Barratt for the bug report. + + -- Jakub Wilk Sun, 22 Apr 2012 17:21:14 +0200 + +catdvi (0.14-12) unstable; urgency=low + + * debian/patches/02_hardening-format-security.diff: Closes: #643361. + + -- Bart Martens Thu, 29 Sep 2011 04:08:11 +0200 + +catdvi (0.14-11) unstable; urgency=low + + * Fixed depends-on-obsolete-package depends: tetex-base -bin -extra. + * Fixed debhelper-but-no-misc-depends. + + -- Bart Martens Fri, 15 May 2009 17:51:53 +0200 + +catdvi (0.14-10) unstable; urgency=low + + * debian/control, debian/rules: Now using cdbs. + * debian/patches/01_outenc_num_403867.diff: Added. Closes: #403867. + + -- Bart Martens Sun, 03 Feb 2008 18:26:13 +0100 + +catdvi (0.14-9) unstable; urgency=low + + * Copy of 0.14-8, thereby reverting the changes of 0.14-7.1. + * debian/changelog: Added changelog entry for 0.14-7.1. + + -- Bart Martens Sat, 23 Sep 2006 18:07:04 +0200 + +catdvi (0.14-7.1) unstable; urgency=medium + + * Non-maintainer upload. + * Set the dependencies right to have all tex-parts in. Closes: #291040 + + -- Andreas Barth Fri, 8 Sep 2006 22:52:06 +0200 + +catdvi (0.14-8) unstable; urgency=low + + * debian/control: Added Depends: tetex-base | texlive-base, tetex-bin | + texlive-base-bin, and added Recommends: tetex-extra | + texlive-fonts-recommended. Closes: #291040. Patch by Frank Küster + , thanks. + + -- Bart Martens Thu, 7 Sep 2006 07:23:20 +0200 + +catdvi (0.14-7) unstable; urgency=low + + * debian/control: Changed my e-mail address. + * debian/control, debian/rules, debian/compat: Debhelper version. + * debian/control: Build-depends on libkpathsea-dev and autotools-dev. + * debian/control: Standards version. + * debian/copyright: Updated. + * debian/rules: Don't put config.guess and config.sub in .diff.gz. + * debian/watch: Updated to version 3. + + -- Bart Martens Sat, 17 Jun 2006 15:38:06 +0200 + +catdvi (0.14-6) unstable; urgency=low + + * debian/control: Newer version of libkpathsea. Closes: #354508. Reported + by Adrian Bunk , thanks. + + -- Bart Martens Wed, 8 Mar 2006 23:35:11 +0100 + +catdvi (0.14-5) unstable; urgency=low + + * New maintainer. Closes: #354349. + + -- Bart Martens Sun, 26 Feb 2006 11:07:19 +0100 + +catdvi (0.14-4) unstable; urgency=low + + * QA upload. + * Fixed "Missing dependencies", closes: #291040. + * Fixed "Assertion failure", closes: #279733. Patch thanks to + Bjoern Brill . + * debian/control: Policy changed to 3.6.2. + * debian/control: Changed maintainer's email address. + * debian/control: Added homepage. + * Added watch file. + * Fixed package-uses-deprecated-debhelper-compat-version. + * Fixed old-fsf-address-in-copyright-file. + + -- Anibal Monsalve Salazar Sun, 26 Feb 2006 11:58:38 +1100 + +catdvi (0.14-3) unstable; urgency=low + + * debian/control: Policy changed to 3.6.1 + * debian/control: Changed maintainer's email address. + + -- Andrea Bedini Thu, 15 Jan 2004 19:59:37 +0100 + +catdvi (0.14-2) unstable; urgency=low + + * Policy changed to 3.5.8 + * Closing ITA + (closes: #174850) + + Sponsorship: frankie@debian.org + + -- Andrea Bedini Mon, 13 Jan 2003 13:53:44 +0100 + +catdvi (0.14-1) unstable; urgency=low + + * New upstream release. + * rebuilt the package using debhelper. + * debian/rules: Installs changelog-authors too. + * debian/control: it does not depend anymore to tetex-base, tetex-base is + only suggested now. + * New maintainer. + + Sponsorship: frankie@debian.org + + -- Andrea Bedini Tue, 7 Jan 2003 02:43:22 +0100 + +catdvi (0.13-1) unstable; urgency=low + + * New upstream release + + -- Antti-Juhani Kaijanaho Wed, 3 Apr 2002 19:50:48 +0300 + +catdvi (0.12-1) unstable; urgency=low + + * New upstream release + * Acknowledge NMU, closes: #94072. + * debian/copyright: Updated. + * debian/control [Standards-Version]: Bumped to 3.5.6. + * debian/control [Build-Depends]: Added version guard to libkpathsea-dev + based on its shlibs data. + * debian/rules: Install catdvi.txt, README, TODO, NEWS and AUTHORS, too. + + -- Antti-Juhani Kaijanaho Thu, 13 Dec 2001 11:56:06 +0200 + +catdvi (0.11-2) unstable; urgency=low + + * NMU + * Fixed build dependency on tetex-dev (is now libkpathsea-dev), closes: #94072. + + -- Michael Piefel Tue, 19 Jun 2001 17:34:13 +0200 + +catdvi (0.11-1) unstable; urgency=low + + * New upstream release + * debian/copyright: Updated. + + -- Antti-Juhani Kaijanaho Wed, 21 Feb 2001 22:17:18 +0200 + +catdvi (0.10-2) unstable; urgency=low + + * debian/control [Build-Depends]: Up tetex-dev version requirement + so that we build with the new libkpathsea packages, closes: #79724. + + -- Antti-Juhani Kaijanaho Mon, 18 Dec 2000 08:47:59 +0200 + +catdvi (0.10-1) unstable; urgency=low + + * New upstream release. + + includes a manual page, closes: #62754. + * debian/control: Update Build-Depends version constraints. + * debian/control: Downgrade the Recommends tetex-extra to Suggests. + * debian/rules: Override makefile variable INSTALL_DATA + * debian/rules: Compress manual pages. + * debian/copyright: Updated download address. + * debian/copyright: Remove (old) FSF address. + + -- Antti-Juhani Kaijanaho Fri, 16 Jun 2000 19:47:18 +0300 + +catdvi (0.9-3) unstable; urgency=low + + * Update librules.mk - remove debian/stamp at clean, closes: #64060. + + -- Antti-Juhani Kaijanaho Tue, 16 May 2000 17:26:07 +0300 + +catdvi (0.9-2) unstable; urgency=low + + * Update librules.mk - fixes 'debian/stamp does not exist' problems + + -- Antti-Juhani Kaijanaho Wed, 26 Apr 2000 00:43:39 +0300 + +catdvi (0.9-1) unstable; urgency=low + + * Initial packaging. + + -- Antti-Juhani Kaijanaho Sun, 16 Apr 2000 13:40:00 +0300 + --- catdvi-0.14.orig/debian/compat +++ catdvi-0.14/debian/compat @@ -0,0 +1 @@ +7 --- catdvi-0.14.orig/debian/control +++ catdvi-0.14/debian/control @@ -0,0 +1,30 @@ +Source: catdvi +Section: tex +Priority: extra +Maintainer: Debian QA Group +Build-Depends: debhelper (>= 5), libkpathsea-dev, autotools-dev, cdbs +Standards-Version: 3.8.1 +Homepage: http://catdvi.sourceforge.net/ + +Package: catdvi +Architecture: any +Depends: ${shlibs:Depends}, texlive-base, texlive-base-bin, ${misc:Depends} +Recommends: texlive-fonts-recommended +Description: DVI to plain text translator + CatDVI translates a TeX Device Independent (DVI) file into a readable + plaintext file. It aims to generate high-quality output that reproduces + all aspects of the DVI file within the limits of the output medium. + CatDVI uses Unicode internally and can output ASCII, ISO Latin 1 and + UTF-8 Unicode. + . + CatDVI can be used for previewing TeX documents on character-cell displays + such as traditional terminals and terminal emulators. It is also possible + to use it in generation of plain text documents from TeX source, assuming + that the document is written with this conversion in mind. + . + CatDVI is under development and as such yet incomplete. However, it is + quite useful even in its current form and already outperforms some of its + competition in some areas. + . + CatDVI requires that the TFM files for all fonts used in its input DVI files + are installed or can be generated by kpathsea. --- catdvi-0.14.orig/debian/copyright +++ catdvi-0.14/debian/copyright @@ -0,0 +1,39 @@ +This package was debianized by Andrea Bedini on +Tue, 7 Jan 2003 02:43:22 +0100. + +It was downloaded from http://catdvi.sourceforge.net/ + +Copyright 1987-1999 Free Software Foundation, Inc. +Copyright 1999, J.H.M. Dassen (Ray) +Copyright 1999-2001, Antti-Juhani Kaijanaho +Copyright 2000-2001, Karl Berry, Olaf Weber and others (kpathsea library) +Copyright 2000-2002, Bjoern Brill + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is +Copyright 2000-2002, Antti-Juhani Kaijanaho +Copyright 2001, Michael Piefel +Copyright 2003-2004, Andrea Bedini +Copyright 2006, Anibal Monsalve Salazar +Copyright 2006-2008, Bart Martens +and is licensed under the GPL, see above. + --- catdvi-0.14.orig/debian/dirs +++ catdvi-0.14/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/man/man1 --- catdvi-0.14.orig/debian/docs +++ catdvi-0.14/debian/docs @@ -0,0 +1,6 @@ +AUTHORS +catdvi.txt +changelog-authors +NEWS +README +TODO --- catdvi-0.14.orig/debian/patches/01_outenc_num_403867.diff +++ catdvi-0.14/debian/patches/01_outenc_num_403867.diff @@ -0,0 +1,36 @@ +Patch by Samuel Thibault . +Fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=403867 +catdvi: Default output encoding should be the current locale + + +diff -ur catdvi-0.14-orig/catdvi.c catdvi-0.14/catdvi.c +--- catdvi-0.14-orig/catdvi.c 2007-12-18 23:02:13.000000000 +0000 ++++ catdvi-0.14/catdvi.c 2007-12-18 23:07:21.000000000 +0000 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include "findtfm.h" + #include "readdvi.h" + #include "outenc.h" +@@ -70,9 +71,19 @@ + { 0, 0, 0, 0 } + }; + static char const * shopt = "d:e:hl:p:NUs"; ++ const char *charset; ++ enum outenc_num_t i; + + setlocale(LC_ALL, ""); + ++ charset = nl_langinfo(CODESET); ++ for (i = 0; i < OE_TOOBIG; i++) { ++ if (!strcmp(charset, outenc_names[i])) { ++ outenc_num = i; ++ break; ++ } ++ } ++ + msglevel = 10; /* Level of verbosity for pmesg */ + + #ifdef USE_MALLOC0 --- catdvi-0.14.orig/debian/patches/02_hardening-format-security.diff +++ catdvi-0.14/debian/patches/02_hardening-format-security.diff @@ -0,0 +1,12 @@ +diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/catdvi-0.14/bytesex.c ./bytesex.c +--- ../orig/catdvi-0.14/bytesex.c 2002-07-05 23:34:18.000000000 +0200 ++++ ./bytesex.c 2011-09-29 03:58:45.000000000 +0200 +@@ -36,7 +36,7 @@ + } else { + panic("%s\n", strerror(errno)); + } +- panic(errmsg); ++ panic("%s", errmsg); + } + } + --- catdvi-0.14.orig/debian/patches/03_kpathsea_version_string_declaration.diff +++ catdvi-0.14/debian/patches/03_kpathsea_version_string_declaration.diff @@ -0,0 +1,16 @@ +Description: remove conflicting declaration of kpathsea_version_string +Author: Jakub Wilk +Bug-Debian: http://bugs.debian.org/666169 +Forwarded: no +Last-Update: 2012-04-22 + +--- a/kpathsea.c ++++ b/kpathsea.c +@@ -36,7 +36,6 @@ + + void version_findtfm(void) + { +- extern char * kpathsea_version_string; + puts(kpathsea_version_string); + } + --- catdvi-0.14.orig/debian/rules +++ catdvi-0.14/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --prefix=/usr --mandir=\$${prefix}/share/man +DEB_MAKE_BUILD_TARGET = catdvi +DEB_MAKE_INSTALL_TARGET = install prefix=$(CURDIR)/debian/catdvi/usr + +update-config:: update-config-stamp + +update-config-stamp: + mkdir d-r-orig + cp -p *.d version.h d-r-orig + touch update-config-stamp + +clean:: + if [ -f update-config-stamp ] ; then \ + mv d-r-orig/* . ; \ + rmdir d-r-orig ; \ + rm update-config-stamp ; \ + fi + --- catdvi-0.14.orig/debian/watch +++ catdvi-0.14/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/catdvi/catdvi-(.*)\.tar\.gz --- catdvi-0.14.orig/fontinfo.c +++ catdvi-0.14/fontinfo.c @@ -363,6 +363,10 @@ * and axis_height happens to be the last one). */ tfm_tbl[k].axis_height = font_param(k, 22); + if(tfm_tbl[k].axis_height < 0) { + warning("Font has negative axis_height; substituting 0\n"); + tfm_tbl[k].axis_height = 0; + } } else tfm_tbl[k].axis_height = 0; @@ -417,9 +421,10 @@ return fw_prod(fw, tfm_tbl[font].scale); } -uint32 font_char_width(sint32 font, sint32 glyph) +sint32 font_char_width(sint32 font, sint32 glyph) { - uint32 wi, ugly, rv; + uint32 wi, ugly; + sint32 rv; if (glyph < 0) { warning("ignoring negative glyph index"); @@ -451,9 +456,10 @@ } -uint32 font_char_height(sint32 font, sint32 glyph) +sint32 font_char_height(sint32 font, sint32 glyph) { - uint32 he, ugly, rv; + uint32 he, ugly; + sint32 rv; if (glyph < 0) { warning("ignoring negative glyph index"); @@ -485,9 +491,10 @@ } -uint32 font_char_depth(sint32 font, sint32 glyph) +sint32 font_char_depth(sint32 font, sint32 glyph) { - uint32 de, ugly, rv; + uint32 de, ugly; + sint32 rv; if (glyph < 0) { warning("ignoring negative glyph index"); @@ -556,7 +563,7 @@ } -uint32 font_axis_height(sint32 font) +fix_word_t font_axis_height(sint32 font) { if (font < 0 || font >= LEN_TFM_TBL) { warning("Font index out of range\n"); --- catdvi-0.14.orig/fontinfo.h +++ catdvi-0.14/fontinfo.h @@ -37,12 +37,12 @@ /* Return the width/height/depth of the refereced glyph in * the referenced font. */ -uint32 font_char_width(sint32 font, sint32 glyph); -uint32 font_char_height(sint32 font, sint32 glyph); -uint32 font_char_depth(sint32 font, sint32 glyph); +sint32 font_char_width(sint32 font, sint32 glyph); +sint32 font_char_height(sint32 font, sint32 glyph); +sint32 font_char_depth(sint32 font, sint32 glyph); /* Return the unscaled(!) axis height, or 0 for fonts without this parameter */ -uint32 font_axis_height(sint32 font); +fix_word_t font_axis_height(sint32 font); /* scale a fixword in font units to DVI units */ fix_word_t font_scale_fw(sint32 font, fix_word_t fw); --- catdvi-0.14.orig/layout.c +++ catdvi-0.14/layout.c @@ -603,7 +603,7 @@ y = p->b.y; width = p->b.width; height = p->b.height; - depth = p->b.depth; + depth = max(0, p->b.depth); left_margin = min(left_margin, x); right_margin = max(right_margin, x + width); --- catdvi-0.14.orig/page.c +++ catdvi-0.14/page.c @@ -269,6 +269,44 @@ b.flags = 0; b.axis = 0; + /* Make sure some fundamental assumptions are true */ + if(b.width < 0) { + /* We can treat backspacing glyphs as empty boxes here, since + * advancing the DVI h register has already been taken care of. + */ + pmesg( + 60, + "PAGE_SET_GLYPH: negative glyph width %li treated as 0\n", + b.width + ); + b.width = 0; + } + if(b.height < 0) { + /* A submarine! This really should not happen. */ + warning( + "Negative glyph height %li treated as 0.\n", + b.height + ); + b.height = 0; + } + /* depth < 0 does occur from time to time. Main source are small + * glyphs with tight bounding box centered on the math axis. + * We leave this as it is to keep the math axis in the centre; + * so use max(0, b.depth) instead of b.depth for some calculations. + * We do however make an additional consistency check: + */ + if(b.depth < -b.height) { + /* A glyph from Down Under! */ + warning("Inconsistent font metrics, depth < -height. Fixed.\n"); + pmesg( + 60, + "PAGE_SET_GLYPH: upside down glyph, depth=%li, height=%li\n", + b.depth, + b.height + ); + b.depth = -b.height; + } + hint = glyph_get_hint(glyph); if(hint & GH_DIACRITIC) {