[subversion-commit] SVN tetex commit + diffs: r405 - in
tetex-bin/trunk/debian: . patches
Julian Gilbey
jdg at costa.debian.org
Tue Dec 13 21:39:32 UTC 2005
Author: jdg
Date: 2005-12-13 21:39:31 +0000 (Tue, 13 Dec 2005)
New Revision: 405
Modified:
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/patches/patch-deb
tetex-bin/trunk/debian/patches/patch-poppler
Log:
* {texconfig,fmtutil,updmap}-sys: improve handling to avoid spurious
warnings when fmtutil is called from texconfig-sys (Closes: #343172)
* fmtutil: change $scriptname back to $progname to simplify patch
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2005-12-13 15:21:53 UTC (rev 404)
+++ tetex-bin/trunk/debian/changelog 2005-12-13 21:39:31 UTC (rev 405)
@@ -1,3 +1,11 @@
+tetex-bin (3.0-13) UNRELEASED; urgency=low
+
+ * {texconfig,fmtutil,updmap}-sys: improve handling to avoid spurious
+ warnings when fmtutil is called from texconfig-sys (Closes: #343172)
+ * fmtutil: change $scriptname back to $progname to simplify patch
+
+ -- Julian Gilbey <jdg at debian.org> Tue, 13 Dec 2005 21:37:58 +0000
+
tetex-bin (3.0-12) unstable; urgency=low
* Because of the frequent security issues with xpdf, we do no longer use
Modified: tetex-bin/trunk/debian/patches/patch-deb
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb 2005-12-13 15:21:53 UTC (rev 404)
+++ tetex-bin/trunk/debian/patches/patch-deb 2005-12-13 21:39:31 UTC (rev 405)
@@ -1,22 +1,23 @@
- configure | 13 +++++++------
- texk/kpathsea/mktexlsr | 17 +++++------------
- texk/make/paths.mk | 2 +-
- texk/tetex/Makefile.in | 4 ++--
- texk/tetex/fmtutil | 33 +++++++++++++++++++++++++++++++--
- texk/tetex/fmtutil-sys | 3 ++-
- texk/tetex/fmtutil.man | 17 +++++++++++++++++
- texk/tetex/texconfig | 5 +++--
- texk/tetex/updmap | 45 +++++++++++++++++++++++++++++++++++++++++++--
- texk/tetex/updmap-sys | 3 ++-
- texk/tetex/updmap.man | 33 +++++++++++++++++++++++++--------
- texk/web2c/cwebdir/cweb.1 | 10 +++++-----
- texk/web2c/fmtutil.in | 2 +-
- 13 files changed, 144 insertions(+), 43 deletions(-)
+ configure | 13 +++++----
+ texk/kpathsea/mktexlsr | 17 +++---------
+ texk/make/paths.mk | 2 -
+ texk/tetex/Makefile.in | 4 +-
+ texk/tetex/fmtutil | 55 ++++++++++++++++++++++++++++++++++++++--
+ texk/tetex/fmtutil-sys | 9 +++++-
+ texk/tetex/fmtutil.man | 17 ++++++++++++
+ texk/tetex/texconfig | 5 ++-
+ texk/tetex/texconfig-sys | 3 +-
+ texk/tetex/updmap | 62 ++++++++++++++++++++++++++++++++++++++++++++--
+ texk/tetex/updmap-sys | 3 +-
+ texk/tetex/updmap.man | 33 ++++++++++++++++++------
+ texk/web2c/cwebdir/cweb.1 | 10 +++----
+ texk/web2c/fmtutil.in | 2 -
+ 14 files changed, 189 insertions(+), 46 deletions(-)
-Index: tetex-bin-3.0/configure
+Index: tetex-bin/configure
===================================================================
---- tetex-bin-3.0.orig/configure 2005-11-14 13:28:15.731792944 +0100
-+++ tetex-bin-3.0/configure 2005-11-14 13:33:42.441125576 +0100
+--- tetex-bin.orig/configure 2005-12-13 21:32:02.000000000 +0000
++++ tetex-bin/configure 2005-12-13 21:32:18.000000000 +0000
@@ -4213,12 +4213,13 @@
@@ -37,10 +38,10 @@
# more customizations for standalone xdvik
if test -z "$xdvik_standalone"; then
-Index: tetex-bin-3.0/texk/kpathsea/mktexlsr
+Index: tetex-bin/texk/kpathsea/mktexlsr
===================================================================
---- tetex-bin-3.0.orig/texk/kpathsea/mktexlsr 2005-11-14 13:28:15.731792944 +0100
-+++ tetex-bin-3.0/texk/kpathsea/mktexlsr 2005-11-14 13:33:42.441125576 +0100
+--- tetex-bin.orig/texk/kpathsea/mktexlsr 2005-12-13 21:32:02.000000000 +0000
++++ tetex-bin/texk/kpathsea/mktexlsr 2005-12-13 21:32:18.000000000 +0000
@@ -103,9 +103,9 @@
db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
@@ -81,10 +82,10 @@
done
tty -s && echo "$progname: Done." >&2
exit 0
-Index: tetex-bin-3.0/texk/make/paths.mk
+Index: tetex-bin/texk/make/paths.mk
===================================================================
---- tetex-bin-3.0.orig/texk/make/paths.mk 2005-11-14 13:28:15.731792944 +0100
-+++ tetex-bin-3.0/texk/make/paths.mk 2005-11-14 13:33:42.441125576 +0100
+--- tetex-bin.orig/texk/make/paths.mk 2005-12-13 21:32:02.000000000 +0000
++++ tetex-bin/texk/make/paths.mk 2005-12-13 21:32:18.000000000 +0000
@@ -47,7 +47,7 @@
texmf = @texmfmain@
@@ -94,10 +95,10 @@
# Regular input files.
texinputdir = $(texmf)/tex
-Index: tetex-bin-3.0/texk/tetex/Makefile.in
+Index: tetex-bin/texk/tetex/Makefile.in
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/Makefile.in 2005-11-14 13:28:15.731792944 +0100
-+++ tetex-bin-3.0/texk/tetex/Makefile.in 2005-11-14 13:33:42.442125424 +0100
+--- tetex-bin.orig/texk/tetex/Makefile.in 2005-12-13 21:32:02.000000000 +0000
++++ tetex-bin/texk/tetex/Makefile.in 2005-12-13 21:32:18.000000000 +0000
@@ -35,7 +35,7 @@
# Auxiliary files.
@@ -116,10 +117,10 @@
done
$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/texconfig $(texmf)/texconfig/g $(texmf)/texconfig/v $(texmf)/texconfig/x
$(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
-Index: tetex-bin-3.0/texk/tetex/texconfig
+Index: tetex-bin/texk/tetex/texconfig
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/texconfig 2005-11-14 13:28:15.731792944 +0100
-+++ tetex-bin-3.0/texk/tetex/texconfig 2005-11-14 13:33:42.442125424 +0100
+--- tetex-bin.orig/texk/tetex/texconfig 2005-12-13 21:32:02.000000000 +0000
++++ tetex-bin/texk/tetex/texconfig 2005-12-13 21:32:18.000000000 +0000
@@ -883,8 +883,8 @@
faq)
@@ -139,10 +140,10 @@
else
echo "$progname: setting up vardir failed. Reason: no permission to write file \`$tfc'" >&2
rc=1
-Index: tetex-bin-3.0/texk/tetex/fmtutil
+Index: tetex-bin/texk/tetex/fmtutil
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/fmtutil 2005-11-14 13:28:15.732792792 +0100
-+++ tetex-bin-3.0/texk/tetex/fmtutil 2005-11-14 13:33:42.443125272 +0100
+--- tetex-bin.orig/texk/tetex/fmtutil 2005-12-13 21:32:02.000000000 +0000
++++ tetex-bin/texk/tetex/fmtutil 2005-12-13 21:32:18.000000000 +0000
@@ -25,7 +25,13 @@
# --cnffile file set configfile for fmtutil
# --fmtdir directory set destination directory for format files
@@ -158,13 +159,17 @@
###############################################################################
# program history:
# Sa Jan 15 18:13:46 CET 2005 avoid multiple variable assignments in one statement
-@@ -76,14 +82,40 @@
+@@ -76,14 +82,44 @@
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-progname=fmtutil
-argv0=$0
-+: ${scriptname:=fmtutil}
++case $RUNNING_AS_SYS in
++ "") progname=fmtutil ;;
++ *) progname=fmtutil-sys ;;
++esac
++
+: ${argv0:=$0}
+export argv0
+
@@ -181,11 +186,11 @@
+ if [ "$1" = "--root-home" ]; then
+ shift
+ echo >&2
-+ echo "$scriptname: Option --root-home given," >&2
++ echo "$progname: Option --root-home given," >&2
+ echo "generating formats in /root/.texmf-var." >&2
+ echo >&2
+ else
-+ if [ ! "$scriptname" = "fmtutil-sys" ]; then
++ if [ ! "$progname" = "fmtutil-sys" ]; then
+ echo >&2
+ echo "Warning: fmtutil is being run as root; fmtutil-sys should probably be" >&2
+ echo "used instead. If this is done by a Debian package upon installation," >&2
@@ -201,102 +206,9 @@
# cleanup()
# clean up the temp area and exit with proper exit status
###############################################################################
-@@ -222,7 +254,7 @@
- version()
- {
- cat <<eof
--$progname version $version.
-+$scriptname version $version.
- eof
- true
- cleanup
-@@ -234,7 +266,7 @@
- ###############################################################################
- abort()
- {
-- echo "$progname: $1." >&2
-+ echo "$scriptname: $1." >&2
- false # some systems need this to set nonzero $?
- cleanup
+@@ -885,5 +921,18 @@
}
-@@ -258,7 +290,7 @@
- cat <<eof
- ###############################################################################
--$progname: Error! Not all formats have been built successfully.
-+$scriptname: Error! Not all formats have been built successfully.
- Visit the log files in directory
- $destdir
- for details.
-@@ -357,7 +389,7 @@
- need_find_hyphenfile=false
- cfgparam=
- cfgmaint=
-- tmpdir=${TMP-/tmp}/$progname.$$
-+ tmpdir=${TMP-/tmp}/$scriptname.$$
- verboseFlag=true
-
- # mktexfmtMode: if called as mktexfmt, set to true. Will echo the generated
-@@ -435,7 +467,7 @@
- --test|--dolinks|--force)
- ;;
- "") break;;
-- *) abort "$progname: unknown option \`$1'. Try $progname --help for help";;
-+ *) abort "$scriptname: unknown option \`$1'. Try $scriptname --help for help";;
- esac
- do test $# -gt 0 && shift; done
-
-@@ -455,7 +487,7 @@
- test $? = 0 || cleanup
- set x $co; shift
- id=$1; cnf_file=$3; orig=$4
-- verboseMsg "$progname: initial config file is \`$orig'"
-+ verboseMsg "$scriptname: initial config file is \`$orig'"
- fi
- else
- if test -z "$cfgparam"; then
-@@ -491,9 +523,9 @@
- ci=`tcfmgr --tmp $tmpdir --cmd ci --id $id`
- if test $? = 0; then
- if test -n "$ci"; then
-- verboseMsg "$progname: configuration file updated: \`$ci'"
-+ verboseMsg "$scriptname: configuration file updated: \`$ci'"
- else
-- verboseMsg "$progname: configuration file unchanged."
-+ verboseMsg "$scriptname: configuration file unchanged."
- fi
- else
- abort "failed to update configuration file."
-@@ -566,7 +598,7 @@
-
- # We don't want user-interaction for the following "mv" command:
- if mv "$i" "$destdir/$i" </dev/null; then
-- verboseMsg "$progname: $destdir/$i installed."
-+ verboseMsg "$scriptname: $destdir/$i installed."
- $mktexfmtMode && echo "$destdir/$i"
- fi
- mktexupd "$destdir" "$i"
-@@ -674,7 +706,7 @@
- test -n "$pool" \
- && poolfile=`(kpsewhich -progname=$engine $pool.pool) 2>/dev/null`
- if test -n "$poolfile" && test -f "$poolfile"; then
-- verboseMsg "$progname: attempting to create localized format using pool=$pool and tcx=$tcx."
-+ verboseMsg "$scriptname: attempting to create localized format using pool=$pool and tcx=$tcx."
- cp "$poolfile" $engine.pool
- test -n "$tcx" && tcxflag=-translate-file=$tcx
- localpool=true
-@@ -690,7 +722,7 @@
- esac
-
- rm -f $fmtfile
-- verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
-+ verboseMsg "$scriptname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
-
- # run in a subshell to get a local effect of TEXPOOL manipulation:
- (
-@@ -885,5 +917,18 @@
- }
-
main ${1+"$@"}
+
+###############################################################################
@@ -313,17 +225,17 @@
+
true
cleanup
-Index: tetex-bin-3.0/texk/tetex/fmtutil-sys
+Index: tetex-bin/texk/tetex/fmtutil-sys
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/fmtutil-sys 2005-11-14 13:28:15.732792792 +0100
-+++ tetex-bin-3.0/texk/tetex/fmtutil-sys 2005-11-14 13:33:49.810005336 +0100
+--- tetex-bin.orig/texk/tetex/fmtutil-sys 2005-12-13 21:32:02.000000000 +0000
++++ tetex-bin/texk/tetex/fmtutil-sys 2005-12-13 21:32:18.000000000 +0000
@@ -23,6 +23,11 @@
TEXMFVAR="$v"
TEXMFCONFIG="$c"
-export TEXMFVAR TEXMFCONFIG
-+scriptname=fmtutil-sys
-+export TEXMFVAR TEXMFCONFIG scriptname
++RUNNING_AS_SYS=true
++export TEXMFVAR TEXMFCONFIG RUNNING_AS_SYS
-exec fmtutil ${1+"$@"}
+if [ "$argv0" = "mktexfmt" ]; then
@@ -331,10 +243,10 @@
+else
+ exec fmtutil ${1+"$@"}
+fi
-Index: tetex-bin-3.0/texk/tetex/fmtutil.man
+Index: tetex-bin/texk/tetex/fmtutil.man
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/fmtutil.man 2005-11-14 13:28:15.732792792 +0100
-+++ tetex-bin-3.0/texk/tetex/fmtutil.man 2005-11-14 13:33:42.443125272 +0100
+--- tetex-bin.orig/texk/tetex/fmtutil.man 2005-12-13 21:32:02.000000000 +0000
++++ tetex-bin/texk/tetex/fmtutil.man 2005-12-13 21:32:18.000000000 +0000
@@ -41,6 +41,14 @@
.IP "\fB--cnffile\fP \fIfile\fP"
specify the configuration
@@ -366,10 +278,10 @@
.PP
.SH "FILES"
.PP
-Index: tetex-bin-3.0/texk/web2c/fmtutil.in
+Index: tetex-bin/texk/web2c/fmtutil.in
===================================================================
---- tetex-bin-3.0.orig/texk/web2c/fmtutil.in 2005-11-14 13:28:15.732792792 +0100
-+++ tetex-bin-3.0/texk/web2c/fmtutil.in 2005-11-14 13:33:42.444125120 +0100
+--- tetex-bin.orig/texk/web2c/fmtutil.in 2005-12-13 21:32:02.000000000 +0000
++++ tetex-bin/texk/web2c/fmtutil.in 2005-12-13 21:32:18.000000000 +0000
@@ -55,7 +55,7 @@
# Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
@@ -379,10 +291,10 @@
# Change "pdfamstex.ini -> pdfbamstex.ini" and "- -> language.dat"
# if you want babel support in pdfamstex:
-Index: tetex-bin-3.0/texk/web2c/cwebdir/cweb.1
+Index: tetex-bin/texk/web2c/cwebdir/cweb.1
===================================================================
---- tetex-bin-3.0.orig/texk/web2c/cwebdir/cweb.1 2005-11-14 13:28:15.732792792 +0100
-+++ tetex-bin-3.0/texk/web2c/cwebdir/cweb.1 2005-11-14 13:33:42.444125120 +0100
+--- tetex-bin.orig/texk/web2c/cwebdir/cweb.1 2005-12-13 21:32:02.000000000 +0000
++++ tetex-bin/texk/web2c/cwebdir/cweb.1 2005-12-13 21:32:18.000000000 +0000
@@ -100,19 +100,19 @@
.
.SH FILES
@@ -408,10 +320,10 @@
Directory for cweb "include" files.
.
.SH "SEE ALSO"
-Index: tetex-bin-3.0/texk/tetex/updmap.man
+Index: tetex-bin/texk/tetex/updmap.man
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/updmap.man 2005-11-14 13:28:15.732792792 +0100
-+++ tetex-bin-3.0/texk/tetex/updmap.man 2005-11-14 13:33:42.444125120 +0100
+--- tetex-bin.orig/texk/tetex/updmap.man 2005-12-13 21:32:02.000000000 +0000
++++ tetex-bin/texk/tetex/updmap.man 2005-12-13 21:32:18.000000000 +0000
@@ -32,11 +32,18 @@
line, \fBupdmap\fP will write generated map files to a directory of
your choosing (via one of the \fB--*outputdir\fP options), or automatically
@@ -483,10 +395,10 @@
\fBgsftopk\fP(1), \fBpdftex\fP(1), \fBps2pk\fP(1),
\fBtexhash\fP(1), \fBxdvi\fP(1)\&.
.PP
-Index: tetex-bin-3.0/texk/tetex/updmap
+Index: tetex-bin/texk/tetex/updmap
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/updmap 2005-11-14 13:33:42.368136672 +0100
-+++ tetex-bin-3.0/texk/tetex/updmap 2005-11-14 13:33:42.445124968 +0100
+--- tetex-bin.orig/texk/tetex/updmap 2005-12-13 21:32:18.000000000 +0000
++++ tetex-bin/texk/tetex/updmap 2005-12-13 21:32:18.000000000 +0000
@@ -15,6 +15,8 @@
# --nohash do not run texhash
# --nomkmap do not recreate map files
@@ -496,7 +408,7 @@
#
# Valid commands:
# --edit edit $cnfFileShort file
-@@ -112,10 +114,38 @@
+@@ -112,9 +114,40 @@
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
# the version string
@@ -504,12 +416,15 @@
+version=1107552857-debian # seconds since `00:00:00 1970-01-01 UTC'
# date '+%s' (with GNU date)
- ###############################################################################
++case $RUNNING_AS_SYS in
++ "") progname=updmap ;;
++ *) progname=updmap-sys ;;
++esac
++
++###############################################################################
+# Debian hack, needed until depending packages have switched to
+# calling updmap-sys
+###############################################################################
-+: progname=${progname:=updmap}
-+
+if [ `id -u` -eq 0 ]; then
+ if [ "$1" = "--root-home" ]; then
+ shift
@@ -532,11 +447,10 @@
+
+
+
-+###############################################################################
+ ###############################################################################
# help()
# display help message and exit
- ###############################################################################
-@@ -317,6 +347,8 @@
+@@ -317,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).
###############################################################################
@@ -545,7 +459,7 @@
setOption()
{
opt=$1
-@@ -351,6 +383,8 @@
+@@ -351,6 +386,8 @@
# enableMap (type, map)
# enables an entry in the config file for map with a given type.
###############################################################################
@@ -554,7 +468,7 @@
enableMap()
{
case $1 in
-@@ -373,6 +407,8 @@
+@@ -373,6 +410,8 @@
# disableMap (map)
# disables map in config file (any type)
###############################################################################
@@ -563,7 +477,7 @@
disableMap()
{
#mapType=`awk '($1 == "MixedMap" || $1 == "Map") && $2 == map { print $1 }' \
-@@ -385,6 +421,11 @@
+@@ -385,6 +424,11 @@
}
###############################################################################
@@ -575,7 +489,7 @@
# psADOBE()
# transform fontnames from URW to Adobe
###############################################################################
-@@ -1274,7 +1315,8 @@
+@@ -1274,7 +1318,8 @@
main()
{
# initialize global variables
@@ -585,7 +499,7 @@
cmd=
log=
-@@ -1375,4 +1417,17 @@
+@@ -1375,4 +1420,17 @@
}
main ${1+"$@"}
@@ -603,16 +517,29 @@
+fi
+
cleanup
-Index: tetex-bin-3.0/texk/tetex/updmap-sys
+Index: tetex-bin/texk/tetex/updmap-sys
===================================================================
---- tetex-bin-3.0.orig/texk/tetex/updmap-sys 2005-11-14 13:28:15.732792792 +0100
-+++ tetex-bin-3.0/texk/tetex/updmap-sys 2005-11-14 13:33:42.445124968 +0100
+--- tetex-bin.orig/texk/tetex/updmap-sys 2005-12-13 21:32:02.000000000 +0000
++++ tetex-bin/texk/tetex/updmap-sys 2005-12-13 21:32:18.000000000 +0000
@@ -23,6 +23,7 @@
TEXMFVAR="$v"
TEXMFCONFIG="$c"
-export TEXMFVAR TEXMFCONFIG
-+progname=updmap-sys
-+export TEXMFVAR TEXMFCONFIG progname
++RUNNING_AS_SYS=true
++export TEXMFVAR TEXMFCONFIG RUNNING_AS_SYS
exec updmap ${1+"$@"}
+Index: tetex-bin/texk/tetex/texconfig-sys
+===================================================================
+--- tetex-bin.orig/texk/tetex/texconfig-sys 2005-12-13 21:32:02.000000000 +0000
++++ tetex-bin/texk/tetex/texconfig-sys 2005-12-13 21:32:18.000000000 +0000
+@@ -23,6 +23,7 @@
+
+ TEXMFVAR="$v"
+ TEXMFCONFIG="$c"
+-export TEXMFVAR TEXMFCONFIG
++RUNNING_AS_SYS=true
++export TEXMFVAR TEXMFCONFIG RUNNING_AS_SYS
+
+ exec texconfig ${1+"$@"}
Modified: tetex-bin/trunk/debian/patches/patch-poppler
===================================================================
--- tetex-bin/trunk/debian/patches/patch-poppler 2005-12-13 15:21:53 UTC (rev 404)
+++ tetex-bin/trunk/debian/patches/patch-poppler 2005-12-13 21:39:31 UTC (rev 405)
@@ -1,6 +1,7 @@
-diff -Nur tetex-bin-3.0/texk/web2c/pdftexdir/depend.mk tetex-bin-3.0.new/texk/web2c/pdftexdir/depend.mk
---- tetex-bin-3.0/texk/web2c/pdftexdir/depend.mk 2004-03-09 12:20:12.000000000 +0100
-+++ tetex-bin-3.0.new/texk/web2c/pdftexdir/depend.mk 2005-12-09 19:08:15.000000000 +0100
+Index: tetex-bin/texk/web2c/pdftexdir/depend.mk
+===================================================================
+--- tetex-bin.orig/texk/web2c/pdftexdir/depend.mk 2005-12-10 20:32:30.000000000 +0000
++++ tetex-bin/texk/web2c/pdftexdir/depend.mk 2005-12-13 21:08:53.000000000 +0000
@@ -1,54 +1,4 @@
-epdf.o: epdf.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
@@ -60,9 +61,10 @@
+ ../../kpathsea/c-proto.h ../../web2c/c-auto.h ../../web2c/config.h \
+ ../../kpathsea/c-fopen.h ../../web2c/pdftexdir/ptexmac.h
+pdftosrc.o: pdftosrc.cc
-diff -Nur tetex-bin-3.0/texk/web2c/pdftexdir/pdftoepdf.cc tetex-bin-3.0.new/texk/web2c/pdftexdir/pdftoepdf.cc
---- tetex-bin-3.0/texk/web2c/pdftexdir/pdftoepdf.cc 2005-02-03 17:16:39.000000000 +0100
-+++ tetex-bin-3.0.new/texk/web2c/pdftexdir/pdftoepdf.cc 2005-12-09 19:08:15.000000000 +0100
+Index: tetex-bin/texk/web2c/pdftexdir/pdftoepdf.cc
+===================================================================
+--- tetex-bin.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2005-12-10 20:32:30.000000000 +0000
++++ tetex-bin/texk/web2c/pdftexdir/pdftoepdf.cc 2005-12-13 21:08:53.000000000 +0000
@@ -26,22 +26,22 @@
#include <stdio.h>
#include <string.h>
@@ -138,9 +140,10 @@
LinkDest *link = pdf_doc->doc->findDest(&name);
if (link == 0 || !link->isOk())
pdftex_fail("pdf inclusion: invalid destination <%s>",
-diff -Nur tetex-bin-3.0/texk/web2c/pdftexdir/pdftosrc.cc tetex-bin-3.0.new/texk/web2c/pdftexdir/pdftosrc.cc
---- tetex-bin-3.0/texk/web2c/pdftexdir/pdftosrc.cc 2004-03-22 21:39:54.000000000 +0100
-+++ tetex-bin-3.0.new/texk/web2c/pdftexdir/pdftosrc.cc 2005-12-09 19:08:15.000000000 +0100
+Index: tetex-bin/texk/web2c/pdftexdir/pdftosrc.cc
+===================================================================
+--- tetex-bin.orig/texk/web2c/pdftexdir/pdftosrc.cc 2005-12-10 20:32:30.000000000 +0000
++++ tetex-bin/texk/web2c/pdftexdir/pdftosrc.cc 2005-12-13 21:08:53.000000000 +0000
@@ -25,21 +25,21 @@
#include <stdio.h>
#include <string.h>
@@ -198,10 +201,11 @@
doc = new PDFDoc(fileName);
if (!doc->isOk()) {
fprintf(stderr, "Invalid PDF file\n");
-diff -Nur tetex-bin-3.0/configure tetex-bin-3.0.new/configure
---- tetex-bin-3.0/configure 2005-02-06 19:27:03.000000000 +0100
-+++ tetex-bin-3.0.new/configure 2005-12-12 10:12:35.000000000 +0100
-@@ -3292,9 +3236,9 @@
+Index: tetex-bin/configure
+===================================================================
+--- tetex-bin.orig/configure 2005-12-13 21:08:52.000000000 +0000
++++ tetex-bin/configure 2005-12-13 21:08:53.000000000 +0000
+@@ -3292,9 +3292,9 @@
# we need libxpdf for pdf[ex]tex
test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
@@ -214,9 +218,10 @@
: ${needs_libxpdf=no}
export needs_libxpdf
-diff -Nur tetex-bin-3.0/configure.in tetex-bin-3.0.new/configure.in
---- tetex-bin-3.0/configure.in 2005-02-01 22:59:46.000000000 +0100
-+++ tetex-bin-3.0.new/configure.in 2005-12-12 10:05:59.000000000 +0100
+Index: tetex-bin/configure.in
+===================================================================
+--- tetex-bin.orig/configure.in 2005-12-10 20:32:59.000000000 +0000
++++ tetex-bin/configure.in 2005-12-13 21:08:53.000000000 +0000
@@ -145,9 +145,9 @@
# we need libxpdf for pdf[ex]tex
@@ -229,3 +234,4 @@
+test "$with_pdfxtex" != no && : ${needs_libxpdf=no}
: ${needs_libxpdf=no}
export needs_libxpdf
+
More information about the Pkg-tetex-commits
mailing list