--- texlive-bin-2009.orig/debian/changelog +++ texlive-bin-2009/debian/changelog @@ -0,0 +1,690 @@ +texlive-bin (2009-6ubuntu1) maverick; urgency=low + + * Add missing dependency on ed to texlive-binaries. (Closes: #580732, + LP: #577305) + + -- Anders Kaseorg Sun, 15 Aug 2010 00:24:43 +0200 + +texlive-bin (2009-6build1) maverick; urgency=low + + * No-change upload to build against current poppler library ABI. + + -- Didier Roche Thu, 05 Aug 2010 12:16:24 +0200 + +texlive-bin (2009-6) unstable; urgency=high + + [ Frank Küster ] + * include a patch that allows texconfig to handle more default paper + settings. This is intended to be submitted upstream, and to be used + to address #402994 (libpaper integration) [fk] + + [ Norbert Preining ] + * include (lost) man pages for texconfig-dialog, devnag, bibtex8, + omfonts, otangle, pdfopen (no bug, but see #574796) + * add a patch upstream-web2c-tmpfilewithpid that fixes overwriting + files with -recorder in parallel builds (Closes: #575731). + * bump standards version to 3.8.4, no changes necessary + * bump build-dep on libpoppler to 0.12.4 (against my will!!) + (Closes: #577684) + * Fix CVE-2010-1440: this overrides the incomplete fix for CVE-2010-0793. + + [ Security Team ] + Fixed in 2009-5+nmu1 + * Fix CVE-2010-0827: buffer overflow in dvips (virtualfont.c). + + -- Norbert Preining Sat, 01 May 2010 02:17:20 +0900 + +texlive-bin (2009-5) unstable; urgency=low + + * include a patch (from upstream) to fmtutil so that multiple + defined formats are accepted. That is the definitive fix for bug + #557091, but the other one is necessary, too. + * install synctex.5 man page + * manage bibtex with alternatives, code by Андрей Парамонов + (Closes: #539482) + + -- Norbert Preining Sat, 26 Dec 2009 19:06:47 +0900 + +texlive-bin (2009-4) unstable; urgency=low + + * make texlive-binaries replace the (only in old-stable present) + freetype1-tools (Closes: #560975) + * take over forgotten patch from TL2007 for building on i386-hurd. + The patches are now icu-xetex_hurd.diff and detex-hurd.diff + (patches thanks to Samuel Thibault as already in TL2007, and + thanks for Hilmar for tracking that down) (Closes: #560800) + * add "-Wl,--no-relax" to LDFLAGS on alpha to fix a FTBFS, thanks to + Steve Langasek for the pointer (Closes: #557330) [hilmar-guest] + * resurrect etex which was lost (Closes: #561768) + - install etex from inst/bin/ + - add etex.1 to debian as it is shipped in src:texlive-base + * include a fix for segfaults in mpost (Closes: #561500) + + -- Norbert Preining Mon, 21 Dec 2009 23:53:48 +0900 + +texlive-bin (2009-3) unstable; urgency=low + + * first upload to unstable + * replace/conflict/provide dvi2tty to make upgrades smooth (Closes: #559120) + + -- Norbert Preining Wed, 09 Dec 2009 23:04:26 +0900 + +texlive-bin (2009-2) experimental; urgency=low + + * add replace texlive-extra-utils (<< 2008) for dvi* (reported in bug + #557086) + + -- Norbert Preining Sat, 21 Nov 2009 15:55:27 +0900 + +texlive-bin (2009-1) experimental; urgency=low + + [ Frank Küster ] + * New upstream (closes: #481060) version (pre-release, but not far from) + with lots of internal changes, hence the upload to experimental. This + upstream version fixes the following bugs: + + - many manpage typos, with warm thanks and a virtual QA bouquet to + A. Costa , closes: #450552, #450553, #450554, + #450555, #450556, #450557, #450558, #450559, #450560, #464351 (the + last was found by Joachim Breitner + + [xdvi bugs] + - closes: #336807, crashes with (breaklinks) hyperrefs + - closes: #357462, shrinkFactor 0 is broken + - closes: #361218, dies while printing + - closes: #342529, unnecessarily noisy in expert mode + - closes: #350292, please use cntl-wheel to zoom + - closes: #351672, please use shift-wheel to scroll left or right + - closes: #478176, transition to texlive has lost xdvi 'grid' feature + - closes: #461818, typo in oxdvi.1 and xdvi.1 man pages + + [mixed executables] + - bibtex: Upstream added a patch that closes: #520920 + + - dvipdfm is now a symlink to dvipdfmx. Among other problems, this + closes: #485563 + + - closes: #421464, pdfetex: Not embedding Base-14 fonts creates + somewhat broken files + - closes: #518536, fresh upstream of pdftex is needed (latest stable + pdftex is 1.40.9 available) + - #532074, 'man pdftex': missing .ds WB + + - closes: #446617, texlive-metapost: Omits font encoding from output + - closes: #457711, texlive-metapost: mpost man page does not match reality + + - closes: #507652, make math support working in xe(la)tex and lmodern + fonts + - closes: #489943, mktexpk does not work in directories containing + spaces + - closes: #536795, 'man texconfig' typos (the fix also affects a + Debian-specific patch) + - closes: #420836, "texdoc -s" is too slow, should use ls-R database + + - closes: #459571, please include the TeXcount.pl script to do TeX + word count + - closes: #413652, a2ping: embedding all fonts + - closes: #542463, vlna program missing from texlive-lang-czechslovak + + * The texlive-bin source package is now handled independently from the + other TeXLive source packages, i.e. it is not configured in + tpm2deb.cfg in our svn repository and the debian directory. Instead, + it now looks more like a standard compiled package and should be + easier to work on in case of security uploads or NMUs. + * This also means that some of it's older binary packages, like + texlive-metapost, have moved source package. By chance, this closes: + #517600, #517601 + * Support a create-orig-source target in debian/rules. The orig.tar.gz + is now either wget'ed if we are working on a released version, or + automatically created from a svn repository for development + * There are now only three binary packages, texlive-binaries and the two + library packages. texlive-binaries Replaces/Conflicts/Provides + texlive-base-bin in order to get a working (if not smooth) + transition. + * Add Build-Depends: time, since the upstream Build script uses it + * Don't install the format links, they will generated by dh_installtex + in the other packages, also do not install the man pages for the + links + * do not install rungs, it is not necessary + * do not install script links, they will be shipped together with + the script itself + * Add patch 60_unneeded_linking. These needs testing! + + [ أحمد المحمودي (Ahmed El-Mahmoudy) ] + * debian/rules: use /usr/share/quilt/quilt.make provided by quilt and remove + patch-stamp & unpatch targets + * Install changelog into libkpathsea packages + * Add a README.source + + [ Norbert Preining ] + * fix postinst update-alternatives, the xdvi-xaw does not have .bin anymore + * add texlive-binaries.prerm to remove the alternative + * add same version number to libkpathsea-dev deps on libkpathsea5 to make + lintian happy + * make texlive-binaries replace/conflict/provide dvipdfmx (in accordance + with the maintainer of dvipdfmx we will phase out dvipdfmx itself) + * new source package format "3.0 (quilt)" can be used (closes: #538557) + * Install copyright file + * add patch for libpoppler 0.12 (thanks to Ubuntu for inspiration) + + -- Norbert Preining Fri, 13 Nov 2009 01:20:08 +0900 + +texlive-bin (2007.dfsg.2-3) unstable; urgency=medium + + * add missing source roadmap.fig of roadmap.eps in fontinst documentation + (Closes: #482915) (urgency medium due to RC bug) + (new patch add-missing-fontinst-source) + + -- Norbert Preining Thu, 26 Jun 2008 23:14:59 +0200 + +texlive-bin (2007.dfsg.2-2) unstable; urgency=low + + * use local keyword in a policy-compliant way (Closes: #488023) + (urgency medium since RC bug) + * do not install fmtutil.cnf in texmf-texlive/web2c (Closes: #488035) + + -- Norbert Preining Wed, 25 Jun 2008 21:59:32 +0200 + +texlive-bin (2007.dfsg.2-1) unstable; urgency=medium + + * Let tl-metapost replace tl-context (closes: #484818). This is a RC + bug, hence medium urgency [fk] + * Fix shell scripting errors in texlive-base-bin's preinst script (one + fix actually is done in common.functions.preinst and affects all + packages, but didn't show up there). Closes: #484833 [fk] + * include sfd files necessary for other packages, but removed from + the archive with the imminent removal of freetype1-tools. That needs + a new .orig.tar.gz + * bump standards version to 3.8.0: + - rename README.Debian-source to README.source an explain how to change + something using quilt by refering to the quilt README.source + - add homepage field to control + - add a patch target to debian/rules + * add dversionmangle to debian/watch file to ignore the .dfsg.NN suffix + + -- Norbert Preining Thu, 12 Jun 2008 18:12:50 +0200 + +texlive-bin (2007.dfsg.1-4) unstable; urgency=low + + * add mktexlsr-ignore-more-vcs patch that makes mktexlsr ignore not only + .svn, but also other VCS directories. Patch taken from upstream + (Closes: #481371) [np] + * Fix NEWS.Debian of texlive-base-bin to describe the issue of removed + conffiles better (closes: #482631) [fk] + * add a missing line to the tl2007.2 xetex patch, taken from upstream + * add a patch to xdvipdfmx to re-allow inclusion of tagged pdf images + (Closes: #483019) (big thanks to Jonathan Kew for tracking all this down) + * do not install xdvizilla(.1) (Closes: #477160) + * use gcc/g++-4.2 on armel to fix FTBFS (closes: #483939) (thanks Adeodato) + + -- Norbert Preining Sun, 01 Jun 2008 16:29:49 +0200 + +texlive-bin (2007.dfsg.1-3) unstable; urgency=low + + * improve manpage of patgen (Closes: #450875) + * (really?) fix the watch file (Closes: #449621), thanks Raphael Geissert + * bump standards version to 3.7.3, no changes needed + * add texlive-common dependency to the -doc splitted packages, + otherwise configuration can fail due to missing update-updmap etc + (Closes: #457270) (Closes Ubuntu bug: 177674) + * include dviconcat and dviutils (orphaned package dviutils/seetex) and + provide/replace/conflict with dviutils (extra-utils) + * texlive-xetex recommends texlive-latex-base (Closes: #462610) + * add copies of supp-pdf.tex and supp-mis.tex from context 2008-01-28 + to texlive-metapost so inclusion of metapost images in pdf(la)tex does + work without installation of context (Closes: #465107) + * fix perl warning in thumbpdf (patch: fix-thumbpdf-perlwarning) + (Closes: #469294) + * fix a segfault in ovp2ovf (patch: fix-ovp2ovf-segfault) (Closes: #470433) + * TeX Live 2007.2 release incorporation: fixes for xetex and xdvipdfmx, + new patches tl2007.2-xetex and tl2007.2-xdvipdfmx + (adapted from Jonathan Kew's original patches to work with poppler) + * add the LPPL to debian/copyright + * texlive-extra-utils now recommends ghostscript (Closes: #476954) + * fix skipping of all trees in mktexlsr with empty $HOME (Closes: #473548) + * add a patch for Sinhala support by Anuradha Ratnaweera + , but keep it disabled until Jonathan gives me + the ok. This would close the bug #476957. + + -- Norbert Preining Sun, 20 Apr 2008 20:14:04 +0200 + +texlive-bin (2007.dfsg.1-2) unstable; urgency=low + + * Update location of upstream iso.zip file in uscan watch file (closes: + #449621), thanks to Raphael Geissert [fk] + * switch to libpoppler-0.5.9 patch, since the new libpoppler (>= 0.6) is in + unstable, adjust build deps to libpoppler-dev >= 0.6 (Closes: #451588) + + -- Norbert Preining Mon, 19 Nov 2007 11:41:11 +0100 + +texlive-bin (2007.dfsg.1-1) unstable; urgency=low + + * disable pdftex character shifting (option G) in config.pdf + (Closes: #434891) + * rebuild new orig.tar.gz necessary to blacklist latexmp completely + (Closes: #436965) + * add patch gcc43-compile-fix to compilation of teckit with newer + gcc compilers (Closes: #441605) (patch taken from 007-12ubuntu3, + thanks Matthias Klose) + * implement doc splitting, so that we can build separate -doc packages + for every collection we want to [np] + splitting is done for: metapost, base-bin + * fix segfault of dvips -z on amd64 (patch applied upstream), thanks to + Bastien Roucaries for finding and providing a patch (Closes: #447081) + (Fixes: CVE-2007-5935) + + -- Norbert Preining Mon, 22 Oct 2007 07:35:16 +0200 + +texlive-bin (2007-14) unstable; urgency=low + + * Really move Philokalia.otf to a fonts directory [fk] + * fix FTBFS on hurd-i386, adding patch icu-powerpc-buildfix-patch from + Samuel Thibault (Closes: #437949) [np] + * set LANG=C for the update-alternatives grepping, thanks Andreas Degert + (Closes: #438551) [np] + * Add missing quotes around the sed script in + texlive-base-bin.postinst(.pre) (Closes parts of #439205) [np] + * blacklist latexmp.pdf since no source is present (Closes: #436965) [np] + + -- Norbert Preining Sat, 01 Sep 2007 11:40:57 +0200 + +texlive-bin (2007-13) unstable; urgency=low + + * let texlive-xetex depend on dvipdfmx (Closes: #430373) + * add xetex patch, included in release texlive 2007.1. This patch fixes + xetex crashes on big-endian 64bit archs, and crashes with some OT fonts. + * update a2ping script and it's man page (Closes: #412107) + * update config.ps from current svn (Closes: #431338) + * add lost texlive-extra-utils recommends dvidvi (thanks Lionel for + spotting this) + * include the fixes to dvilj(k) which are included in the TeX Live + security branch, this adds a patch dviljk-security-fixes + * Move Philokalia-Regular.otf from the documentation to a fonts + directory, thanks to Ralf Stubner (closes: #433138) + * duplicate the code to recreate missing conffiles pdftexconfig.tex, + config.ps from texlive-base-bin postinst in preinst (Closes: #425803, + #435156, #435081, #433889, #436235, #435719, #435081, #433889) [np] + * use see in texdoc for displaying of all types of files (Closes: #432037) + * adapt the menu entries to new policy + + -- Norbert Preining Mon, 13 Aug 2007 16:26:41 +0200 + +texlive-bin (2007-12) unstable; urgency=low + + * Add a debian-specific patch for fmtutil which makes the --enable, + --disable and --edit commands work safely. Furthermore, patch + texconfig to use update-texmf (closes: #409798) [fk] + * fix manpage of pkfix (Closes: #429587) + + -- Norbert Preining Wed, 20 Jun 2007 10:09:36 +0200 + +texlive-bin (2007-11) unstable; urgency=low + + * Refine the code to resurrect pdftexconfig.tex (no version check) and + properly document it in NEWS.Debian. + * Also resurrect config.ps, thanks to Bruce MacDonald + (closes: #427059) [fk] + + -- Frank Küster Fri, 1 Jun 2007 17:32:35 +0200 + +texlive-bin (2007-10) unstable; urgency=low + + * don't install libkpathsea.la (Closes: #426006) [np] + * do not actually carry out the "preserve deleted conffile" due to the + tetex bug and too many busted installations, and resurrect the + critical conffile pdftexconfig.tex for sid users (Closes: #425781) + [np,fk] + * Add missing Depends of libkpathsea-dev on libkpathsea4 (closes: + #426710) [fk] + + -- Frank Küster Wed, 30 May 2007 17:58:37 +0200 + +texlive-bin (2007-9) unstable; urgency=low + + * Make sure --enable-shared is not in effect in the subdirectories for + static-only libraries, in particular xetex's teckit. Thanks to Aaron + M. Ucko (closes: #425863) [fk] + * Move libkpathsea4 and the -dev package to the correct sections (libs + and libdevel, not tex) [np] + + -- Frank Küster Thu, 24 May 2007 20:12:02 +0200 + +texlive-bin (2007-8) unstable; urgency=low + + * lang-indic: move bangfont.tex from doc to run files (Closes: #424031) + * lang-indic: add missing python header to ebong script (Closes: #423990) + * dpkg_md5sum in common-functions.preinst returns now the empty string + in case of an unknown conffile (could have been created by touch). + This should fix Ubuntu bug 111654. [np] + * Build with --enable-ipc to allow piping of output [fk] + * Build shared kpathsea library and include it in separate packages [fk] + * move bin-thumbpdf to texlive-base-bin (Closes: #424658) [np] + * texlive-extra-utils suggests gs-* for epstopdf (Closes: #423988) [np] + * replace patches/30_libpoppler with patches/30_libpoppler_new for + new libpoppler 0.5, make the build-dep libpoppler-dev (>= 0.5.4) + (Closes: #425065, #356079) + * add stricter dependencies to all packages: if in the final shipout + dep on a texlive package there is no version given, the value of + latest-version (from tpm2deb.cfg) of the source package is taken. + (Closes: #421969) + * remove cruft from control files (cweb, ctie, texdoctk) + (Closes: #241089, #249085) + * don't leave copies of conffiles in TEXMFDIST (Closes: #420139) + * add poppler to the pdftex banner (Closes: #420971) + * texlive-lang-indic depends on python + * remove the rpath entry in all the binaries + * add patch 64_fix_makempx_installation to fix the installation + of makempx script instead of the binary (thanks Sanjoy Mahajan) + * rework the xdvi conf file handling code to not "preserve removal" + when upgrading from older texlive versions (Closes: #425272) + * format generation reworked: + - texlive-base-bin does not provide formats anymore since all the + respective ini files are in texlive-base + - texlive-base takes the format generation + + -- Norbert Preining Mon, 21 May 2007 14:17:19 +0200 + +texlive-bin (2007-7) unstable; urgency=low + + * fix typo in texlive-base-bin.postinst (Closes: #422929) + + -- Norbert Preining Wed, 09 May 2007 00:59:49 +0200 + +texlive-bin (2007-6) unstable; urgency=low + + * Update patch 62_dvips_absolutepath_doc, it also fixes the manpage + now. Thanks to Eric Cooper [fk]. + * Add patch 63_texmf.cnf_for_comparison_temp from upstream. The patched + file is only used for comparing with our generated texmf.cnf from + tex-common, and the upstream patch has been incorporated there [fk]. + * remove 31_pdftex_gcc_ICE-on-alpha, recent revision of gcc have + fixed the FTBFS bug. + * move the debianize-updmap call in updmap after the syncWithTrees + function so that this function is also debianized. (Closes: #421184) [np] + * apply teTeX texdoctk.defaults patch to get texdoctk to use the right + programs (Closes: #421633) [np] + * add menu entry of xdvi, texdoctk, texconfig (Closes: #421634) [np] + * Bring dvips to version 5.96dev, 2007-05-06 (patch + 32_dvips_fontbug_fix_upstream). This fixes a problem with double + partial inclusion of fonts, and adds improvements for debugging such + problems (closes: #266718) [fk] + + -- Frank Küster Mon, 7 May 2007 19:38:34 +0200 + +texlive-bin (2007-5) unstable; urgency=low + + * fix config file handling (Closes: #419826) [np] + - fix a bug in tpm2deb-bin.pl which prevented any config file handling + - fix another bug in tpm2deb-bin.pl which didn't install the config + file handling in the postrm script + + -- Norbert Preining Wed, 18 Apr 2007 08:13:17 +0200 + +texlive-bin (2007-4) unstable; urgency=low + + * Add patch 31_pdftex_gcc_ICE-on-alpha to work around a bug in newer + gcc, thanks to Falk Hueffner (closes: #419434) [fk] + * Since we take over xdvi from tetex-bin, we remove its xdvi alternative + in case it is present (closes: #419381) [fk] + * Remove any format or log files in /var/lib/texmf/web2c, they must be + in $engine subdirs now. teTeX does not properly remove them (so this + closes: #333767), and they cause strange failures with context (see + #419059 and #418976) [fk] + * Add patch 62_dvips_absolutepath_doc to document the change in dvips' + file inclusion behavior in config.ps (closes: #418788) + + -- Norbert Preining Tue, 17 Apr 2007 13:17:16 +0200 + +texlive-bin (2007-3) unstable; urgency=low + + * Disable the comparison of texmf.cnf introduced in the last version. + It can still be run manually, but doing so at build time would make + texlive-bin FTBFS each time tex-common updates its files in texmf.d + [fk] + * Fix the friday 13 bugs: A bad coincidence combined a serious bug in + debhelper (#419060) produces buggy maintainer scripts in most + texlive packages. The debhelper bug is fixed, this + closes: #418981 + * add texlive-font-utils replaces tetex-bin << 2007 (Closes: #418995) + * Add patch 51_fmtutil_keep_failedlog so that fmtutil will keep log + files even if no format file is created at all [fk] + (Closes: #419016) + + -- Norbert Preining Sat, 14 Apr 2007 09:31:47 +0200 + +texlive-bin (2007-2) unstable; urgency=low + + * first upload of TeX Live 2007 to unstable + + * fix xdvi.cfg config file transfer bug (Closes: #415906) [np] + + * Added two scripts which allow to compare our upstream-provided + texmf.cnf (which will not be used) with the texmf.cnf generated from + tex-common's snippets, and let the build fail if both show other than + the known differences. This is run in the clean and build targets and + allows to track upstream changes. + + In order to build on non-clean systems, export + DEBIAN_NOCHECK_TEXMFCNF=true (or, actually, anything nonzero) + [fk] + + * replace links of odvicopy.1 and odvitype.1 to the respective + man pages without o with a minimal manpage (Closes: #417274) [np] + + * drop updated collection-binextra.tpm and bin-dvipos.tpm + into the source package tosolve the missing dvipos problem. [np] + + * Fix missing build dependency on tex-common >= 1.3, thanks to Yannick + Roehlly for spotting this. [np] + + * texlive-base-bin now suggests gs (or variants), postscript-viewers and + pdf viewers. [np] (Closes: #414473) + + * do not compress documentation pdf files + + -- Norbert Preining Tue, 10 Apr 2007 18:15:25 +0200 + +texlive-bin (2007-1) experimental; urgency=low + + * new upstream release + * Major changes: + - now includes XeTeX (new package texlive-xetex) + - pdfTeX 1.40 + - MetaPost 1.0 + - the Debian packages no longer include ConTeXt, but depend on the + separate context package instead. + - Totally reworked Debian packaging, in particular the Perl scripts. + - TeX Live now replaces teTeX and provides dummy packages for the + transition. + - configuration files from /etc/texmf/texlive have been moved to + the TDS-locations below /etc/texmf + * Patches: + - Move from dpatch to quilt + - update patch 30_libpoppler to the new pdftex. This needs to be + extended to patch xetex as well! + - Drop patches 15_fmtutil_metapost_fix, 20_xpdf3.01pl1, + 21b_pdftex_cjkfonts_overflow, 51_fmtutil_tempdir_in_texinputs + (applied upstream), 52_feynmf-perl-sec-fix (no longer included) + - all other patches unfuzzied (sometimes manually) + * Add patch 01_tmp_configure_without_installextra to bypass texlinks, + fmtutil and updmap invocations at build time [FK] + * include teTeXs perl script for /usr/bin/xdvi which supports compressed + dvi files (Closes: #412611) [NP] + + -- Norbert Preining Wed, 21 Mar 2007 17:03:16 +0100 + +texlive-bin (2005.dfsg.2-12) unstable; urgency=low + + * blacklist dvidvi.tpm and add a recommend tl-extra-utils -> dvidvi + (Closes: #411537) + + -- Norbert Preining Tue, 20 Feb 2007 22:38:54 +0100 + +texlive-bin (2005.dfsg.2-11) unstable; urgency=low + + * The timezone patch from the last upload was wrong for 64bit + architectures. Applied corrected patch from upstream, thanks to + Martin Michlmayr (closes: #409517) [frank] + + -- Frank Küster Thu, 15 Feb 2007 14:07:50 +0100 + +texlive-bin (2005.dfsg.2-10) unstable; urgency=low + + * rebuild from old packaging machinery + + -- Norbert Preining Wed, 10 Jan 2007 14:12:09 +0100 + +texlive-bin (2005.dfsg.2-9) unstable; urgency=low + + * Apply patch by Julian Gilbey to prevent mktexlsr from + creating ls-R in root's home directory (closes: #402925) + * Apply a patch by "Mark A. Wicks" to fix a crash + of dvipdfm in half-hour timezones (Closes: #403267) + + -- Norbert Preining Thu, 4 Jan 2007 00:47:50 +0100 + +texlive-bin (2005.dfsg.2-8) unstable; urgency=low + + * move bin-ttfutils to tl-font-utils, blacklist everything but ttf2afm, + add bin-ttfutils.tpm and ttf2afm.1 to the source package + (Closes: #402983) (Closes also ubuntu #75545) + * reinclude pslatex script and its manpage into texlive-base-bin. + + -- Norbert Preining Thu, 28 Dec 2006 15:04:19 +0100 + +texlive-bin (2005.dfsg.2-7) unstable; urgency=low + + * change shebang for getnonfreefonts to /bin/bash (Closes: #398112) + * fix the texdoctk perl errors (Closes: #402651) + * include xdvi upstream fix for segfault on hitting g with -nogrey + (Closes: #369569) + + -- Norbert Preining Tue, 12 Dec 2006 08:05:45 +0100 + +texlive-bin (2005.dfsg.2-6) unstable; urgency=low + + * Apply patch from upstream to pdftex that allows it to work properly + with CJK fonts with their large number of subfonts. Many thanks to + Thanh Han The , Jie Luo + for the patch and many others for + debugging, in particular Danai SAE-HAN (韓達耐) + who reminded me. + + This allows CJK-related packages to depend on texlive and + closes: #399967. + * Patch texdoctk so that it still works if documentation in TeXlive's as + well as teTeX's TEXMFDIST is present. Thanks to Braun Gabor + for reporting and Ralf Stubner + for ideas for fixing this (closes: #401930) + + -- Frank Küster Wed, 6 Dec 2006 22:40:27 +0100 + +texlive-bin (2005.dfsg.2-5) unstable; urgency=high + + * Add Conflicts of texlive-omega on the aleph package (closes: + #400930), both provide the same binary. In the long run, aleph should + be superseded by AFNIX. + + -- Frank Küster Fri, 1 Dec 2006 14:34:22 +0100 + +texlive-bin (2005.dfsg.2-4) unstable; urgency=low + + * blacklist feynmf in tl-metapost and add a Recommends on the feynmf + package (closes: #400657) + + -- Frank Küster Tue, 28 Nov 2006 14:52:03 +0100 + +texlive-bin (2005.dfsg.2-3) unstable; urgency=low + + * include fixes for superficially linked in libs + * extend texconfig man page and include some fixes from teTeX + (Closes: #396904) + + -- Norbert Preining Tue, 7 Nov 2006 14:37:17 +0100 + +texlive-bin (2005.dfsg.2-2) unstable; urgency=low + + * update the debian patch for updmap(.1) (Closes: #393189) + * adjust built-in search paths of libkpathsea to the Debian defaults + (Closes: #392641) + * include patch for pdfetex to support newer TTF fonts (Closes: #394028) + + -- Norbert Preining Thu, 19 Oct 2006 10:27:51 +0200 + +texlive-bin (2005.dfsg.2-1) unstable; urgency=medium + + * remove magic header of a2ping, thumbpdf, and pdfcrop + * report bugs together with tex-common, and report status of the + tetex packages. Fix some small things in bug.scripts. + * change uploader field to my debian.org email address + * blacklist lacheck in tl-extra-utils and add a recommend on lacheck + * blacklist dviconcat(.1) and dviselect(.1) files in tl-extra-utils + and recommend dviutils + * use xdvi.bin in the xdvi shell script, and use alternatives + system to set xdvi.bin to xdvi-xaw.bin (Closes: #391437) + * move bin-texdoc, ie texdoc and texdoctk, from tl-extra-utils to + texlive-base-bin (Closes: #391640) + * texlive-bin: include the already unpacked sources instead of the + source.tar.bz2. Changes to the clean target: + - don't remove unpack-stamp + - don't remove the whole build dir, only build/inst and build/Work + (Closes: #380227) (Thanks Frank for insisting!) + * Use tex-common's (>= 0.33) debianize-updmap (Closes: #391348) + * urgency set to medium to get these fixes to testing + + -- Norbert Preining Mon, 9 Oct 2006 19:01:51 +0200 + +texlive-bin (2005.dfsg.1-1) unstable; urgency=low + + * remove fmtutil.cnf link (useless) and mktex.cnf link (taken from + tex-common) (Closes: #376524) + * add lintian override for wrong-name-for-upstream-changelog triggered + by CHANGES.packaging + * change maintainer to debian-tex-maint@l.d.o + + -- Norbert Preining Thu, 3 Aug 2006 12:36:56 +0200 + +texlive-bin (2005-2) unstable; urgency=low + + * first upload to unstable, sponsored by + Frank Küster + * texdoc support + - let tetex texdoc find documentation of texlive (Closes: #364776) + - include tetex texdoc patches (following of symlinks, security + fixes) (Closes: #356390) + * texlive-lang-polish conflicts with octave-forge as both provide + /usr/bin/mex, this is preliminary, a better solution must be + sought (Closes: #364059) + * change shell for the reportbug script to bash (Closes: #356391) + * fix installation of thumbpdf and pdfcrop (Closes: #352092) + * improve various descriptions (Closes: #354964) + * call the update-* programs in all postinst scripts, so that the + config files do not contain left-overs (Closes: #355266) + * fix creation of formats which in turn depend on the latex format + (Closes: #351707) + * remap the ibycus4.map TeX/MF input file from the fonts/map location + to the fonts/source location (Closes: #354652) + * depend on the updated lmodern package, thus making the fonts + available for X (Closes: #351727) + * lots of internal changes, important ones being: + - texlive packages now do not include files which have been + packaged for Debian already (eg cm-super, lmodern, musixtex) + - most packages can be used together with teTeX + - fix several upstream bugs + - generate license information for each file from the + TeX Catalogue (ongoing work) + for detailed changes see CHANGES.packaging in texlive-common + + -- Norbert Preining Thu, 11 May 2006 00:12:10 +0200 + +texlive-bin (2005-1) experimental; urgency=low + + * First upload to experimental (Closes: #312897) + + -- Norbert Preining Thu, 12 Jan 2006 17:30:22 +0100 + +# vim:set fileencoding=utf-8: # +# Local Variables: +# coding: utf-8 +# mode: debian-changelog +# End: --- texlive-bin-2009.orig/debian/control +++ texlive-bin-2009/debian/control @@ -0,0 +1,35 @@ +Source: texlive-bin +Section: tex +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian TeX Maintainers +Uploaders: Norbert Preining , Frank Küster +Build-Depends: debhelper (>= 7), quilt, sharutils, ed, libncurses5-dev | libncurses-dev, libxaw7-dev, libpng12-dev | libpng-dev, zlib1g-dev | libz-dev, libgd2-xpm-dev | libgd2-noxpm-dev, flex, bison, libpoppler-dev (>= 0.12.4), chrpath, g++-4.4 [armel], time +Standards-Version: 3.8.4 +Homepage: http://www.tug.org/texlive + +Package: texlive-binaries +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, tex-common (>= 2.00), ed +Conflicts: texlive-base-bin, dvi2tty +Replaces: texlive-base-bin, texlive-omega (<< 2008), dvipdfmx, texlive-extra-utils (<< 2008), texlive-font-utils (<< 2008), texlive-lang-cyrillic (<< 2008), texlive-xetex (<< 2008), texlive-metapost (<< 2008), texlive-lang-indic (<< 2008), texlive-formats-extra (<< 2008), dvi2tty, freetype1-tools +Provides: texlive-base-bin, dvi2tty +Description: Binaries for TeX Live + This package contains all the binaries of TeX Live packages. + +Package: libkpathsea5 +Section: libs +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: TeX Live: path search library for TeX (runtime part) + This package contains the runtime part of the Kpathsea[rch] library, + which implements generic path searching, configuration, and + TeX-specific file searching. + +Package: libkpathsea-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, libkpathsea5 (= ${binary:Version}), ${shlibs:Depends} +Description: TeX Live: path search library for TeX (development part) + This package contains the static library and header files for the + Kpathsea[rch] library. --- texlive-bin-2009.orig/debian/texlive-binaries.prerm +++ texlive-bin-2009/debian/texlive-binaries.prerm @@ -0,0 +1,17 @@ +#!/bin/sh -e +# texlive-binaries postinst, created 2009 by Norbert Preining +# probably not copyrightable as it looks now, but anyway the code maybe +# freely copied, distributed and/or modified + +# deactivate the xdvi.bin alternative +case "$1" in + upgrade) + ;; + *) + update-alternatives --remove xdvi.bin /usr/bin/xdvi-xaw + update-alternatives --remove bibtex /usr/bin/bibtex.original + ;; +esac + +#DEBHELPER# + --- texlive-bin-2009.orig/debian/compat +++ texlive-bin-2009/debian/compat @@ -0,0 +1 @@ +5 --- texlive-bin-2009.orig/debian/copyright +++ texlive-bin-2009/debian/copyright @@ -0,0 +1,793 @@ +Copyright information for the texlive bundle + +Table of contents: + +1. Copyright and License of the debian-specific adaptions +2. License of the TeX live distribution as a compilation work +3. Licenses of individual parts +3.1 Explanation of the format of the following information +3.2 Packages with license problems +3.3 Individual license texts +3.4 (Incomplete) list of licenses of individual parts + + +1. Copyright and License of the debian-specific adaptions + +Debian adaptions for these packages are licensed under the GNU General +Public License, version 2, and are under Copyright by: + + Norbert Preining (2005-) + Frank Küster (2006-) + +All code generated for the Debian adaptions is under the GNU General +Public License. + +-------- + +2. License of the TeX live distribution as a compilation work + +COPYING CONDITIONS FOR TeX Live: + +To the best of our knowledge, all software in this distribution is +freely redistributable (libre, that is, not necessarily gratis), within +the Free Software Foundation's definition and Debian Free Software +Guidelines. If you find any non-free files included, please contact us +(references given below). + +That said, TeX Live has neither a single copyright holder nor a single +license covering its entire contents, since it is a collection of many +disparate packages. Therefore, you may copy, modify, and/or +redistribute software from TeX Live only if you comply with the +requirements placed thereon by the owners of the respective packages. + +To most easily learn these requirements, we suggest checking the TeX +Catalogue at: http://www.ctan.org/tex-archive/help/Catalogue/ (or any +CTAN mirror). The Catalogue is also included in TeX Live in +./texmf/doc/html/catalogue/, but the online version will have updates. +Of course the legal statements within the packages themselves are the +final authority. + +In some cases, TeX Live is distributed with a snapshot of the CTAN +archive, which is entirely independent of and separable from TeX Live +itself. (The "live" DVD in the TeX Collection is one example of this.) +Please be aware that the CTAN snapshot contains many files which are +*not* freely redistributable; see LICENSE.CTAN for more information. + + +GUIDELINES FOR REDISTRIBUTION: + +In general, you may redistribute TeX Live, with or without modification, +for profit or not, according to the usual free software tenets. Here +are some general guidelines for doing this: + +- If you make any changes to the TeX Live distribution or any +package it contains, besides complying with any licensing requirements, +you must prominently mention such changes in your modified distribution +so that users do not take your work for ours, and know to contact you, +not us, in case of questions or problems. A new top-level +README. file is a good place to describe the general situation. + +- Especially (but not necessarily) if changes or additions are made, we +recommend a clearly different title, such as " demo CD", +based on TeX Live YYYY demo (with updates)", where YYYY is the year of +TeX Live you are publishing. This credits both our work and yours. + +- You absolutely may *not* place your own copyright on the entire +distribution, since it is not your work (as stated above, TeX Live is +not created by any single person or entity). Statements such as "all +rights reserved" and "may not be reproduced" are especially +reprehensible, since they are antithetical to the free software +principles under which TeX Live is produced. + +- You may use any cover or media label designs that you wish. Such +packaging and marketing details are not covered by any TeX Live license. + +- Finally, we make the following requests (not legal requirements): + +a) Acknowledging that TeX Live is developed as a joint effort by all TeX + user groups, and encouraging the user/reader to join their user group + of choice. + + The web page http://www.tug.org/usergroups.html may be referenced as + a list of TeX user groups. We also appreciate your explicitly + listing all the user groups as given on that page, space permitting. + +b) Referencing the TeX Live home page: http://www.tug.org/tex-live/. + +c) Crediting the editor of the original TeX Live: Sebastian Rahtz. + +Such credits may be placed on the label of your media, your cover, +and/or in accompanying text (for instance, in the acknowledgements +section of a book). + +Finally, although it is certainly not a requirement, we'd like to invite +any redistributors to make a donation to the project, whether cash or +in-kind, for example via https://www.tug.org/donate.html. Thanks. + + +If you have any questions or comments, *please* contact us. In general, +we appreciate being given the chance to review any TeX Live-related +material in advance of publication, simply to avoid mistakes. It is +much better to correct text on a CD label or in a book before thousands +of copies are made! + +We are also happy to keep anyone planning a publication informed as to +our deadlines and progress. Just let us know. However, you should be +aware that TeX Live is produced entirely by volunteers, and no dates can +be guaranteed. + + +LICENSING FOR NEW PACKAGES: + +Finally, we are often asked what license to use for new work. To be +considered for inclusion on TeX Live, a package must use a free software +license, such as the LaTeX Project Public License, the GNU Public +License, the X Window System license, the modified BSD license, etc., or +be put into the public domain. Please see the url's below for more +discussion of this. + +Thanks for your interest in TeX. + +- Sebastian Rahtz, editor, for the TeX Live team + + +TeX Live mailing list: texlive@tug.org +TeX Live home page: http://www.tug.org/tex-live/ + +The FSF's free software definition: http://www.gnu.org/philosophy/free-sw.html +Debian Free Software Guidelines: http://www.debian.org/intro/free +FSF commentary on existing licenses: + http://www.gnu.org/licenses/license-list.html + +LPPL: http://latex-project.org/lppl.html or texmf/doc/latex/base/lppl.txt +LPPL rationale: texmf/doc/latex/base/modguide.pdf + +------------- + +3. Reference to an (incomplete) list of licenses of individual parts + +Individual parts of this distribution have their own copyright and +license. + +3.1 Explanation of the format of the following information + +Since most packages use standard licenses, we have separated the list +of license texts and the list of packages and individual files with +their licenses. In section 3.3 we provide the license texts and their +abbreviations used in in the file list. The file list itself is +generated automatically from the TeX Catalogue and can be found, for +each binary package, in /usr/share/doc/texlive-/Licenses. + +The information in the TeX Catalogue is checked by the Debian TeX +maintainers and the CTAN maintainers. If you find any contradiction +in the listing with the reality please inform us. + +In the case of gpl and lppl, the string without a number means that +the license statement contains a "or any later version" statement. In +the list in Licenses, each package has a header line like this: + +% ccfonts: lppl (verification data:1.1:1.1:2006-03-14:frank:readme) + +indicating that the package ccfonts is under LPPL, exists in version +1.1, the license has been checked in version 1.1 on 2006-03-14 by +"frank" (the username among the Catalogue developers, actually Frank +Küster), and the license information is in a file "readme". After +that follows the list of files, + + tex/latex/ccfonts/t1ccr.fd + tex/latex/ccfonts/ccfonts.sty + tex/latex/ccfonts/ts1ccr.fd + doc/latex/ccfonts/* + +where the * indicates that all ordinary files in that directory belong +to that package (but not necessarily subdirectories and files +therein). + +3.2 TODO: Packages with licensing problems + +[ this is copied over from teTeX, and some problems might already be +solved ] + +3.2.1 Serious problems + +- euler: LPPL according changelog, but no indication in file. + +- adrconv: No license at all for the documentation + +- antp: PD according to catalogue, no statement in the files, no + sources; contacted upstream + +- bbm: no license statement at all, bug filed + +- cite: chapterbib.sty is missing a license statement in the header + +- Problematic files by Donald Arseneau: + + * chapterbib.sty: no license information + * tabls.sty: no license information + * import.sty: "this software is free of any restrictions" + * relsize.sty: "public domain", nothing else + * shapepar.sty: noncommercial + * version.sty: no license information, not only by D.A. + * selectp.sty: no license information + *./source/latex/shapepar/README.shapepar + ./source/latex/shapepar/shapepar.sty + ./source/latex/shapepar/shapepar.ltx + ./source/latex/hyphenat/hyphenat.dtx: no license information + + +- citesort.sty: no license statement + +- index.doc: no license statement - probably unused + +- dinbrief: lppl 1.1+, but with additional restrictions which are non-free + +- eepic: The style files are public domain, but all the documentation + has no license at all. + +- extsizes: extsizes.sty, extarticle.cls and extreport.cls, and the + size*.clo files have a correct LPPL notice, the others have none. + The author seems to be active on Wikipedia, tried to contact him + +- beamericon*: no license statement. beamerexample-seminar: just like + seminar, which has not been investigated yet. Filed bug against beamer. + +- one file in the psnfss directory with unclear license: + + tex/latex/psnfss/8r.sty + +3.2.2 Normal :-) problems + +- listings: LPPL, plus: + +,---- +| *Modification*advice* +| +| Permission is granted to modify the listings package as well as +| lstdrvrs.dtx. You are not allowed to distribute a modified version of +| the listings package or lstdrvrs.dtx unless you change the file names +| and provide the original files. In any case it is better to contact +| the address below; other users will welcome removed bugs, new +| features, and additional programming languages. + +This is more restrictive than LPPL 1.3 (6.a and 6.d.2). The title is advice... + +- ae: Just a formal problem, the GPL is included, but nowhere is it + explicitly stated that this license applies to the package. + + contacted upstream + +- antt: gust font license, unclear which files % contacted upstream + + +3.3 Individual license texts + +The actual text of the licenses can either be found in +/usr/share/common-licenses (for artistic,bsd,gpl) or in "3.2 Text of +the licenses" below. For BSD-like licenses that just exchange the +name of the copyright holder, we do not list the license text. + +A. gpl (GNU General Public License) + +The full text of the GPL is given in /usr/share/common-licenses/GPL. + +B. lppl (LaTeX Project Public License) + +The LaTeX Project Public License +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +LPPL Version 1.3c 2006-05-20 + +Copyright 1999 2002-2006 LaTeX3 Project + Everyone is allowed to distribute verbatim copies of this + license document, but modification of it is not allowed. + + +PREAMBLE +======== + +The LaTeX Project Public License (LPPL) is the primary license under +which the the LaTeX kernel and the base LaTeX packages are distributed. + +You may use this license for any work of which you hold the copyright +and which you wish to distribute. This license may be particularly +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is +unrelated to TeX. + +The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', +below, gives instructions, examples, and recommendations for authors +who are considering distributing their works under this license. + +This license gives conditions under which a work may be distributed +and modified, as well as conditions under which modified versions of +that work may be distributed. + +We, the LaTeX3 Project, believe that the conditions below give you +the freedom to make and distribute modified versions of your work +that conform with whatever technical specifications you wish while +maintaining the availability, integrity, and reliability of +that work. If you do not see how to achieve your goal while +meeting these conditions, then read the document `cfgguide.tex' +and `modguide.tex' in the base LaTeX distribution for suggestions. + + +DEFINITIONS +=========== + +In this license document the following terms are used: + + `Work' + Any work being distributed under this License. + + `Derived Work' + Any work that under any applicable law is derived from the Work. + + `Modification' + Any procedure that produces a Derived Work under any applicable + law -- for example, the production of a file containing an + original file associated with the Work or a significant portion of + such a file, either verbatim or with modifications and/or + translated into another language. + + `Modify' + To apply any procedure that produces a Derived Work under any + applicable law. + + `Distribution' + Making copies of the Work available from one person to another, in + whole or in part. Distribution includes (but is not limited to) + making any electronic components of the Work accessible by + file transfer protocols such as FTP or HTTP or by shared file + systems such as Sun's Network File System (NFS). + + `Compiled Work' + A version of the Work that has been processed into a form where it + is directly usable on a computer system. This processing may + include using installation facilities provided by the Work, + transformations of the Work, copying of components of the Work, or + other activities. Note that modification of any installation + facilities provided by the Work constitutes modification of the Work. + + `Current Maintainer' + A person or persons nominated as such within the Work. If there is + no such explicit nomination then it is the `Copyright Holder' under + any applicable law. + + `Base Interpreter' + A program or process that is normally needed for running or + interpreting a part or the whole of the Work. + + A Base Interpreter may depend on external components but these + are not considered part of the Base Interpreter provided that each + external component clearly identifies itself whenever it is used + interactively. Unless explicitly specified when applying the + license to the Work, the only applicable Base Interpreter is a + `LaTeX-Format' or in the case of files belonging to the + `LaTeX-format' a program implementing the `TeX language'. + + + +CONDITIONS ON DISTRIBUTION AND MODIFICATION +=========================================== + +1. Activities other than distribution and/or modification of the Work +are not covered by this license; they are outside its scope. In +particular, the act of running the Work is not restricted and no +requirements are made concerning any offers of support for the Work. + +2. You may distribute a complete, unmodified copy of the Work as you +received it. Distribution of only part of the Work is considered +modification of the Work, and no right to distribute such a Derived +Work may be assumed under the terms of this clause. + +3. You may distribute a Compiled Work that has been generated from a +complete, unmodified copy of the Work as distributed under Clause 2 +above, as long as that Compiled Work is distributed in such a way that +the recipients may install the Compiled Work on their system exactly +as it would have been installed if they generated a Compiled Work +directly from the Work. + +4. If you are the Current Maintainer of the Work, you may, without +restriction, modify the Work, thus creating a Derived Work. You may +also distribute the Derived Work without restriction, including +Compiled Works generated from the Derived Work. Derived Works +distributed in this manner by the Current Maintainer are considered to +be updated versions of the Work. + +5. If you are not the Current Maintainer of the Work, you may modify +your copy of the Work, thus creating a Derived Work based on the Work, +and compile this Derived Work, thus creating a Compiled Work based on +the Derived Work. + +6. If you are not the Current Maintainer of the Work, you may +distribute a Derived Work provided the following conditions are met +for every component of the Work unless that component clearly states +in the copyright notice that it is exempt from that condition. Only +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. + + a. If a component of this Derived Work can be a direct replacement + for a component of the Work when that component is used with the + Base Interpreter, then, wherever this component of the Work + identifies itself to the user when used interactively with that + Base Interpreter, the replacement component of this Derived Work + clearly and unambiguously identifies itself as a modified version + of this component to the user when used interactively with that + Base Interpreter. + + b. Every component of the Derived Work contains prominent notices + detailing the nature of the changes to that component, or a + prominent reference to another file that is distributed as part + of the Derived Work and that contains a complete and accurate log + of the changes. + + c. No information in the Derived Work implies that any persons, + including (but not limited to) the authors of the original version + of the Work, provide any support, including (but not limited to) + the reporting and handling of errors, to recipients of the + Derived Work unless those persons have stated explicitly that + they do provide such support for the Derived Work. + + d. You distribute at least one of the following with the Derived Work: + + 1. A complete, unmodified copy of the Work; + if your distribution of a modified component is made by + offering access to copy the modified component from a + designated place, then offering equivalent access to copy + the Work from the same or some similar place meets this + condition, even though third parties are not compelled to + copy the Work along with the modified component; + + 2. Information that is sufficient to obtain a complete, + unmodified copy of the Work. + +7. If you are not the Current Maintainer of the Work, you may +distribute a Compiled Work generated from a Derived Work, as long as +the Derived Work is distributed to all recipients of the Compiled +Work, and as long as the conditions of Clause 6, above, are met with +regard to the Derived Work. + +8. The conditions above are not intended to prohibit, and hence do not +apply to, the modification, by any method, of any component so that it +becomes identical to an updated version of that component of the Work as +it is distributed by the Current Maintainer under Clause 4, above. + +9. Distribution of the Work or any Derived Work in an alternative +format, where the Work or that Derived Work (in whole or in part) is +then produced by applying some process to that format, does not relax or +nullify any sections of this license as they pertain to the results of +applying that process. + +10. a. A Derived Work may be distributed under a different license + provided that license itself honors the conditions listed in + Clause 6 above, in regard to the Work, though it does not have + to honor the rest of the conditions in this license. + + b. If a Derived Work is distributed under a different license, that + Derived Work must provide sufficient documentation as part of + itself to allow each recipient of that Derived Work to honor the + restrictions in Clause 6 above, concerning changes from the Work. + +11. This license places no restrictions on works that are unrelated to +the Work, nor does this license place any restrictions on aggregating +such works with the Work by any means. + +12. Nothing in this license is intended to, or may be used to, prevent +complete compliance by all parties with all applicable laws. + + +NO WARRANTY +=========== + +There is no warranty for the Work. Except when otherwise stated in +writing, the Copyright Holder provides the Work `as is', without +warranty of any kind, either expressed or implied, including, but not +limited to, the implied warranties of merchantability and fitness for a +particular purpose. The entire risk as to the quality and performance +of the Work is with you. Should the Work prove defective, you assume +the cost of all necessary servicing, repair, or correction. + +In no event unless required by applicable law or agreed to in writing +will The Copyright Holder, or any author named in the components of the +Work, or any other party who may distribute and/or modify the Work as +permitted above, be liable to you for damages, including any general, +special, incidental or consequential damages arising out of any use of +the Work or out of inability to use the Work (including, but not limited +to, loss of data, data being rendered inaccurate, or losses sustained by +anyone as a result of any failure of the Work to operate with any other +programs), even if the Copyright Holder or said author or said other +party has been advised of the possibility of such damages. + + +MAINTENANCE OF THE WORK +======================= + +The Work has the status `author-maintained' if the Copyright Holder +explicitly and prominently states near the primary copyright notice in +the Work that the Work can only be maintained by the Copyright Holder +or simply that it is `author-maintained'. + +The Work has the status `maintained' if there is a Current Maintainer +who has indicated in the Work that they are willing to receive error +reports for the Work (for example, by supplying a valid e-mail +address). It is not required for the Current Maintainer to acknowledge +or act upon these error reports. + +The Work changes from status `maintained' to `unmaintained' if there +is no Current Maintainer, or the person stated to be Current +Maintainer of the work cannot be reached through the indicated means +of communication for a period of six months, and there are no other +significant signs of active maintenance. + +You can become the Current Maintainer of the Work by agreement with +any existing Current Maintainer to take over this role. + +If the Work is unmaintained, you can become the Current Maintainer of +the Work through the following steps: + + 1. Make a reasonable attempt to trace the Current Maintainer (and + the Copyright Holder, if the two differ) through the means of + an Internet or similar search. + + 2. If this search is successful, then enquire whether the Work + is still maintained. + + a. If it is being maintained, then ask the Current Maintainer + to update their communication data within one month. + + b. If the search is unsuccessful or no action to resume active + maintenance is taken by the Current Maintainer, then announce + within the pertinent community your intention to take over + maintenance. (If the Work is a LaTeX work, this could be + done, for example, by posting to comp.text.tex.) + + 3a. If the Current Maintainer is reachable and agrees to pass + maintenance of the Work to you, then this takes effect + immediately upon announcement. + + b. If the Current Maintainer is not reachable and the Copyright + Holder agrees that maintenance of the Work be passed to you, + then this takes effect immediately upon announcement. + + 4. If you make an `intention announcement' as described in 2b. above + and after three months your intention is challenged neither by + the Current Maintainer nor by the Copyright Holder nor by other + people, then you may arrange for the Work to be changed so as + to name you as the (new) Current Maintainer. + + 5. If the previously unreachable Current Maintainer becomes + reachable once more within three months of a change completed + under the terms of 3b) or 4), then that Current Maintainer must + become or remain the Current Maintainer upon request provided + they then update their communication data within one month. + +A change in the Current Maintainer does not, of itself, alter the fact +that the Work is distributed under the LPPL license. + +If you become the Current Maintainer of the Work, you should +immediately provide, within the Work, a prominent and unambiguous +statement of your status as Current Maintainer. You should also +announce your new status to the same pertinent community as +in 2b) above. + + +WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE +====================================================== + +This section contains important instructions, examples, and +recommendations for authors who are considering distributing their +works under this license. These authors are addressed as `you' in +this section. + +Choosing This License or Another License +---------------------------------------- + +If for any part of your work you want or need to use *distribution* +conditions that differ significantly from those in this license, then +do not refer to this license anywhere in your work but, instead, +distribute your work under a different license. You may use the text +of this license as a model for your own license, but your license +should not refer to the LPPL or otherwise give the impression that +your work is distributed under the LPPL. + +The document `modguide.tex' in the base LaTeX distribution explains +the motivation behind the conditions of this license. It explains, +for example, why distributing LaTeX under the GNU General Public +License (GPL) was considered inappropriate. Even if your work is +unrelated to LaTeX, the discussion in `modguide.tex' may still be +relevant, and authors intending to distribute their works under any +license are encouraged to read it. + +A Recommendation on Modification Without Distribution +----------------------------------------------------- + +It is wise never to modify a component of the Work, even for your own +personal use, without also meeting the above conditions for +distributing the modified component. While you might intend that such +modifications will never be distributed, often this will happen by +accident -- you may forget that you have modified that component; or +it may not occur to you when allowing others to access the modified +version that you are thus distributing it and violating the conditions +of this license in ways that could have legal implications and, worse, +cause problems for the community. It is therefore usually in your +best interest to keep your copy of the Work identical with the public +one. Many works provide ways to control the behavior of that work +without altering any of its licensed components. + +How to Use This License +----------------------- + +To use this license, place in each of the components of your work both +an explicit copyright notice including your name and the year the work +was authored and/or last substantially modified. Include also a +statement that the distribution and/or modification of that +component is constrained by the conditions in this license. + +Here is an example of such a notice and statement: + + %% pig.dtx + %% Copyright 2005 M. Y. Name + % + % This work may be distributed and/or modified under the + % conditions of the LaTeX Project Public License, either version 1.3 + % of this license or (at your option) any later version. + % The latest version of this license is in + % http://www.latex-project.org/lppl.txt + % and version 1.3 or later is part of all distributions of LaTeX + % version 2005/12/01 or later. + % + % This work has the LPPL maintenance status `maintained'. + % + % The Current Maintainer of this work is M. Y. Name. + % + % This work consists of the files pig.dtx and pig.ins + % and the derived file pig.sty. + +Given such a notice and statement in a file, the conditions +given in this license document would apply, with the `Work' referring +to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being +generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' +referring to any `LaTeX-Format', and both `Copyright Holder' and +`Current Maintainer' referring to the person `M. Y. Name'. + +If you do not want the Maintenance section of LPPL to apply to your +Work, change `maintained' above into `author-maintained'. +However, we recommend that you use `maintained', as the Maintenance +section was added in order to ensure that your Work remains useful to +the community even when you can no longer maintain and support it +yourself. + +Derived Works That Are Not Replacements +--------------------------------------- + +Several clauses of the LPPL specify means to provide reliability and +stability for the user community. They therefore concern themselves +with the case that a Derived Work is intended to be used as a +(compatible or incompatible) replacement of the original Work. If +this is not the case (e.g., if a few lines of code are reused for a +completely different task), then clauses 6b and 6d shall not apply. + + +Important Recommendations +------------------------- + + Defining What Constitutes the Work + + The LPPL requires that distributions of the Work contain all the + files of the Work. It is therefore important that you provide a + way for the licensee to determine which files constitute the Work. + This could, for example, be achieved by explicitly listing all the + files of the Work near the copyright notice of each file or by + using a line such as: + + % This work consists of all files listed in manifest.txt. + + in that place. In the absence of an unequivocal list it might be + impossible for the licensee to determine what is considered by you + to comprise the Work and, in such a case, the licensee would be + entitled to make reasonable conjectures as to which files comprise + the Work. + + + + +C. Artistic +D. PD (Public domain): + +The file or package contains a statement equivalent to + +"This file is in the public domain. You may freely use, modify and +distribute it". + +E. Non-standard licenses, by package name: + +(1) eepic.sty, eepicemu.sty: + The macros are in public domain. + You may distribute or modify it in any ways you like. + epic.sty: + You may use this file in whatever way you wish. You are requested to + leave this notice intact, and report any bugs, enhancements, comments, + suggestions, etc. to: + ... + +(2) The Computer Modern fonts by Donald E. Knuth have a special + license; essentially, they are public domain, but no modified + version may use the same name, and the names "TeX" and "MetaFont" + for the resulting programs, unless they pass the TRIP and TRAP + tests. The complete license statement can be found in a text at + http://www.tug.org/TUGboat/Articles/tb11-4/tb30knut.pdf, and the + relevant parts are: + + ,---- + | My work on developing TEX, METAFONT, and Computer + | Modern has come to an end. I willmake no further + | changes except to correct extremely serious bugs. + | + | I have put these systems into the public domain so that + | people everywhere can use the ideas freely if they wish. + | + | [...] + | As stated on the copyright pages of Volumes B, D, and + | E, anybody can make use of my programs in whatever + | way they wish, as long as they do not use the names + | TEX, METAFONT, or Computer Modern. In particular, + | any person or group who wants to produce a program + | superior to mine is free to do so. However, nobody is + | allowed to call a system TEX or METAFONT unless that + | system conforms 100% to my own programs, as I have + | specified in the manuals for the TRIP and TRAP tests. + | And nobody is allowed to use the names of the Computer + | Modern fonts in Volume E for any fonts that do not + | produce identical tfm files. This prohibition applies to + | all people or machines, whether appointed by TUG or + | by any other organization. I do not intend to delegate the + | responsibility formaintainance of TEX, METAFONT, or + | Computer Modern to anybody else, ever. + `---- + + For those who believe more in texts written on paper, we reproduce + here the copyright page of Volume $of "Computers and Typesetting" + by Donald E. Knuth, which present the commented code for the + Computer Modern fonts: + + ,---- + | The quotations on pages 7 and 351 have been excerpted [...]. + | + | METAFONT is a trademark of th Addison Wesley Publishing Company. + | + | TeX is a trademark of the American Mathematical Society. + | + | The programs for computer Modern are in the public domain, and readers + | may freely generate and hand-tune their own fonts using the algorithms + | of this book. However, use of the names is restricted: Any fonts + | whose names cmr10 or cmbx12 or ... are identical to the standard font + | names of this book should be fully compatible with the fonts defined + | here; i.e., fonts with the same names are supposed to have precisely + | the same character coding schemes and precisely the same font metric + | files. + `---- + + + + ***** + +F. Individual files, not belonging to any package: + +% cahyph.tex: LPPL 1+ +% gahyph.tex: GPL 2+ +% icehyph.tex: LPPL 1.2+ +% ruhyphas.tex: LPPL 1.2+ +% ruhyphzn.tex: LPPL 1.2+ +% sehyph.tex: LPPL 1.2+ + + + +3.4 Reference to an (incomplete) list of licenses of individual parts + +The file list for each binary package has the format explained above +and can be found, for each binary package, in + +/usr/share/doc/texlive-/Licenses. + +$Id: copyright 3943 2009-05-22 12:11:09Z preining $ --- texlive-bin-2009.orig/debian/README.source +++ texlive-bin-2009/debian/README.source @@ -0,0 +1,3 @@ +The used patch system is quilt. + +See /usr/share/doc/quilt/README.source for more information. --- texlive-bin-2009.orig/debian/TODO +++ texlive-bin-2009/debian/TODO @@ -0,0 +1,118 @@ +- texlive-binaries.links.dist is not dealt with, or only in parts! + +- work to be done on patches is briefly documented in + debian/patches/series + +- think about libkpathsea4 -> libkpathsea5 so version bump !!! + +- fix the .install files so that only those files actually there are + referenced, and not more (eg texlua and texluac links are there but + should not be installed) + +- some entries in debian/rules are disabled because the files needed + are not yet in TL2009. Could be, however, that they are no longer + needed + +- dh_shlibdeps gives warnings about superfluous linking + +- what to do with freetype1? + +- the following files are not found in the bin directory; we need to + find out whether this is an error or on purpose, and if on purpose + if it's a problem for debian. + + from texlive-base-binaries.install: + +-inst/bin/dvipdft usr/bin + from package dvipdfm that should be built, maybe because we + call --disable-dvipdfmx induces --disable-dvipdfm? + + +-inst/bin/ebb usr/bin +-inst/bin/extractbb usr/bin + from dvipdfmx, which is built separately + +-inst/bin/lualatex usr/bin +-inst/bin/luatex usr/bin +-inst/bin/pdflualatex usr/bin +-inst/bin/pdfluatex usr/bin + from luatex, build separately + +-inst/bin/makempx usr/bin +-inst/bin/mfplain usr/bin +-inst/bin/mpto usr/bin +-inst/bin/newer usr/bin + current texlive does not include these binaries in metapost + can be removed (hopefully) + +-inst/bin/odvips usr/bin +-inst/bin/oxdvi usr/bin + not built anymore, functionality is merged into xdvi/dvips + + + from texlive-extra-binaries.install: + +-inst/bin/musixflx usr/bin + + from musixtex, build separately + +-inst/bin/bbox usr/bin +-inst/bin/cfftot1 usr/bin +-inst/bin/disdvi usr/bin +-inst/bin/dvi2tty usr/bin +-inst/bin/dvidvi usr/bin +-inst/bin/epsffit usr/bin +-inst/bin/extractres usr/bin +-inst/bin/fixdlsrps usr/bin +-inst/bin/fixfmps usr/bin +-inst/bin/fixmacps usr/bin +-inst/bin/fixpsditps usr/bin +-inst/bin/fixpspps usr/bin +-inst/bin/fixscribeps usr/bin +-inst/bin/fixtpps usr/bin +-inst/bin/fixwfwps usr/bin +-inst/bin/fixwpps usr/bin +-inst/bin/fixwwps usr/bin +-inst/bin/getafm usr/bin +-inst/bin/includeres usr/bin +-inst/bin/lacheck usr/bin +-inst/bin/mmafm usr/bin +-inst/bin/mmpfb usr/bin +-inst/bin/otfinfo usr/bin +-inst/bin/otftotfm usr/bin +-inst/bin/psbook usr/bin +-inst/bin/psmerge usr/bin +-inst/bin/psnup usr/bin +-inst/bin/psresize usr/bin +-inst/bin/psselect usr/bin +-inst/bin/pstops usr/bin +-inst/bin/showchar usr/bin +-inst/bin/t1ascii usr/bin +-inst/bin/t1asm usr/bin +-inst/bin/t1binary usr/bin +-inst/bin/t1disasm usr/bin +-inst/bin/t1dotlessj usr/bin +-inst/bin/t1lint usr/bin +-inst/bin/t1mac usr/bin +-inst/bin/t1reencode usr/bin +-inst/bin/t1testpage usr/bin +-inst/bin/t1unmac usr/bin +-inst/bin/tex2xindy usr/bin +-inst/bin/texindy usr/bin +-inst/bin/ttf2pk usr/bin +-inst/bin/ttf2tfm usr/bin +-inst/bin/ttftotype42 usr/bin + + Strange, all related to font stuff etc has to be investigated + +-inst/bin/xindy.mem usr/bin +-inst/bin/xindy.run usr/bin +-inst/bin/xindy usr/bin + + xindy, built separately in Debian + +DONE +- please add + --with-tex-banner='"TeX Live 2009/Debian"' + to the configure call (see email of Karl to the tldistros ML). + --- texlive-bin-2009.orig/debian/libkpathsea-dev.preinst +++ texlive-bin-2009/debian/libkpathsea-dev.preinst @@ -0,0 +1,16 @@ +#!/bin/sh -e +# libkpathsea-dev.preinst.pre +# created 2008 by the Debian TeX Task Force +# probably not copyrightable as it looks now, but anyway the code maybe +# freely copied, distributed and/or modified + +# remove link of doc file as shipped with up to version 3.0 + +if [ -L /usr/share/doc/libkpathsea-dev ] ; then + if [ "$(readlink -n /usr/share/doc/libkpathsea-dev)" = libkpathsea4 ] ; then + rm /usr/share/doc/libkpathsea-dev + fi +fi + +#DEBHELPER# + --- texlive-bin-2009.orig/debian/debianize-fmtutil +++ texlive-bin-2009/debian/debianize-fmtutil @@ -0,0 +1,429 @@ +# This file, debianize-fmtutil, is meant to be sourced by fmtutil and +# enhance the --enable and --disable options with the functionality +# needed to deal with Debian's generated fmtutil.cnf. +# $Id$ + +# This is the planned scheme how it works +# +# A for disablefmt: +# 1. create a list of files to act on (either in sysconfdir only, or in user dirs too) +# 2. grep for not-commented lines in these files that contain $fmt +# 3. if in syswide-mode, for each of these files, run configReplace appropriately; +# if not in syswide mode, for each of these files, +# test whether it is in the syswide dir +# 3.a if not, run configReplace appropriately +# 3b. if yes, create copy in user dir and run configReplace appropriately +# +# B for enableMap: +# 1. create a list of files to act on (either in sysconfdir only, or in user dirs too) +# 2. grep for commented lines in these files that contain $map +# 2.1. if any are found, check whether it is only one +# 2.1.1 if there is only one, run configReplace on that file appropriately +# 2.1.2 if there is more than one, the precedence is +# 20tetex-extra.cfg > XX*local*.cfg > 10tetex-base.cfg > any +# (extra has maximum priority because +# 2.1.2.1 if it's clear on which file to act, run configReplace on that file +# appropriately +# 2.1.2.2 if unclear (i.e. only "any"), exit with an error +# 2.2 if none are found, act on 10local.cfg (could be made configurable) +# - if 10local.cfg does not exist, create it (with an explanatory comment) +# - run configReplace on it appropriately +# +# C for syncwithtrees (and even more?) +# ? +# +# After that, update-fmtutil must be run (in the appropriate mode!), and then fmtutil +# must reexecute itself. Since disableMap is called by enableMap, we need a wrapper +# for it. + +############################################################################### +# verboseMsg(msg) +# print `msg' to stderr is $verbose is true +############################################################################### +verboseMsg() { + $verboseFlag && verbose echo ${1+"$@"} >&2 +} + +############################################################################### +# enablefmt(format) +# enables format in configuration file +############################################################################### +enablefmt() +{ + enableFmtInner $1 + runUpdate +} + +############################################################################### +# disablefmt(format) +# disables format in configuration file +############################################################################### +disablefmt() +{ + disableFmtInner $1 + runUpdate +} + +############################################################################### +# debianEditWarnAndShow() +# warn that this won't work +############################################################################### +debianEditWarnAndShow(){ + echo "Warning!" + echo "" + echo "In Debian, fmtutil.cnf, the format configuration file, is a generated file." + echo "The actual configuration files are in /etc/texmf/fmt.d." + echo "Please read the update-fmtutil(1) manpage and edit those files." + echo "" + echo "Instead of editing, you will now be shown fmtutil.cnf in a pager." + echo "" + echo "Press enter to continue." + read dummy + + sensible-pager $cnf_file + +} + +############################################################################### +# DebianSyswideMode () +# determine whether we are running in syswide mode (or user-specific) +############################################################################### +DebianSyswideMode(){ + test "$(id -u)" -eq 0 && return 0 || return 1 +} + +############################################################################### +# FindDebianUserdir () +# find the directory containing user-specific fmt.d snippets +############################################################################### +FindDebianUserdir(){ +# verboseMsg "entering FindDebianUserdir" + + texmfconfig=$(kpsewhich --expand-path '$TEXMFCONFIG') + OLDIFS="$IFS" + IFS=: + count=0 + for d in "$texmfconfig"; do + count=$(($count+1)) + : ${cnfdir:=$d} + if [ -d "$d/fmt.d" ]; then + defaultuserdir="$d/fmt.d" + break + fi + done + IFS="$OLDIFS" + # still empty? Pick one + if [ -z "$defaultuserdir" ]; then + if [ $count -eq 1 ]; then + defaultuserdir="$cnfdir/fmt.d" + else + echo "TEXMFCONFIG contains more than one directory, and none of them" >&2 + echo "already contains a fmt.d/ subdirectory." >&2 + echo "I don't know how to proceed here, stopping." >&2 + return + fi + fi + + /usr/share/texmf/web2c/mktexdir $defaultuserdir + if [ -d $defaultuserdir ]; then + echo $defaultuserdir + fi +} + +############################################################################### +# createDebianConffilelist +# create a list of configuration files containing fmtutil snippets; +# we are going to act on these +############################################################################### +createDebianConffilelist(){ +# verboseMsg "entering createDebianConffilelist" + + userFiles="" + local DebianConffilelist="" + syswideFiles=`find /etc/texmf/fmt.d -maxdepth 1 -type f -name '*.cnf'` + if ! DebianSyswideMode; then + debianuserdir=`FindDebianUserdir` + if [ -n "$debianuserdir" ]; then + userFiles=`find "$debianuserdir" -maxdepth 1 -type f -name '*.cnf'` + fi + fi + if [ -n "$userFiles" ]; then + for sysfile in $syswideFiles; do + for userfile in $userFiles; do + if [ ! "`basename $userfile`" = "`basename $sysfile`" ]; then + DebianConffilelist="$DebianConffilelist $sysfile" + fi + done + done + DebianConffilelist="$DebianConffilelist $userFiles" + else + DebianConffilelist="$syswideFiles" + fi + echo $DebianConffilelist +} + +############################################################################### +# snippetFileIsWritable (debCnfFile) +# checks whether we are (supposed to be) able to write to a file +############################################################################### +snippetFileIsWritable(){ + local file=$1 + + if DebianSyswideMode; then + return 0 + else + # /etc/texmf/fmt.d shouldn't be hardcoded + if [ "${file#/etc/texmf}" = "${file}" ]; then + # file is not in systemwide dir + return 0 + else + return 1 + fi + fi +} + +############################################################################### +# makeUserCopy (filename) +# create a copy in the user dir +############################################################################### +makeUserCopy(){ + local debCnfFile="$1" + + # create a copy of that file in the user dir + debianuserdir=`FindDebianUserdir` + newdebCnfFile="$debianuserdir/`basename $debCnfFile`" + verboseMsg "I'm not allowed to handle $fmt in $debCnfFile." >&2 + verboseMsg "Creating copy in $debianuserdir instead." >&2 + cp $debCnfFile $newdebCnfFile + echo "$newdebCnfFile" +} + +############################################################################### +# findUserfiles (filelist) +# pick user-specific files out of a filelist of configuration files +############################################################################### +findUserfiles(){ + userfiles="" + while [ $# -gt 0 ]; do + file="$1" + if [ "$file" = "${file#/etc/texmf/}" ]; then + # doesn't start with /etc/texmf/: must be user-specific + userfiles="$userfiles $file" + fi + shift; + done + echo $userfiles +} + +############################################################################### +# findRightMatchfile (format,filelist) +# find the right file from filelist to enable mapname +############################################################################### +findRightMatchfile(){ + fmt=$1; shift + matchfiles="$@" + local debCnfFile="" + + if [ $# -eq 1 ]; then + # it is only one, enable map in it. May we write it? + debCnfFile=$matchfiles + if ! snippetFileIsWritable $debCnfFile; then + debCnfFile=`makeUserCopy $debCnfFile` + fi + echo $debCnfFile + verboseMsg "Enabling format in $debCnfFile." + return 0 + else + # there are more than one; + if ! DebianSyswideMode; then + # can only change files in the user's dir + usermatchfiles=`findUserfiles $matchfiles` + if [ `(set $usermatchfiles; echo $#)` -eq 1 ]; then + # exactly one of them is a user-specific file + echo $usermatchfiles + verboseMsg "Enabling format in user-specific file $usermatchfiles." + return 0 + else + # two files in the user directory (as bad as two in the site-wide + # dir), or no user-specific files. If there are two user-specific + # files, report about them: + test -n "$usermatchfiles" && matchfiles="$usermatchfiles" || true + fi + fi + # for now, we exit with an error. Any sensible choice would have to + # check whether teTeX or texlive is installed, and I want to save me + # that hazzle. + cat >&2 <&2 <&2 + echo "Exiting" >&2 + exit 0 + ) + DebCnfFile=`pickLocalFile $fmt $debianuserdir` + fi +# # configReplace will try to grep in the file: touch it to prevent a error message +# touch $DebCnfFile + verboseMsg "Using local configuration file $DebCnfFile" + echo $DebCnfFile +} + +############################################################################### +# runUpdate +# run update-fmtutil +############################################################################### +runUpdate(){ + updOptions="" + if [ -n "$cfgparam" ]; then + # --conffile option was given on the command line + updOptions="--output-file $orig" + fi + # here we could check for an alternative user dir, or output file + # but as long as FindDebianUserdir only reports the default location, + # it doesn't make sense + + verboseMsg "Running update-fmtutil to merge the changed files" + update-fmtutil --quiet $updOptions +} + +############################################################################### +# disableFmtInner (map) +# disables fmt in config file (any type) (real command) +############################################################################### +disableFmtInner() +{ + fmt=$1 + noverbose="$2" + + local debCnfFile + + oldverbose="$verbose" + if [ -n "$noverbose" ]; then + # don't confuse users with disable messages when they called --enable +# verboseMsg "disabling verbosity" + verbose=false + fi + + + if [ -z "$DebianConffilelist" ]; then + DebianConffilelist=`createDebianConffilelist` + fi + + # create list of all files that contain an entry + for debCnfFile in $DebianConffilelist; do + if grep -q "^$fmt" $debCnfFile; then + if ! snippetFileIsWritable $debCnfFile; then + debCnfFile=`makeUserCopy $debCnfFile` + fi + verboseMsg "Disabling $fmt in $debCnfFile." + ed $debCnfFile >/dev/null 2>&1 <<-eof + g/^$fmt[ ]/s/^/#! / + w + q +eof + fi + done + + verbose="$oldverbose" + return 0 +} + +############################################################################### +# enableFmtInner (fmt) +# enables fmt in config file (any type) (real command) +############################################################################### +enableFmtInner(){ + fmt=$1 + local debCnfFile="" + + if [ -z "$DebianConffilelist" ]; then + DebianConffilelist=`createDebianConffilelist` + fi + + # a format should only be defined once, so we carefully disable + # everything about it here: + disableFmtInner "$fmt" noverbose + + # now enable with the right type. + # But we have to determine where to enable. + # is there already a file that contains a (commented) entry? + matchfiles="" + for file in $DebianConffilelist; do + if grep -q "^#![ ]*$fmt[ ]" "$file"; then + matchfiles="$matchfiles $file" + fi + done + if [ -n "$matchfiles" ]; then + # there is already (at least) one file that has a commented entry for our map + debCnfFile=`findRightMatchfile $fmt $matchfiles` + test -w "$debCnfFile" || debCnfFile="" + fi + if [ -z "$debCnfFile" ]; then + # still none, there is no (commented) entry in any writable file yet. + debCnfFile=`findRightLocalfile $fmt` + test -n "$debCnfFile" || abort "Cannot proceed. Exiting" + verboseMsg "Creating new entry for format $fmt in $debCnfFile" + fi + + ed $debCnfFile >/dev/null 2>&1 <<-eof + g/^#![ ]*$fmt[ ]/s/..[ ]*// + w + q +eof +} + + --- texlive-bin-2009.orig/debian/rules +++ texlive-bin-2009/debian/rules @@ -0,0 +1,124 @@ +#!/usr/bin/make -f +# +# debian/rules file for texlive-bin +# $Id: rules.in 3735 2009-02-21 15:23:31Z preining $ + +include /usr/share/quilt/quilt.make + +SHELL=/bin/bash + +first: build + +# if we are compiling on armel we have to use gcc/g++ 4.4 to fix the +# build error due to upstream bug, see #483939 +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +GCC_44_ARCHES := armel +RELAX_ARCHES := alpha + +ifneq (,$(filter $(DEB_BUILD_ARCH),$(GCC_44_ARCHES))) + export CC=gcc-4.4 + export CXX=g++-4.4 +endif + +ifneq (,$(filter $(DEB_BUILD_ARCH),$(RELAX_ARCHES))) + export LDFLAGS=-Wl,--no-relax +endif + +# +# upstream stuff +upstream_pre_release=true +create-orig-source: +ifeq ($(upstream_pre_release),true) + -chmod a+x debian/create-orig-tar + debian/create-orig-tar +else + wget $(somewhere) +endif + +# still statically links some libs, most notably icu-xetex. +export TL_CONF_SHARED=--enable-shared +## export TL_CONF_LARGEFILE=--enable-largefile +export TL_CONFIGURE_ARGS= \ + --disable-native-texlive-build \ + --disable-lcdf-typetools \ + --disable-dvipng \ + --disable-musixflx \ + --disable-ps2eps \ + --disable-psutils \ + --disable-luatex \ + --disable-t1utils \ + --disable-cjkutils \ + --disable-dvidvi \ + --disable-lacheck \ + --disable-tex4htk \ + --with-system-libpng \ + --with-system-zlib \ + --with-system-gd \ + --with-system-freetype2 \ + --with-freetype2-include=/usr/include/freetype2 \ + --with-x \ + --with-xdvi-x-toolkit=xaw \ + --with-mf-x-toolkit \ + --enable-ipc \ + --with-system-xpdf \ + --with-tex-banner='TeX Live 2009/Debian' +export CONFIG_SHELL=/bin/sh + +build: build-stamp + +build-stamp: $(QUILT_STAMPFN) + ./Build + # remove rpath from binaries + for i in inst/bin/* ; do chrpath -d $$i 2>/dev/null || true ; done + touch $@ + +install: install-stamp + +install-stamp: build-stamp + touch install-stamp + +clean: unpatch + rm -rf Work inst + # texlive contains some .orig files we need to keep otherwise + # the copy will fail due to the files occurring in the tlpdb + dh_clean -X.orig + rm -f build-stamp + rm -f install-stamp + +binary-indep: + +binary-arch: build install + dh_testdir + dh_testroot + dh_install + # for alternatives treatment we rename usr/bin/bibtex to + # usr/bin/bibtex.original + mv debian/texlive-binaries/usr/bin/bibtex \ + debian/texlive-binaries/usr/bin/bibtex.original + mv debian/texlive-binaries/usr/share/man/man1/bibtex.1 \ + debian/texlive-binaries/usr/share/man/man1/bibtex.original.1 + dh_installmenu + dh_installdocs # -A debian/README.source + dh_installchangelogs + dh_installchangelogs -plibkpathsea5 -plibkpathsea-dev texk/kpathsea/ChangeLog +# bash debian/convert-info-files-to-unix.sh +# bash debian/fix-manpages.sh + dh_installinfo + dh_installmime + dh_link + dh_compress -X.pdf + dh_fixperms + dh_makeshlibs -plibkpathsea5 + dh_strip + dh_installdeb + dh_shlibdeps -l debian/libkpathsea5/usr/lib + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch + +.PHONY: build clean binary-indep binary-arch binary install + + +# eof --- texlive-bin-2009.orig/debian/texlive-binaries.postinst +++ texlive-bin-2009/debian/texlive-binaries.postinst @@ -0,0 +1,59 @@ +#!/bin/sh -e +# texlive-binaries postinst, created 2008 by Frank Kster +# probably not copyrightable as it looks now, but anyway the code maybe +# freely copied, distributed and/or modified + + +# activate the xdvi.bin alternative +case "$1" in + configure|reconfigure) + update-alternatives --install /usr/bin/xdvi.bin xdvi.bin /usr/bin/xdvi-xaw 30 + update-alternatives --install /usr/bin/bibtex bibtex \ + /usr/bin/bibtex.original 100 \ + --slave /usr/share/man/man1/bibtex.1.gz bibtex.1.gz \ + /usr/share/man/man1/bibtex.original.1.gz + ;; +esac + +# +# if fmtutil-sys is available rebuild all available formats +# +dhit_libkpathsea_configured () +{ + kpsewhich --version >/dev/null 2>&1 +} +dhit_build_format () +{ + + tempfile=$(mktemp -p /tmp fmtutil.XXXXXXXX) + printf "Building format(s) $*.\n\tThis may take some time... " + if fmtutil-sys "$@" > $tempfile 2>&1 ; then + rm -f $tempfile + echo "done." + else + exec >&2 + echo + echo "fmtutil-sys failed. Output has been stored in" + echo "$tempfile" + echo "Please include this file if you report a bug." + echo + exit 1 + fi +} + +case "$1" in + configure|reconfigure) + update-texmf + update-fmtutil + if dhit_libkpathsea_configured; then + # we are shipping mktexlsr, so it must be there! + mktexlsr /usr/share/texmf /usr/share/texmf-texlive /var/lib/texmf + if [ -r /usr/share/texmf/texconfig/tcfmgr ] ; then + dhit_build_format --refresh + fi + fi + ;; +esac + +#DEBHELPER# + --- texlive-bin-2009.orig/debian/libkpathsea5.install +++ texlive-bin-2009/debian/libkpathsea5.install @@ -0,0 +1,2 @@ +inst/lib/libkpathsea.so.5.0.0 usr/lib/ +inst/lib/libkpathsea.so.5 usr/lib/ --- texlive-bin-2009.orig/debian/texlive-binaries.install +++ texlive-bin-2009/debian/texlive-binaries.install @@ -0,0 +1,360 @@ +# debian specific stuff here +debian/debianize-fmtutil usr/share/texlive-bin +# +# binaries without man pages +# +inst/bin/disdvi usr/bin +inst/bin/dvipdfm usr/bin +inst/bin/dvipdfmx usr/bin +inst/bin/dvipdft usr/bin +inst/bin/ebb usr/bin +inst/bin/extractbb usr/bin +inst/bin/pdfclose usr/bin +inst/bin/teckit_compile usr/bin +inst/bin/xetex usr/bin +inst/bin/xdvipdfmx usr/bin +# +# binaries with man pages +# +inst/bin/afm2tfm usr/bin +inst/texmf/doc/man/man1/afm2tfm.1 usr/share/man/man1 +# +inst/bin/aleph usr/bin +inst/texmf/doc/man/man1/aleph.1 usr/share/man/man1 +# +inst/bin/allcm usr/bin +inst/texmf/doc/man/man1/allcm.1 usr/share/man/man1 +# +inst/bin/allec usr/bin +inst/texmf/doc/man/man1/allec.1 usr/share/man/man1 +# +inst/bin/allneeded usr/bin +inst/texmf/doc/man/man1/allneeded.1 usr/share/man/man1 +# +inst/bin/bibtex usr/bin +inst/texmf/doc/man/man1/bibtex.1 usr/share/man/man1 +# +inst/bin/bibtex8 usr/bin +debian/man-pages/bibtex8.1 usr/share/man/man1 +# +inst/bin/dvi2fax usr/bin +inst/texmf/doc/man/man1/dvi2fax.1 usr/share/man/man1 +# +inst/bin/dvips usr/bin +inst/texmf/doc/man/man1/dvips.1 usr/share/man/man1 +# +inst/bin/dvired usr/bin +inst/texmf/doc/man/man1/dvired.1 usr/share/man/man1 +# +inst/bin/dvitomp usr/bin +inst/texmf/doc/man/man1/dvitomp.1 usr/share/man/man1 +# +inst/bin/fmtutil-sys usr/bin +inst/texmf/doc/man/man1/fmtutil-sys.1 usr/share/man/man1 +# +inst/bin/fmtutil usr/bin +inst/texmf/doc/man/man1/fmtutil.1 usr/share/man/man1 +# +inst/bin/gftodvi usr/bin +inst/texmf/doc/man/man1/gftodvi.1 usr/share/man/man1 +# +inst/bin/gftopk usr/bin +inst/texmf/doc/man/man1/gftopk.1 usr/share/man/man1 +# +inst/bin/gftype usr/bin +inst/texmf/doc/man/man1/gftype.1 usr/share/man/man1 +# +inst/bin/gsftopk usr/bin +inst/texmf/doc/man/man1/gsftopk.1 usr/share/man/man1 +# +inst/bin/kpseaccess usr/bin +inst/texmf/doc/man/man1/kpseaccess.1 usr/share/man/man1 +# +inst/bin/kpsepath usr/bin +inst/texmf/doc/man/man1/kpsepath.1 usr/share/man/man1 +# +inst/bin/kpsereadlink usr/bin +inst/texmf/doc/man/man1/kpsereadlink.1 usr/share/man/man1 +# +inst/bin/kpsestat usr/bin +inst/texmf/doc/man/man1/kpsestat.1 usr/share/man/man1 +# +inst/bin/kpsetool usr/bin +inst/texmf/doc/man/man1/kpsetool.1 usr/share/man/man1 +# +inst/bin/kpsewhere usr/bin +inst/texmf/doc/man/man1/kpsewhere.1 usr/share/man/man1 +# +inst/bin/kpsewhich usr/bin +inst/texmf/doc/man/man1/kpsewhich.1 usr/share/man/man1 +# +inst/bin/kpsexpand usr/bin +inst/texmf/doc/man/man1/kpsexpand.1 usr/share/man/man1 +# +inst/bin/makeindex usr/bin +inst/texmf/doc/man/man1/makeindex.1 usr/share/man/man1 +# +inst/bin/mf usr/bin +inst/texmf/doc/man/man1/mf.1 usr/share/man/man1 +# +inst/bin/mf-nowin usr/bin +inst/texmf/doc/man/man1/mf-nowin.1 usr/share/man/man1 +# +inst/bin/mft usr/bin +inst/texmf/doc/man/man1/mft.1 usr/share/man/man1 +# +inst/bin/mkindex usr/bin +inst/texmf/doc/man/man1/mkindex.1 usr/share/man/man1 +# +inst/bin/mkocp usr/bin +inst/texmf/doc/man/man1/mkocp.1 usr/share/man/man1 +# +inst/bin/mkofm usr/bin +inst/texmf/doc/man/man1/mkofm.1 usr/share/man/man1 +# +inst/bin/mktexfmt usr/bin +inst/texmf/doc/man/man1/mktexfmt.1 usr/share/man/man1 +# +inst/bin/mktexlsr usr/bin +inst/texmf/doc/man/man1/mktexlsr.1 usr/share/man/man1 +# +inst/bin/mktexmf usr/bin +inst/texmf/doc/man/man1/mktexmf.1 usr/share/man/man1 +# +inst/bin/mktexpk usr/bin +inst/texmf/doc/man/man1/mktexpk.1 usr/share/man/man1 +# +inst/bin/mktextfm usr/bin +inst/texmf/doc/man/man1/mktextfm.1 usr/share/man/man1 +# +inst/bin/mpost usr/bin +inst/texmf/doc/man/man1/mpost.1 usr/share/man/man1 +# +inst/bin/odvicopy usr/bin +inst/texmf/doc/man/man1/odvicopy.1 usr/share/man/man1 +# +inst/bin/odvitype usr/bin +inst/texmf/doc/man/man1/odvitype.1 usr/share/man/man1 +# +inst/bin/ofm2opl usr/bin +inst/texmf/doc/man/man1/ofm2opl.1 usr/share/man/man1 +# +inst/bin/omfonts usr/bin +debian/man-pages/omfonts.1 usr/share/man/man1 +# +inst/bin/otangle usr/bin +debian/man-pages/otangle.1 usr/share/man/man1 +# +inst/bin/opl2ofm usr/bin +inst/texmf/doc/man/man1/opl2ofm.1 usr/share/man/man1 +# +inst/bin/otp2ocp usr/bin +inst/texmf/doc/man/man1/otp2ocp.1 usr/share/man/man1 +# +inst/bin/outocp usr/bin +inst/texmf/doc/man/man1/outocp.1 usr/share/man/man1 +# +inst/bin/ovf2ovp usr/bin +inst/texmf/doc/man/man1/ovf2ovp.1 usr/share/man/man1 +# +inst/bin/ovp2ovf usr/bin +inst/texmf/doc/man/man1/ovp2ovf.1 usr/share/man/man1 +# +inst/bin/etex usr/bin +# man page is in texlive-base but never installed, what a pain, use the +# copy here +debian/man-pages/etex.1 usr/share/man/man1 +# +inst/bin/pdfetex usr/bin +inst/texmf/doc/man/man1/pdfetex.1 usr/share/man/man1 +# +inst/bin/pdftex usr/bin +inst/texmf/doc/man/man1/pdftex.1 usr/share/man/man1 +# +inst/bin/pdfopen usr/bin +debian/man-pages/pdfopen.1 usr/share/man/man1 +# +inst/bin/pktogf usr/bin +inst/texmf/doc/man/man1/pktogf.1 usr/share/man/man1 +# +inst/bin/pktype usr/bin +inst/texmf/doc/man/man1/pktype.1 usr/share/man/man1 +# +inst/bin/tcdialog usr/bin +inst/texmf/doc/man/man1/tcdialog.1 usr/share/man/man1 +# +inst/bin/texconfig-dialog usr/bin +debian/man-pages/texconfig-dialog.1 usr/share/man/man1 +# +inst/bin/texconfig-sys usr/bin +inst/texmf/doc/man/man1/texconfig-sys.1 usr/share/man/man1 +# +inst/bin/texconfig usr/bin +inst/texmf/doc/man/man1/texconfig.1 usr/share/man/man1 +# +inst/bin/texhash usr/bin +inst/texmf/doc/man/man1/texhash.1 usr/share/man/man1 +# +inst/bin/texlinks usr/bin +inst/texmf/doc/man/man1/texlinks.1 usr/share/man/man1 +# +inst/bin/tex usr/bin +inst/texmf/doc/man/man1/tex.1 usr/share/man/man1 +# +inst/bin/updmap-sys usr/bin +inst/texmf/doc/man/man1/updmap-sys.1 usr/share/man/man1 +# +inst/bin/updmap usr/bin +inst/texmf/doc/man/man1/updmap.1 usr/share/man/man1 +# man page linked from xdvi.1 +inst/bin/xdvi-xaw usr/bin +inst/bin/xdvi usr/bin +inst/texmf/doc/man/man1/xdvi.1 usr/share/man/man1 +# +inst/bin/afm2pl usr/bin +inst/texmf/doc/man/man1/afm2pl.1 usr/share/man/man1 +# +inst/texmf/doc/man/man1/cweb.1 usr/share/man/man1 +# +inst/bin/ctangle usr/bin +inst/texmf/doc/man/man1/ctangle.1 usr/share/man/man1 +# +inst/bin/ctie usr/bin +inst/texmf/doc/man/man1/ctie.1 usr/share/man/man1 +# +inst/bin/cweave usr/bin +inst/texmf/doc/man/man1/cweave.1 usr/share/man/man1 +# +inst/bin/detex usr/bin +inst/texmf/doc/man/man1/detex.1 usr/share/man/man1 +# +inst/bin/devnag usr/bin +debian/man-pages/devnag.1 usr/share/man/man1 +# +inst/bin/dt2dv usr/bin +inst/texmf/doc/man/man1/dt2dv.1 usr/share/man/man1 +# +inst/bin/dv2dt usr/bin +inst/texmf/doc/man/man1/dv2dt.1 usr/share/man/man1 +# +inst/bin/dvi2tty usr/bin +inst/texmf/doc/man/man1/dvi2tty.1 usr/share/man/man1 +# +inst/bin/dvibook usr/bin +inst/texmf/doc/man/man1/dvibook.1 usr/share/man/man1 +# +inst/bin/dviconcat usr/bin +inst/texmf/doc/man/man1/dviconcat.1 usr/share/man/man1 +# +inst/bin/dvicopy usr/bin +inst/texmf/doc/man/man1/dvicopy.1 usr/share/man/man1 +# +inst/bin/dvihp usr/bin +inst/texmf/doc/man/man1/dvihp.1 usr/share/man/man1 +# +inst/bin/dvilj2p usr/bin +inst/texmf/doc/man/man1/dvilj2p.1 usr/share/man/man1 +# +inst/bin/dvilj4 usr/bin +inst/texmf/doc/man/man1/dvilj4.1 usr/share/man/man1 +# +inst/bin/dvilj4l usr/bin +inst/texmf/doc/man/man1/dvilj4l.1 usr/share/man/man1 +# +inst/bin/dvilj6 usr/bin +inst/texmf/doc/man/man1/dvilj6.1 usr/share/man/man1 +# +inst/bin/dvilj usr/bin +inst/texmf/doc/man/man1/dvilj.1 usr/share/man/man1 +# +inst/bin/dvipos usr/bin +inst/texmf/doc/man/man1/dvipos.1 usr/share/man/man1 +# +inst/bin/dviselect usr/bin +inst/texmf/doc/man/man1/dviselect.1 usr/share/man/man1 +# +inst/bin/dvitodvi usr/bin +inst/texmf/doc/man/man1/dvitodvi.1 usr/share/man/man1 +# +inst/bin/dvitype usr/bin +inst/texmf/doc/man/man1/dvitype.1 usr/share/man/man1 +# +inst/bin/fontinst usr/bin +inst/texmf/doc/man/man1/fontinst.1 usr/share/man/man1 +# +inst/bin/mag usr/bin +inst/texmf/doc/man/man1/mag.1 usr/share/man/man1 +# +inst/bin/patgen usr/bin +inst/texmf/doc/man/man1/patgen.1 usr/share/man/man1 +# +inst/bin/pdftosrc usr/bin +inst/texmf/doc/man/man1/pdftosrc.1 usr/share/man/man1 +# +inst/bin/pfb2pfa usr/bin +inst/texmf/doc/man/man1/pfb2pfa.1 usr/share/man/man1 +# +inst/bin/pk2bm usr/bin +inst/texmf/doc/man/man1/pk2bm.1 usr/share/man/man1 +# +inst/bin/pltotf usr/bin +inst/texmf/doc/man/man1/pltotf.1 usr/share/man/man1 +# +inst/bin/pooltype usr/bin +inst/texmf/doc/man/man1/pooltype.1 usr/share/man/man1 +# +inst/bin/ps2frag usr/bin +inst/texmf/doc/man/man1/ps2frag.1 usr/share/man/man1 +# +inst/bin/ps2pk usr/bin +inst/texmf/doc/man/man1/ps2pk.1 usr/share/man/man1 +# +inst/bin/pslatex usr/bin +inst/texmf/doc/man/man1/pslatex.1 usr/share/man/man1 +# +inst/bin/synctex usr/bin +inst/texmf/doc/man/man1/synctex.1 usr/share/man/man1 +debian/man-pages/synctex.5 usr/share/man/man5 +# +inst/bin/tangle usr/bin +inst/texmf/doc/man/man1/tangle.1 usr/share/man/man1 +# +inst/bin/tftopl usr/bin +inst/texmf/doc/man/man1/tftopl.1 usr/share/man/man1 +# +inst/bin/tie usr/bin +inst/texmf/doc/man/man1/tie.1 usr/share/man/man1 +# +inst/bin/tpic2pdftex usr/bin +inst/texmf/doc/man/man1/tpic2pdftex.1 usr/share/man/man1 +# +inst/bin/ttf2afm usr/bin +inst/texmf/doc/man/man1/ttf2afm.1 usr/share/man/man1 +# +inst/bin/vftovp usr/bin +inst/texmf/doc/man/man1/vftovp.1 usr/share/man/man1 +# +inst/bin/vptovf usr/bin +inst/texmf/doc/man/man1/vptovf.1 usr/share/man/man1 +# +inst/bin/weave usr/bin +inst/texmf/doc/man/man1/weave.1 usr/share/man/man1 +# +inst/bin/rubibtex usr/bin +inst/texmf/doc/man/man1/rubibtex.1 usr/share/man/man1 +# +inst/bin/rumakeindex usr/bin +inst/texmf/doc/man/man1/rumakeindex.1 usr/share/man/man1 +# +inst/bin/vlna usr/bin +inst/texmf/doc/man/man1/vlna.1 usr/share/man/man1 +# +inst/bin/ttf2pk usr/bin +inst/texmf/doc/man/man1/ttf2pk.1 usr/share/man/man1 +# +inst/bin/ttf2tfm usr/bin +inst/texmf/doc/man/man1/ttf2tfm.1 usr/share/man/man1 +# +inst/bin/ttfdump usr/bin +inst/texmf/doc/man/man1/ttfdump.1 usr/share/man/man1 +# --- texlive-bin-2009.orig/debian/texlive-binaries.preinst +++ texlive-bin-2009/debian/texlive-binaries.preinst @@ -0,0 +1,18 @@ +#!/bin/sh -e +# texlive-binaries preinst, created 2008 by the Debian TeX Task Force +# probably not copyrightable as it looks now, but anyway the code maybe +# freely copied, distributed and/or modified + +# remove any format or log files in /var/lib/texmf/web2c, they must be +# in $engine subdirs now. tetex does not properly remove them, and +# they cause strange failures with context. +for ext in fmt mem log base; do + rm -f /var/lib/texmf/web2c/*.$ext +done + +#DEBHELPER# + +# texlive-binaries.preinst end +# Local Variables: +# mode: shell-script +# End: --- texlive-bin-2009.orig/debian/libkpathsea-dev.README +++ texlive-bin-2009/debian/libkpathsea-dev.README @@ -0,0 +1,24 @@ +Why a new soname of libkpathsea in teTeX 3.0? +--------------------------------------------- + +We're just quoting Olaf Weber, the author of web2c. The full message can be +found on: +http://lists.debian.org/debian-tetex-maint/2004/03/msg00181.html + +"libkpathsea moved from using klibtool (a web2c-specific libtool-like hack) +to libtool. As a result it acquired a new soname. +libkpathsea was not designed to work well as a shared library, and has +numerous flaws in that area -- in particular, too many internals are +exposed, and too much is hard-coded." + +Olaf does not expect too many changes in the API of the libkpathsea between +teTeX 2.0.2 and 3.0 so just relinking the programs should be sufficient. +However that is not really predictable. + +"So at present my advice is that it's better to be safe than sorry, and +enforce that the version of libkpathsea matches the program's version." + +A new redesigned libkpathsea, which is really a shared lib, is on his TODO +list, but he can't say when it will be released. + + -- Frank Kster , Wed Aug 24 12:54:11 2005 --- texlive-bin-2009.orig/debian/libkpathsea-dev.install +++ texlive-bin-2009/debian/libkpathsea-dev.install @@ -0,0 +1,3 @@ +inst/lib/libkpathsea.a usr/lib/ +inst/lib/libkpathsea.so usr/lib/ +inst/include/kpathsea/* usr/include/kpathsea/ --- texlive-bin-2009.orig/debian/create-orig-tar +++ texlive-bin-2009/debian/create-orig-tar @@ -0,0 +1,92 @@ +#!/bin/sh -e + +compute_revision() +{ + export max + srcdir="$1" + cd "$srcdir" + declare -x max + max=0 + svn status -v | ( while read a b rest ; do + declare -x max + if [ "$max" -lt "$b" ] ; then + max=$b + fi + done + echo "$max" + ) +} + + +sourcedir=/src/TeX/TeXLive/Build/source + +if [ "$1" = "-download" ] ; then + use_downloaded_source=false + shift +else + use_downloaded_source=true + if [ "$1" = "-sourcedir" ] ; then + shift + sourcedir="$1" + shift + fi +fi + +if [ "$1" = "-rev" ] ; then + rev=`compute_revision "$sourcedir"` + echo "compute revision: $rev" + exit 0 +fi + +target=$(pwd) +V=2009~ +NAME=texlive-bin_$V +dircomponent=texlive-bin-$V + +cleanup() +{ + exit $rc + [ -n "$tempdir" ] && rm -rf "$tempdir" + exit $rc +} + + +if ! [ "$use_downloaded_source" = "true" ]; then + tempdir=$(mktemp -d) + trap 'cleanup 0' HUP INT QUIT BUS PIPE TERM + cd $tempdir + svn co svn://tug.org/texlive/trunk/Build/source + sourcedir=./source + revision=`compute_revision "$sourcedir"` + #revision=$(cd $sourcedir;svn info | sed -n -e '/Revision:/{s/Revision: //;p}') + find source -name ".svn" | xargs rm -r + cd $target + sourcedir=$tempdir/Build/source +else + revision=`compute_revision "$sourcedir"` + #revision=$(cd $sourcedir;svn info | sed -n -e '/Revision:/{s/Revision: //;p}') +fi + + + +do_tar () +{ + verbose="-v --show-transformed-names" + compress=-z + tar_common_opt="--exclude-vcs $compress $verbose" + # + dir=$1 + shift + name=$1 + shift + tarfile=$target/$name.tar.gz + tar -cf "$tarfile" --owner=0 --group=0 \ + --transform="s,^,$dir/," $tar_common_opt \ + "$@" + (cd $target && sha256sum `basename $tarfile`) >$tarfile.sha256 + ls -l "$tarfile" +} + + +cd $sourcedir +do_tar ${dircomponent}svn$revision ${NAME}svn$revision.orig * --- texlive-bin-2009.orig/debian/patches/cve-2010-1440 +++ texlive-bin-2009/debian/patches/cve-2010-1440 @@ -0,0 +1,43 @@ +Fix for CVE-2010-1440 +From Jan Lieskovsky + + we decided to treat the CVE-2010-1440 issue as a completely + new tetex / texlive issue, rather than an incomplete fix for CVE-2010-0739 + (in fact, the reproducer for CVE-2010-0739 is only catalyst / accelerator + to see this flaw on ppc architecture, but in fact, it's another occurrence + of integer overflow in teTeX / TeXLive code). + +--- + texk/dvipsk/dospecial.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +Index: texlive-bin-2009/texk/dvipsk/dospecial.c +=================================================================== +--- texlive-bin-2009.orig/texk/dvipsk/dospecial.c 2010-05-01 02:15:09.000000000 +0900 ++++ texlive-bin-2009/texk/dvipsk/dospecial.c 2010-05-01 02:15:16.000000000 +0900 +@@ -333,7 +333,11 @@ + int j ; + static int omega_specials = 0; + +- if (nextstring + numbytes > maxstring) { ++ if (numbytes < 0 || numbytes > maxstring - nextstring) { ++ if (numbytes < 0 || numbytes > (INT_MAX - 1000) / 2 ) { ++ error("! Integer overflow in predospecial"); ++ exit(1); ++ } + p = nextstring = mymalloc(1000 + 2 * numbytes) ; + maxstring = nextstring + 2 * numbytes + 700 ; + } +@@ -918,7 +922,11 @@ + char seen[NKEYS] ; + float valseen[NKEYS] ; + +- if (nextstring + nbytes > maxstring) { ++ if (nbytes < 0 || nbytes > maxstring - nextstring) { ++ if (nbytes < 0 || nbytes > (INT_MAX - 1000) / 2 ) { ++ error("! Integer overflow in bbdospecial"); ++ exit(1); ++ } + p = nextstring = mymalloc(1000 + 2 * nbytes) ; + maxstring = nextstring + 2 * nbytes + 700 ; + } --- texlive-bin-2009.orig/debian/patches/icu-xetex_hurd.diff +++ texlive-bin-2009/debian/patches/icu-xetex_hurd.diff @@ -0,0 +1,104 @@ +diff -urN icu-xetex.orig/aclocal.m4 icu-xetex/aclocal.m4 +--- texlive-bin-2009.orig/libs/icu/icu-xetex.orig/aclocal.m4 2008-03-04 14:26:36.000000000 +0100 ++++ texlive-bin-2009/libs/icu/icu-xetex/aclocal.m4 2009-12-12 21:46:34.000000000 +0100 +@@ -31,6 +31,7 @@ + icu_cv_host_frag=mh-linux-va + fi ;; + *-*-linux*|*-pc-gnu) icu_cv_host_frag=mh-linux ;; ++*-*-gnu*) icu_cv_host_frag=mh-gnu ;; + *-*-cygwin|*-*-mingw32) + if test "$GCC" = yes; then + AC_TRY_COMPILE([ +diff -urN icu-xetex.orig/config/mh-gnu icu-xetex/config/mh-gnu +--- texlive-bin-2009.orig/libs/icu/icu-xetex.orig/config/mh-gnu 1970-01-01 01:00:00.000000000 +0100 ++++ texlive-bin-2009/libs/icu/icu-xetex/config/mh-gnu 2009-12-12 21:42:43.000000000 +0100 +@@ -0,0 +1,78 @@ ++## -*-makefile-*- ++## Linux-specific setup ++## Copyright (c) 1999-2006, International Business Machines Corporation and ++## others. All Rights Reserved. ++ ++## Commands to generate dependency files ++GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) ++GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) ++ ++## Flags for position independent code ++SHAREDLIBCFLAGS = -fPIC ++SHAREDLIBCXXFLAGS = -fPIC ++SHAREDLIBCPPFLAGS = -DPIC ++ ++## Additional flags when building libraries and with threads ++THREADSCPPFLAGS = -D_REENTRANT ++LIBCPPFLAGS = ++ ++## Compiler switch to embed a runtime search path ++LD_RPATH= ++LD_RPATH_PRE = -Wl,-rpath, ++ ++## These are the library specific LDFLAGS ++LDFLAGSICUDT=-nodefaultlibs -nostdlib ++ ++## Compiler switch to embed a library name ++# The initial tab in the next line is to prevent icu-config from reading it. ++ LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) ++#SH# # We can't depend on MIDDLE_SO_TARGET being set. ++#SH# LD_SONAME= ++ ++## Shared object suffix ++SO = so ++## Non-shared intermediate object suffix ++STATIC_O = ao ++ ++## Compilation rules ++%.$(STATIC_O): $(srcdir)/%.c ++ $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< ++%.o: $(srcdir)/%.c ++ $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< ++ ++%.$(STATIC_O): $(srcdir)/%.cpp ++ $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< ++%.o: $(srcdir)/%.cpp ++ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< ++ ++ ++## Dependency rules ++%.d: $(srcdir)/%.c ++ @echo "generating dependency information for $<" ++ @$(SHELL) -ec '$(GEN_DEPS.c) $< \ ++ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ ++ [ -s $@ ] || rm -f $@' ++ ++%.d: $(srcdir)/%.cpp ++ @echo "generating dependency information for $<" ++ @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ ++ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ ++ [ -s $@ ] || rm -f $@' ++ ++## Versioned libraries rules ++ ++%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) ++ $(RM) $@ && ln -s ${conftest.$ac_ext <<_ACEOF --- texlive-bin-2009.orig/debian/patches/17_texdoc +++ texlive-bin-2009/debian/patches/17_texdoc @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 17_texdoc.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: texdoc should follow symlinks, and man pages, and sec fixes, from tetex + +@DPATCH@ + texk/texlive/linked_scripts/texdoc/texdoc.tlu | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +Index: texlive-bin-2009~svn13478/texk/texlive/linked_scripts/texdoc/texdoc.tlu +=================================================================== +--- texlive-bin-2009~svn13478.orig/texk/texlive/linked_scripts/texdoc/texdoc.tlu 2009-05-26 11:00:08.000000000 +0200 ++++ texlive-bin-2009~svn13478/texk/texlive/linked_scripts/texdoc/texdoc.tlu 2009-05-27 22:20:00.000000000 +0200 +@@ -6,6 +6,9 @@ + Origial shell script by Thomas Esser, David Aspinall, and Simon Wilkinson. + Public domain.]] + --[[ Changelog ++ 0.4-debian 2008-07 ++ - set support_zipped to true [fk] ++ + 0.4 2008-07 + - moved configuration from texmf.cnf to texdoc.cnf + - added an 'alias' feature +@@ -77,7 +80,7 @@ + -- everything works for them (look for support_zipped in the code). + -- If you use this feature, please let us know: if nobody uses it, + -- we'll drop it at some point. +-support_zipped = false ++support_zipped = true + + + -- BEGIN function definitions (till the 'END' mark) --- texlive-bin-2009.orig/debian/patches/23_use_xdvi.bin +++ texlive-bin-2009/debian/patches/23_use_xdvi.bin @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 23_use_xdvi.bin.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: use xdvi.bin as xdvi binary, which is handled via alternatives +## DP: and not xdvi-xaw.real. The alternatives setting updates xdvi.bin +## DP: to xdvi-xaw.real + +@DPATCH@ + texk/xdvik/xdvi-sh.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: texlive-bin-2009~svn13478/texk/xdvik/xdvi-sh.in +=================================================================== +--- texlive-bin-2009~svn13478.orig/texk/xdvik/xdvi-sh.in 2009-05-26 10:59:48.000000000 +0200 ++++ texlive-bin-2009~svn13478/texk/xdvik/xdvi-sh.in 2009-05-27 22:20:14.000000000 +0200 +@@ -50,4 +50,4 @@ + XFILESEARCHPATH="$xdviapppath:${XFILESEARCHPATH-%D}"; export XFILESEARCHPATH + fi + +-exec @final_exec_name@ $NAMEOPT ${1+"$@"} ++exec xdvi.bin $NAMEOPT ${1+"$@"} --- texlive-bin-2009.orig/debian/patches/50_fmtutil_deb +++ texlive-bin-2009/debian/patches/50_fmtutil_deb @@ -0,0 +1,120 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50_fmtutil_deb.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: debianize fmtutil, updmap etc, taken from tetex + +@DPATCH@ + texk/tetex/fmtutil | 23 ++++++----------------- + texk/tetex/fmtutil.man | 22 ++++++++++++++++++++-- + 2 files changed, 26 insertions(+), 19 deletions(-) + +Index: texlive-bin-2009/texk/tetex/fmtutil.man +=================================================================== +--- texlive-bin-2009.orig/texk/tetex/fmtutil.man 2009-11-11 13:55:26.000000000 +0000 ++++ texlive-bin-2009/texk/tetex/fmtutil.man 2009-11-11 13:55:45.000000000 +0000 +@@ -33,10 +33,25 @@ + print a summary of commands and options + .IP "\fB--missing\fP" + create any missing format files ++.IP "\fB--refresh\fP" ++recreate only existing format files + .IP "\fB--showhyphen\fP \fIformatname\fP" + print the name of the + hyphenation file for the format + \fIformatname\fP ++.IP "\fB--enablefmt\fP \fIformatname\fP" ++enable formatname in config file ++.IP "\fB--disablefmt\fP \fIformatname\fP" ++disable formatname in config file ++.IP "\fB--listcfg\fP" ++list (enabled and disabled) configurations, filtered to available ++formats ++.IP "\fB--catcfg\fP" ++output the content of the config file ++.IP "\fB--edit\fP" ++edit fmtutil.cnf file (disabled in Debian) ++.IP "\fB--version\fP" ++show version info + .PP + .SH "OPTIONS" + .PP +@@ -58,12 +73,15 @@ + .PP + .SH "FILES" + .PP +-.IP "\fIfmtutil\&.cnf\fP" ++.IP "\fIfmtutil\&.cnf\fP" + default configuration file ++.IP "\fI/etc/texmf/fmt.d/\fP" ++Debian-specific directory for configuration file snippets + .PP + .SH "SEE ALSO" + .PP +-\fBkpsewhich\fP(1) ++\fBkpsewhich\fP(1), ++\fBupdate-fmtutil\fP(1) + .PP + .SH "BUGS" + .PP +Index: texlive-bin-2009/texk/tetex/fmtutil +=================================================================== +--- texlive-bin-2009.orig/texk/tetex/fmtutil 2009-11-11 13:55:26.000000000 +0000 ++++ texlive-bin-2009/texk/tetex/fmtutil 2009-11-11 13:55:45.000000000 +0000 +@@ -508,7 +508,8 @@ + cleanup $? + ;; + edit) +- ${VISUAL-${EDITOR-vi}} $cnf_file ++ # defined by debianize-fmtutil ++ debianEditWarnAndShow + ;; + enablefmt|disablefmt) + $cmd $arg +@@ -523,22 +524,6 @@ + ;; + esac + +- if test -n "$cfgmaint"; then +- if test -z "$cfgparam"; then +- ci=`tcfmgr --tmp $tmpdir --cmd ci --id $id` +- if test $? = 0; then +- if test -n "$ci"; then +- verboseMsg "$progname: configuration file updated: \`$ci'" +- else +- verboseMsg "$progname: configuration file unchanged." +- fi +- else +- abort "failed to update configuration file." +- fi +- fi +- cleanup $? +- fi +- + # set up destdir: + if test -z "$destdir"; then + : ${MT_TEXMFVAR=`kpsewhich -var-value=TEXMFVAR`} +@@ -949,6 +934,7 @@ + ############################################################################### + # disablefmt(format) + # disables format in configuration file ++# [ redefined by debianize-fmtutil ] + ############################################################################### + disablefmt() + { +@@ -965,6 +951,7 @@ + ############################################################################### + # enablefmt(format) + # enables format in configuration file ++# [ redefined by debianize-fmtutil ] + ############################################################################### + enablefmt() + { +@@ -977,5 +964,7 @@ + (exit 0); return 0 + } + ++. /usr/share/texlive-bin/debianize-fmtutil ++ + main ${1+"$@"} + cleanup 0 --- texlive-bin-2009.orig/debian/patches/60_unneeded_linking +++ texlive-bin-2009/debian/patches/60_unneeded_linking @@ -0,0 +1,45 @@ +--- + texk/web2c/Makefile.in | 2 +- + texk/xdvik/Makefile.in | 2 +- + utils/pdfopen/Makefile.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +Index: texlive-bin-2009~svn15596/texk/web2c/Makefile.in +=================================================================== +--- texlive-bin-2009~svn15596.orig/texk/web2c/Makefile.in 2009-09-23 23:47:34.000000000 +0900 ++++ texlive-bin-2009~svn15596/texk/web2c/Makefile.in 2009-10-03 23:37:10.000000000 +0900 +@@ -1356,7 +1356,7 @@ + @MFN_TRUE@mf_nowin_CPPFLAGS = $(X_CFLAGS) -DMFNOWIN + @MFN_TRUE@mf_nowin_LDADD = libmf.a $(LDADD) $(windowlib) + windowlib = window/libwindow.a +-mf_x_libs = $(X_LIBS) $(x_tool_libs) $(X_PRE_LIBS) $(x_ext_lib) $(wlibs) $(X_EXTRA_LIBS) ++mf_x_libs = $(X_LIBS) $(x_tool_libs) $(wlibs) $(X_EXTRA_LIBS) + + # Metafont C sources + mf_c_h = mfini.c mf0.c mf1.c mfcoerce.h mfd.h +Index: texlive-bin-2009~svn15596/texk/xdvik/Makefile.in +=================================================================== +--- texlive-bin-2009~svn15596.orig/texk/xdvik/Makefile.in 2009-06-16 21:01:38.000000000 +0900 ++++ texlive-bin-2009~svn15596/texk/xdvik/Makefile.in 2009-10-03 23:37:10.000000000 +0900 +@@ -374,7 +374,7 @@ + x_ldflags = $(X_LIBS) $(x_linker_options) $(iconv_libpath) + x_extra_libs = $(X_EXTRA_LIBS) $(iconv_libs) + xdvi_x_libs = $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt \ +- $(X_PRE_LIBS) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs) ++ $(x_xpm_libs) -lX11 $(x_extra_libs) + common_ldadd = $(KPATHSEA_LIBS) $(T1LIB_LIBS) $(xdvi_x_libs) + common_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND) + libxdvi_dependencies = ${top_srcdir}/*.[ch] ${top_srcdir}/gui/*.[ch] ${top_builddir}/psheader.c +Index: texlive-bin-2009~svn15596/utils/pdfopen/Makefile.in +=================================================================== +--- texlive-bin-2009~svn15596.orig/utils/pdfopen/Makefile.in 2009-05-22 21:38:02.000000000 +0900 ++++ texlive-bin-2009~svn15596/utils/pdfopen/Makefile.in 2009-10-03 23:37:10.000000000 +0900 +@@ -178,7 +178,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + INCLUDES = $(X_CFLAGS) +-LDADD = $(X_LIBS) -lX11 -lXmu $(X_EXTRA_LIBS) ++LDADD = $(X_LIBS) -lX11 $(X_EXTRA_LIBS) + pdfopen_SOURCES = pdfopen.c sendx.c + pdfclose_SOURCES = pdfclose.c sendx.c + EXTRA_DIST = xpdfopen.pdf xpdfopen.tex --- texlive-bin-2009.orig/debian/patches/12e_fix_vpe_invocation +++ texlive-bin-2009/debian/patches/12e_fix_vpe_invocation @@ -0,0 +1,15 @@ +--- + texk/texlive/linked_scripts/vpe/vpe.pl | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: texlive-bin-2009~svn13478/texk/texlive/linked_scripts/vpe/vpe.pl +=================================================================== +--- texlive-bin-2009~svn13478.orig/texk/texlive/linked_scripts/vpe/vpe.pl 2009-05-26 11:00:06.000000000 +0200 ++++ texlive-bin-2009~svn13478/texk/texlive/linked_scripts/vpe/vpe.pl 2009-05-27 22:18:41.000000000 +0200 +@@ -1,5 +1,4 @@ +-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q' +- if 0; ++#!/usr/bin/perl -w + use strict; + # + # vpe.pl --- texlive-bin-2009.orig/debian/patches/30_libpoppler_0.5.9 +++ texlive-bin-2009/debian/patches/30_libpoppler_0.5.9 @@ -0,0 +1,454 @@ +# 30_libpoppler.dpatch +# +# use libpoppler instead of libxpdf in pdfetex and xetex +# don't build pdftosrc as it needs libpoppler from experimental + +@DPATCH@ + configure | 6 - + configure.in | 8 - + texk/web2c/pdftexdir/Makefile.in | 2 + texk/web2c/pdftexdir/depend.mk | 58 ---------- + texk/web2c/pdftexdir/pdftex.mk | 9 + + texk/web2c/pdftexdir/pdftexextra.in | 2 + texk/web2c/pdftexdir/pdftoepdf.cc | 41 +++---- + texk/web2c/pdftexdir/pdftosrc.cc | 39 +++--- + texk/web2c/pdftexdir/utils.c | 4 + texk/web2c/xetexdir/XeTeX_ext.c | 4 + texk/web2c/xetexdir/pdfimage.cpp | 24 +++- + texk/web2c/xetexdir/xetex.mk | 8 + + 12 files changed, 88 insertions(+), 117 deletions(-) + +Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/depend.mk +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/depend.mk 2008-03-23 17:38:33.000000000 +0100 ++++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/depend.mk 2009-02-21 22:40:51.000000000 +0100 +@@ -1,55 +1,5 @@ +-epdf.o: epdf.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ +- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h +-mapfile.o: mapfile.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ +- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h +-papersiz.o: papersiz.c ptexlib.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h +-utils.o: utils.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ +- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h \ +- ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h \ +- ../../../libs/md5/md5.h pdftexextra.h \ +- ../../../libs/obsdcompat/openbsd-compat.h +-vfpacket.o: vfpacket.c ptexlib.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h +-pkin.o: pkin.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ +- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h +-writefont.o: writefont.c ../../../libs/xpdf/goo/gmem.h ptexlib.h \ +- ../pdftexd.h ../texmfmp.h ../cpascal.h ../config.h ../help.h \ +- ../texmfmem.h ../pdftexcoerce.h ptexmac.h +-writet1.o: writet1.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ +- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h +-writet3.o: writet3.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ +- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h +-writezip.o: writezip.c ptexlib.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h +-writeenc.o: writeenc.c ptexlib.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h +-writettf.o: writettf.c ptexlib.h writettf.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h macnames.c +-writejpg.o: writejpg.c ptexlib.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h image.h +-writepng.o: writepng.c ptexlib.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h image.h +-writeimg.o: writeimg.c ptexlib.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h image.h +-pdftoepdf.o: pdftoepdf.cc ../../../libs/xpdf/xpdf/Object.h \ +- ../../../libs/xpdf/goo/gmem.h ../../../libs/xpdf/xpdf/Array.h \ +- ../../../libs/xpdf/xpdf/Dict.h ../../../libs/xpdf/xpdf/Stream.h \ +- ../../../libs/xpdf/xpdf/XRef.h ../../../libs/xpdf/xpdf/Catalog.h \ +- ../../../libs/xpdf/xpdf/Page.h ../../../libs/xpdf/xpdf/GfxFont.h \ +- ../../../libs/xpdf/xpdf/Error.h epdf.h ++pdftoepdf.o: pdftoepdf.cc epdf.h ../../kpathsea/c-auto.h \ ++ ../../kpathsea/c-proto.h ../../web2c/c-auto.h ../../web2c/config.h \ ++ ../../kpathsea/c-fopen.h ../../web2c/pdftexdir/ptexmac.h + ttf2afm.o: ttf2afm.c writettf.h macnames.c +-pdftosrc.o: pdftosrc.cc ../../../libs/xpdf/xpdf/Object.h \ +- ../../../libs/xpdf/xpdf/Array.h ../../../libs/xpdf/xpdf/Dict.h \ +- ../../../libs/xpdf/xpdf/Stream.h ../../../libs/xpdf/xpdf/XRef.h \ +- ../../../libs/xpdf/xpdf/Catalog.h ../../../libs/xpdf/xpdf/Page.h \ +- ../../../libs/xpdf/xpdf/PDFDoc.h ../../../libs/xpdf/xpdf/Link.h \ +- ../../../libs/xpdf/xpdf/Error.h ../../../libs/xpdf/xpdf/config.h ++pdftosrc.o: pdftosrc.cc +Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftoepdf.cc +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2008-08-12 19:15:53.000000000 +0200 ++++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftoepdf.cc 2009-02-21 22:40:51.000000000 +0100 +@@ -24,25 +24,24 @@ + #include + #include + #include +-#include +-#include +-#include +-#include +-#include + #include +-#include "Object.h" +-#include "Stream.h" +-#include "Array.h" +-#include "Dict.h" +-#include "XRef.h" +-#include "Catalog.h" +-#include "Link.h" +-#include "Page.h" +-#include "GfxFont.h" +-#include "PDFDoc.h" +-#include "GlobalParams.h" +-#include "Error.h" +- ++#include ++#include ++#include ++#include ++#include ++#include "poppler/Object.h" ++#include "poppler/Stream.h" ++#include "poppler/Array.h" ++#include "poppler/Dict.h" ++#include "poppler/XRef.h" ++#include "poppler/Link.h" ++#include "poppler/Catalog.h" ++#include "poppler/Page.h" ++#include "poppler/GfxFont.h" ++#include "poppler/PDFDoc.h" ++#include "poppler/GlobalParams.h" ++#include "poppler/Error.h" + #include "epdf.h" + + static const char _svn_version[] = +@@ -159,7 +158,7 @@ + fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name, + p->occurences); + #endif +- GString *docName = new GString(p->file_name); ++ GooString *docName = new GooString(p->file_name); + p->doc = new PDFDoc(docName); // takes ownership of docName + if (!p->doc->isOk() || !p->doc->okToPrint()) { + pdftex_fail("xpdf: reading PDF image failed"); +@@ -520,7 +519,7 @@ + int i, l, c; + Ref ref; + char *p; +- GString *s; ++ GooString *s; + if (obj->isBool()) { + pdf_printf("%s", obj->getBool()? "true" : "false"); + } else if (obj->isInt()) { +@@ -713,7 +712,7 @@ + epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages(); + if (page_name) { + // get page by name +- GString name(page_name); ++ GooString name(page_name); + LinkDest *link = pdf_doc->doc->findDest(&name); + if (link == 0 || !link->isOk()) + pdftex_fail("PDF inclusion: invalid destination <%s>", page_name); +Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftosrc.cc +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftosrc.cc 2008-05-08 16:25:16.000000000 +0200 ++++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftosrc.cc 2009-02-21 22:40:51.000000000 +0100 +@@ -23,22 +23,23 @@ + #include + #include + #include +-#include + #include +-#include +-#include +-#include +-#include "Object.h" +-#include "Stream.h" +-#include "Array.h" +-#include "Dict.h" +-#include "XRef.h" +-#include "Catalog.h" +-#include "Page.h" +-#include "GfxFont.h" +-#include "PDFDoc.h" +-#include "GlobalParams.h" +-#include "Error.h" ++ ++#include ++#include ++#include ++#include ++#include "poppler/Object.h" ++#include "poppler/Stream.h" ++#include "poppler/Array.h" ++#include "poppler/Dict.h" ++#include "poppler/XRef.h" ++#include "poppler/Catalog.h" ++#include "poppler/Page.h" ++#include "poppler/GfxFont.h" ++#include "poppler/PDFDoc.h" ++#include "poppler/GlobalParams.h" ++#include "poppler/Error.h" + + static const char _svn_version[] = + "$Id: pdftosrc.cc 7945 2008-05-08 14:25:16Z martin $ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc.cc $"; +@@ -49,7 +50,7 @@ + { + char *p, buf[1024]; + PDFDoc *doc; +- GString *fileName; ++ GooString *fileName; + Stream *s; + Object srcStream, srcName, catalogDict; + FILE *outfile; +@@ -63,8 +64,8 @@ + "Usage: pdftosrc []\n"); + exit(1); + } +- fileName = new GString(argv[1]); +- globalParams = new GlobalParams(); ++ fileName = new GooString(argv[1]); ++ globalParams = new GlobalParams(NULL); + doc = new PDFDoc(fileName); + if (!doc->isOk()) { + fprintf(stderr, "Invalid PDF file\n"); +@@ -84,7 +85,7 @@ + } + srcStream.initNull(); + if (objnum == 0) { +- catalogDict.dictLookup("SourceObject", &srcStream); ++ catalogDict.dictLookup(UGooString("SourceObject"), &srcStream); + if (!srcStream.isStream("SourceFile")) { + fprintf(stderr, "No SourceObject found\n"); + exit(1); +Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/Makefile.in +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/Makefile.in 2008-07-17 19:58:14.000000000 +0200 ++++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/Makefile.in 2009-02-21 22:42:43.000000000 +0100 +@@ -11,7 +11,7 @@ + ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) \ + -I. -I$(srcdir) \ + -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) \ +- @LIBXPDFCPPFLAGS@ \ ++ -I/usr/include/poppler \ + -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. \ + -I$(LIBOBSDCOMPATSRCDIR) -I$(LIBOBSDCOMPATSRCDIR)/.. \ + -DPDF_PARSER_ONLY +Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftex.mk +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftex.mk 2008-07-11 08:51:52.000000000 +0200 ++++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftex.mk 2009-02-21 22:40:51.000000000 +0100 +@@ -3,6 +3,9 @@ + # differ between releases of pdfeTeX. + # $Id: pdftex.mk 9446 2008-07-11 06:51:52Z thanh $ + ++# use libpoppler instead of included xpdf code ++ADDLDFLAGS = -lpoppler ++ + # We build pdftex + pdftex = @PETEX@ pdftex + pdftexdir = pdftexdir +@@ -30,7 +33,7 @@ + + # Making pdftex + pdftex: pdftexd.h $(pdftex_o) $(pdftexextra_o) $(pdftexlibsdep) +- @CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ ++ @CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ $(ADDLDFLAGS) + + # C file dependencies. + $(pdftex_c) pdftexcoerce.h pdftexd.h: pdftex.p $(web2c_texmf) $(srcdir)/$(pdftexdir)/pdftex.defines $(srcdir)/$(pdftexdir)/pdftex.h +@@ -135,10 +138,10 @@ + rm -f ttf2afm.c macnames.c + # + # pdftosrc +-pdftosrc = pdftosrc ++pdftosrc = + + pdftosrc: $(pdftexdir)/pdftosrc.o $(LIBXPDFDEP) +- @CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@ ++ @CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@ $(ADDLDFLAGS) + $(pdftexdir)/pdftosrc.o:$(srcdir)/$(pdftexdir)/pdftosrc.cc + cd $(pdftexdir) && $(MAKE) pdftosrc.o + check: pdftosrc-check +Index: texlive-bin-2008.svn12198/configure +=================================================================== +--- texlive-bin-2008.svn12198.orig/configure 2009-02-21 22:34:42.000000000 +0100 ++++ texlive-bin-2008.svn12198/configure 2009-02-21 22:40:51.000000000 +0100 +@@ -6835,9 +6835,9 @@ + + # we need libxpdf for pdf[ex]tex, xetex + test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no} +-test "$with_pdftex" != no && : ${needs_libxpdf=yes} +-test "$with_pdfetex" != no && : ${needs_libxpdf=yes} +-test "$with_xetex" != no && : ${needs_libxpdf=yes} ++test "$with_pdftex" != no && : ${needs_libxpdf=no} ++test "$with_pdfetex" != no && : ${needs_libxpdf=no} ++test "$with_xetex" != no && : ${needs_libxpdf=no} + : ${needs_libxpdf=no} + export needs_libxpdf + +Index: texlive-bin-2008.svn12198/configure.in +=================================================================== +--- texlive-bin-2008.svn12198.orig/configure.in 2009-02-21 22:34:42.000000000 +0100 ++++ texlive-bin-2008.svn12198/configure.in 2009-02-21 22:43:36.000000000 +0100 +@@ -163,9 +163,9 @@ + + # we need libxpdf for pdf[ex]tex, xetex + test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no} +-test "$with_pdftex" != no && : ${needs_libxpdf=yes} +-test "$with_pdfetex" != no && : ${needs_libxpdf=yes} +-test "$with_xetex" != no && : ${needs_libxpdf=yes} ++test "$with_pdftex" != no && : ${needs_libxpdf=no} ++test "$with_pdfetex" != no && : ${needs_libxpdf=no} ++test "$with_xetex" != no && : ${needs_libxpdf=no} + : ${needs_libxpdf=no} + export needs_libxpdf + +@@ -220,7 +220,7 @@ + sinclude(libs/ncurses/ncurses.ac) + sinclude(libs/zlib/zlib.ac) + sinclude(libs/libpng/libpng.ac) +-sinclude(libs/xpdf/libxpdf.ac) ++#sinclude(libs/xpdf/libxpdf.ac) + sinclude(libs/t1lib/t1lib.ac) + sinclude(libs/freetype/freetype.ac) + sinclude(libs/freetype2/freetype2.ac) +Index: texlive-bin-2008.svn12198/texk/web2c/xetexdir/XeTeX_ext.c +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/xetexdir/XeTeX_ext.c 2008-08-01 15:54:24.000000000 +0200 ++++ texlive-bin-2008.svn12198/texk/web2c/xetexdir/XeTeX_ext.c 2009-02-21 22:40:51.000000000 +0100 +@@ -33,7 +33,7 @@ + */ + + #ifdef XETEX_OTHER +-#include "xpdf/config.h" ++#include "poppler/poppler-config.h" + #include "png.h" + #endif + +@@ -190,7 +190,7 @@ + #else + "Compiled with fontconfig version %d.%d.%d; using %d.%d.%d\n" + "Compiled with libpng version %s; using %s\n" +- "Compiled with xpdf version %s\n" ++ "Compiled with libpoppler version %s\n" + #endif + ; + +Index: texlive-bin-2008.svn12198/texk/web2c/xetexdir/pdfimage.cpp +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/xetexdir/pdfimage.cpp 2008-05-21 15:43:19.000000000 +0200 ++++ texlive-bin-2008.svn12198/texk/web2c/xetexdir/pdfimage.cpp 2009-02-21 22:40:51.000000000 +0100 +@@ -11,10 +11,24 @@ + + #include "pdfimage.h" + +-#include "PDFDoc.h" +-#include "Catalog.h" +-#include "Page.h" +-#include "GString.h" ++#include ++#include ++#include ++#include ++#include ++#include "poppler/Object.h" ++#include "poppler/Stream.h" ++#include "poppler/Array.h" ++#include "poppler/Dict.h" ++#include "poppler/XRef.h" ++#include "poppler/Link.h" ++#include "poppler/Catalog.h" ++#include "poppler/Page.h" ++#include "poppler/GfxFont.h" ++#include "poppler/PDFDoc.h" ++#include "poppler/GlobalParams.h" ++#include "poppler/Error.h" ++ + + #include "XeTeX_ext.h" + +@@ -29,7 +43,7 @@ + pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box) + /* return the box converted to TeX points */ + { +- GString* name = new GString(filename); ++ GooString* name = new GooString(filename); + PDFDoc* doc = new PDFDoc(name); + + if (!doc) { +Index: texlive-bin-2008.svn12198/texk/web2c/xetexdir/xetex.mk +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/xetexdir/xetex.mk 2008-06-03 17:24:50.000000000 +0200 ++++ texlive-bin-2008.svn12198/texk/web2c/xetexdir/xetex.mk 2009-02-21 22:45:11.000000000 +0100 +@@ -8,6 +8,10 @@ + # but need to check possible effect on other programs + ALL_CXXFLAGS = @CXXFLAGS@ + ++# use libpoppler instead of included xpdf code ++ADDLDFLAGS = -lpoppler ++ ++ + # We build xetex unless configure decides to skip it + xetex = @XETEX@ xetex + +@@ -33,7 +37,7 @@ + + @XETEX_GENERIC@ XETEX_DEFINES = -DXETEX_OTHER + +-@XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@ ++@XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@ $(ADDLDFLAGS) + + @XETEX_GENERIC@ EXTRADEPS = @LIBXPDFDEP@ @LIBPNGDEP@ + +@@ -168,7 +172,7 @@ + $(compile) $(ALL_CFLAGS) $(FTFLAGS) $(LIBPNGCPPFLAGS) $(ZLIBCPPFLAGS) -c $< -o $@ + + pdfimage.o: $(srcdir)/xetexdir/pdfimage.cpp $(srcdir)/xetexdir/pdfimage.h +- $(CXX) $(ALL_CFLAGS) $(FTFLAGS) $(LIBXPDFCPPFLAGS) -c $< -o $@ ++ $(CXX) $(ALL_CFLAGS) $(FTFLAGS) $(LIBXPDFCPPFLAGS) -I/usr/include/poppler -c $< -o $@ + + XeTeX_pic.o: $(srcdir)/xetexdir/XeTeX_pic.c $(srcdir)/xetexdir/XeTeX_ext.h $(XeTeXImageHdrs) + $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@ +Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/utils.c +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/utils.c 2008-05-08 16:25:16.000000000 +0200 ++++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/utils.c 2009-02-21 22:40:51.000000000 +0100 +@@ -35,7 +35,7 @@ + #include "zlib.h" + #include "ptexlib.h" + #include "png.h" +-#include "xpdf/config.h" /* just to get the xpdf version */ ++#include "poppler/poppler-config.h" /* just to get the xpdf version */ + + static const char _svn_version[] = + "$Id: utils.c 7945 2008-05-08 14:25:16Z martin $ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/utils.c $"; +@@ -1267,7 +1267,7 @@ + (void) asprintf(versions, + "Compiled with libpng %s; using libpng %s\n" + "Compiled with zlib %s; using zlib %s\n" +- "Compiled with xpdf version %s\n", ++ "Compiled with libpoppler version %s\n", + PNG_LIBPNG_VER_STRING, png_libpng_ver, + ZLIB_VERSION, zlib_version, xpdfVersion); + } +Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftexextra.in +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftexextra.in 2008-03-23 17:38:33.000000000 +0100 ++++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftexextra.in 2009-02-21 22:46:18.000000000 +0100 +@@ -26,7 +26,7 @@ + (generated from ../lib/texmfmp.c). + */ + +-#define BANNER "This is pdfTeX, Version 3.1415926-PDFTEX-VERSION-ETEX-VERSION" ++#define BANNER "This is pdfTeX using libpoppler, Version 3.1415926-PDFTEX-VERSION-ETEX-VERSION" + #define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)" + #define AUTHOR NULL + #define PROGRAM_HELP PDFTEXHELP --- texlive-bin-2009.orig/debian/patches/upstream-web2c-tmpfilewithpid +++ texlive-bin-2009/debian/patches/upstream-web2c-tmpfilewithpid @@ -0,0 +1,33 @@ +See comments in the diff for explanations +--- + texk/web2c/lib/openclose.c | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +Index: texlive-bin-2009/texk/web2c/lib/openclose.c +=================================================================== +--- texlive-bin-2009.orig/texk/web2c/lib/openclose.c 2010-03-30 22:15:52.000000000 +0900 ++++ texlive-bin-2009/texk/web2c/lib/openclose.c 2010-03-30 22:17:20.000000000 +0900 +@@ -37,12 +37,19 @@ + static void + recorder_start(void) + { +- /* Alas, while we might want to use mkstemp it is not portable. +- So we have to be content with using a default name... */ ++ /* Alas, while we'd like to use mkstemp it is not portable, ++ and doing the autoconfiscation (and providing fallbacks) is more ++ than we want to cope with. So we have to be content with using a ++ default name. Throw in the pid so at least parallel builds might ++ work (Debian bug 575731). */ + string cwd; +- +- recorder_name = (string)xmalloc(strlen(kpse_program_name)+5); ++ pid_t pid = getpid(); ++ char pid_str[MAX_INT_LENGTH]; ++ sprintf (pid_str, "%ld", (long) pid); ++ ++ recorder_name = (string)xmalloc(strlen(kpse_program_name) + strlen(pid_str) + 5); + strcpy(recorder_name, kpse_program_name); ++ strcat(recorder_name, pid_str); + strcat(recorder_name, ".fls"); + + /* If an output directory was specified, use it instead of cwd. */ --- texlive-bin-2009.orig/debian/patches/12b_fix_a2ping_invocation +++ texlive-bin-2009/debian/patches/12b_fix_a2ping_invocation @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 12b_fix_a2ping_invocation.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix invocation of a2ping to get rid of magic + +@DPATCH@ +--- + texk/texlive/linked_scripts/a2ping/a2ping.pl | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +Index: texlive-bin-2009~svn13478/texk/texlive/linked_scripts/a2ping/a2ping.pl +=================================================================== +--- texlive-bin-2009~svn13478.orig/texk/texlive/linked_scripts/a2ping/a2ping.pl 2009-05-26 11:00:07.000000000 +0200 ++++ texlive-bin-2009~svn13478/texk/texlive/linked_scripts/a2ping/a2ping.pl 2009-05-27 22:16:58.000000000 +0200 +@@ -1,11 +1,5 @@ +-#! /bin/sh +-eval '(exit $?0)' && eval 'PERL_BADLANG=x;export PERL_BADLANG;: \ +-;exec perl -x -S -- "$0" ${1+"$@"};#'if 0; +-eval 'setenv PERL_BADLANG x;exec perl -x -S -- "$0" $argv:q;#'.q+ +-#!perl -w +-package Htex::a2ping; $0=~/(.*)/s;unshift@INC,'.';do($1);die$@if$@;__END__+if !1; +-# This Perl script was generated by JustLib2 at Wed Apr 23 09:14:13 2003. +-# Don't touch/remove any lines above; http://www.inf.bme.hu/~pts/justlib ++#! /usr/bin/perl -w ++package Htex::a2ping; + # + # This program is free software, licensed under the GNU GPL, >=2.0. + # This software comes with absolutely NO WARRANTY. Use at your own risk! --- texlive-bin-2009.orig/debian/patches/53_builtin-searchpath-fix +++ texlive-bin-2009/debian/patches/53_builtin-searchpath-fix @@ -0,0 +1,68 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 53_builtin-searchpath-fix.dpatch +## +## DP: adjust built-in search paths for kpathsea library to Debian standard + +@DPATCH@ + texk/kpathsea/texmf.cnf | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +Index: texlive-bin-2009/texk/kpathsea/texmf.cnf +=================================================================== +--- texlive-bin-2009.orig/texk/kpathsea/texmf.cnf 2009-10-08 23:03:54.000000000 +0000 ++++ texlive-bin-2009/texk/kpathsea/texmf.cnf 2009-11-11 13:58:43.000000000 +0000 +@@ -53,15 +53,15 @@ + + % The tree containing the runtime files closely related to the specific + % program version used: +-TEXMFMAIN = $SELFAUTOPARENT/texmf ++TEXMFMAIN = /usr/share/texmf + + % The main distribution tree: +-TEXMFDIST = $SELFAUTOPARENT/texmf-dist ++TEXMFDIST = /usr/share/texmf-texlive + + % A place for local additions to a "standard" texmf tree. + % This tree is not used for local configuration maintained by + % texconfig, it uses TEXMFCONFIG below. +-TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local ++TEXMFLOCAL = /usr/local/share/texmf + + % TEXMFSYSVAR, where texconfig-sys stores variable runtime data. + % With teTeX-3.0 or later, this must be set. +@@ -69,7 +69,7 @@ + % TEXMFSYSVAR = $TEXMFMAIN + % For using a separate tree: + % TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var +-TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var ++TEXMFSYSVAR = /var/lib/texmf + + % TEXMFSYSCONFIG, where texconfig-sys stores configuration data. + % With teTeX-3.0 or later, this must be set. +@@ -77,7 +77,7 @@ + % TEXMFSYSCONFIG = $TEXMFMAIN + % For using a separate tree: + % TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config +-TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config ++TEXMFSYSCONFIG = /etc/texmf + + % User texmf trees are allowed as follows. + % This used to be HOMETEXMF. +@@ -128,7 +128,7 @@ + % Where generated fonts may be written. This tree is used when the sources + % were found in a system tree and either that tree wasn't writable, or the + % varfonts feature was enabled in MT_FEATURES in mktex.cnf. +-VARTEXFONTS = $TEXMFVAR/fonts ++VARTEXFONTS = /var/cache/fonts + + % Where to look for ls-R files. There need not be an ls-R in the + % directories in this path, but if there is one, Kpathsea will use it. +@@ -456,7 +456,7 @@ + % + % For security reasons, it is better not to include . in this path. + % +-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} ++TEXMFCNF = /usr/share/texmf/web2c;/usr/share/texmf-texlive/web2c;/usr/local/share/texmf/web2c + + # kpathsea 3.5.3 and later sets these at runtime. To avoid empty + # expansions from binaries linked against an earlier version of the --- texlive-bin-2009.orig/debian/patches/12_fix_epstopdf_invocation +++ texlive-bin-2009/debian/patches/12_fix_epstopdf_invocation @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 12_fix_epstopdf_invocation.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix invocation of epstopdf to get rid of magic + +@DPATCH@ + texk/texlive/linked_scripts/epstopdf/epstopdf.pl | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: texlive-bin-2009/texk/texlive/linked_scripts/epstopdf/epstopdf.pl +=================================================================== +--- texlive-bin-2009.orig/texk/texlive/linked_scripts/epstopdf/epstopdf.pl 2009-11-11 13:55:30.000000000 +0000 ++++ texlive-bin-2009/texk/texlive/linked_scripts/epstopdf/epstopdf.pl 2009-11-11 13:55:33.000000000 +0000 +@@ -1,5 +1,4 @@ +-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q' +- if 0; ++#!/usr/bin/perl + use strict; + + # $Id: epstopdf.pl 15569 2009-09-30 00:21:49Z karl $ --- texlive-bin-2009.orig/debian/patches/series +++ texlive-bin-2009/debian/patches/series @@ -0,0 +1,34 @@ +12_fix_epstopdf_invocation +12a_fix_thumbpdf_invocation +12b_fix_a2ping_invocation +12c_fix_pdfcrop_invocation +12e_fix_vpe_invocation +17_texdoc +23_use_xdvi.bin +### for backports with poppler << 0.5 (etch) +###30_libpoppler_0.4.5 +### for libpoppler 0.5 (not used anymore) +###30_libpoppler_0.5.4 +### for double new libpoppler >= 0.5.9 (lenny) +###30_libpoppler_0.5.9 +# for unstable +# 30_libpoppler_0.10 +41_maketexmf +50_fmtutil_deb +51_fmtutil_keep_failedlog +# not ready, we do not ship feynmf by now +# 52_feynmf-perl-sec-fix +53_builtin-searchpath-fix +55_texconfig_stuff +56_updmap_deb +57_texconfig_papersizes_for_upstream +60_unneeded_linking +libpoppler-0.12 +icu-xetex_hurd.diff +fix-mpost-segfault +detex-hurd.diff +fmtutil-fix-infinite-loop_upstream +upstream-web2c-tmpfilewithpid +cve-2010-1440 +#cve-2010-0739.patch +cve-2010-0827.patch --- texlive-bin-2009.orig/debian/patches/12a_fix_thumbpdf_invocation +++ texlive-bin-2009/debian/patches/12a_fix_thumbpdf_invocation @@ -0,0 +1,19 @@ +12a_fix_thumbpdf_invocation.dpatch +Fix invocation of thumbpdf to get rid of magic +--- + texk/texlive/linked_scripts/thumbpdf/thumbpdf.pl | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +Index: texlive-bin-2009~svn13478/texk/texlive/linked_scripts/thumbpdf/thumbpdf.pl +=================================================================== +--- texlive-bin-2009~svn13478.orig/texk/texlive/linked_scripts/thumbpdf/thumbpdf.pl 2009-05-26 11:00:08.000000000 +0200 ++++ texlive-bin-2009~svn13478/texk/texlive/linked_scripts/thumbpdf/thumbpdf.pl 2009-05-27 22:16:27.000000000 +0200 +@@ -1,7 +1,4 @@ +-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q' +- if 0; +-use strict; +-$^W=1; # turn warning on ++#!/usr/bin/perl -w + # + # thumbpdf.pl + # --- texlive-bin-2009.orig/debian/patches/41_maketexmf +++ texlive-bin-2009/debian/patches/41_maketexmf @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 41_maketexmf.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix for mktexmf script from perforce depot + +@DPATCH@ + texk/kpathsea/mktexmf | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +Index: texlive-bin-2009~svn13478/texk/kpathsea/mktexmf +=================================================================== +--- texlive-bin-2009~svn13478.orig/texk/kpathsea/mktexmf 2009-05-26 11:00:24.000000000 +0200 ++++ texlive-bin-2009~svn13478/texk/kpathsea/mktexmf 2009-05-27 22:44:43.000000000 +0200 +@@ -36,17 +36,20 @@ + rootfile=$sauterroot + rootname=b-$rootname + else +- case $rootname in ++ case $name in + # csso12[0-5][0-9] from CJK package; unsupported by mktexmf + csso12[0-5][0-9]) +- rootfile=;; +- cs*|lcsss*|icscsc*|icstt*|ilcsss*) +- rootfile=`kpsewhich cscode.mf`;; +- wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*) +- lhprefix=`echo "$name" | sed 's/^\(..\).*/\1/'` +- rootfile=`kpsewhich ${lhprefix}codes.mf 2>/dev/null`;; ++ rootfile=;; + *) +- rootfile=`kpsewhich $rootname.mf 2>/dev/null`;; ++ case $rootname in ++ cs*|lcsss*|icscsc*|icstt*|ilcsss*) ++ rootfile=`kpsewhich cscode.mf`;; ++ wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*) ++ lhprefix=`echo "$name" | sed 's/^\(..\).*/\1/'` ++ rootfile=`kpsewhich ${lhprefix}codes.mf 2>/dev/null`;; ++ *) ++ rootfile=`kpsewhich $rootname.mf 2>/dev/null`;; ++ esac;; + esac + fi + { test -z "$rootfile" || test ! -f "$rootfile"; } && exit 1 --- texlive-bin-2009.orig/debian/patches/52_feynmf-perl-sec-fix +++ texlive-bin-2009/debian/patches/52_feynmf-perl-sec-fix @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 52_feynmf-perl-sec-fix.dpatch by Kevin B. McCarty +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: secure tmp file handling + +@DPATCH@ +--- ./texmf-dist/source/texlive-20080816-source/latex/feynmf/feynmf.pl.orig ++++ ./texmf-dist/source/texlive-20080816-source/latex/feynmf/feynmf.pl +@@ -270,10 +270,11 @@ + my @tfm = @_; + # Prepare a fake temporary PL file + # (/dev/null won't do, because the font must not be empty): +- my ($pl) = "/tmp/feynmf$$.pl"; ++ my ($pl) = `/bin/tempfile -p feynmf -s .pl`; + my ($tfm); + $pltotf_prog + or die "feynmf: fatal: pltopf programm required unless -notfm\n"; ++ chop ($pl); + open (PL, ">$pl") or die "feynmf: can't open temporary file $pl: $!\n"; + push @temporay_files, $pl; + print PL <<__END_PL__; +@@ -373,7 +374,7 @@ + maybe_run "$gftopk_prog $gf" if $gftopk_prog; + } + } +- close (); ++ close (LOG); + } + } + } --- texlive-bin-2009.orig/debian/patches/30_libpoppler_0.10 +++ texlive-bin-2009/debian/patches/30_libpoppler_0.10 @@ -0,0 +1,513 @@ +# 30_libpoppler.dpatch +# +# use libpoppler instead of libxpdf in pdfetex and xetex +# don't build pdftosrc as it needs libpoppler from experimental + +@DPATCH@ + configure | 6 - + configure.in | 8 - + texk/web2c/pdftexdir/Makefile.in | 7 + + texk/web2c/pdftexdir/depend.mk | 58 ---------- + texk/web2c/pdftexdir/pdftex.mk | 9 + + texk/web2c/pdftexdir/pdftexextra.in | 2 + texk/web2c/pdftexdir/pdftoepdf.cc | 41 +++---- + texk/web2c/pdftexdir/pdftosrc.cc | 39 +++--- + texk/web2c/pdftexdir/utils.c | 6 - + texk/web2c/xetexdir/XeTeX_ext.c | 8 - + texk/web2c/xetexdir/pdfimage.cpp | 26 +++- + texk/web2c/xetexdir/xetex.mk | 12 +- + 12 files changed, 100 insertions(+), 122 deletions(-) + +Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/depend.mk +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/depend.mk 2009-03-10 20:05:59.000000000 +0100 ++++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/depend.mk 2009-03-10 20:06:13.000000000 +0100 +@@ -1,55 +1,5 @@ +-epdf.o: epdf.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ +- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h +-mapfile.o: mapfile.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ +- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h +-papersiz.o: papersiz.c ptexlib.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h +-utils.o: utils.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ +- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h \ +- ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h \ +- ../../../libs/md5/md5.h pdftexextra.h \ +- ../../../libs/obsdcompat/openbsd-compat.h +-vfpacket.o: vfpacket.c ptexlib.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h +-pkin.o: pkin.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ +- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h +-writefont.o: writefont.c ../../../libs/xpdf/goo/gmem.h ptexlib.h \ +- ../pdftexd.h ../texmfmp.h ../cpascal.h ../config.h ../help.h \ +- ../texmfmem.h ../pdftexcoerce.h ptexmac.h +-writet1.o: writet1.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ +- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h +-writet3.o: writet3.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ +- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h +-writezip.o: writezip.c ptexlib.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h +-writeenc.o: writeenc.c ptexlib.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h +-writettf.o: writettf.c ptexlib.h writettf.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h macnames.c +-writejpg.o: writejpg.c ptexlib.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h image.h +-writepng.o: writepng.c ptexlib.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h image.h +-writeimg.o: writeimg.c ptexlib.h ../pdftexd.h ../texmfmp.h \ +- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ +- ptexmac.h image.h +-pdftoepdf.o: pdftoepdf.cc ../../../libs/xpdf/xpdf/Object.h \ +- ../../../libs/xpdf/goo/gmem.h ../../../libs/xpdf/xpdf/Array.h \ +- ../../../libs/xpdf/xpdf/Dict.h ../../../libs/xpdf/xpdf/Stream.h \ +- ../../../libs/xpdf/xpdf/XRef.h ../../../libs/xpdf/xpdf/Catalog.h \ +- ../../../libs/xpdf/xpdf/Page.h ../../../libs/xpdf/xpdf/GfxFont.h \ +- ../../../libs/xpdf/xpdf/Error.h epdf.h ++pdftoepdf.o: pdftoepdf.cc epdf.h ../../kpathsea/c-auto.h \ ++ ../../kpathsea/c-proto.h ../../web2c/c-auto.h ../../web2c/config.h \ ++ ../../kpathsea/c-fopen.h ../../web2c/pdftexdir/ptexmac.h + ttf2afm.o: ttf2afm.c writettf.h macnames.c +-pdftosrc.o: pdftosrc.cc ../../../libs/xpdf/xpdf/Object.h \ +- ../../../libs/xpdf/xpdf/Array.h ../../../libs/xpdf/xpdf/Dict.h \ +- ../../../libs/xpdf/xpdf/Stream.h ../../../libs/xpdf/xpdf/XRef.h \ +- ../../../libs/xpdf/xpdf/Catalog.h ../../../libs/xpdf/xpdf/Page.h \ +- ../../../libs/xpdf/xpdf/PDFDoc.h ../../../libs/xpdf/xpdf/Link.h \ +- ../../../libs/xpdf/xpdf/Error.h ../../../libs/xpdf/xpdf/config.h ++pdftosrc.o: pdftosrc.cc +Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftoepdf.cc +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2009-03-10 20:05:59.000000000 +0100 ++++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftoepdf.cc 2009-03-10 20:06:13.000000000 +0100 +@@ -24,25 +24,24 @@ + #include + #include + #include +-#include +-#include +-#include +-#include +-#include + #include +-#include "Object.h" +-#include "Stream.h" +-#include "Array.h" +-#include "Dict.h" +-#include "XRef.h" +-#include "Catalog.h" +-#include "Link.h" +-#include "Page.h" +-#include "GfxFont.h" +-#include "PDFDoc.h" +-#include "GlobalParams.h" +-#include "Error.h" +- ++#include ++#include ++#include ++#include ++#include ++#include "poppler/Object.h" ++#include "poppler/Stream.h" ++#include "poppler/Array.h" ++#include "poppler/Dict.h" ++#include "poppler/XRef.h" ++#include "poppler/Link.h" ++#include "poppler/Catalog.h" ++#include "poppler/Page.h" ++#include "poppler/GfxFont.h" ++#include "poppler/PDFDoc.h" ++#include "poppler/GlobalParams.h" ++#include "poppler/Error.h" + #include "epdf.h" + + static const char _svn_version[] = +@@ -159,7 +158,7 @@ + fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name, + p->occurences); + #endif +- GString *docName = new GString(p->file_name); ++ GooString *docName = new GooString(p->file_name); + p->doc = new PDFDoc(docName); // takes ownership of docName + if (!p->doc->isOk() || !p->doc->okToPrint()) { + pdftex_fail("xpdf: reading PDF image failed"); +@@ -520,7 +519,7 @@ + int i, l, c; + Ref ref; + char *p; +- GString *s; ++ GooString *s; + if (obj->isBool()) { + pdf_printf("%s", obj->getBool()? "true" : "false"); + } else if (obj->isInt()) { +@@ -713,7 +712,7 @@ + epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages(); + if (page_name) { + // get page by name +- GString name(page_name); ++ GooString name(page_name); + LinkDest *link = pdf_doc->doc->findDest(&name); + if (link == 0 || !link->isOk()) + pdftex_fail("PDF inclusion: invalid destination <%s>", page_name); +Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftosrc.cc +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftosrc.cc 2009-03-10 20:05:59.000000000 +0100 ++++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftosrc.cc 2009-03-10 20:06:13.000000000 +0100 +@@ -23,22 +23,23 @@ + #include + #include + #include +-#include + #include +-#include +-#include +-#include +-#include "Object.h" +-#include "Stream.h" +-#include "Array.h" +-#include "Dict.h" +-#include "XRef.h" +-#include "Catalog.h" +-#include "Page.h" +-#include "GfxFont.h" +-#include "PDFDoc.h" +-#include "GlobalParams.h" +-#include "Error.h" ++ ++#include ++#include ++#include ++#include ++#include "poppler/Object.h" ++#include "poppler/Stream.h" ++#include "poppler/Array.h" ++#include "poppler/Dict.h" ++#include "poppler/XRef.h" ++#include "poppler/Catalog.h" ++#include "poppler/Page.h" ++#include "poppler/GfxFont.h" ++#include "poppler/PDFDoc.h" ++#include "poppler/GlobalParams.h" ++#include "poppler/Error.h" + + static const char _svn_version[] = + "$Id: pdftosrc.cc 7945 2008-05-08 14:25:16Z martin $ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc.cc $"; +@@ -49,7 +50,7 @@ + { + char *p, buf[1024]; + PDFDoc *doc; +- GString *fileName; ++ GooString *fileName; + Stream *s; + Object srcStream, srcName, catalogDict; + FILE *outfile; +@@ -63,8 +64,8 @@ + "Usage: pdftosrc []\n"); + exit(1); + } +- fileName = new GString(argv[1]); +- globalParams = new GlobalParams(); ++ fileName = new GooString(argv[1]); ++ globalParams = new GlobalParams(NULL); + doc = new PDFDoc(fileName); + if (!doc->isOk()) { + fprintf(stderr, "Invalid PDF file\n"); +@@ -84,7 +85,7 @@ + } + srcStream.initNull(); + if (objnum == 0) { +- catalogDict.dictLookup("SourceObject", &srcStream); ++ catalogDict.dictLookup(UGooString("SourceObject"), &srcStream); + if (!srcStream.isStream("SourceFile")) { + fprintf(stderr, "No SourceObject found\n"); + exit(1); +Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/Makefile.in +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/Makefile.in 2009-03-10 20:05:59.000000000 +0100 ++++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/Makefile.in 2009-03-10 20:06:13.000000000 +0100 +@@ -11,6 +11,7 @@ + ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) \ + -I. -I$(srcdir) \ + -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) \ ++ -I/usr/include/poppler \ + @LIBXPDFCPPFLAGS@ \ + -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. \ + -I$(LIBOBSDCOMPATSRCDIR) -I$(LIBOBSDCOMPATSRCDIR)/.. \ +@@ -38,11 +39,15 @@ + LIBOBSDCOMPATDIR=../../../libs/obsdcompat + LIBOBSDCOMPATSRCDIR=$(srcdir)/$(LIBOBSDCOMPATDIR) + ++POPPLERVERSION=`pkg-config --modversion poppler` ++ + XCPPFLAGS=-I.. -I$(srcdir)/.. -I../.. -I$(srcdir)/../.. -I$(LIBMD5DIR) \ + -I$(LIBMD5SRCDIR) @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ \ + -I$(LIBXPDFDIR) -I$(LIBXPDFDIR)/.. -I$(LIBXPDFSRCDIR) -I$(LIBXPDFSRCDIR)/.. \ + -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATSRCDIR) \ +- -I$(LIBOBSDCOMPATSRCDIR)/.. -DpdfTeX ++ -I$(LIBOBSDCOMPATSRCDIR)/.. -DpdfTeX \ ++ -DPOPPLERVERSION=\"$(POPPLERVERSION)\" ++ + + OBJS = epdf.o mapfile.o utils.o vfpacket.o pkin.o \ + writefont.o writet1.o writet3.o writezip.o writeenc.o writettf.o \ +Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftex.mk +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftex.mk 2009-03-10 20:05:59.000000000 +0100 ++++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftex.mk 2009-03-10 20:06:13.000000000 +0100 +@@ -3,6 +3,9 @@ + # differ between releases of pdfeTeX. + # $Id: pdftex.mk 9446 2008-07-11 06:51:52Z thanh $ + ++# use libpoppler instead of included xpdf code ++ADDLDFLAGS = -lpoppler ++ + # We build pdftex + pdftex = @PETEX@ pdftex + pdftexdir = pdftexdir +@@ -30,7 +33,7 @@ + + # Making pdftex + pdftex: pdftexd.h $(pdftex_o) $(pdftexextra_o) $(pdftexlibsdep) +- @CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ ++ @CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ $(ADDLDFLAGS) + + # C file dependencies. + $(pdftex_c) pdftexcoerce.h pdftexd.h: pdftex.p $(web2c_texmf) $(srcdir)/$(pdftexdir)/pdftex.defines $(srcdir)/$(pdftexdir)/pdftex.h +@@ -135,10 +138,10 @@ + rm -f ttf2afm.c macnames.c + # + # pdftosrc +-pdftosrc = pdftosrc ++pdftosrc = + + pdftosrc: $(pdftexdir)/pdftosrc.o $(LIBXPDFDEP) +- @CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@ ++ @CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@ $(ADDLDFLAGS) + $(pdftexdir)/pdftosrc.o:$(srcdir)/$(pdftexdir)/pdftosrc.cc + cd $(pdftexdir) && $(MAKE) pdftosrc.o + check: pdftosrc-check +Index: texlive-bin-2008.svn12198/configure +=================================================================== +--- texlive-bin-2008.svn12198.orig/configure 2009-03-10 20:06:05.000000000 +0100 ++++ texlive-bin-2008.svn12198/configure 2009-03-10 20:06:13.000000000 +0100 +@@ -6835,9 +6835,9 @@ + + # we need libxpdf for pdf[ex]tex, xetex + test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no} +-test "$with_pdftex" != no && : ${needs_libxpdf=yes} +-test "$with_pdfetex" != no && : ${needs_libxpdf=yes} +-test "$with_xetex" != no && : ${needs_libxpdf=yes} ++test "$with_pdftex" != no && : ${needs_libxpdf=no} ++test "$with_pdfetex" != no && : ${needs_libxpdf=no} ++test "$with_xetex" != no && : ${needs_libxpdf=no} + : ${needs_libxpdf=no} + export needs_libxpdf + +Index: texlive-bin-2008.svn12198/configure.in +=================================================================== +--- texlive-bin-2008.svn12198.orig/configure.in 2009-03-10 20:06:05.000000000 +0100 ++++ texlive-bin-2008.svn12198/configure.in 2009-03-10 20:06:13.000000000 +0100 +@@ -163,9 +163,9 @@ + + # we need libxpdf for pdf[ex]tex, xetex + test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no} +-test "$with_pdftex" != no && : ${needs_libxpdf=yes} +-test "$with_pdfetex" != no && : ${needs_libxpdf=yes} +-test "$with_xetex" != no && : ${needs_libxpdf=yes} ++test "$with_pdftex" != no && : ${needs_libxpdf=no} ++test "$with_pdfetex" != no && : ${needs_libxpdf=no} ++test "$with_xetex" != no && : ${needs_libxpdf=no} + : ${needs_libxpdf=no} + export needs_libxpdf + +@@ -220,7 +220,7 @@ + sinclude(libs/ncurses/ncurses.ac) + sinclude(libs/zlib/zlib.ac) + sinclude(libs/libpng/libpng.ac) +-sinclude(libs/xpdf/libxpdf.ac) ++#sinclude(libs/xpdf/libxpdf.ac) + sinclude(libs/t1lib/t1lib.ac) + sinclude(libs/freetype/freetype.ac) + sinclude(libs/freetype2/freetype2.ac) +Index: texlive-bin-2008.svn12198/texk/web2c/xetexdir/XeTeX_ext.c +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/xetexdir/XeTeX_ext.c 2009-03-10 20:05:59.000000000 +0100 ++++ texlive-bin-2008.svn12198/texk/web2c/xetexdir/XeTeX_ext.c 2009-03-10 20:06:13.000000000 +0100 +@@ -33,7 +33,7 @@ + */ + + #ifdef XETEX_OTHER +-#include "xpdf/config.h" ++#include "poppler/poppler-config.h" + #include "png.h" + #endif + +@@ -190,7 +190,7 @@ + #else + "Compiled with fontconfig version %d.%d.%d; using %d.%d.%d\n" + "Compiled with libpng version %s; using %s\n" +- "Compiled with xpdf version %s\n" ++ "Compiled with libpoppler version %s\n" + #endif + ; + +@@ -201,7 +201,7 @@ + #ifdef XETEX_OTHER + + strlen(PNG_LIBPNG_VER_STRING) + + strlen(png_libpng_ver) +- + strlen(xpdfVersion) ++ + strlen(POPPLERVERSION) + + 6 * 3 /* for fontconfig version #s (won't really need 3 digits per field!) */ + #endif + + 6 * 3; /* for freetype version #s (ditto) */ +@@ -226,7 +226,7 @@ + FC_VERSION / 10000, (FC_VERSION % 10000) / 100, FC_VERSION % 100, + fc_version / 10000, (fc_version % 10000) / 100, fc_version % 100, + PNG_LIBPNG_VER_STRING, png_libpng_ver, +- xpdfVersion ++ POPPLERVERSION + #endif + ); + } +Index: texlive-bin-2008.svn12198/texk/web2c/xetexdir/pdfimage.cpp +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/xetexdir/pdfimage.cpp 2009-03-10 20:05:59.000000000 +0100 ++++ texlive-bin-2008.svn12198/texk/web2c/xetexdir/pdfimage.cpp 2009-03-10 20:06:59.000000000 +0100 +@@ -11,10 +11,24 @@ + + #include "pdfimage.h" + +-#include "PDFDoc.h" +-#include "Catalog.h" +-#include "Page.h" +-#include "GString.h" ++#include ++#include ++#include ++#include ++#include ++#include "poppler/Object.h" ++#include "poppler/Stream.h" ++#include "poppler/Array.h" ++#include "poppler/Dict.h" ++#include "poppler/XRef.h" ++#include "poppler/Link.h" ++#include "poppler/Catalog.h" ++#include "poppler/Page.h" ++#include "poppler/GfxFont.h" ++#include "poppler/PDFDoc.h" ++#include "poppler/GlobalParams.h" ++#include "poppler/Error.h" ++ + + #include "XeTeX_ext.h" + +@@ -29,7 +43,7 @@ + pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box) + /* return the box converted to TeX points */ + { +- GString* name = new GString(filename); ++ GooString* name = new GooString(filename); + PDFDoc* doc = new PDFDoc(name); + + if (!doc) { +@@ -88,7 +102,7 @@ + pdf_count_pages(char* filename) + { + int pages = 0; +- GString* name = new GString(filename); ++ GooString* name = new GooString(filename); + PDFDoc* doc = new PDFDoc(name); + + if (!doc) { +Index: texlive-bin-2008.svn12198/texk/web2c/xetexdir/xetex.mk +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/xetexdir/xetex.mk 2009-03-10 20:05:59.000000000 +0100 ++++ texlive-bin-2008.svn12198/texk/web2c/xetexdir/xetex.mk 2009-03-10 20:06:13.000000000 +0100 +@@ -8,6 +8,10 @@ + # but need to check possible effect on other programs + ALL_CXXFLAGS = @CXXFLAGS@ + ++# use libpoppler instead of included xpdf code ++ADDLDFLAGS = -lpoppler ++ ++ + # We build xetex unless configure decides to skip it + xetex = @XETEX@ xetex + +@@ -33,7 +37,7 @@ + + @XETEX_GENERIC@ XETEX_DEFINES = -DXETEX_OTHER + +-@XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@ ++@XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@ $(ADDLDFLAGS) + + @XETEX_GENERIC@ EXTRADEPS = @LIBXPDFDEP@ @LIBPNGDEP@ + +@@ -168,7 +172,7 @@ + $(compile) $(ALL_CFLAGS) $(FTFLAGS) $(LIBPNGCPPFLAGS) $(ZLIBCPPFLAGS) -c $< -o $@ + + pdfimage.o: $(srcdir)/xetexdir/pdfimage.cpp $(srcdir)/xetexdir/pdfimage.h +- $(CXX) $(ALL_CFLAGS) $(FTFLAGS) $(LIBXPDFCPPFLAGS) -c $< -o $@ ++ $(CXX) $(ALL_CFLAGS) $(FTFLAGS) $(LIBXPDFCPPFLAGS) -I/usr/include/poppler -c $< -o $@ + + XeTeX_pic.o: $(srcdir)/xetexdir/XeTeX_pic.c $(srcdir)/xetexdir/XeTeX_ext.h $(XeTeXImageHdrs) + $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@ +@@ -214,9 +218,11 @@ + $(XeTeXFontHdrs) $(GRAPHITESRCDIR)/include/graphite/Font.h + $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(GRAPHITEFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@ + ++POPPLERVERSION=`pkg-config --modversion poppler` ++ + # special rules for files that need the TECkit headers as well + XeTeX_ext.o: $(srcdir)/xetexdir/XeTeX_ext.c xetexd.h +- $(compile) $(ICUCFLAGS) $(FTFLAGS) $(TECKITFLAGS) $(LIBPNGCPPFLAGS) $(LIBXPDFCPPFLAGS) $(ZLIBCPPFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) $(XETEX_GRAPHITE) -c $< -o $@ ++ $(compile) $(ICUCFLAGS) $(FTFLAGS) $(TECKITFLAGS) $(LIBPNGCPPFLAGS) $(LIBXPDFCPPFLAGS) $(ZLIBCPPFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) $(XETEX_GRAPHITE) -DPOPPLERVERSION=\"$(POPPLERVERSION)\" -c $< -o $@ + XeTeX_mac.o: $(srcdir)/xetexdir/XeTeX_mac.c xetexd.h + $(compile) $(ICUCFLAGS) $(TECKITFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@ + +Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/utils.c +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/utils.c 2009-03-10 20:05:59.000000000 +0100 ++++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/utils.c 2009-03-10 20:06:13.000000000 +0100 +@@ -35,7 +35,7 @@ + #include "zlib.h" + #include "ptexlib.h" + #include "png.h" +-#include "xpdf/config.h" /* just to get the xpdf version */ ++#include "poppler/poppler-config.h" /* just to get the xpdf version */ + + static const char _svn_version[] = + "$Id: utils.c 7945 2008-05-08 14:25:16Z martin $ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/utils.c $"; +@@ -1267,9 +1267,9 @@ + (void) asprintf(versions, + "Compiled with libpng %s; using libpng %s\n" + "Compiled with zlib %s; using zlib %s\n" +- "Compiled with xpdf version %s\n", ++ "Compiled with libpoppler version %s\n", + PNG_LIBPNG_VER_STRING, png_libpng_ver, +- ZLIB_VERSION, zlib_version, xpdfVersion); ++ ZLIB_VERSION, zlib_version, POPPLERVERSION); + } + + +Index: texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftexextra.in +=================================================================== +--- texlive-bin-2008.svn12198.orig/texk/web2c/pdftexdir/pdftexextra.in 2009-03-10 20:05:59.000000000 +0100 ++++ texlive-bin-2008.svn12198/texk/web2c/pdftexdir/pdftexextra.in 2009-03-10 20:06:13.000000000 +0100 +@@ -26,7 +26,7 @@ + (generated from ../lib/texmfmp.c). + */ + +-#define BANNER "This is pdfTeX, Version 3.1415926-PDFTEX-VERSION-ETEX-VERSION" ++#define BANNER "This is pdfTeX using libpoppler, Version 3.1415926-PDFTEX-VERSION-ETEX-VERSION" + #define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)" + #define AUTHOR NULL + #define PROGRAM_HELP PDFTEXHELP --- texlive-bin-2009.orig/debian/patches/51_fmtutil_keep_failedlog +++ texlive-bin-2009/debian/patches/51_fmtutil_keep_failedlog @@ -0,0 +1,26 @@ +--- + texk/tetex/fmtutil | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +Index: texlive-bin-2009/texk/tetex/fmtutil +=================================================================== +--- texlive-bin-2009.orig/texk/tetex/fmtutil 2009-11-11 13:55:45.000000000 +0000 ++++ texlive-bin-2009/texk/tetex/fmtutil 2009-11-11 13:58:20.000000000 +0000 +@@ -726,7 +726,6 @@ + log_warning "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed." + + # We don't want user-interaction for the following "mv" commands: +- mv "$format.log" "$fulldestdir/$format.log" + #include + #include +-#include +-#include +-#include +-#include +-#include + #include +-#include "Object.h" +-#include "Stream.h" +-#include "Array.h" +-#include "Dict.h" +-#include "XRef.h" +-#include "Catalog.h" +-#include "Link.h" +-#include "Page.h" +-#include "GfxFont.h" +-#include "PDFDoc.h" +-#include "GlobalParams.h" +-#include "Error.h" +- ++#include ++#include ++#include ++#include ++#include ++#include "poppler/Object.h" ++#include "poppler/Stream.h" ++#include "poppler/Array.h" ++#include "poppler/Dict.h" ++#include "poppler/XRef.h" ++#include "poppler/Link.h" ++#include "poppler/Catalog.h" ++#include "poppler/Page.h" ++#include "poppler/GfxFont.h" ++#include "poppler/PDFDoc.h" ++#include "poppler/GlobalParams.h" ++#include "poppler/Error.h" + #include "epdf.h" + + // This file is mostly C and not very much C++; it's just used to interface +@@ -169,7 +168,7 @@ + fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name, + p->occurences); + #endif +- GString *docName = new GString(p->file_name); ++ GooString *docName = new GooString(p->file_name); + p->doc = new PDFDoc(docName); // takes ownership of docName + if (!p->doc->isOk() || !p->doc->okToPrint()) { + pdftex_fail("xpdf: reading PDF image failed"); +@@ -511,7 +510,7 @@ + int i, l, c; + Ref ref; + char *p; +- GString *s; ++ GooString *s; + if (obj->isBool()) { + pdf_printf("%s", obj->getBool()? "true" : "false"); + } else if (obj->isInt()) { +@@ -677,7 +676,7 @@ + float pdf_version_found, pdf_version_wanted; + // initialize + if (!isInit) { +- globalParams = new GlobalParams(); ++ globalParams = new GlobalParams(NULL); + globalParams->setErrQuiet(gFalse); + isInit = gTrue; + } +@@ -703,7 +702,7 @@ + epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages(); + if (page_name) { + // get page by name +- GString name(page_name); ++ GooString name(page_name); + LinkDest *link = pdf_doc->doc->findDest(&name); + if (link == 0 || !link->isOk()) + pdftex_fail("PDF inclusion: invalid destination <%s>", page_name); +Index: texlive-bin-2007/texk/web2c/pdftexdir/pdftosrc.cc +=================================================================== +--- texlive-bin-2007.orig/texk/web2c/pdftexdir/pdftosrc.cc 2006-12-27 00:37:34.000000000 +0100 ++++ texlive-bin-2007/texk/web2c/pdftexdir/pdftosrc.cc 2007-04-16 15:30:03.000000000 +0200 +@@ -25,22 +25,23 @@ + #include + #include + #include +-#include + #include +-#include +-#include +-#include +-#include "Object.h" +-#include "Stream.h" +-#include "Array.h" +-#include "Dict.h" +-#include "XRef.h" +-#include "Catalog.h" +-#include "Page.h" +-#include "GfxFont.h" +-#include "PDFDoc.h" +-#include "GlobalParams.h" +-#include "Error.h" ++ ++#include ++#include ++#include ++#include ++#include "poppler/Object.h" ++#include "poppler/Stream.h" ++#include "poppler/Array.h" ++#include "poppler/Dict.h" ++#include "poppler/XRef.h" ++#include "poppler/Catalog.h" ++#include "poppler/Page.h" ++#include "poppler/GfxFont.h" ++#include "poppler/PDFDoc.h" ++#include "poppler/GlobalParams.h" ++#include "poppler/Error.h" + + static XRef *xref = 0; + +@@ -48,7 +49,7 @@ + { + char *p, buf[1024]; + PDFDoc *doc; +- GString *fileName; ++ GooString *fileName; + Stream *s; + Object srcStream, srcName, catalogDict; + FILE *outfile; +@@ -62,8 +63,8 @@ + "Usage: pdftosrc []\n"); + exit(1); + } +- fileName = new GString(argv[1]); +- globalParams = new GlobalParams(); ++ fileName = new GooString(argv[1]); ++ globalParams = new GlobalParams(NULL); + doc = new PDFDoc(fileName); + if (!doc->isOk()) { + fprintf(stderr, "Invalid PDF file\n"); +Index: texlive-bin-2007/texk/web2c/pdftexdir/Makefile.in +=================================================================== +--- texlive-bin-2007.orig/texk/web2c/pdftexdir/Makefile.in 2006-12-27 00:37:34.000000000 +0100 ++++ texlive-bin-2007/texk/web2c/pdftexdir/Makefile.in 2007-04-16 15:30:03.000000000 +0200 +@@ -8,7 +8,7 @@ + kpathsea_srcdir_parent = $(srcdir)/../.. + kpathsea_dir_parent = ../.. + +-ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) -I. -I$(srcdir) -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) @LIBXPDFCPPFLAGS@ -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/.. ++ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) -I. -I$(srcdir) -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) -I/usr/include/poppler -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/.. + CXX = @CXX@ + + .SUFFIXES: .cc .o +Index: texlive-bin-2007/texk/web2c/pdftexdir/pdftex.mk +=================================================================== +--- texlive-bin-2007.orig/texk/web2c/pdftexdir/pdftex.mk 2006-12-27 00:37:34.000000000 +0100 ++++ texlive-bin-2007/texk/web2c/pdftexdir/pdftex.mk 2007-04-16 15:30:03.000000000 +0200 +@@ -2,6 +2,9 @@ + # This fragment contains the parts of the makefile that are most likely to + # differ between releases of pdfeTeX. + ++# use libpoppler instead of included xpdf code ++ADDLDFLAGS = -lpoppler ++ + # We build pdftex + pdftex = @PETEX@ pdftex + pdftexdir = pdftexdir +@@ -29,7 +32,7 @@ + + # Making pdftex + pdftex: pdftexd.h $(pdftex_o) $(pdftexextra_o) $(pdftexlibsdep) +- @CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ ++ @CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ $(ADDLDFLAGS) + + # C file dependencies. + $(pdftex_c) pdftexcoerce.h pdftexd.h: pdftex.p $(web2c_texmf) $(srcdir)/$(pdftexdir)/pdftex.defines $(srcdir)/$(pdftexdir)/pdftex.h +@@ -153,10 +156,10 @@ + rm -f ttf2afm.c macnames.c + # + # pdftosrc +-pdftosrc = pdftosrc ++pdftosrc = + + pdftosrc: $(pdftexdir)/pdftosrc.o $(LIBXPDFDEP) +- @CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@ ++ @CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@ $(ADDLDFLAGS) + $(pdftexdir)/pdftosrc.o:$(srcdir)/$(pdftexdir)/pdftosrc.cc + cd $(pdftexdir) && $(MAKE) pdftosrc.o + check: pdftosrc-check +Index: texlive-bin-2007/configure +=================================================================== +--- texlive-bin-2007.orig/configure 2007-04-16 15:29:55.000000000 +0200 ++++ texlive-bin-2007/configure 2007-04-16 15:30:03.000000000 +0200 +@@ -3459,9 +3459,9 @@ + + # we need libxpdf for pdf[ex]tex, xetex + test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no} +-test "$with_pdftex" != no && : ${needs_libxpdf=yes} +-test "$with_pdfetex" != no && : ${needs_libxpdf=yes} +-test "$with_xetex" != no && : ${needs_libxpdf=yes} ++test "$with_pdftex" != no && : ${needs_libxpdf=no} ++test "$with_pdfetex" != no && : ${needs_libxpdf=no} ++test "$with_xetex" != no && : ${needs_libxpdf=no} + : ${needs_libxpdf=no} + export needs_libxpdf + +Index: texlive-bin-2007/configure.in +=================================================================== +--- texlive-bin-2007.orig/configure.in 2007-04-16 15:29:55.000000000 +0200 ++++ texlive-bin-2007/configure.in 2007-04-16 15:30:03.000000000 +0200 +@@ -157,9 +157,9 @@ + + # we need libxpdf for pdf[ex]tex, xetex + test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no} +-test "$with_pdftex" != no && : ${needs_libxpdf=yes} +-test "$with_pdfetex" != no && : ${needs_libxpdf=yes} +-test "$with_xetex" != no && : ${needs_libxpdf=yes} ++test "$with_pdftex" != no && : ${needs_libxpdf=no} ++test "$with_pdfetex" != no && : ${needs_libxpdf=no} ++test "$with_xetex" != no && : ${needs_libxpdf=no} + : ${needs_libxpdf=no} + export needs_libxpdf + +@@ -207,7 +207,7 @@ + sinclude(libs/libpng/libpng.ac) + sinclude(libs/zlib/zlib.ac) + sinclude(libs/ncurses/ncurses.ac) +-sinclude(libs/xpdf/libxpdf.ac) ++#sinclude(libs/xpdf/libxpdf.ac) + sinclude(libs/t1lib/t1lib.ac) + sinclude(libs/gd/gd.ac) + sinclude(libs/freetype/freetype.ac) +Index: texlive-bin-2007/texk/web2c/xetexdir/XeTeX_ext.c +=================================================================== +--- texlive-bin-2007.orig/texk/web2c/xetexdir/XeTeX_ext.c 2007-01-15 14:04:36.000000000 +0100 ++++ texlive-bin-2007/texk/web2c/xetexdir/XeTeX_ext.c 2007-04-16 15:30:03.000000000 +0200 +@@ -33,7 +33,7 @@ + */ + + #ifdef XETEX_OTHER +-#include "xpdf/config.h" ++#include "poppler/poppler-config.h" + #include "png.h" + #endif + +@@ -194,7 +194,7 @@ + #else + "Compiled with fontconfig version %d.%d.%d; using %d.%d.%d\n" + "Compiled with libpng version %s; using %s\n" +- "Compiled with xpdf version %s\n" ++ "Compiled with libpoppler version %s\n" + #endif + ; + +Index: texlive-bin-2007/texk/web2c/xetexdir/pdfimage.cpp +=================================================================== +--- texlive-bin-2007.orig/texk/web2c/xetexdir/pdfimage.cpp 2006-12-09 11:29:12.000000000 +0100 ++++ texlive-bin-2007/texk/web2c/xetexdir/pdfimage.cpp 2007-04-16 15:30:03.000000000 +0200 +@@ -11,10 +11,24 @@ + + #include "pdfimage.h" + +-#include "PDFDoc.h" +-#include "Catalog.h" +-#include "Page.h" +-#include "GString.h" ++#include ++#include ++#include ++#include ++#include ++#include "poppler/Object.h" ++#include "poppler/Stream.h" ++#include "poppler/Array.h" ++#include "poppler/Dict.h" ++#include "poppler/XRef.h" ++#include "poppler/Link.h" ++#include "poppler/Catalog.h" ++#include "poppler/Page.h" ++#include "poppler/GfxFont.h" ++#include "poppler/PDFDoc.h" ++#include "poppler/GlobalParams.h" ++#include "poppler/Error.h" ++ + + #include "XeTeX_ext.h" + +@@ -28,7 +42,7 @@ + int + pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box) + { +- GString* name = new GString(filename); ++ GooString* name = new GooString(filename); + PDFDoc* doc = new PDFDoc(name); + + if (!doc) { +Index: texlive-bin-2007/texk/web2c/xetexdir/xetex.mk +=================================================================== +--- texlive-bin-2007.orig/texk/web2c/xetexdir/xetex.mk 2007-01-20 13:44:35.000000000 +0100 ++++ texlive-bin-2007/texk/web2c/xetexdir/xetex.mk 2007-04-16 15:30:03.000000000 +0200 +@@ -4,6 +4,10 @@ + + Makefile: $(srcdir)/xetexdir/xetex.mk + ++# use libpoppler instead of included xpdf code ++ADDLDFLAGS = -lpoppler ++ ++ + # We build xetex unless configure decides to skip it + xetex = @XETEX@ xetex + +@@ -29,7 +33,7 @@ + + @XETEX_GENERIC@ XETEX_DEFINES = -DXETEX_OTHER + +-@XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@ ++@XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@ $(ADDLDFLAGS) + + @XETEX_GENERIC@ EXTRADEPS = @LIBXPDFDEP@ @LIBPNGDEP@ + +@@ -144,7 +148,7 @@ + $(compile) $(ALL_CFLAGS) $(LIBPNGCPPFLAGS) $(ZLIBCPPFLAGS) -c $< -o $@ + + pdfimage.o: $(srcdir)/xetexdir/pdfimage.cpp $(srcdir)/xetexdir/pdfimage.h +- $(CXX) $(ALL_CFLAGS) $(LIBXPDFCPPFLAGS) -c $< -o $@ ++ $(CXX) $(ALL_CFLAGS) $(LIBXPDFCPPFLAGS) -I/usr/include/poppler -c $< -o $@ + + XeTeX_pic.o: $(srcdir)/xetexdir/XeTeX_pic.c $(srcdir)/xetexdir/XeTeX_ext.h $(XeTeXImageHdrs) + $(compile) $(TECKITFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@ +Index: texlive-bin-2007/texk/web2c/pdftexdir/utils.c +=================================================================== +--- texlive-bin-2007.orig/texk/web2c/pdftexdir/utils.c 2007-01-01 18:20:03.000000000 +0100 ++++ texlive-bin-2007/texk/web2c/pdftexdir/utils.c 2007-04-16 15:30:03.000000000 +0200 +@@ -37,7 +37,7 @@ + #include "zlib.h" + #include "ptexlib.h" + #include "png.h" +-#include "xpdf/config.h" /* just to get the xpdf version */ ++#include "poppler/poppler-config.h" /* just to get the xpdf version */ + + #define check_nprintf(size_get, size_want) \ + if ((unsigned)(size_get) >= (unsigned)(size_want)) \ +@@ -1261,7 +1261,7 @@ + (void) asprintf(versions, + "Compiled with libpng %s; using libpng %s\n" + "Compiled with zlib %s; using zlib %s\n" +- "Compiled with xpdf version %s\n", ++ "Compiled with libpoppler version %s\n", + PNG_LIBPNG_VER_STRING, png_libpng_ver, + ZLIB_VERSION, zlib_version, xpdfVersion); + } --- texlive-bin-2009.orig/debian/patches/fix-mpost-segfault +++ texlive-bin-2009/debian/patches/fix-mpost-segfault @@ -0,0 +1,17 @@ +--- + texk/web2c/mplibdir/mpxout.w | 2 ++ + 1 file changed, 2 insertions(+) + +Index: texlive-bin-2009/texk/web2c/mplibdir/mpxout.w +=================================================================== +--- texlive-bin-2009.orig/texk/web2c/mplibdir/mpxout.w 2009-12-21 08:05:13.000000000 +0900 ++++ texlive-bin-2009/texk/web2c/mplibdir/mpxout.w 2009-12-21 08:05:45.000000000 +0900 +@@ -260,6 +260,8 @@ + va_start(ap, msg); + fprintf(stderr, "fatal: "); + (void)vfprintf(stderr, msg, ap); ++ va_end(ap); ++ va_start(ap, msg); + mpx_printf(mpx, "fatal", msg, ap); + va_end(ap); + mpx->history=mpx_fatal_error; --- texlive-bin-2009.orig/debian/patches/libpoppler-0.12 +++ texlive-bin-2009/debian/patches/libpoppler-0.12 @@ -0,0 +1,41 @@ +Fix FTBFS with poppler again, they will never be able to keep APIs + +Thanks to Ubuntu people for that patch +--- + texk/web2c/pdftexdir/pdftoepdf.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +Index: texlive-bin-2009~svn15596/texk/web2c/pdftexdir/pdftoepdf.cc +=================================================================== +--- texlive-bin-2009~svn15596.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2009-10-18 10:21:47.000000000 +0900 ++++ texlive-bin-2009~svn15596/texk/web2c/pdftexdir/pdftoepdf.cc 2009-10-18 10:22:28.000000000 +0900 +@@ -650,7 +650,7 @@ + } + for (r = encodingList; r != 0; r = n) { + n = r->next; +- delete r->font; ++// delete r->font; + delete r; + } + } +@@ -690,6 +690,7 @@ + Page *page; + int rotate; + PDFRectangle *pagebox; ++ int minor_pdf_version_found, major_pdf_version_found; + float pdf_version_found, pdf_version_wanted; + // initialize + if (!isInit) { +@@ -705,8 +706,11 @@ + // this works only for PDF 1.x -- but since any versions of PDF newer + // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will + // then have to changed drastically anyway. +- pdf_version_found = pdf_doc->doc->getPDFVersion(); ++ minor_pdf_version_found = pdf_doc->doc->getPDFMinorVersion(); ++ major_pdf_version_found = pdf_doc->doc->getPDFMajorVersion(); ++ pdf_version_found = major_pdf_version_found + (minor_pdf_version_found * 0.1); + pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1); ++ + if (pdf_version_found > pdf_version_wanted) { + char msg[] = + "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed"; --- texlive-bin-2009.orig/debian/patches/cve-2010-0739.patch +++ texlive-bin-2009/debian/patches/cve-2010-0739.patch @@ -0,0 +1,17 @@ +Index: dospecial.c +=================================================================== +--- a/texk/dvipsk/dospecial.c (revision 17558) ++++ b/texk/dvipsk/dospecial.c (revision 17569) +@@ -297,6 +297,12 @@ + static int omega_specials = 0; + + if (nextstring + numbytes > maxstring) { ++ if (numbytes < 0 ++ || (numbytes > 0 && 2 > INT_MAX / numbytes) ++ || 2 * numbytes > 1000 + 2 * numbytes) { ++ error("! Integer overflow in predospecial"); ++ exit(1); ++ } + p = nextstring = mymalloc(1000 + 2 * numbytes) ; + maxstring = nextstring + 2 * numbytes + 700 ; + } --- texlive-bin-2009.orig/debian/patches/cve-2010-0827.patch +++ texlive-bin-2009/debian/patches/cve-2010-0827.patch @@ -0,0 +1,28 @@ +--- + texk/dvipsk/virtualfont.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +Index: texlive-bin-2009/texk/dvipsk/virtualfont.c +=================================================================== +--- texlive-bin-2009.orig/texk/dvipsk/virtualfont.c 2010-05-01 02:12:57.000000000 +0900 ++++ texlive-bin-2009/texk/dvipsk/virtualfont.c 2010-05-01 02:16:19.000000000 +0900 +@@ -36,7 +36,7 @@ + * Subroutine vfbyte returns the next byte. + */ + static FILE *vffile ; +-static char name[50] ; ++static char name[500] ; + void + badvf(char *s) + { +@@ -93,6 +93,10 @@ + if (*d==0) + d = vfpath ; + #endif ++ if (strlen(n) + 5 >= sizeof (name)) { ++ /* 5 for vf() + null */ ++ error("! VF file name too long in vfopen") ; ++ } + #ifdef MVSXA /* IBM: MVS/XA */ + (void)sprintf(name, "vf(%s)", n) ; + #else --- texlive-bin-2009.orig/debian/patches/fmtutil-fix-infinite-loop_upstream +++ texlive-bin-2009/debian/patches/fmtutil-fix-infinite-loop_upstream @@ -0,0 +1,30 @@ +inifinite loops should only be checked in mktexfmt mode to make sure that +double defined format/engine combinations are accepted +Included upstream, written by Norbert Preining +--- + texk/tetex/fmtutil | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +Index: texlive-bin-2009/texk/tetex/fmtutil +=================================================================== +--- texlive-bin-2009.orig/texk/tetex/fmtutil 2009-12-23 18:52:43.000000000 +0900 ++++ texlive-bin-2009/texk/tetex/fmtutil 2009-12-23 18:53:32.000000000 +0900 +@@ -58,7 +58,7 @@ + + progname=fmtutil + argv0=$0 +-version=20091009.0222 ++version=20091223.1047 + + cnf=fmtutil.cnf # name of the config file + export PATH +@@ -699,6 +699,9 @@ + rm -f $fmtfile + + # Check for infinite recursion before running the iniTeX: ++ # We do this check only if we are running in mktexfmt mode ++ # otherwise double format definitions will create an infinite loop, too ++ $mktexfmtMode || mktexfmt_loop= + case :$mktexfmt_loop: in + *:"$format/$engine":*) + abort "Infinite recursion detected, giving up!" ;; --- texlive-bin-2009.orig/debian/patches/detex-hurd.diff +++ texlive-bin-2009/debian/patches/detex-hurd.diff @@ -0,0 +1,22 @@ +Fix building on hurd-i386. From Samuel Thibault +> There was also a problem with xxx.l which uses the NOFILE macro which is +> linux-only. +--- + texk/detex/detex.l | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: texlive-bin-2009/texk/detex/detex.l +=================================================================== +--- texlive-bin-2009.orig/texk/detex/detex.l 2009-12-21 18:18:10.000000000 +0900 ++++ texlive-bin-2009/texk/detex/detex.l 2009-12-21 18:18:34.000000000 +0900 +@@ -59,6 +59,10 @@ + + #endif + ++#ifndef NOFILE ++#define NOFILE 256 ++#endif ++ + void SetEnvIgnore(char *sbEnvList); + int BeginEnv(char *sbEnv); + int EndEnv(char *sbEnv); --- texlive-bin-2009.orig/debian/patches/57_texconfig_papersizes_for_upstream +++ texlive-bin-2009/debian/patches/57_texconfig_papersizes_for_upstream @@ -0,0 +1,525 @@ +--- + texk/tetex/texconfig | 347 ++++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 302 insertions(+), 45 deletions(-) + + +Index: texlive-bin-2009/texk/tetex/texconfig +=================================================================== +--- texlive-bin-2009.orig/texk/tetex/texconfig 2010-02-11 14:17:41.000000000 +0100 ++++ texlive-bin-2009/texk/tetex/texconfig 2010-02-13 21:39:15.000000000 +0100 +@@ -25,7 +25,9 @@ + progname=texconfig + + # the version string +-version=20080708.1050 ++version=20080708.1050plus_paperconf ++# paperconf additions by Frank Kster 2010, Public Domain: ++# You may freely copy, distribute and/or modify any part of the patch + + envVars=" + AFMFONTS BIBINPUTS BSTINPUTS CMAPFONTS CWEBINPUTS ENCFONTS GFFONTS +@@ -333,6 +335,18 @@ + } + + ############################################################################### ++# fmgrConfigShowPaper (file regex) ++# shows the paper setting in file, according to regex ++# ++fmgrConfigShow() ++{ ++ fmgrConfigShowFile=`tcfmgr --cmd find --file $1` ++ fmgrConfigShowRegex=$2 ++ ++ sed -n "$fmgrConfigShowRegex" $fmgrConfigShowFile ++} ++ ++############################################################################### + # fmgrConfigReplace (file regex value) + # replaces line matching regex by value in file + # +@@ -546,6 +560,177 @@ + + # + ############################################################################### ++# Main functions, ++# called from tcBatch with original positional parameters shifted by 1 ++############################################################################### ++ ++############################################################################### ++# SizeToPaper ++# Convert paper dimensions to a unique paper name ++############################################################################### ++SizeToPaper() ++{ ++ UsageSizeToPaper="Usage: texconfig size-to-paper height width" ++ case $1 in ++ "") ++ echo $UsageSizeToPaper >&2 ++ ;; ++ *) ++ AskedHeight=$1 ++ AskedWidth=$2 ++ locateConfigPsFile ++ papername=$(listDvipsPapers | \ ++ grep "$AskedWidth[[:space:]]*$AskedHeight" | \ ++ sed 's/[[:space:]].*//' \ ++ ) ++ if [ ! -n "$papername" ] || [ "$papername" = "unknown" ] || [ "$papername" = "nopaper" ]; then ++ echo "No paper known with height $AskedHeight and width $AskedWidth" >&2 ++ echo "Known units are mm and in, decimal separator is \`.'" ++ echo "Maybe height and width have been exchanged?" >&2 ++ cleanup 1 ++ else ++ if [ $(echo $papername | wc -w) -gt 1 ]; then ++ # filter out duplicates. This command line shows duplicates in the current config.ps: ++ # ./texconfig dvips paper-list | \ ++ # sed 's/\([[:alnum:]]*\)[[:space:]]\(.*\)/\2 \1/' | \ ++ # sort | \ ++ # sed 's/\(.*\)[[:space:]]\([[:alnum:]]*\)/\2 \1/' | \ ++ # uniq -D -f 1 ++ papernameList=$papername ++ papername=$(echo $papername | \ ++ sed 's/11x17//;s/statement//;s/a4size//;s/letterSize//;s/flse//;s/[[:space:]]//g' \ ++ ) ++ echo $papername ++ fi ++ : ++ fi ++ ;; ++ esac ++} ++ ++############################################################################### ++# PaperToSize ++# Convert paper name to dimensions, values taken from config.ps ++############################################################################### ++PaperToSize() ++{ ++ UsagePaperToSize="Usage: texconfig paper-to-size [-m|--machine-readable] papername" ++ sparseOutput=0 ++ case $1 in ++ -m|--machine-readable) ++ sparseOutput=1 ++ shift ++ ;; ++ esac ++ case $1 in ++ "") ++ echo $UsagePaperToSize >&2 ++ ;; ++ *) ++ AskedPaper=$1 ++ locateConfigPsFile ++ paperline=$(listDvipsPapers | grep "^$AskedPaper[[:space:]]") ++ if [ ! -n "$paperline" ]; then ++ echo "unknown paper size: $AskedPaper" >&2 ++ cleanup 1 ++ fi ++ allowedUnitLetters="min" ++ width=$(echo $paperline | sed \ ++ "s/.*['\'']\([[:digit:].]*[$allowedUnitLetters][$allowedUnitLetters]\).*/\1/" \ ++ ) ++ height=$(echo $paperline | sed \ ++ "s/.*[[:space:]]\([[:digit:].]*[$allowedUnitLetters][$allowedUnitLetters]\).$/\1/" \ ++ ) ++ if [ $sparseOutput = 1 ]; then ++ echo $height $width ++ else ++ echo "Paper $AskedPaper has height $height and width $width" ++ fi ++ ;; ++ esac ++ ++} ++ ++############################################################################### ++# pdftexSetPaper ++# set paper for pdftex ++############################################################################### ++pdftexSetPaper() ++{ ++ pdfPaperHelp="Usage: $progname pdftex paper PAPER" ++ ++ pdfPaperName="$1" ++ ++ if [ -z $pdfPaperName ]; then ++ echo "$help" >&2 ++ rc=1 ++ return $rc ++ fi ++ ++ pdfPaperDims=$(PaperToSize -m $pdfPaperName) ++ PaperHeight=$(echo $pdfPaperDims | sed 's/ .*//') # keep value before blank ++ PaperWidth=$( echo $pdfPaperDims | sed 's/.* //') # keep value after blank ++ ++ pdfPaperHeight=$(echo $PaperHeight | sed 's/mm/ true mm/;s/in/ true in/') ++ pdfPaperWidth=$( echo $PaperWidth | sed 's/mm/ true mm/;s/in/ true in/') ++ ++ setupTmpDir ++ fmgrConfigReplace pdftexconfig.tex pdfpagewidth '\pdfpagewidth='"$pdfPaperWidth" ++ wChanged=$fmgrConfigReplaceChanged ++ fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$pdfPaperHeight" ++ if $wChanged || $fmgrConfigReplaceChanged; then ++ echo "pdftex paper size has changed, refreshing formats" ++ fmtutil --refresh ++ fi ++} ++ ++############################################################################### ++# pdftexPaperConf ++# get paper for pdftex ++############################################################################### ++pdftexPaperConf(){ ++ pdftexconfig=`tcfmgr --cmd find --file pdftexconfig.tex` ++ pdftexPaperWidth=$(sed -n '/^\\pdfpagewidth/ {s/^\\pdfpagewidth=//;s/ true //;p}' $pdftexconfig) ++ pdftexPaperHeight=$(sed -n '/^\\pdfpageheight/ {s/^\\pdfpageheight=//;s/ true //;p}' $pdftexconfig) ++ ++ SizeToPaper $pdftexPaperHeight $pdftexPaperWidth ++} ++ ++############################################################################### ++# dvipdfmPaperConf ++# get paper for dvipdfm ++############################################################################### ++dvipdfmPaperConf(){ ++ fmgrConfigShow config '/^p/ {s/^p //;p}' ++} ++ ++############################################################################### ++# dvipdfmxPaperConf ++# get paper for dvipdfmx ++############################################################################### ++dvipdfmxPaperConf(){ ++ fmgrConfigShow dvipdfmx.cfg '/^p/ {s/^p //;p}' ++} ++ ++############################################################################### ++# dvipsPaperConf ++# get paper for dvips ++############################################################################### ++dvipsPaperConf(){ ++ locateConfigPsFile ++ fmgrConfigShow config.ps '/^@ / {s/^@ \([^[:space:]]*\).*/\1/;p;q}' ++} ++ ++############################################################################### ++# XDviPaperConf ++# get paper for XDvi ++############################################################################### ++XDviPaperConf(){ ++ fmgrConfigShow XDvi '/^\*paper:/ {s/^\*paper: \([^[:space:]]*\).*/\1/;p;q}' ++} ++ ++# ++############################################################################### + # tcBatch(args) + # handle batch mode + ############################################################################### +@@ -615,6 +800,18 @@ + echo + echo '==== kpathsea variables from environment only (ok if no output here) ====' + echoShowVariable $envVars ++ echo ++ echo '========================== default paper sizes ==========================' ++ echo -n "dvipdfm: " ++ dvipdfmPaperConf ++ echo -n "dvipdfmx: " ++ dvipdfmxPaperConf ++ echo -n "dvips: " ++ dvipsPaperConf ++ echo -n "pdftex: " ++ pdftexPaperConf ++ echo -n "XDvi: " ++ XDviPaperConf + ;; + + # texconfig dvipdfm +@@ -638,6 +835,9 @@ + echo "$progname: try \`$progname dvipdfm paper' for help" >&2 + rc=1 ;; + esac ;; ++ paperconf) ++ dvipdfmPaperConf ++ ;; + # texconfig dvipdfm "" + "") + echo "$help" >&2; rc=1 ;; +@@ -672,6 +872,9 @@ + rc=1 ;; + esac ;; + # texconfig dvipdfmx "" ++ paperconf) ++ dvipdfmxPaperConf ++ ;; + "") + echo "$help" >&2; rc=1 ;; + # texconfig dvipdfmx +@@ -689,6 +892,7 @@ + help="Usage: $progname dvips add PRINTER + $progname dvips del PRINTER + $progname dvips paper PAPER ++ $progname dvips paper-list + $progname dvips [-P PRINTER] mode MODE + $progname dvips [-P PRINTER] offset OFFSET + $progname dvips [-P PRINTER] printcmd CMD" +@@ -821,6 +1025,9 @@ + ;; + esac + ;; ++ paperconf) ++ dvipsPaperConf ++ ;; + mode) + case $2 in + "") +@@ -1226,23 +1433,25 @@ + help="Usage: $progname paper PAPER + + Valid PAPER settings: +- letter a4" ++ a0 a1 a10 a2 a3 a4 a5 a6 a7 a8 a9 b0 b1 b2 b3 b4 b5 b6 c5 ledger legal letter tabloid" + +- p=$2; pXdvi=$2; pDvips=$2 ++ p=$2 + case $2 in +- letter) +- pXdvi=us;; +- a4) +- pXdvi=a4;; ++ a0|a1|a10|a2|a3|a4|a5|a6|a7|a8|a9|b0|b1|b2|b3|b4|b5|b6|c5|ledger|legal|letter|tabloid) ++ # handled by xdvi and dvips (and hence all others) ++ : ++ ;; + "") echo "$help" >&2; rc=1; return;; + *) +- echo "$progname: unknown PAPER \`$2' given as argument for \`$progname paper'" >&2 ++ echo "$progname: PAPER \`$2' is not understood by all programs." >&2 + echo "$progname: try \`$progname paper' for help" >&2 ++ echo " or use \`$progname PROGNAME paper $2' instead " >&2 ++ echo " for the programs you need." >&2 + rc=1 + return;; + esac + if checkForBinary dvips >/dev/null && tcfmgr --cmd find --file config.ps >/dev/null 2>&1; then +- tcBatch dvips paper $pDvips ++ tcBatch dvips paper $p + fi + if checkForBinary dvipdfm >/dev/null && tcfmgr --cmd find --file config >/dev/null 2>&1; then + tcBatch dvipdfm paper $p +@@ -1251,7 +1460,7 @@ + tcBatch dvipdfmx paper $p + fi + if checkForBinary xdvi >/dev/null && tcfmgr --cmd find --file XDvi >/dev/null 2>&1; then +- tcBatch xdvi paper $pXdvi ++ tcBatch xdvi paper $p + fi + if checkForBinary pdftex >/dev/null && tcfmgr --cmd find --file pdftexconfig.tex >/dev/null 2>&1; then + tcBatch pdftex paper $p +@@ -1259,10 +1468,16 @@ + ;; + + pdftex) +- help="Usage: $progname pdftex paper PAPER ++ help="Usage: ++ $progname pdftex paper PAPER + +-Valid PAPER settings: +- a4 letter" ++ Valid PAPER settings: Same as for dvips, use ++ $progname dvips paper-list ++ to get a list of valid PAPER values. ++ ++ $progname pdftex paperconf ++ $progname pdftex mode MODE ++" + case $2 in + + mode) +@@ -1290,32 +1505,12 @@ + ;; + + paper) +- case $3 in +- letter) +- w="8.5 true in"; h="11 true in" +- setupTmpDir +- fmgrConfigReplace pdftexconfig.tex pdfpagewidth '\pdfpagewidth='"$w" +- wChanged=$fmgrConfigReplaceChanged +- fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h" +- if $wChanged || $fmgrConfigReplaceChanged; then +- fmtutil --refresh +- fi +- ;; +- a4) +- w="210 true mm"; h="297 true mm" +- fmgrConfigReplace pdftexconfig.tex pdfpagewidth '\pdfpagewidth='"$w" +- wChanged=$fmgrConfigReplaceChanged +- fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h" +- if $wChanged || $fmgrConfigReplaceChanged; then +- fmtutil --refresh +- fi +- ;; +- "") echo "$help" >&2; rc=1;; +- *) +- echo "$progname: unknown PAPER \`$3' given as argument for \`$progname pdftex paper'" >&2 +- echo "$progname: try \`$progname pdftex paper' for help" >&2 +- rc=1 ;; +- esac ;; ++ shift; shift ++ pdftexSetPaper $@ ++ ;; ++ paperconf) ++ pdftexPaperConf ++ ;; + "") + echo "$help" >&2; rc=1;; + *) +@@ -1340,10 +1535,17 @@ + + # handle "xdvi paper PAPER" + xdvi) ++ # 20100125: added paper sizes found in xdvi.c, version.h says 22.84.16 in TeXLive 2010 + tcBatchXdviPapers='us "8.5x11" ++letter "8.5x11" + usr "11x8.5" ++ledger "17x11" ++tabloid "11x17" + legal "8.5x14" ++legalr "14x8.5" + foolscap "13.5x17.0" ++foolscap "17.0x13.5" ++a0 "84.1x118.9cm" + a1 "59.4x84.0cm" + a2 "42.0x59.4cm" + a3 "29.7x42.0cm" +@@ -1351,6 +1553,10 @@ + a5 "14.85x21.0cm" + a6 "10.5x14.85cm" + a7 "7.42x10.5cm" ++a8 "5.2x7.4cm" ++a9 "3.7x5.2cm" ++a10 "2.6x3.7cm" ++a0r "118.9x84.1cm" + a1r "84.0x59.4cm" + a2r "59.4x42.0cm" + a3r "42.0x29.7cm" +@@ -1358,6 +1564,10 @@ + a5r "21.0x14.85cm" + a6r "14.85x10.5cm" + a7r "10.5x7.42cm" ++a8r "7.4x5.2cm" ++a9r "5.2x3.7cm" ++a10r "3.7x2.6cm" ++b0 "1000.0x141.4cm" + b1 "70.6x100.0cm" + b2 "50.0x70.6cm" + b3 "35.3x50.0cm" +@@ -1365,6 +1575,10 @@ + b5 "17.6x25.0cm" + b6 "13.5x17.6cm" + b7 "8.8x13.5cm" ++b8 "6.2x8.8cm" ++b9 "4.4x6.2cm" ++b10 "3.1x4.4cm" ++b0 "141.4x100cm" + b1r "100.0x70.6cm" + b2r "70.6x50.0cm" + b3r "50.0x35.3cm" +@@ -1372,6 +1586,10 @@ + b5r "25.0x17.6cm" + b6r "17.6x13.5cm" + b7r "13.5x8.8cm" ++b8r "8.8x6.2cm" ++b9r "6.2x4.4cm" ++b10r "4.4x3.1cm" ++c0 "91.7x129.7cm" + c1 "64.8x91.6cm" + c2 "45.8x64.8cm" + c3 "32.4x45.8cm" +@@ -1379,27 +1597,35 @@ + c5 "16.2x22.9cm" + c6 "11.46x16.2cm" + c7 "8.1x11.46cm" ++c8 "5.7x8.1cm" ++c9 "4.0x5.7cm" ++c10 "2.8x4.0cm" ++c0r "129.7x91.7cm" + c1r "91.6x64.8cm" + c2r "64.8x45.8cm" + c3r "45.8x32.4cm" + c4r "32.4x22.9cm" + c5r "22.9x16.2cm" + c6r "16.2x11.46cm" +-c7r "11.46x8.1cm"' ++c7r "11.46x8.1cm" ++c8r "8.1x5.7cm" ++c9r "5.7x4.0cm" ++c10r "4.0x2.8cm"' + help="Usage: $progname xdvi paper PAPER + + Valid PAPER settings: +- a1 a1r a2 a2r a3 a3r a4 a4r a5 a5r a6 a6r a7 a7r +- b1 b1r b2 b2r b3 b3r b4 b4r b5 b5r b6 b6r b7 b7r +- c1 c1r c2 c2r c3 c3r c4 c4r c5 c5r c6 c6r c7 c7r +- foolscap legal us usr" ++ a0 a0r a1 a1r a2 a2r a3 a3r a4 a4r a5 a5r a6 a6r a7 a7r a8 a8r a9 a9r a10 a10r ++ b0 b0r b1 b1r b2 b2r b3 b3r b4 b4r b5 b5r b6 b6r b7 b7r b8 b8r b9 b9r b10 b10r ++ c0 c0r c1 c1r c2 c2r c3 c3r c4 c4r c5 c5r c6 c6r c7 c7r c8 c8r c9 c9r c10 c10r ++ foolscap foolscapr legal legalr us|letter usr ledger tabloid" + case $2 in + paper-list) + echo "$tcBatchXdviPapers" + ;; + paper) + case $3 in +- a1|a1r|a2|a2r|a3|a3r|a4|a4r|a5|a5r|a6|a6r|a7|a7r|b1|b1r|b2|b2r|b3|b3r|b4|b4r|b5|b5r|b6|b6r|b7|b7r|c1|c1r|c2|c2r|c3|c3r|c4|c4r|c5|c5r|c6|c6r|c7|c7r|foolscap|legal|us|usr) ++ # 20100125: added paper sizes found in xdvi.c, version.h says 22.84.16 in TeXLive 2010 ++ a0|a1|a1r|a2|a2r|a3|a3r|a4|a4r|a5|a5r|a6|a6r|a7|a7r|a8|a8r|a9|a9r|a10|a10r|b0|b0r|b1|b1r|b2|b2r|b3|b3r|b4|b4r|b5|b5r|b6|b6r|b7|b7r|b8|b8r|b9|b9r|b10|b10r|c0|c0r|c1|c1r|c2|c2r|c3|c3r|c4|c4r|c5|c5r|c6|c6r|c7|c7r|c8|c8r|c9|c9r|c10|c10r|foolscap|foolscapr|legal|legalr|us|usr|letter|ledger|tabloid) + fmgrConfigReplace XDvi paper: "*paper: $3" + ;; + "") echo "$help" >&2; rc=1;; +@@ -1408,6 +1634,9 @@ + echo "$progname: try \`$progname xdvi paper' for help" >&2 + rc=1 ;; + esac ;; ++ paperconf) ++ XDviPaperConf ++ ;; + "") + echo "$help" >&2; rc=1;; + *) +@@ -1417,6 +1646,34 @@ + ;; + esac + ;; ++ paper-to-size) ++ shift ++ PaperToSize $@ ++ ;; ++ size-to-paper) ++ shift ++ SizeToPaper $@ ++ ;; ++ # compare-papers) ++ # # this option is not meant to be used by users; therefore I don't care for insecure tempfiles ++ # tcBatch xdvi paper-list | cut -d " " -f 1 | sort -u > ${TMPDIR:-/tmp}/xdvi.list ++ # tcBatch dvips paper-list | cut -d " " -f 1 | sort -u > ${TMPDIR:-/tmp}/dvips.list ++ # xdviOnly=$(comm -2 -3 ${TMPDIR:-/tmp}/xdvi.list ${TMPDIR:-/tmp}/dvips.list) ++ # dvipsOnly=$(comm -1 -3 ${TMPDIR:-/tmp}/xdvi.list ${TMPDIR:-/tmp}/dvips.list) ++ # knownToBoth=$(comm -1 -2 ${TMPDIR:-/tmp}/xdvi.list ${TMPDIR:-/tmp}/dvips.list) ++ # echo "xdvi only:" ++ # eval echo $xdviOnly ++ # echo ++ # echo ++ # echo "dvips only:" ++ # eval echo $dvipsOnly ++ # echo ++ # echo ++ # echo "known to both:" ++ # eval echo $knownToBoth ++ # rm ${TMPDIR:-/tmp}/dvips.list ++ # rm ${TMPDIR:-/tmp}/xdvi.list ++ # ;; + *) + echo "$progname: unknown option \`$1' given as argument for \`$progname'" >&2 + echo "$progname: try \`$progname help' for help" >&2 --- texlive-bin-2009.orig/debian/patches/12c_fix_pdfcrop_invocation +++ texlive-bin-2009/debian/patches/12c_fix_pdfcrop_invocation @@ -0,0 +1,19 @@ +12c_fix_pdfcrop_invocation.dpatch +Fix invocation of pdfcrop to get rid of magic +--- + texk/texlive/linked_scripts/pdfcrop/pdfcrop.pl | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +Index: texlive-bin-2009~svn13478/texk/texlive/linked_scripts/pdfcrop/pdfcrop.pl +=================================================================== +--- texlive-bin-2009~svn13478.orig/texk/texlive/linked_scripts/pdfcrop/pdfcrop.pl 2009-05-26 11:00:08.000000000 +0200 ++++ texlive-bin-2009~svn13478/texk/texlive/linked_scripts/pdfcrop/pdfcrop.pl 2009-05-27 22:17:17.000000000 +0200 +@@ -1,7 +1,5 @@ +-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q' +- if 0; ++#!/usr/bin/perl -w + use strict; +-$^W=1; # turn warning on + # + # pdfcrop.pl + # --- texlive-bin-2009.orig/debian/patches/56_updmap_deb +++ texlive-bin-2009/debian/patches/56_updmap_deb @@ -0,0 +1,143 @@ +--- + texk/tetex/updmap | 23 ++++++++++++++++------- + texk/tetex/updmap.man | 27 +++++++++++++++++++-------- + 2 files changed, 35 insertions(+), 15 deletions(-) + +Index: texlive-bin-2009~svn15596/texk/tetex/updmap.man +=================================================================== +--- texlive-bin-2009~svn15596.orig/texk/tetex/updmap.man 2009-08-15 08:13:49.000000000 +0900 ++++ texlive-bin-2009~svn15596/texk/tetex/updmap.man 2009-10-03 23:37:05.000000000 +0900 +@@ -32,11 +32,20 @@ + line, \fBupdmap\fP will write generated map files to a directory of + your choosing (via one of the \fB--*outputdir\fP options), or automatically + determine where to place the files\&. In the latter case, it tries to +-use the tree where the variable TEXMFVAR points to. ++use the tree where the variable TEXMFVAR -- or TEXMFSYSVAR if called ++as \fBupdmap-sys\fP -- points to. ++.PP + When used with the options \fB--edit\fP, \fB--setoption\fP, +-\fB--enable\fP, \fB--disable\fP, or \fB--syncwithtrees\fP, \fBupdmap\fP will first write +-\fBupdmap\&.cfg\fP(5) and regenerate the map files only if this file +-has been changed\&. ++\fB--enable\fP, \fB--disable\fP, or \fB--syncwithtrees\fP, ++\fBupdmap\fP will first write \fBupdmap\&.cfg\fP(5) and regenerate the ++map files only if this file has been changed\&. In Debian, updmap has ++been adapted so that \fB--enable\fP and \fB--disable\fP do the "right ++thing": change the configuration snippets in \fIupdmap.d\fP instead, ++call \fBupdate-updmap\fP(1) to regenerate \fBupdmap\&.cfg\fP(5) and ++regenerate the map files afterwards. There are some limitations, ++though: \fBupdmap\fP will regenerate the map files even if ++\fBupdmap\&.cfg\fP(5) has not been changed, and \fB--edit\fP and ++\fB--syncwithtrees\fP cannot be used. + .PP + .SH "OPTIONS" + .PP +@@ -98,10 +107,10 @@ + \fBdvipdfmDownloadBase14\fP + .IP + .IP "\fB--enable\fP \fImaptype\fP \fImapfile\fP" +-Add or enable a \fBMap\fP or \fBMixedMap\fP for \fImapfile\fP\&. ++Permanently add or enable a \fBMap\fP or \fBMixedMap\fP for \fImapfile\fP\&. + .IP + .IP "\fB--enable Map=\fImapfile\fP" +-Add or enable a Map for \fImapfile\fP\&. ++Permanently add or enable a Map for \fImapfile\fP\&. + .IP + .IP "\fB--enable MixedMap=\fP\fImapfile\fP" + Add or enable a MixedMap for \fImapfile\fP\&. +@@ -126,7 +135,9 @@ + .IP "\fIupdmap\&.cfg\fP" + Main configuration file\&. In + \fItexmf/web2c\fP by default, but may be located elsewhere +-depending on your distribution\&. ++depending on your distribution\&. \fBNote for Debian\fP: On Debian +++ that file is generated out of files in \fI/etc/texmf/updmap.d\fP. +++ See \fBupdate-updmap\fP(8) or the \fITeX-on-Debian\fP document. + .IP + .IP "\fIdvips35\&.map\fP" + Map file for standard 35 PostScript fonts for +@@ -240,7 +251,7 @@ + .PP + .SH "SEE ALSO" + .PP +-\fBupdmap\&.cfg\fP(5), \fBdvipdfm\fP(1), \fBdvips\fP(1), ++\fBupdmap\&.cfg\fP(5), \fBupdate-updmap\fP(8), \fBdvipdfm\fP(1), \fBdvips\fP(1), + \fBgsftopk\fP(1), \fBpdftex\fP(1), \fBps2pk\fP(1), + \fBtexhash\fP(1), \fBxdvi\fP(1)\&. + .PP +Index: texlive-bin-2009~svn15596/texk/tetex/updmap +=================================================================== +--- texlive-bin-2009~svn15596.orig/texk/tetex/updmap 2009-07-24 02:09:15.000000000 +0900 ++++ texlive-bin-2009~svn15596/texk/tetex/updmap 2009-10-03 23:37:05.000000000 +0900 +@@ -350,6 +350,8 @@ + # sets option to value in the config file (replacing the existing setting + # or by adding a new line to the config file). + ############################################################################### ++# for Debian, this is superseded by a function defined in debianize-updmap ++# (see below) + setOption() + { + opt=$1 +@@ -384,6 +386,8 @@ + # enableMap (type, map) + # enables an entry in the config file for map with a given type. + ############################################################################### ++# for Debian, this is superseded by a function defined in debianize-updmap ++# (see below) + enableMap() + { + case $1 in +@@ -406,6 +410,8 @@ + # disableMap (map) + # disables map in config file (any type) + ############################################################################### ++# for Debian, this is superseded by a function defined in debianize-updmap ++# (see below) + disableMap() + { + #mapType=`awk '($1 == "MixedMap" || $1 == "Map") && $2 == map { print $1 }' \ +@@ -759,12 +765,8 @@ + !!! ERROR! The map file \`$2' has not been found at all. + + Either put this file into the right place or remove the +- reference from the configuration file. An automatic way +- to disable unavailable map files is to call +- $progname --syncwithtrees +- +- For manual editing, call +- $progname --edit ++ reference from the configuration files - see ++ update-updmap(1). + " + + false; return 1 +@@ -1071,6 +1073,8 @@ + # update the config file: uncomment all lines which refer to map files that + # are unavailabe in the texmf trees + ############################################################################### ++# for Debian, this is superseded by a function defined in debianize-updmap ++# (see below) + syncWithTrees() + { + for i in `egrep '^(Mixed)?Map' "$cnfFile" | sed 's@.* @@'`; do +@@ -1084,6 +1088,11 @@ + } + + ############################################################################### ++# source Debian-specific changes, superseding the last three functions ++############################################################################### ++. /usr/share/tex-common/debianize-updmap ++ ++############################################################################### + # normalizeLines() + # remove comments, whitespace is exactly one space, no empty lines, + # no whitespace at end of line, one space before and after ", +@@ -1386,7 +1395,7 @@ + + case "$cmd" in + edit) +- ${VISUAL-${EDITOR-vi}} "$cnfFile";; ++ debianEditWarnAndShow;; + setoption) + setOption "$setoptionOpt" "$setoptionVal";; + enable) --- texlive-bin-2009.orig/debian/patches/55_texconfig_stuff +++ texlive-bin-2009/debian/patches/55_texconfig_stuff @@ -0,0 +1,143 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 55_texconfig_stuff.dpatch by Frank Kster +## +## DP: expand texconfig man page, some random texconfig fixes + +@DPATCH@ + texk/tetex/texconfig | 22 ++++++++++++++-------- + texk/tetex/texconfig.man | 28 +++++++++++++++++++++++++++- + 2 files changed, 41 insertions(+), 9 deletions(-) + +Index: texlive-bin-2009~svn15596/texk/tetex/texconfig +=================================================================== +--- texlive-bin-2009~svn15596.orig/texk/tetex/texconfig 2008-07-18 05:24:39.000000000 +0900 ++++ texlive-bin-2009~svn15596/texk/tetex/texconfig 2009-10-03 23:37:02.000000000 +0900 +@@ -567,7 +567,7 @@ + $progname help (or --help; show this help) + $progname hyphen FORMAT (edit hyphenation config for FORMAT) + $progname init [FORMAT]... (rebuild FORMATs, or all formats +- plus run texlinks and updmap) ++ plus run updmap) + $progname mode MODE (set Metafont MODE) + $progname paper PAPER (set default paper size to PAPER) + $progname pdftex [OPTION]... (pdftex options) +@@ -889,8 +889,8 @@ + + faq) + setupTexmfmain +- if test -f $MT_TEXMFMAIN/doc/tetex/teTeX-FAQ; then +- <$MT_TEXMFMAIN/doc/tetex/teTeX-FAQ eval ${PAGER-more} ++ if test -f $MT_TEXMFDIST/doc/tetex/teTeX-FAQ.gz; then ++ <$MT_TEXMFDIST/doc/tetex/teTeX-FAQ.gz eval zcat | ${PAGER-sensible-pager} + else + echo "$progname: faq not found (usually in \$TEXMFMAIN/doc/tetex/teTeX-FAQ)" >&2 + rc=1 +@@ -930,16 +930,19 @@ + ;; + *) + tcBatchFontVardir=$3 +- tfc=`kpsewhich texmf.cnf` ++ tfcs=$(grep -l '^[[:space:]]*VARTEXFONTS[[:space:]]*=' /etc/texmf/texmf.d/*.cnf) ++ # last match wins ++ for file in $tfcs; do tfc=$file; done + if test -n "$tfc"; then + if test -w "$tfc"; then + configReplace "$tfc" '^VARTEXFONTS' "VARTEXFONTS = $tcBatchFontVardir" ++ update-texmf + else + echo "$progname: setting up vardir failed. Reason: no permission to write file \`$tfc'" >&2 + rc=1 + fi + else +- echo "$progname: setting up vardir failed. Reason: failed to find file texmf.cnf" >&2 ++ echo "$progname: setting up vardir failed. Reason: failed to find file \`$tfc'" >&2 + rc=1 + fi + ;; +@@ -1036,7 +1039,6 @@ + for i in `awk '{print $1}' $tmpdir/addOrChange`; do + fmtutil --byfmt "$i" || rc=1 + done +- texlinks --multiplatform || rc=1 + fi + ;; + +@@ -1083,6 +1085,11 @@ + rc=1 + return + ;; ++ /var/lib/texmf/*) ++ echo "$progname: The hyphenation file for $tcBatchHyphenFormat is a generated file in Debian" ++ echo "You cannot use this texconfig command, use \`update-language(1)' instead." ++ echo "Please read its manual page or /usr/share/tex-common/TeX-on-Debian*" ++ ;; + esac + + getRelDir "$tcBatchHyphenFile" +@@ -1110,7 +1117,7 @@ + fi + ;; + esac +- ${VISUAL-${EDITOR-vi}} "$tcBatchHFEdit" ++ ${VISUAL:-${EDITOR:-sensible-editor}} "$tcBatchHFEdit" + if cmp "$tcBatchHFEdit" "$tcBatchHFOrig" >/dev/null 2>&1; then + echo "$progname: configuration unchanged." >&2 + else +@@ -1160,7 +1167,6 @@ + case $2 in + "") + if $fmtutil --all \ +- && texlinks --multiplatform \ + && $updmap; then + : + else +Index: texlive-bin-2009~svn15596/texk/tetex/texconfig.man +=================================================================== +--- texlive-bin-2009~svn15596.orig/texk/tetex/texconfig.man 2009-09-28 06:07:35.000000000 +0900 ++++ texlive-bin-2009~svn15596/texk/tetex/texconfig.man 2009-10-03 23:37:02.000000000 +0900 +@@ -38,6 +38,20 @@ + .I TEXMFSYSCONFIG. + (You may need to be root to do this.) + .PP ++Note that on a Debian system, changes to formats, font setup, ++hyphenation for different languages, etc. should not be done with ++texconfig, because ++.B fmtutil.cnf(5), updmap.cfg(5), texmf.cnf ++and ++.B language.dat ++are generated files in Debian. See ++.I TeX-on-Debian.pdf, TeX-on-Debian.txt.gz ++or ++.I TeX-on-Debian.html/index.html ++in ++.I /usr/share/doc/tex-common/ ++for alternatives. ++.PP + .I texconfig + also offers a non-interactive batch mode which can be accessed with + the following commands +@@ -120,11 +134,23 @@ + (and their answers). + .TP + .B font vardir DIR, font ro, font ro ++These options should not be used on a Debian system unless you really ++know what you are doing. For details, look at the output of ++.B texconfig fonts ++and read section 2.5, font caching, in the TeX-on-Debian documentation ++in ++.I /usr/share/doc/tex-common/. + .TP + .B formats + This command allows to edit + .B fmtutil.cnf(5) +-and (re)creates any new or changed formats afterwards. ++and (re)creates any new or changed formats afterwards. It should not ++be used on Debian systems, unless you want to temporarily create and ++test a specific format, because ++.B fmtutil.cnf(5) ++is a generated file in Debian, and changes will be overwritten. See ++.B update-fmtutil ++for details. + .TP + .B hyphen FORMAT + This command allows to edit the hyphenation configuration file for --- texlive-bin-2009.orig/debian/man-pages/texconfig-dialog.1 +++ texlive-bin-2009/debian/man-pages/texconfig-dialog.1 @@ -0,0 +1,9 @@ +.TH texconfig-dialog 1 "February 2005" "teTeX" "teTeX" +.SH NAME +texconfig-dialog \- helper program for texconfig and texconfig-sys +.SH DESCRIPTION +.I texconfig-dialog +is a helper program for texconfig and texconfig-sys, see the respective +man pages for details. +.SH AUTHOR +Thomas Esser --- texlive-bin-2009.orig/debian/man-pages/otangle.1 +++ texlive-bin-2009/debian/man-pages/otangle.1 @@ -0,0 +1,147 @@ +.TH OTANGLE 1 "20 October 2002" "Web2C 7.5.5" +.\"===================================================================== +.if n .ds MF Metafont +.if t .ds MF M\s-2ETAFONT\s0 +.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP +.if n .ds TX TeX +.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP for troff +.el .ds OX TeX for nroff +.\" the same but obliqued +.\" BX definition must follow TX so BX can use TX +.if t .ds BX \fRB\s-2IB\s0\fP\*(TX +.if n .ds BX BibTeX +.\" LX definition must follow TX so LX can use TX +.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX +.if n .ds LX LaTeX +.if n .ds WB Web +.if t .ds WB W\s-2EB\s0 +.\"===================================================================== +.SH NAME +otangle \- translate WEB to Pascal +.SH SYNOPSIS +.B otangle +[ +.RI options +] +.I webfile[.web] +[ +.I changefile[.ch] +] +.\"===================================================================== +.SH DESCRIPTION +This manual page is not meant to be exhaustive. The complete +documentation for this version of \*(TX can be found in the info file +or manual +.IR "Web2C: A TeX implementation" . +.PP +The +.B otangle +program converts a \*(WB +source document into a Pascal program that may be compiled in the usual +way with the on-line Pascal compiler (e.g., +.BR pc (1)). +The output file is packed into lines of 72 characters or less, with +the only concession to readability being the termination of lines at +semicolons when this can be done conveniently. +.PP +The \*(WB language allows you to prepare a single document containing all +the information that is needed both to produce a compilable Pascal +program and to produce a well-formatted document describing the program +in as much detail as the writer may desire. The user of \*(WB must be +familiar with both \*(TX and Pascal. \*(WB also provides a relatively +simple, although adequate, macro facility that permits a Pascal program +to be written in small easily-understood modules. +.PP +The command line should have either one or two names on it. +The first is taken as the \*(WB file (and +.I .web +is added if there is no +extension). +If there is another name, it is a change file (and +.I .ch +is added if there is +no extension). The change file overrides parts of the \*(WB file, +as described in the \*(WB system documentation. +.PP +The output files are a Pascal file and a string pool file, +whose names are formed by adding +.I .p +and +.I .pool +respectively to the root of the \*(WB file name. +.\"===================================================================== +.SH "OPTIONS" +This version of +.B otangle +understands the following options. Note that some of these options +may render the output unsuitable for processing by a Pascal compiler. +.TP +.B --help +.rb +Print help message and exit. +.TP +.B --version +.rb +Print version information and exit. +.\"===================================================================== +.SH "SEE ALSO" +.BR pc (1), +.BR pxp (1) +(for formatting +.B otangle +output when debugging), +.BR tex (1). +.PP +Donald E. Knuth, +.IR "The \*(WB System of Structured Documentation" . +.PP +Donald E. Knuth, +.IR "Literate Programming" , +Computer Journal +.BR 27 , +97\-111, 1984. +.PP +Wayne Sewell, +.IR "Weaving a Program" , +Van Nostrand Reinhold, 1989, ISBN 0-442-31946-0. +.PP +Donald E. Knuth, +.I "\*(OX: The Program" +(Volume B of +.IR "Computers and Typesetting" ), +Addison-Wesley, 1986, ISBN 0-201-13437-3. +.PP +Donald E. Knuth, +.I "\*(MF: The Program" +(Volume D of +.IR "Computers and Typesetting" ), +Addison-Wesley, 1986, ISBN 0-201-13438-1. +.PP +These last two are by far the largest extant examples of \*(WB +programs. +.PP +There is an active Internet electronic mail discussion list on the +subject of literate programming; send a subscription request to +.I litprog-request@shsu.edu +to join. +.\"===================================================================== +.SH AUTHORS +\*(WB was designed by Donald E. Knuth, based on an earlier system +called DOC (implemented by Ignacio Zabala). +The +.B tangle +and +.B weave +programs are themselves written in \*(WB. The system +was originally ported to Unix at Stanford by Howard Trickey, and at +Cornell by Pavel Curtis. +.PP +.B otangle +incorporates extensions for Omega, and is written by +John Plaice and Yannis Haralambous. +.PP +This manpage has +been written by Norbert Preining for Debian/GNU Linux by adapting the +man page for tangle and may be used, modified and/or distributed freely +by anyone. + --- texlive-bin-2009.orig/debian/man-pages/omfonts.1 +++ texlive-bin-2009/debian/man-pages/omfonts.1 @@ -0,0 +1,14 @@ +.TH "omfonts" "1" "March 2006" "Omega" "Omega" +.PP +.SH "NAME" +omfonts \ - the driver program behind ofm2opl, opl2ofm, ovf2ovp, and ovp2ovf. +.PP +.SH "DESCRIPTION and SEE ALSO" +.PP +Please see the respective man pages of \fBofm2opl\fP(1), \fBopl2ofm\fP(1), +\fBovf2ovp\fP(1), and \fBovp2ovf\fP(1). +.PP +.SH "AUTHOR" +.PP +This manual page was written by Norbert Preining , for +the Debian GNU/Linux system. It is too trivial to deserve special attention. --- texlive-bin-2009.orig/debian/man-pages/devnag.1 +++ texlive-bin-2009/debian/man-pages/devnag.1 @@ -0,0 +1,35 @@ +.TH DEVNAG "1" "April 2006" "devnag 2.13" "User Commands" +.SH NAME +devnag \- Devanagari for TeX preprocessor +.SH SYNOPSIS +.B devnag in[.dn] [out[.tex]] +.SH DESCRIPTION +.PP +.B devnag +is a preprocessor that reads transliterated Devanagari input delimited by +\dn and converts it into a form with which TeX is familiar. +.PP +The preprocessor +handles the details of character placement such as the alignment of +vowel diacritics and consonant ligatures. The rest of the layout, +however, must be managed by the user. +.PP +For specification of the format please see the documentation accompanying +the package. +.SH OPTIONS +.TP +in[.dn] out[.tex] +The default file extension for an input file is .dn and for an output +file .tex. The output filename is optional. If an output filename is +not specified, the preprocessor will name it after the input file. +.TP +\fB\-v\fR +report devnag version +.SH AUTHORS +.B devnag +was written by Frans J. Velthuis and is currently +maintained by Zdenek Wagner . +This manpage +was written by Norbert Preining for Debian/GNU Linux and may be used, +modified and/or distributed freely by anyone. + --- texlive-bin-2009.orig/debian/man-pages/pdfopen.1 +++ texlive-bin-2009/debian/man-pages/pdfopen.1 @@ -0,0 +1,49 @@ +.TH PDFOPEN "1" "April 2006" "pdfopen 0.4: Acrobat Reader remote control" "User Commands" +.SH NAME +pdfopen, pdfclose \- manual page for pdfopen 0.4: Acrobat Reader remote control +.SH DESCRIPTION +.B pdfopen +and +.B pdfclose +can be used to control a running instance of Acrobat Reader. +.IP +pdfopen [\-\-file +.I +] +.IP +pdfclose [\-\-file +.I +] +.PP +Without argument, the +.B pdfopen +program sends a "Ctrl\-<\-" to an existing X window with the name +.B Acrobat Reader, +and "Alt-<-" to a window with the name +.B AdobeReader, +if such windows exist. +.B pdfclose +sends a "Ctrl\-w" instead. +.SH OPTIONS +.TP +\-\-file +With this argument, +.B pdfclose +closes an existing window with the name , and +.B pdfopen +opens a window with the name (starting a reader if +necesary), or it reloads if it was already open. +.TP +--all,--page +These arguments, accepted by Fabrice Popineau's Windows originals of +.B pdfopen +and +.B pdfclose, +are silently ignored. +.SH AUTHORS +.B pdfopen +and +.B pdfclose +are written by Taco Hoekwater . This manpage has +been written by Frank K\[:u]ster for Debian/GNU Linux and may be used, +modified and/or distributed freely by anyone. --- texlive-bin-2009.orig/debian/man-pages/synctex.5 +++ texlive-bin-2009/debian/man-pages/synctex.5 @@ -0,0 +1,310 @@ +.Dd May 11, 2008 +.Dt SYNCTEX 5 +.Os "Independant" +.\" +.\" +.Sh NAME +.Nm synctex +.Nd Synchronize TeXnology help file +.\" +.\" +.Sh DESCRIPTION +Synchronize TeXnology help file +.Pq synctexs +are text files that help input/output synchronization during document preparation with the TeX typesetting system. +.Sh BASICS +The structure of this file should not be considered public, in the sense that no one should need to parse its contents, except the synctex command line utility, and the synctex_parser library. +Unless it is absolutely not avoidable, access to the contents of the synctex file should only be made through requests made to the synctex command line utility. +.\" +.Sh STRUCTURE +The element structure of a synctex file is a list of text line records as follows. +.Sq \&* , +.Sq \&+ , +and +.Sq \&? +have their usual EBNF meanings: +.Sq \&* +means zero or more, +.Sq \&+ +means one or more, and +.Sq \&? +means zero or one +.Pq i.e., optional . +.Pp +.Bl -item -offset indent +.\" +.It +.Li ::= +.Pq The whole contents in 4 sections +.Bl -item -offset indent +.It +.Li +.It +.Li +.It +.Li +.It +.Li +.El +.\" +.El +.Pp +Each section starts with the first occurrence of a sectioning line, and ends with the next section, if any. +In the following definitions, we do not mention the section ending condition. +.Sh The preamble +.Bl -item -offset indent +.\" +.It +.Li ::= +.Bl -item -offset indent +.It +.Li Qq SyncTeX Version: + +.It +.Li * +.It +.Li Qq Magnification: + +.It +.Li Qq Unit: + +.It +.Li Qq X Offset: + +.It +.Li Qq Y Offset: + +.El +.It +.Li ::= +.Qq Input: + +.Qq \&: + +.\" +.El +.Sh The content +.Bl -item -offset indent +.It +.Li ::= +.Bl -item -offset indent +.It +.Li +.It +.Li Qq Content: + +.It +.Li +.It +.Li * +.It +.Li +.It +.Li * +.It +.Li ... +.It +.Li +.It +.Li * +.El +.It +.Li ::= +.Qq \&! + +.Pp +.El +.Pp +.Bl -item -offset indent +.It +.Li ::= +.Bl -item -offset indent +.It +.Li +.It +.Li Qq \&{ + / +.It +.Li * +.It +.Li +.It +.Li Qq \&} + +.El +.El +.Pp +The describes what is inside a box. +It is either a vertical or horizontal box, +with some records related to glue, kern or math nodes. +.Bl -item -offset indent +.It +.Li ::= +.Bl -item -offset indent +.It +.Li | +.It +.Li || +.It +.Li |||| +.El +.It +.Li ::= +.Bl -item -offset indent +.It +.Li Qq \&[ + +.Qq \&: + +.Qq \&: + +.It +.Li * +.It +.Li Qq \&] + +.El +.It +.Li ::= +.Bl -item -offset indent +.It +.Li Qq \&( + +.Qq \&: + +.Qq \&: + +.It +.Li * +.It +.Li Qq \&) + +.El +.El +.Pp +Void boxes: +.Bl -item -offset indent +.It +.Li ::= +.Qq v + +.Qq \&: + +.Qq \&: + +.It +.Li ::= +.Qq h + +.Qq \&: + +.Qq \&: + +.It +.Li ::= +.Qq \&, + +.Qq \&, + +.It +.Li ::= +.It +.Li ::= +.It +.Li ::= +.It +.Li ::= +.Qq \&, +( +.Qq \&, +)? +.It +.Li ::= +.It +.Li ::= +.El +.Pp +The forthcoming records are basic one liners. +.Bl -item -offset indent +.It +.Li ::= +.Qq x + +.Qq \&: + +.It +.Li ::= +.Qq k + +.Qq \&: + +.Qq \&: + +.It +.Li ::= +.Qq g + +.Qq \&: + +.It +.Li ::= +.Qq $ + +.Qq \&: + +.El +.Pp +.\" .Sx underline, .Dq double quotes, .Pq enclosed in parenthesis +.Sh The postamble +The postamble closes the file +If there is no postamble, it means that the typesetting process did not end correctly. +.Bl -item -offset indent +.\" +.It +.Li ::= +.Bl -item -offset indent +.It +.Li +.It +.Li Qq Count: + +.El +.Sh The post scriptum +The post scriptum contains material possibly added by 3rd parties. +It allows to append some transformation (shift and magnify). +Typically, one applies a dvi to pdf filter with offset options and magnification, +then he appends the same options to the synctex file, for example +.Bd -offset indent + synctex update -o foo.pdf -m 0.486 -x 9472573sp -y 13.3dd source.dvi +.Ed +.Bl -item -offset indent +.\" +.It +.Li ::= +.\" +.Bl -item -offset indent +.It +.Li +.It +.Li Qq Post Scriptum: + +.It +.Li Qq Magnification: + +.Pq Set additional magnification +.It +.Li Qq X Offset: + +.Pq Set horizontal offset +.It +.Li Qq Y Offset: + +.Pq Set vertical offset +.El +This second information will override the offset and magnification previously available in the preamble section. +All the numbers are encoded using the decimal representation with "C" locale. +.Sh USAGE +.Pp +The is used to compute the visible size of hbox's. +The byte offset is an implicit anchor to navigate the synctex file from sheet to sheet. +. --- texlive-bin-2009.orig/debian/man-pages/etex.1 +++ texlive-bin-2009/debian/man-pages/etex.1 @@ -0,0 +1,434 @@ +.TH ETEX 1 "7 January 2007" "pdftex 1.40" "Web2C 7.5.7" +.\"===================================================================== +.if n .ds MF Metafont +.if t .ds MF M\s-2ETAFONT\s0 +.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP +.if n .ds TX TeX +.if n .ds MF Metafont +.if t .ds MF M\s-2ETAFONT\s0 +.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP for troff +.el .ds OX TeX for nroff +.\" the same but obliqued +.\" BX definition must follow TX so BX can use TX +.if t .ds BX \fRB\s-2IB\s0\fP\*(TX +.if n .ds BX BibTeX +.\" LX definition must follow TX so LX can use TX +.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX +.if n .ds LX LaTeX +.if t .ds AX \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(TX +.if n .ds AX AmSTeX +.if t .ds AY \fRA\\h'-0.1667m'\\v'0.20v'M\\v'-0.20v'\\h'-0.125m'S\fP\*(LX +.if n .ds AY AmSLaTeX +.\"===================================================================== +.SH NAME +etex, einitex, evirtex \- extended TeX +.SH SYNOPSIS +.B etex +.RI [ options ] +[\fB&\fR \fIformat\fR ] +[ \fIfile\fR | \fB\e\fR \fIcommands\fR ] +.\"===================================================================== +.SH DESCRIPTION +Run the e-\*(TX typesetter on +.IR file , +usually creating +.IR file.dvi . +If the file argument has no extension, ".tex" will be appended to it. +Instead of a filename, a set of e-\*(TX commands can be given, the first +of which must start with a backslash. +With a +.BI & format +argument e-\*(TX uses a different set of precompiled commands, +contained in +.IR format.fmt ; +it is usually better to use the +.B -fmt +.I format +option instead. +.PP +e-\*(TX is the first concrete result of an international research & +development project, the NTS Project, which was established under the +aegis of DANTE e.V. during 1992. The aims of the project are to +perpetuate and develop the spirit and philosophy of \*(TX, whilst +respecting Knuth's wish that \*(TX should remain frozen. +.PP +e-\*(TX can be used in two different modes: in +.I compatibility mode +it is supposed to be completely interchangable with standard \*(TX. +In +.I extended mode +several new primitives are added that facilitate (among other things) +bidirectional typesetting. +.PP +An extended mode format is generated by prefixing the name of the +source file for the format with an asterisk (*). Such formats are +often prefixed with an `e', hence +.B etex +as the extended version of +.B tex +and +.B elatex +as the extended version of +.BR latex . +However, +.B eplain +is an exception to this rule. +.PP +The +.B einitex +and +.B evirtex +commands are e-\*(TX's analogues to the +.B initex +and +.B virtex +commands. In this installation, they are symbolic links to the +.B etex +executable. These symbolic links may not exist at all. +.PP +e-\*(TX's handling of its command-line arguments is similar to that of +the other \*(TX programs in the +.I web2c +implementation. +.\"===================================================================== +.SH OPTIONS +This version of e-\*(TX understands the following command line options. +.TP +.BI -fmt \ format +.rb +Use +.I format +as the name of the format to be used, instead of the name by which +e-\*(TX was called or a +.I %& +line. +.TP +.B -enc +.rb +Enable the enc\*(TX extensions. This option is only effective in +combination with +.BR -ini . +For documentation of the enc\*(TX extensions see +.BR http://www.olsak.net/enctex.html . +.TP +.B -etex +.rb +Enable the e-\*(TX extensions. This option is only effective in +combination with +.BR -ini . +.TP +.B -file-line-error +.rb +Print error messages in the form +.I file:line:error +which is similar to the way many compilers format them. +.TP +.B -no-file-line-error +.rb +Disable printing error messages in the +.I file:line:error +style. +.TP +.B -file-line-error-style +.rb +This is the old name of the +.B -file-line-error +option. +.TP +.B -halt-on-error +.rb +Exit with an error code when an error is encountered during processing. +.TP +.B -help +.rb +Print help message and exit. +.TP +.B -ini +.rb +Start in +.I INI +mode, which is used to dump formats. The +.I INI +mode can be used for typesetting, but no format is preloaded, and +basic initializations like setting catcodes may be required. +.TP +.BI -interaction \ mode +.rb +Sets the interaction mode. The mode can be either +.IR batchmode , +.IR nonstopmode , +.IR scrollmode , +and +.IR errorstopmode . +The meaning of these modes is the same as that of the corresponding +\ecommands. +.TP +.B -ipc +.rb +Send DVI output to a socket as well as the usual output file. Whether +this option is available is the choice of the installer. +.TP +.B -ipc-start +.rb +As +.BR -ipc , +and starts the server at the other end as well. Whether this option +is available is the choice of the installer. +.TP +.BI -jobname \ name +.rb +Use +.I name +for the job name, instead of deriving it from the name of the input file. +.TP +.BI -kpathsea-debug \ bitmask +.rb +Sets path searching debugging flags according to the bitmask. See the +.I Kpathsea +manual for details. +.TP +.BI -mktex \ fmt +.rb +Enable +.RI mktex fmt , +where +.I fmt +must be either +.I tex +or +.IR tfm . +.TP +.B -mltex +.rb +Enable ML\*(TX extensions. Only effective in combination with +.BR -ini . +.TP +.BI -no-mktex \ fmt +.rb +Disable +.RI mktex fmt , +where +.I fmt +must be either +.I tex +or +.IR tfm . +.TP +.BI -output-comment \ string +.rb +Use +.I string +for the +.I DVI +file comment instead of the date. +.TP +.BI -output-directory \ directory +.rb Write output files in +.I directory +instead of the current directory. Look up input files in +.I directory +first, the along the normal search path. +.TP +.B -parse-first-line +.rb +If the first line of the main input file begins with +.I %& +parse it to look for a dump name or a +.B -translate-file +option. +.TP +.B -no-parse-first-line +.rb +Disable parsing of the first line of the main input file. +.TP +.BI -progname \ name +.rb +Pretend to be program +.IR name . +This affects both the format used and the search paths. +.TP +.B -recorder +.rb +Enable the filename recorder. This leaves a trace of the files opened +for input and output in a file with extension +.IR .fls . +.TP +.B -shell-escape +.rb +Enable the +.BI \ewrite18{ command } +construct. The +.I command +can be any shell command. This construct is normally +disallowed for security reasons. +.TP +.B -no-shell-escape +.rb +Disable the +.BI \ewrite18{ command } +construct, even if it is enabled in the +.I texmf.cnf +file. +.TP +.B -src-specials +.rb +Insert source specials into the +.I DVI +file. +.TP +.BI -src-specials \ where +.rb +Insert source specials in certain placed of the +.I DVI +file. +.I where +is a comma-separated value list: +.IR cr , +.IR display , +.IR hbox , +.IR math , +.IR par , +.IR parent , +or +.IR vbox . +.TP +.BI -translate-file \ tcxname +.rb +Use the +.I tcxname +translation table to set the mapping of input characters and +re-mapping of output characters. +.TP +.BI -default-translate-file \ tcxname +.rb +Like +.B -translate-file +except that a +.I %& +line can overrule this setting. +.TP +.B -version +.rb +Print version information and exit. +.\"===================================================================== +.SH ENVIRONMENT +See the Kpathsearch library documentation (the `Path specifications' +node) for precise details of how the environment variables are used. +The +.B kpsewhich +utility can be used to query the values of the variables. +.PP +One caveat: In most e-\*(TX formats, you cannot use ~ in a filename you +give directly to e-\*(TX, because ~ is an active character, and hence is +expanded, not taken as part of the filename. Other programs, such as +\*(MF, do not have this problem. +.PP +.TP +TEXMFOUTPUT +Normally, e-\*(TX puts its output files in the current directory. If +any output file cannot be opened there, it tries to open it in the +directory specified in the environment variable TEXMFOUTPUT. +There is no default value for that variable. For example, if you say +.I etex paper +and the current directory is not writable, if TEXMFOUTPUT has +the value +.IR /tmp , +e-\*(TX attempts to create +.I /tmp/paper.log +(and +.IR /tmp/paper.dvi , +if any output is produced.) +.TP +TEXINPUTS +Search path for +.I \einput +and +.I \eopenin +files. +This should probably start with ``.'', so +that user files are found before system files. An empty path +component will be replaced with the paths defined in the +.I texmf.cnf +file. For example, set TEXINPUTS to ".:/home/usr/tex:" to prepend the +current direcory and ``/home/user/tex'' to the standard search path. +.TP +TEXFORMATS +Search path for format files. +.TP +TEXPOOL +search path for +.B etex +internal strings. +.TP +TEXEDIT +Command template for switching to editor. The default, usually +.BR vi , +is set when e-\*(TX is compiled. +.TP +TFMFONTS +Search path for font metric +.RI ( .tfm ) +files. +.\"===================================================================== +.SH FILES +The location of the files mentioned below varies from system to +system. Use the +.B kpsewhich +utility to find their locations. +.TP +.I etex.pool +Text file containing e-\*(TX's internal strings. +.TP +.I texfonts.map +Filename mapping definitions. +.TP +.I *.tfm +Metric files for e-\*(TX's fonts. +.TP +.I *.fmt +Predigested e-\*(TX format (.\|fmt) files. +.br +.\"===================================================================== +.SH NOTES +Starting with version 1.40, pdf\*(TX incorporates the e-\*(TX +extensions, so in this installation e\*(TX is just a symbolic link to +pdf\*(TX. See +.BR pdftex (1). +This manual page is not meant to be exhaustive. The complete +documentation for this version of e-\*(TX can be found in the info +manual +.IR "Web2C: A TeX implementation" . +.\"===================================================================== +.SH BUGS +This version of e-\*(TX implements a number of optional extensions. +In fact, many of these extensions conflict to a greater or lesser +extent with the definition of e-\*(TX. When such extensions are +enabled, the banner printed when e-\*(TX starts is changed to print +.B e-TeXk +instead of +.BR e-TeX . +.PP +This version of e-\*(TX fails to trap arithmetic overflow when +dimensions are added or subtracted. Cases where this occurs are rare, +but when it does the generated +.I DVI +file will be invalid. +.\"===================================================================== +.SH "SEE ALSO" +.BR pdftex (1), +.BR tex (1), +.BR mf (1). +.\"===================================================================== +.SH AUTHORS +e-\*(TX was developed by Peter Breitenlohner (and the NTS team). +.PP +\*(TX was designed by Donald E. Knuth, +who implemented it using his \*(WB system for Pascal programs. +It was ported to Unix at Stanford by Howard Trickey, and +at Cornell by Pavel Curtis. +The version now offered with the Unix \*(TX distribution is that +generated by the \*(WB to C system +.RB ( web2c ), +originally written by Tomas Rokicki and Tim Morgan. +.PP +The enc\*(TX extensions were written by Petr Olsak. --- texlive-bin-2009.orig/debian/man-pages/bibtex8.1 +++ texlive-bin-2009/debian/man-pages/bibtex8.1 @@ -0,0 +1,92 @@ +.TH BIBTEX8 "1" "April 2006" "bibtex8 3.71" "User Commands" +.SH NAME +bibtex8 \- 8-bit Big BibTeX version 0.99c +.SH SYNOPSIS +.B bibtex8 +[\fIoptions\fR] \fIaux-file\fR +.SH DESCRIPTION +.PP +8-bit BibTeX is an enhanced, portable C version of BibTeX 0.99. It has been +enhanced in these areas: +.PP +- conversion to "big" (32-bit) capacity +.PP +- capacity selectable at run time +.PP +- flexible support for non-English languages using 8-bit character sets +.PP +- well matched to LateX2e and its "inputenc" package +.PP +Oren Patashnik, the creator of BibTeX, is working on a new BibTeX 1.0 that +will be a modern implementation supporting large capacities and non-English +languages (see TUGboat, pages 269--274, volume 15, number 3, September 1994). +He is content for this version to be released, but hopes that people will +eventually migrate to BibTeX 1.0 when it is released. Its release date is +uncertain at the moment. +.SH OPTIONS +.TP +\-? \fB\-\-help\fR +display this help text +.TP +\fB\-7\fR \fB\-\-traditional\fR +operate in the original 7\-bit mode +.TP +\fB\-8\fR \fB\-\-8bit\fR +force 8\-bit mode, no CS file used +.TP +\fB\-c\fR \fB\-\-csfile\fR FILE +read FILE as the BibTeX character set +and sort definition file +.TP +\fB\-d\fR \fB\-\-debug\fR TYPE +report debugging information. TYPE is one +or more of all, csf, io, mem, misc, search. +.TP +\fB\-s\fR \fB\-\-statistics\fR +report internal statistics +.TP +\fB\-t\fR \fB\-\-trace\fR +report execution tracing +.TP +\fB\-v\fR \fB\-\-version\fR +report BibTeX version +.TP +\fB\-B\fR \fB\-\-big\fR +set large BibTeX capacity +.TP +\fB\-H\fR \fB\-\-huge\fR +set huge BibTeX capacity +.TP +\fB\-W\fR \fB\-\-wolfgang\fR +set really huge BibTeX capacity for Wolfgang +.TP +\fB\-M\fR \fB\-\-min_crossrefs\fR ## +set min_crossrefs to ## +.TP +\fB\-\-mcites\fR ## +allow ## \ecites in the .aux files +.TP +\fB\-\-mentints\fR ## +allow ## integer entries in the .bib databases +.TP +\fB\-\-mentstrs\fR ## +allow ## string entries in the .bib databases +.TP +\fB\-\-mfields\fR ## +allow ## fields in the .bib databases +.TP +\fB\-\-mpool\fR ## +set the string pool to ## bytes +.TP +\fB\-\-mstrings\fR ## +allow ## unique strings +.TP +\fB\-\-mwizfuns\fR ## +allow ## wizard functions +.SH AUTHORS +.B bibtex8 +was written by Niel Kempson and +Alejandro Aguilar-Sierra . This manpage +was written by Norbert Preining for Debian/GNU Linux and may be used, +modified and/or distributed freely by anyone. +