[Debian-tex-commits] SVN tetex-bin commit + diffs: r2006 - in
tetex-bin/trunk/debian: . patches
Frank Küster
frank at alioth.debian.org
Wed Dec 6 22:21:21 CET 2006
Author: frank
Date: 2006-12-06 22:21:20 +0100 (Wed, 06 Dec 2006)
New Revision: 2006
Modified:
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/patches/README.patches
tetex-bin/trunk/debian/patches/patch-texdoctk
tetex-bin/trunk/debian/patches/patch-texdoctk-tmp
Log:
* Hardcode the two possible TEXMFDIST paths in texdoctk. This makes it
work again if tetex-doc and one texlive-doc-* package are installed at
the same time. Thanks to Braun Gabor <braung at renyi.hu> for reporting
and Ralf Stubner <ralf.stubner at web.de> for ideas for fixing this
(closes: #400058)
* add explanations for more patches in README.patches
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2006-12-06 20:59:45 UTC (rev 2005)
+++ tetex-bin/trunk/debian/changelog 2006-12-06 21:21:20 UTC (rev 2006)
@@ -1,3 +1,13 @@
+tetex-bin (3.0-26~1) unstable; urgency=low
+
+ * Hardcode the two possible TEXMFDIST paths in texdoctk. This makes it
+ work again if tetex-doc and one texlive-doc-* package are installed at
+ the same time. Thanks to Braun Gabor <braung at renyi.hu> for reporting
+ and Ralf Stubner <ralf.stubner at web.de> for ideas for fixing this
+ (closes: #400058)
+
+ -- Frank Küster <frank at debian.org> Wed, 6 Dec 2006 22:19:02 +0100
+
tetex-bin (3.0-25) unstable; urgency=low
* Simplify README.Debian, it now just points to tex-common's "TeX on
Modified: tetex-bin/trunk/debian/patches/README.patches
===================================================================
--- tetex-bin/trunk/debian/patches/README.patches 2006-12-06 20:59:45 UTC (rev 2005)
+++ tetex-bin/trunk/debian/patches/README.patches 2006-12-06 21:21:20 UTC (rev 2006)
@@ -7,6 +7,7 @@
Currently we have the following patches:
patch-xdvi-300109
+patch-xdvi-370505
patch-tmp
patch-texmfcnf
patch-texdoctk
@@ -64,9 +65,6 @@
2. patch-src
============
-texk/web2c/pdftexdir/writefont.c:
- check what happens if this is not done.
-
texk/dvipdfm/Makefile.in:
Use libpaper
@@ -81,6 +79,10 @@
- Add support for tetex-xwarn
- change some filenames
+- hardcode our double TEXMFDIST. This is an ugly, non-portable
+ solution, but it works, and prior to etch's release we probably
+ won't have time for anything more fancy. After etch, will we keep
+ supporting teTeX, anyway?
4. patch-texdoc
===============
@@ -93,8 +95,16 @@
texk/kpathsea/mktexnam:
add support for nonexistent TEXMFVAR
-- purpose of other patches?
+texk/tetex/epstopsf: From upstream (Heiko)
+texk/tetex/fmtutil:
+ From upstream, to allow jadetex find a newly generated latex.ltx
+
+texk/dvipsk/dvips.texi:
+texk/dvipsk/dvips.info:
+texk/dvipsk/dvips.1:
+ Document dvips bug...
+
6. patch-tds
============
@@ -120,3 +130,31 @@
display resolution. It seems to use the variable $deffont, without
making sure it is defined (as far as I understand).
See: #348513, #351558, #351559
+
+9. patch-xdvi-300109
+====================
+
+Patch that allows xdvi to read from file descriptors, instead of
+filenames (closes: #300109)
+
+10. patch-texmfcnf
+==================
+
+Probably nearly useless, since we don't use the generated texmf.cnf.
+The only thing that has an effect is the changed setting of TEXMFCNF
+(closes: #392195)
+
+11. patch-libtool
+=================
+Re-libtoolize with newer libtool to allow building for GNU/KFreeBSD,
+minimal patch thanks to Aurelien Jarno <aurel32 at debian.org> (closes:
+#320141).
+
+12. patch-lintian
+=================
+manpage cosmetics
+
+13. patch-poppler
+=================
+Use libpoppler instead of xpdf code
+
Modified: tetex-bin/trunk/debian/patches/patch-texdoctk
===================================================================
--- tetex-bin/trunk/debian/patches/patch-texdoctk 2006-12-06 20:59:45 UTC (rev 2005)
+++ tetex-bin/trunk/debian/patches/patch-texdoctk 2006-12-06 21:21:20 UTC (rev 2006)
@@ -1,10 +1,10 @@
- texk/tetex/texdoctk | 26 +++++++++++++++++++++++---
- 1 files changed, 23 insertions(+), 3 deletions(-)
+ texk/tetex/texdoctk | 51 ++++++++++++++++++++++++++++++++++++++-------------
+ 1 files changed, 38 insertions(+), 13 deletions(-)
-Index: tetex-bin-3.0/texk/tetex/texdoctk
+Index: trunk/texk/tetex/texdoctk
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/texdoctk 2006-03-02 14:46:40.000000000 +0100
-+++ tetex-bin-3.0/texk/tetex/texdoctk 2006-03-02 16:10:18.000000000 +0100
+--- trunk.orig/texk/tetex/texdoctk 2006-12-06 19:01:11.000000000 +0100
++++ trunk/texk/tetex/texdoctk 2006-12-06 21:38:41.000000000 +0100
@@ -9,11 +9,30 @@
# and the full disclaimer.
###############################################################################
@@ -37,6 +37,17 @@
my $IsWin32 = ($^O =~ /MSWin32/i);
#if ($IsWin32) {
+@@ -32,8 +51,8 @@
+ my $srchflag=0;
+ my $tmpfno;
+ # system variables
+-my ($texmfmain,$texmfdist,$texmfdoc,$texmflocal,$texmfhome,
+- $texdocpath,$distdocpath,$docdocpath,$localdocpath,$homedocpath,
++my ($texmfmain,$texmfdist_tetex,$texmfdist_texlive,$texmfdoc,$texmflocal,$texmfhome,
++ $texdocpath,$distdocpath_tetex,$distdocpath_texlive,$docdocpath,$localdocpath,$homedocpath,
+ $datadir,
+ $dvi_viewer,$dvips_conv,$ps_viewer,$pdf_viewer,
+ $pdfps_conv,$html_viewer,$htmlps_conv,$htmlps_redir,
@@ -42,7 +61,7 @@
# defaults: unix values
my $qq="'";
@@ -55,6 +66,15 @@
my $sysrc=`kpsewhich --progname=texdoctk --format=${qq}other text files${qq} ${TeXDocRcDefaults}`;
my $database=`kpsewhich --progname=texdoctk --format=${qq}other text files${qq} texdoctk.dat`;
my $locdatabase=`kpsewhich --progname=texdoctk --format=${qq}other text files${qq} texdoctk-local.dat`;
+@@ -637,7 +656,7 @@
+ sub finddoc {
+ my($slcdoc,$slc,$parframe)=@_;
+ my ($dummy,$status);
+- SLCDOCFIND: foreach ($texdocpath,$distdocpath,$docdocpath) {
++ SLCDOCFIND: foreach ($texdocpath,$distdocpath_tetex,$distdocpath_texlive,$docdocpath) {
+ $slcdoc="$_/$slc";
+ if (-e $slcdoc) {
+ # found where it should be
@@ -692,6 +711,7 @@
$slcdoc="";
return $slcdoc;
@@ -63,3 +83,50 @@
last CMPREND;
}
}
+@@ -720,7 +740,8 @@
+ my $found=0;
+ if ($docselect =~ /\.sty$/) {
+ STYPATH: foreach my $fullpath ("$texmfmain/tex/$docselect",
+- "$texmfdist/tex/$docselect",
++ "$texmfdist_tetex/tex/$docselect",
++ "$texmfdist_texlive/tex/$docselect",
+ "$texmflocal/tex/$docselect",
+ "$texmfhome/tex/$docselect") {
+ if (-e $fullpath) {
+@@ -733,7 +754,8 @@
+ &popmsg(2,"Selected file:\n$docselect\ndoes not exist.",$tpbframe) }
+ } else {
+ DOCPATH: foreach my $fullpath ("$texdocpath/$docselect",
+- "$distdocpath/$docselect",
++ "$distdocpath_tetex/$docselect",
++ "$distdocpath_texlive/$docselect",
+ "$docdocpath/$docselect",
+ "$localdocpath/$docselect",
+ "$homedocpath/$docselect") {
+@@ -949,7 +971,8 @@
+ -fill=>'x',
+ -expand=>1);
+ my $docframestring="\nDistribution documentation root path(s):\n$texdocpath";
+- $docframestring.=", $distdocpath" if (-e $distdocpath);
++ $docframestring.=", $distdocpath_tetex" if (-e $distdocpath_tetex);
++ $docframestring.=", $distdocpath_texlive" if (-e $distdocpath_texlive);
+ $docframestring.=", $docdocpath" if (length $docdocpath);
+ if ($localdocpath && $localdocpath ne $texdocpath) {
+ $docframestring.="\nLocal documentation root path: $localdocpath\n";
+@@ -1535,10 +1558,12 @@
+ $texmfmain=`kpsewhich --expand-path=${qq}\$TEXMFMAIN${qq}`;
+ chomp $texmfmain;
+ $texdocpath="$texmfmain/$texdocpath";
+- $texmfdist=`kpsewhich --expand-path=${qq}\$TEXMFDIST${qq}`;
+- chomp $texmfdist;
+- $distdocpath=join('/',"$texmfdist",basename($texdocpath,""))
+- if (length $texmfdist);
++# $texmfdist=`kpsewhich --expand-path=${qq}\$TEXMFDIST${qq}`;
++# chomp $texmfdist;
++ $distdocpath_tetex=join('/',"$texmfdist_tetex",basename($texdocpath,""))
++ if (length $texmfdist_tetex);
++ $distdocpath_texlive=join('/',"$texmfdist_texlive",basename($texdocpath,""))
++ if (length $texmfdist_texlive);
+ # TeXLive has this texmf-doc
+ $texmfdoc=join('/',"$texmfmain-doc",basename($texdocpath,""));
+ if (-e $texmfdoc) {
Modified: tetex-bin/trunk/debian/patches/patch-texdoctk-tmp
===================================================================
--- tetex-bin/trunk/debian/patches/patch-texdoctk-tmp 2006-12-06 20:59:45 UTC (rev 2005)
+++ tetex-bin/trunk/debian/patches/patch-texdoctk-tmp 2006-12-06 21:21:20 UTC (rev 2006)
@@ -1,6 +1,11 @@
---- tetex-bin-3.0.orig/texk/tetex/texdoctk 2006/02/05 17:08:01 1.1
-+++ tetex-bin-3.0/texk/tetex/texdoctk 2006/02/05 17:08:17
-@@ -1690,7 +1690,7 @@
+ texk/tetex/texdoctk | 2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+Index: trunk/texk/tetex/texdoctk
+===================================================================
+--- trunk.orig/texk/tetex/texdoctk 2006-12-06 21:38:41.000000000 +0100
++++ trunk/texk/tetex/texdoctk 2006-12-06 21:45:29.000000000 +0100
+@@ -1695,7 +1695,7 @@
my @deffont=$Qbut->configure(-font);
# ensure readability on high-res screens (suggested by R.Kotucha)
$deffont='Helvetica -16 bold' if &x_resolution > 1200;
More information about the Debian-tex-commits
mailing list