[subversion-commit] SVN tetex commit + diffs: r132 - in
tetex-base/trunk/debian: . patches
Frank Küster
frank at costa.debian.org
Tue Aug 16 15:04:54 UTC 2005
Author: frank
Date: 2005-08-16 15:04:53 +0000 (Tue, 16 Aug 2005)
New Revision: 132
Modified:
tetex-base/trunk/debian/control
tetex-base/trunk/debian/patches/patch-deb
tetex-base/trunk/debian/patches/patch-deb.old
tetex-base/trunk/debian/rules
tetex-base/trunk/debian/rules.in
Log:
- [rules.in] properly create stampdir *before* calling patch-stamp
- [control] Build-depend on tex-common again, we don't need it for common.*, that's right, but we do need it for dsf-patch.mk
- [patch-deb*]: resurrect the patch which somehow got empty
Modified: tetex-base/trunk/debian/control
===================================================================
--- tetex-base/trunk/debian/control 2005-08-16 14:58:37 UTC (rev 131)
+++ tetex-base/trunk/debian/control 2005-08-16 15:04:53 UTC (rev 132)
@@ -1,7 +1,7 @@
Source: tetex-base
Section: tex
Priority: optional
-Build-Depends-Indep: debhelper (>= 4.1.16), eperl, sharutils
+Build-Depends-Indep: debhelper (>= 4.1.16), eperl, sharutils, tex-common
Maintainer: teTeX maintainers <debian-tetex-maint at lists.debian.org>
Uploaders: Julian Gilbey <jdg at debian.org>, C.M. Connelly <cmc at debian.org>, Atsuhito KOHDA <kohda at debian.org>, Frank Küster <frank at debian.org>
Standards-Version: 3.5.6
Modified: tetex-base/trunk/debian/patches/patch-deb
===================================================================
--- tetex-base/trunk/debian/patches/patch-deb 2005-08-16 14:58:37 UTC (rev 131)
+++ tetex-base/trunk/debian/patches/patch-deb 2005-08-16 15:04:53 UTC (rev 132)
@@ -0,0 +1,217 @@
+--- dvips/config/config.ps.orig 2005-07-22 16:24:24.591031133 +0200
++++ dvips/config/config.ps 2005-07-22 16:24:24.723017144 +0200
+@@ -7,13 +7,19 @@
+ % to determine this number. (It will be the only thing printed.)
+ m 3500000
+
+-% z1 is "secure", i.e., inhibits execution of `shell commands` in
+-% \specials. Dvips allows this by default.
++% A setting of `z1' inhibits execution of shell commands in `\special's
++% and via the `E' option in config files like this one ("secure mode").
++% Dvips permits these operations by default or with an explit setting of `z0'.
++% Debian GNU/Linux inhibits these operations by default with the setting `z1' here.
+ z1
+
+-% How to print, maybe with lp instead lpr, etc. If commented-out, output
+-% will go into a file by default.
+-o |lpr
++% Where dvips output should go by default. If unspecified, output goes to a file.
++% To send output via a pipe directly to a printing program such as `lpr' or 'lp',
++% use a line like one of the following two:
++% o |lpr
++% o |lpr -Pmyprinter
++% To send output to standard-output by default, use:
++% o -
+
+ % Default resolution of this device, in dots per inch.
+ D 600
+--- texdoctk/texdocrc.defaults.orig 2005-07-22 16:24:24.594030815 +0200
++++ texdoctk/texdocrc.defaults 2005-07-22 16:24:24.723017144 +0200
+@@ -8,7 +8,7 @@
+ # want/need to leave empty.
+
+ # root of doc directory (from $TEXMFMAIN)
+-TEXDOCPATH=doc
++TEXDOCPATH=../doc/texmf
+ # root of local doc directory (from $TEXMFLOCAL)
+ # can be left empty if equal to TEXDOCPATH or if $TEXMFLOCAL is undefined
+ LOCALDOCPATH=
+@@ -26,28 +26,28 @@
+ DVIPS_CONV=dvips -q
+
+ # PostScript handling
+-PS_VIEWER=ghostview
++PS_VIEWER=see
+
+ # PDF handling
+-PDF_VIEWER=acroread
+-PDFPS_CONV=acroread -toPostScript -pairs
++PDF_VIEWER=see
++PDFPS_CONV=pdf2ps
+
+ # HTML handling
+-HTML_VIEWER=netscape
+-HTMLPS_CONV=
++HTML_VIEWER=x-terminal-emulator -e see
++HTMLPS_CONV=html2ps
+ # HTMLPS_REDIR must be on, if the html->ps converter normally writes its output
+ # to stdout instead of a file (e.g. as html2ps) (y or yes to make active)
+-HTMLPS_REDIR=
++HTMLPS_REDIR=y
+
+ # Plain text handling
+ # TDK_OWN is texdoctk's own text file viewer
+ TXT_VIEWER=TDK_OWN
+-TXTPS_CONV=a2ps
++TXTPS_CONV=a2ps -q
+ # TXTPS_REDIR must be on, if the txt->ps converter normally writes its output
+ # to stdout instead of a file (e.g. as a2ps) (y or yes to make active)
+ TXTPS_REDIR=yes
+
+ # printer
+-PRINT_CMD=lpr -Plp
++PRINT_CMD=lpr -h
+
+ # end of config
+--- web2c/mktex.cnf.orig 2005-07-22 16:24:24.612028908 +0200
++++ web2c/mktex.cnf 2005-07-22 16:24:24.724017038 +0200
+@@ -1,5 +1,5 @@
+ : ${MT_FEATURES=appendonlydir:varfonts}
+-: ${MODE=ljfour}
+-: ${BDPI=600}
++#: ${MODE=ljfour}
++#: ${BDPI=600}
+ # uncomment the following line to use ps2pk instead of gsftopk:
+ # : ${ps_to_pk=ps2pk}
+--- tex/generic/config/language.dat.orig 2005-07-22 16:24:24.623027742 +0200
++++ tex/generic/config/language.dat 2005-07-22 16:24:24.725016932 +0200
+@@ -5,6 +5,16 @@
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++%% To make it possible for package scripts to parse this file,
++%% please use only "%! " to comment out hyphenation patterns!
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++% Do not modify the following line!
++% -_- DebPkgProvidedMaps -_-
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ % CAUTION: the first language will be the default if no style-file
+ % (e.g. german.sty) is used.
+ % Since version 3.0 of TeX, hyphenation patterns for multiple languages are
+@@ -15,7 +25,7 @@
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-% The hyphenation pattern files are in the dirctory:
++% The hyphenation pattern files are in the directory:
+ % texmf/tex/generic/hyphen
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+@@ -35,10 +45,14 @@
+ % english should always be defined. Either an alias for american or british.
+ =english
+
+-% French, TWO lines!
++
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++% By default, most languages are enabled - there should be no problems.
++% If you want to use only a subset, please use '%! ' as comment sign.
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++% French and German, TWO lines each!
+ french frhyph.tex
+ =patois
+-
+ german dehypht.tex
+ =austrian
+
+@@ -98,3 +112,7 @@
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ % Email : Thomas Esser, te at dbs.uni-hannover.de
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++%% checked by postinst 2.0.2a-1 %%
++%% do not remove this comment! %%
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+--- scripts/context/perl/texfind.pl.orig 2005-07-22 16:24:24.651024774 +0200
++++ scripts/context/perl/texfind.pl 2005-07-22 16:24:24.745014812 +0200
+@@ -20,7 +20,28 @@
+ use Getopt::Long ;
+ use File::Find ;
+ use Cwd ;
+-use Tk ;
++#use Tk ;
++# patched by Debian
++use File::Basename;
++BEGIN {
++ eval { require Tk; import Tk; };
++ if ($@) {
++ my $progname = basename($0);
++ my $message;
++ if ($@ =~ /^Can\'t locate Tk\.pm/) {
++ $message = "$progname: you must have the perl-tk package installed\nto use this script\n";
++ } else {
++ $message = "$progname: problem loading the Tk module:\n $@\nHave you installed the perl-tk package?\n";
++ }
++
++ if (! -t STDOUT and exists $ENV{DISPLAY})
++ {
++ exec("tetex-xwarn", $message);
++ } else {
++ die $message;
++ }
++ }
++}
+ use Tk::widgets ;
+ use Tk::ROText ;
+
+--- scripts/context/perl/texshow.pl.orig 2005-07-22 16:24:24.674022337 +0200
++++ scripts/context/perl/texshow.pl 2005-07-22 16:24:24.747014600 +0200
+@@ -28,7 +28,28 @@
+ use Getopt::Long ;
+ use XML::Parser;
+ use Data::Dumper;
+-use Tk;
++#use Tk ;
++# patched by Debian
++use File::Basename;
++BEGIN {
++ eval { require Tk; import Tk; };
++ if ($@) {
++ my $progname = basename($0);
++ my $message;
++ if ($@ =~ /^Can\'t locate Tk\.pm/) {
++ $message = "$progname: you must have the perl-tk package installed\nto use this script\n";
++ } else {
++ $message = "$progname: problem loading the Tk module:\n $@\nHave you installed the perl-tk package?\n";
++ }
++
++ if (! -t STDOUT and exists $ENV{DISPLAY})
++ {
++ exec("tetex-xwarn", $message);
++ } else {
++ die $message;
++ }
++ }
++}
+ use Tk::ROText ;
+ use Config;
+ use Time::HiRes;
+--- fonts/map/dvips/omega/omega.map.orig 2005-07-22 16:24:24.683021383 +0200
++++ fonts/map/dvips/omega/omega.map 2005-07-22 16:24:24.747014600 +0200
+@@ -1,3 +1,6 @@
++% map comment changed, so that Debian's dpkg will try to
++% reinstall it after deletion in versions prior to 2.0.2-9
++%
+ omseco OmegaSerifCommon <omseco.pfb
+ omsecob OmegaSerifCommon-Bold <omsecob.pfb
+ omsecoi OmegaSerifCommon-Italic <omsecoi.pfb
+--- fonts/map/dvips/context/original-context-symbol.map.orig 2005-07-22 16:24:24.686021065 +0200
++++ fonts/map/dvips/context/original-context-symbol.map 2005-07-22 16:24:24.748014494 +0200
+@@ -1 +1 @@
+-contnav ContextNavigation <contnav.pfb
+\ No newline at end of file
++contnav ContextNavigation <contnav.pfb
Modified: tetex-base/trunk/debian/patches/patch-deb.old
===================================================================
--- tetex-base/trunk/debian/patches/patch-deb.old 2005-08-16 14:58:37 UTC (rev 131)
+++ tetex-base/trunk/debian/patches/patch-deb.old 2005-08-16 15:04:53 UTC (rev 132)
@@ -0,0 +1,274 @@
+--- dvips/config/config.ps.orig 2005-07-22 14:03:07.077954998 +0200
++++ dvips/config/config.ps 2005-07-22 14:03:07.163945236 +0200
+@@ -7,13 +7,19 @@
+ % to determine this number. (It will be the only thing printed.)
+ m 3500000
+
+-% z1 is "secure", i.e., inhibits execution of `shell commands` in
+-% \specials. Dvips allows this by default.
++% A setting of `z1' inhibits execution of shell commands in `\special's
++% and via the `E' option in config files like this one ("secure mode").
++% Dvips permits these operations by default or with an explit setting of `z0'.
++% Debian GNU/Linux inhibits these operations by default with the setting `z1' here.
+ z1
+
+-% How to print, maybe with lp instead lpr, etc. If commented-out, output
+-% will go into a file by default.
+-o |lpr
++% Where dvips output should go by default. If unspecified, output goes to a file.
++% To send output via a pipe directly to a printing program such as `lpr' or 'lp',
++% use a line like one of the following two:
++% o |lpr
++% o |lpr -Pmyprinter
++% To send output to standard-output by default, use:
++% o -
+
+ % Default resolution of this device, in dots per inch.
+ D 600
+--- texdoctk/texdocrc.defaults.orig 2005-07-22 14:03:07.080954658 +0200
++++ texdoctk/texdocrc.defaults 2005-07-22 14:03:07.163945236 +0200
+@@ -8,7 +8,7 @@
+ # want/need to leave empty.
+
+ # root of doc directory (from $TEXMFMAIN)
+-TEXDOCPATH=doc
++TEXDOCPATH=../doc/texmf
+ # root of local doc directory (from $TEXMFLOCAL)
+ # can be left empty if equal to TEXDOCPATH or if $TEXMFLOCAL is undefined
+ LOCALDOCPATH=
+@@ -26,28 +26,28 @@
+ DVIPS_CONV=dvips -q
+
+ # PostScript handling
+-PS_VIEWER=ghostview
++PS_VIEWER=see
+
+ # PDF handling
+-PDF_VIEWER=acroread
+-PDFPS_CONV=acroread -toPostScript -pairs
++PDF_VIEWER=see
++PDFPS_CONV=pdf2ps
+
+ # HTML handling
+-HTML_VIEWER=netscape
+-HTMLPS_CONV=
++HTML_VIEWER=x-terminal-emulator -e see
++HTMLPS_CONV=html2ps
+ # HTMLPS_REDIR must be on, if the html->ps converter normally writes its output
+ # to stdout instead of a file (e.g. as html2ps) (y or yes to make active)
+-HTMLPS_REDIR=
++HTMLPS_REDIR=y
+
+ # Plain text handling
+ # TDK_OWN is texdoctk's own text file viewer
+ TXT_VIEWER=TDK_OWN
+-TXTPS_CONV=a2ps
++TXTPS_CONV=a2ps -q
+ # TXTPS_REDIR must be on, if the txt->ps converter normally writes its output
+ # to stdout instead of a file (e.g. as a2ps) (y or yes to make active)
+ TXTPS_REDIR=yes
+
+ # printer
+-PRINT_CMD=lpr -Plp
++PRINT_CMD=lpr -h
+
+ # end of config
+--- web2c/mktex.cnf.orig 2005-07-22 14:03:07.082954431 +0200
++++ web2c/mktex.cnf 2005-07-22 14:03:07.164945122 +0200
+@@ -1,5 +1,5 @@
+ : ${MT_FEATURES=appendonlydir:varfonts}
+-: ${MODE=ljfour}
+-: ${BDPI=600}
++#: ${MODE=ljfour}
++#: ${BDPI=600}
+ # uncomment the following line to use ps2pk instead of gsftopk:
+ # : ${ps_to_pk=ps2pk}
+--- tex/generic/config/language.dat.orig 2005-07-22 14:03:07.084954204 +0200
++++ tex/generic/config/language.dat 2005-07-22 14:03:43.222851566 +0200
+@@ -5,6 +5,16 @@
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++%% To make it possible for package scripts to parse this file,
++%% please use only "%! " to comment out hyphenation patterns!
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++% Do not modify the following line!
++% -_- DebPkgProvidedMaps -_-
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ % CAUTION: the first language will be the default if no style-file
+ % (e.g. german.sty) is used.
+ % Since version 3.0 of TeX, hyphenation patterns for multiple languages are
+@@ -15,7 +25,7 @@
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-% The hyphenation pattern files are in the dirctory:
++% The hyphenation pattern files are in the directory:
+ % texmf/tex/generic/hyphen
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+@@ -35,10 +45,14 @@
+ % english should always be defined. Either an alias for american or british.
+ =english
+
+-% French, TWO lines!
++
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++% By default, most languages are enabled - there should be no problems.
++% If you want to use only a subset, please use '%! ' as comment sign.
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++% French and German, TWO lines each!
+ french frhyph.tex
+ =patois
+-
+ german dehypht.tex
+ =austrian
+
+@@ -98,3 +112,7 @@
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ % Email : Thomas Esser, te at dbs.uni-hannover.de
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
++%% checked by postinst 2.0.2a-1 %%
++%% do not remove this comment! %%
++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+--- web2c/updmap.cfg.orig 2005-07-22 14:03:07.087953863 +0200
++++ web2c/updmap.cfg 2005-07-22 14:03:07.165945009 +0200
+@@ -107,11 +107,12 @@
+
+ # latin modern; CTAN:fonts/lm. Enable encoding specific map
+ # files or the "all-in-one" file lm.map, not both at the same time.
+-Map cork-lm.map
+-Map qx-lm.map
+-Map texnansi-lm.map
+-Map ts1-lm.map
+-#! Map lm.map
++# Debian: These fonts are in a separate package, lmodern
++## Map cork-lm.map
++## Map qx-lm.map
++## Map texnansi-lm.map
++## Map ts1-lm.map
++## Map lm.map
+
+ # a symbol font; CTAN:fonts/psfonts/marvosym/
+ Map marvosym.map
+@@ -119,9 +120,6 @@
+ # two font map entries for the mathpple package
+ Map mathpple.map
+
+-# for Omega
+-Map omega.map
+-
+ # the pazo fonts; CTAN:fonts/mathpazo
+ Map pazo.map
+
+@@ -131,16 +129,9 @@
+ # txfonts (times extension); CTAN:fonts/txfonts
+ Map txfonts.map
+
+-# XY-pic fonts; CTAN:macros/generic/diagrams/xypic
+-Map xypic.map
+-
+ # 7-8-9 sizes for cmex taken from TeXtrace2001
+ MixedMap ttcmex.map
+
+-# ps-type1 versions for cm+ams; CTAN:fonts/cm/ps-type1/bluesky
+-MixedMap bsr.map
+-MixedMap bsr-interpolated.map
+-
+ # CSTeX; http://math.feld.cvut.cz/olsak/cstex/
+ MixedMap cs.map
+
+@@ -155,9 +146,6 @@
+ # instead of mt-yy.map:
+ Map mt-belleek.map
+
+-# Euro Symbol fonts by Henrik Theiling; CTAN:fonts/eurosym
+-MixedMap eurosym.map
+-
+ # vntex support, see http://vinux.sourceforge.net/vntex
+ MixedMap vnr.map
+
+--- scripts/context/perl/texfind.pl.orig 2005-07-22 14:03:07.090953522 +0200
++++ scripts/context/perl/texfind.pl 2005-07-22 14:03:07.166944895 +0200
+@@ -20,7 +20,28 @@
+ use Getopt::Long ;
+ use File::Find ;
+ use Cwd ;
+-use Tk ;
++#use Tk ;
++# patched by Debian
++use File::Basename;
++BEGIN {
++ eval { require Tk; import Tk; };
++ if ($@) {
++ my $progname = basename($0);
++ my $message;
++ if ($@ =~ /^Can\'t locate Tk\.pm/) {
++ $message = "$progname: you must have the perl-tk package installed\nto use this script\n";
++ } else {
++ $message = "$progname: problem loading the Tk module:\n $@\nHave you installed the perl-tk package?\n";
++ }
++
++ if (! -t STDOUT and exists $ENV{DISPLAY})
++ {
++ exec("tetex-xwarn", $message);
++ } else {
++ die $message;
++ }
++ }
++}
+ use Tk::widgets ;
+ use Tk::ROText ;
+
+--- scripts/context/perl/texshow.pl.orig 2005-07-22 14:03:07.092953295 +0200
++++ scripts/context/perl/texshow.pl 2005-07-22 14:03:07.167944782 +0200
+@@ -28,7 +28,28 @@
+ use Getopt::Long ;
+ use XML::Parser;
+ use Data::Dumper;
+-use Tk;
++#use Tk ;
++# patched by Debian
++use File::Basename;
++BEGIN {
++ eval { require Tk; import Tk; };
++ if ($@) {
++ my $progname = basename($0);
++ my $message;
++ if ($@ =~ /^Can\'t locate Tk\.pm/) {
++ $message = "$progname: you must have the perl-tk package installed\nto use this script\n";
++ } else {
++ $message = "$progname: problem loading the Tk module:\n $@\nHave you installed the perl-tk package?\n";
++ }
++
++ if (! -t STDOUT and exists $ENV{DISPLAY})
++ {
++ exec("tetex-xwarn", $message);
++ } else {
++ die $message;
++ }
++ }
++}
+ use Tk::ROText ;
+ use Config;
+ use Time::HiRes;
+--- fonts/map/dvips/omega/omega.map.orig 2005-07-22 14:03:07.096952841 +0200
++++ fonts/map/dvips/omega/omega.map 2005-07-22 14:03:07.168944668 +0200
+@@ -1,3 +1,6 @@
++% map comment changed, so that Debian's dpkg will try to
++% reinstall it after deletion in versions prior to 2.0.2-9
++%
+ omseco OmegaSerifCommon <omseco.pfb
+ omsecob OmegaSerifCommon-Bold <omsecob.pfb
+ omsecoi OmegaSerifCommon-Italic <omsecoi.pfb
+--- fonts/map/dvips/context/original-context-symbol.map.orig 2005-07-22 14:03:07.098952614 +0200
++++ fonts/map/dvips/context/original-context-symbol.map 2005-07-22 14:03:07.168944668 +0200
+@@ -1 +1 @@
+-contnav ContextNavigation <contnav.pfb
+\ No newline at end of file
++contnav ContextNavigation <contnav.pfb
Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules 2005-08-16 14:58:37 UTC (rev 131)
+++ tetex-base/trunk/debian/rules 2005-08-16 15:04:53 UTC (rev 132)
@@ -111,13 +111,15 @@
commonstuff_update:
$(update_commonstuff)
-$(stampdir)/eperl-stamp: $(EPERL_FILES)
+$(stampdir):
+ -mkdir $(stampdir)
+
+$(stampdir)/eperl-stamp: $(stampdir) $(EPERL_FILES)
touch $@
-$(stampdir)/build-stamp: patch-stamp
+$(stampdir)/build-stamp: $(stampdir) patch-stamp
$(check-cvs)
dh_testdir
- -mkdir $(stampdir)
# Make sure that our build scripts are executable.
# (only needed after upstream changes)
# chmod +x debian/remove-bad-license-files
Modified: tetex-base/trunk/debian/rules.in
===================================================================
--- tetex-base/trunk/debian/rules.in 2005-08-16 14:58:37 UTC (rev 131)
+++ tetex-base/trunk/debian/rules.in 2005-08-16 15:04:53 UTC (rev 132)
@@ -116,13 +116,15 @@
commonstuff_update:
$(update_commonstuff)
-$(stampdir)/eperl-stamp: $(EPERL_FILES)
+$(stampdir):
+ -mkdir $(stampdir)
+
+$(stampdir)/eperl-stamp: $(stampdir) $(EPERL_FILES)
touch $@
-$(stampdir)/build-stamp: patch-stamp
+$(stampdir)/build-stamp: $(stampdir) patch-stamp
$(check-cvs)
dh_testdir
- -mkdir $(stampdir)
# Make sure that our build scripts are executable.
# (only needed after upstream changes)
# chmod +x debian/remove-bad-license-files
More information about the Pkg-tetex-commits
mailing list