[subversion-commit] SVN tetex commit + diffs: r181 - in
tetex-bin/trunk/debian: . patches
Frank Küster
frank at costa.debian.org
Sat Aug 27 14:12:22 UTC 2005
Author: frank
Date: 2005-08-27 14:12:21 +0000 (Sat, 27 Aug 2005)
New Revision: 181
Modified:
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/debianize-updmap
tetex-bin/trunk/debian/patches/patch-deb
tetex-bin/trunk/debian/rules
tetex-bin/trunk/debian/rules.in
Log:
- [changelog, patch-deb] close #322181 (see changelog entry)
- I didn't know how clever update-fontlang detects user configuration
directories, so debianize-updmap had to be adapted
- export QUILT_PATCHES in debian/rules; my test build apparently only
worked because pbuilder inherits my own environment - is this a bug in
pbuilder or in my pbuilder aliases?
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2005-08-27 12:02:44 UTC (rev 180)
+++ tetex-bin/trunk/debian/changelog 2005-08-27 14:12:21 UTC (rev 181)
@@ -22,8 +22,14 @@
* Do no longer install our outdated version of cweb.el. An updated
version will (hopefully) soon show up in emacs-goodies-el (see
#170773) [frank]
+ * Until maintainer scripts have switched to using updmap-sys, add a uid
+ check to updmap and execute updmap-sys if we are root (unless the
+ --root-home option is given). The same code in fmtutil has been
+ refined, and the manpages adapted. texconfig doesn't need this hack,
+ since it shouldn't be called in maintainer scripts, anyway (closes:
+ #322181) [frank]
- -- Frank Küster <frank at debian.org> Sat, 27 Aug 2005 14:01:49 +0200
+ -- Frank Küster <frank at debian.org> Sat, 27 Aug 2005 16:07:08 +0200
tetex-bin (3.0-6) experimental; urgency=low
Modified: tetex-bin/trunk/debian/debianize-updmap
===================================================================
--- tetex-bin/trunk/debian/debianize-updmap 2005-08-27 12:02:44 UTC (rev 180)
+++ tetex-bin/trunk/debian/debianize-updmap 2005-08-27 14:12:21 UTC (rev 181)
@@ -35,15 +35,43 @@
# file per run.
###############################################################################
+# 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 updmap snippets
+###############################################################################
+FindDebianUserdir(){
+ defaultuserdir=$HOME/.texmf-config/updmap.d
+
+ # this should read a config item in updmap.cfg, but for now we just
+ # check whether the default exists
+ if [ -d $defaultuserdir ]; then
+ echo $defaultuserdir
+ fi
+}
+
+
+###############################################################################
# createDebianConffilelist
# create a list of configuration files containing updmap snippets;
# we are going to act on these
###############################################################################
createDebianConffilelist(){
- if [ -n "$debianuserdir" ]; then
- find /etc/texmf/updmap.d "$debianuserdir" -maxdepth 1 -type f -name '*.cfg'
+ if DebianSyswideMode; then
+ find /etc/texmf/updmap.d -maxdepth 1 -type f -name '*.cfg'
else
- find /etc/texmf/updmap.d -maxdepth 1 -type f -name '*.cfg'
+ debianuserdir=`FindDebianUserdir`
+ if [ -n "$debianuserdir" ]; then
+ find /etc/texmf/updmap.d "$debianuserdir" -maxdepth 1 -type f -name '*.cfg'
+ else
+ find /etc/texmf/updmap.d -maxdepth 1 -type f -name '*.cfg'
+ fi
fi
}
@@ -53,12 +81,19 @@
###############################################################################
runUpdate(){
updOptions=""
- if [ -n "$debianuserdir" ]; then
- updOptions="--conf-dir $debianuserdir"
- 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
+# if ! DebianSyswideMode; then
+# debianuserdir=`FindDebianUserdir`
+# if [ -n "$debianuserdir" ]; then
+# updOptions="--conf-dir $debianuserdir"
+# fi
+# # here we could add support for an alternative output file
+# fi
verboseMsg "Running update-updmap to merge the changed files"
- update-updmap --quiet $updOptions --output-file $orig
+ update-updmap --quiet
}
###############################################################################
# cleanupNoExit()
@@ -147,18 +182,19 @@
return 0
else
# there are more than one;
- if [ -n "$debianuserdir" ]; then
+ if ! DebianSyswideMode; then
# a file in the user's dir takes precedence
- matchfiles=`findUserfiles $matchfiles`
- if [ `(set $matchfiles; echo $#)` -eq 1 ]; then
+ usermatchfiles=`findUserfiles $matchfiles`
+ if [ `(set $usermatchfiles; echo $#)` -eq 1 ]; then
# exactly one of them is a user-specific file
- echo $matchfiles
+ echo $usermatchfiles
verboseMsg "Enabling map file in user-specific file $matchfiles"
return 0
else
- # two files in the user directory. As bad as two in the site-wide
- # dir, we do nothing special
- :
+ # 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
@@ -217,8 +253,9 @@
findRightLocalfile(){
mapName=$1
# Do we know about a user-specific directory?
- if [ -n "$debianuserdir" ]; then
- DebCnfFile=`pickLocalFile $mapName $debianuserdir`
+ DebianSyswideMode || debianuserdir=`FindDebianUserdir`
+ if (! DebianSyswideMode) && [ -d "$debianuserdir" ]; then
+ DebCnfFile=`pickLocalFile $mapName $debianuserdir`
else
DebCnfFile=`pickLocalFile $mapName /etc/texmf/updmap.d`
fi
@@ -309,3 +346,49 @@
runUpdate
reExecSelf
}
+
+###############################################################################
+# setOption (option, value)
+# sets option to value in the config file (replacing the existing setting
+# or by adding a new line to the config file).
+###############################################################################
+setOption()
+{
+ opt=$1
+ val=$2
+ case "$opt" in
+ LW35)
+ case "$val" in
+ URWkb|URW|ADOBE|ADOBEkb)
+ ;;
+ *)
+ abort "invalid value $val for option $opt"
+ ;;
+ esac
+ ;;
+ dvipsPreferOutline|dvipsDownloadBase35|pdftexDownloadBase14|dvipdfmDownloadBase14)
+ case "$val" in
+ true|false)
+ ;;
+ *)
+ abort "invalid value $val for option $opt"
+ esac
+ ;;
+ *)
+ abort "unsupported option $opt"
+ ;;
+ esac
+
+ DebNullCnfFile=""
+ DebianSyswideMode || debianuserdir=`FindDebianUserdir`
+ if (! DebianSyswideMode) && [ -f "$debianuserdir/00updmap.cfg" ]; then
+ DebNullCnfFile=$debianuserdir/00updmap.cfg
+ else
+ DebNullCnfFile=/etc/texmf/updmap.d/00updmap.cfg
+ fi
+
+ configReplace "$DebNullCnfFile" "^$opt[ ]" "$opt $val"
+ runUpdate
+ reExecSelf
+}
+
Modified: tetex-bin/trunk/debian/patches/patch-deb
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb 2005-08-27 12:02:44 UTC (rev 180)
+++ tetex-bin/trunk/debian/patches/patch-deb 2005-08-27 14:12:21 UTC (rev 181)
@@ -1,7 +1,7 @@
Index: configure
===================================================================
---- configure.orig 2005-08-25 17:10:48.000000000 +0200
-+++ configure 2005-08-25 17:10:53.000000000 +0200
+--- configure.orig 2005-08-26 11:51:29.000000000 +0200
++++ configure 2005-08-26 11:51:43.000000000 +0200
@@ -4213,12 +4213,13 @@
@@ -24,8 +24,8 @@
if test -z "$xdvik_standalone"; then
Index: texk/kpathsea/mktexlsr
===================================================================
---- texk/kpathsea/mktexlsr.orig 2005-08-25 17:10:48.000000000 +0200
-+++ texk/kpathsea/mktexlsr 2005-08-25 17:10:53.000000000 +0200
+--- texk/kpathsea/mktexlsr.orig 2005-08-26 11:51:29.000000000 +0200
++++ texk/kpathsea/mktexlsr 2005-08-26 11:51:43.000000000 +0200
@@ -103,9 +103,9 @@
db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
@@ -68,8 +68,8 @@
exit 0
Index: texk/make/paths.mk
===================================================================
---- texk/make/paths.mk.orig 2005-08-25 17:10:48.000000000 +0200
-+++ texk/make/paths.mk 2005-08-25 17:10:53.000000000 +0200
+--- texk/make/paths.mk.orig 2005-08-26 11:51:29.000000000 +0200
++++ texk/make/paths.mk 2005-08-26 11:51:43.000000000 +0200
@@ -47,7 +47,7 @@
texmf = @texmfmain@
@@ -81,8 +81,8 @@
texinputdir = $(texmf)/tex
Index: texk/tetex/Makefile.in
===================================================================
---- texk/tetex/Makefile.in.orig 2005-08-25 17:10:48.000000000 +0200
-+++ texk/tetex/Makefile.in 2005-08-25 17:10:53.000000000 +0200
+--- texk/tetex/Makefile.in.orig 2005-08-26 11:51:29.000000000 +0200
++++ texk/tetex/Makefile.in 2005-08-26 11:51:43.000000000 +0200
@@ -35,7 +35,7 @@
# Auxiliary files.
@@ -103,8 +103,8 @@
$(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
Index: texk/tetex/texconfig
===================================================================
---- texk/tetex/texconfig.orig 2005-08-25 17:10:48.000000000 +0200
-+++ texk/tetex/texconfig 2005-08-25 17:10:53.000000000 +0200
+--- texk/tetex/texconfig.orig 2005-08-26 11:51:29.000000000 +0200
++++ texk/tetex/texconfig 2005-08-27 16:03:05.650137738 +0200
@@ -883,8 +883,8 @@
faq)
@@ -126,8 +126,8 @@
rc=1
Index: texk/tetex/fmtutil
===================================================================
---- texk/tetex/fmtutil.orig 2005-08-25 17:10:48.000000000 +0200
-+++ texk/tetex/fmtutil 2005-08-25 17:10:53.000000000 +0200
+--- texk/tetex/fmtutil.orig 2005-08-26 11:51:29.000000000 +0200
++++ texk/tetex/fmtutil 2005-08-27 15:49:28.577189250 +0200
@@ -25,7 +25,13 @@
# --cnffile file set configfile for fmtutil
# --fmtdir directory set destination directory for format files
@@ -143,7 +143,7 @@
###############################################################################
# program history:
# Sa Jan 15 18:13:46 CET 2005 avoid multiple variable assignments in one statement
-@@ -76,13 +82,33 @@
+@@ -76,7 +82,7 @@
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
@@ -152,11 +152,16 @@
argv0=$0
version=1105809354 # seconds since `00:00:00 1970-01-01 UTC'
# date '+%s' (with GNU date)
-
+@@ -84,6 +90,29 @@
cnf=fmtutil.cnf # name of the config file
+ ###############################################################################
++# Debian hack, needed until depending packages have switched to
++# calling updmap-sys
++###############################################################################
+if [ `id -u` -eq 0 ]; then
+ if [ "$1" = "--root-home" ]; then
++ shift
+ echo
+ echo "$progname: Option --root-home given,"
+ echo "generating formats in /root/.texmf-var."
@@ -168,20 +173,19 @@
+ echo "used instead. If this is done by a Debian package upon installation,"
+ echo "upgrade, or removal, please file a bug against that package."
+ echo
-+ TEXMFVAR="`kpsewhich -var-value TEXMFSYSVAR`"
-+ TEXMFCONFIG="`kpsewhich -var-value TEXMFSYSCONFIG`"
-+ export TEXMFVAR TEXMFCONFIG
++ exec fmtutil-sys ${1+"$@"}
+ fi
+ fi
+fi
+
- ###############################################################################
++###############################################################################
# cleanup()
# clean up the temp area and exit with proper exit status
+ ###############################################################################
Index: texk/tetex/fmtutil-sys
===================================================================
---- texk/tetex/fmtutil-sys.orig 2005-08-25 17:10:48.000000000 +0200
-+++ texk/tetex/fmtutil-sys 2005-08-25 17:10:53.000000000 +0200
+--- texk/tetex/fmtutil-sys.orig 2005-08-26 11:51:29.000000000 +0200
++++ texk/tetex/fmtutil-sys 2005-08-26 11:51:43.000000000 +0200
@@ -23,6 +23,7 @@
TEXMFVAR="$v"
@@ -193,10 +197,25 @@
exec fmtutil ${1+"$@"}
Index: texk/tetex/fmtutil.man
===================================================================
---- texk/tetex/fmtutil.man.orig 2005-08-25 17:10:48.000000000 +0200
-+++ texk/tetex/fmtutil.man 2005-08-25 17:10:53.000000000 +0200
-@@ -53,6 +53,15 @@
+--- texk/tetex/fmtutil.man.orig 2005-08-26 11:51:29.000000000 +0200
++++ texk/tetex/fmtutil.man 2005-08-27 16:02:34.874529455 +0200
+@@ -41,6 +41,14 @@
+ .IP "\fB--cnffile\fP \fIfile\fP"
+ specify the configuration
+ \fIfile\fP \fBfmtutil\fP should use
++.IP "\fB--root-home\FP"
++(Debian-specific, transitional):
++Unless this option is given, \fBfmtutil\fP will refuse to generate
++formats in \fI/root/.texmf-var/\fP if called by root, and execute
++\fBfmtutil-sys\fP instead. This is needed until packages that call
++\fBfmtutil\fP in their maintainer scripts have switched to
++\fBfmtutil-sys\fP, and will then be removed.
++.IP
+ .IP "\fB--dolinks\fP"
(not implemented, just for compatibility)
+ .IP "\fB--fmtdir\fP \fIdirectory\fP"
+@@ -53,6 +61,15 @@
+ (not implemented, just for compatibility)
.IP "\fB--test\fP"
(not implemented, just for compatibility)
+.PP
@@ -213,8 +232,8 @@
.PP
Index: texk/web2c/fmtutil.in
===================================================================
---- texk/web2c/fmtutil.in.orig 2005-08-25 17:10:48.000000000 +0200
-+++ texk/web2c/fmtutil.in 2005-08-25 17:10:53.000000000 +0200
+--- texk/web2c/fmtutil.in.orig 2005-08-26 11:51:29.000000000 +0200
++++ texk/web2c/fmtutil.in 2005-08-26 11:51:43.000000000 +0200
@@ -55,7 +55,7 @@
# Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
@@ -226,8 +245,8 @@
# if you want babel support in pdfamstex:
Index: texk/web2c/cwebdir/cweb.1
===================================================================
---- texk/web2c/cwebdir/cweb.1.orig 2005-08-25 17:10:48.000000000 +0200
-+++ texk/web2c/cwebdir/cweb.1 2005-08-25 17:10:53.000000000 +0200
+--- texk/web2c/cwebdir/cweb.1.orig 2005-08-26 11:51:29.000000000 +0200
++++ texk/web2c/cwebdir/cweb.1 2005-08-26 11:51:43.000000000 +0200
@@ -100,19 +100,19 @@
.
.SH FILES
@@ -255,9 +274,47 @@
.SH "SEE ALSO"
Index: texk/tetex/updmap.man
===================================================================
---- texk/tetex/updmap.man.orig 2005-08-25 17:10:48.000000000 +0200
-+++ texk/tetex/updmap.man 2005-08-25 17:10:53.000000000 +0200
-@@ -98,10 +98,10 @@
+--- texk/tetex/updmap.man.orig 2005-08-26 11:51:29.000000000 +0200
++++ texk/tetex/updmap.man 2005-08-27 16:01:15.728252003 +0200
+@@ -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
+ 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 these options 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. Unfortunately, they will be
++regenerated even if \fBupdmap\&.cfg\fP(5) has not been changed.
+ .PP
+ .SH "OPTIONS"
+ .PP
+@@ -45,6 +52,14 @@
+ .IP "\fB--cnffile\fP \fIfile\fP"
+ Specify a configuration \fIfile\fP\&.
+ .IP
++.IP "\fB--root-home\FP"
++(Debian-specific, transitional):
++Unless this option is given, \fBupdmap\fP will refuse to generate
++files in \fI/root/.texmf-var/\fP if called by root, and execute
++\fBupdmap-sys\fP instead. This is needed until packages that call
++\fBupdmap\fP in their maintainer scripts have switched to
++\fBupdmap-sys\fP, and will then be removed.
++.IP
+ .IP "\fB--dvipsoutputdir\fP \fIdirectory\fP"
+ Specify the output
+ \fIdirectory\fP for map files generated with dvips syntax\&.
+@@ -98,10 +113,10 @@
\fBdvipdfmDownloadBase14\fP
.IP
.IP "\fB--enable\fP \fImaptype\fP \fImapfile\fP"
@@ -270,7 +327,7 @@
.IP
.IP "\fB--enable MixedMap=\fP\fImapfile\fP"
Add or enable a MixedMap for \fImapfile\fP\&.
-@@ -126,7 +126,9 @@
+@@ -126,7 +141,9 @@
.IP "\fIupdmap\&.cfg\fP"
Main configuration file\&. In
\fItexmf/web2c\fP by default, but may be located elsewhere
@@ -281,7 +338,7 @@
.IP
.IP "\fIdvips35\&.map\fP"
Map file for standard 35 PostScript fonts for
-@@ -240,7 +242,7 @@
+@@ -240,7 +257,7 @@
.PP
.SH "SEE ALSO"
.PP
@@ -292,9 +349,18 @@
.PP
Index: texk/tetex/updmap
===================================================================
---- texk/tetex/updmap.orig 2005-08-25 17:10:48.000000000 +0200
-+++ texk/tetex/updmap 2005-08-25 20:00:27.638812777 +0200
-@@ -112,10 +112,15 @@
+--- texk/tetex/updmap.orig 2005-08-26 11:51:43.000000000 +0200
++++ texk/tetex/updmap 2005-08-27 15:47:50.061046415 +0200
+@@ -15,6 +15,8 @@
+ # --nohash do not run texhash
+ # --nomkmap do not recreate map files
+ # --quiet reduce verbosity
++# --root-home (Debian specific) create files in root's homedir
++# must be the first option!
+ #
+ # Valid commands:
+ # --edit edit $cnfFileShort file
+@@ -112,10 +114,37 @@
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
# the version string
@@ -303,107 +369,82 @@
# date '+%s' (with GNU date)
###############################################################################
-+# source Debian-specific changes
++# Debian hack, needed until depending packages have switched to
++# calling updmap-sys
+###############################################################################
-+. /usr/share/tetex-bin/debianize-updmap
++: progname=${progname:=updmap}
+
++if [ `id -u` -eq 0 ]; then
++ if [ "$1" = "--root-home" ]; then
++ shift
++ echo
++ echo "$progname: Option --root-home given,"
++ echo "generating font configuration in /root/.texmf-var."
++ echo
++ else
++ if [ ! "$progname" = "updmap-sys" ]; then
++ echo
++ echo "Warning: fmtutil is being run as root; fmtutil-sys should probably be"
++ echo "used instead. If this is done by a Debian package upon installation,"
++ echo "upgrade, or removal, please file a bug against that package."
++ echo
++ exec updmap-sys ${1+"$@"}
++ fi
++ fi
++fi
++
++
++
+###############################################################################
# help()
# display help message and exit
###############################################################################
-@@ -126,6 +131,8 @@
-
- Valid options:
- --cnffile file specify configuration file
-+ --debian-userdir directory specify directory containing user-specific
-+ updmap.cfg snippets (see update-updmap(1))
- --dvipsoutputdir directory specify output directory (dvips syntax)
- --pdftexoutputdir directory specify output directory (pdftex syntax)
- --dvipdfmoutputdir directory specify output directory (dvipdfm syntax)
-@@ -351,38 +358,40 @@
+@@ -317,6 +346,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
+@@ -351,6 +382,8 @@
# enableMap (type, map)
# enables an entry in the config file for map with a given type.
###############################################################################
--enableMap()
--{
-- case $1 in
-- Map|MixedMap)
-- ;;
-- *)
-- abort "invalid mapType $1"
-- ;;
-- esac
--
-- # a map can only have one type, so we carefully disable everything
-- # about map here:
-- disableMap "$2"
--
-- # now enable with the right type:
-- configReplace "$cnfFile" "^#![ ]*$1[ ]*$2" "$1 $2"
--}
+# for Debian, this is superseded by a function defined in debianize-updmap
-+# enableMap()
-+# {
-+# case $1 in
-+# Map|MixedMap)
-+# ;;
-+# *)
-+# abort "invalid mapType $1"
-+# ;;
-+# esac
-+
-+# # a map can only have one type, so we carefully disable everything
-+# # about map here:
-+# disableMap "$2"
-+
-+# # now enable with the right type:
-+# configReplace "$cnfFile" "^#![ ]*$1[ ]*$2" "$1 $2"
-+# }
-
- ###############################################################################
++# (see below)
+ enableMap()
+ {
+ case $1 in
+@@ -373,6 +406,8 @@
# disableMap (map)
# disables map in config file (any type)
###############################################################################
--disableMap()
--{
-- #mapType=`awk '($1 == "MixedMap" || $1 == "Map") && $2 == map { print $1 }' \
-- # map=$1 <"$cnfFile" | sort | uniq`
-- map=$1
-- mapType=`egrep "^(MixedMap|Map)[ ]*$map( | |$)" "$cnfFile" | awk '{print $1}' | sort | uniq`
-- for type in $mapType; do
-- configReplace "$cnfFile" "^$type[ ]*$1" "#! $type $1"
-- done
--}
+# for Debian, this is superseded by a function defined in debianize-updmap
-+# disableMap()
-+# {
-+# #mapType=`awk '($1 == "MixedMap" || $1 == "Map") && $2 == map { print $1 }' \
-+# # map=$1 <"$cnfFile" | sort | uniq`
-+# map=$1
-+# mapType=`egrep "^(MixedMap|Map)[ ]*$map( | |$)" "$cnfFile" | awk '{print $1}' | sort | uniq`
-+# for type in $mapType; do
-+# configReplace "$cnfFile" "^$type[ ]*$1" "#! $type $1"
-+# done
-+# }
++# (see below)
+ disableMap()
+ {
+ #mapType=`awk '($1 == "MixedMap" || $1 == "Map") && $2 == map { print $1 }' \
+@@ -385,6 +420,11 @@
+ }
###############################################################################
++# source Debian-specific changes, superseding the last three functions
++###############################################################################
++. /usr/share/tetex-bin/debianize-updmap
++
++###############################################################################
# psADOBE()
-@@ -891,6 +900,10 @@
- cfgparam=1; cnfFile=$2; shift;;
- --cnffile=*)
- cfgparam=1; cnfFile=`echo "$1" | sed 's/--cnffile=//'`;;
-+ --debian-userdir)
-+ debianuserdir=$2; shift;;
-+ --debian-userdir=*)
-+ debianuserdir=`echo "$1" | sed 's/--debian-userdir=//'`;;
- --dvipsoutputdir)
- dvipsoutputdirparam=1; dvipsoutputdir=$2; shift;;
- --dvipsoutputdir=*)
-@@ -1285,6 +1298,7 @@
- mkmapEnabled=true
- verbose=true
- needsCleanup=false
-+ debianuserdir=
+ # transform fontnames from URW to Adobe
+ ###############################################################################
+@@ -1274,7 +1314,8 @@
+ main()
+ {
+ # initialize global variables
+- progname=updmap
++ # progname is needed earlier in Debian
++ # progname=updmap
+ cmd=
+ log=
- cnfFileShort=updmap.cfg
- cnfFile=
Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules 2005-08-27 12:02:44 UTC (rev 180)
+++ tetex-bin/trunk/debian/rules 2005-08-27 14:12:21 UTC (rev 181)
@@ -9,6 +9,9 @@
# This is the debhelper compatibility version to use.
export DH_COMPAT=4
+# needed for quilt:
+export QUILT_PATCHES=./debian/patches
+
# debian/rules can never be in eperl_files, because it may not be removed
EPERL_FILES := debian/config debian/preinst debian/postinst debian/prerm debian/postrm \
debian/common.functions debian/tetex-bin_install debian/sarge/recompile.sed
@@ -134,6 +137,8 @@
patch-stamp:
quilt push -a
+ # for debugging pbuilder:
+ env
touch $@
clean-commonstuff:
Modified: tetex-bin/trunk/debian/rules.in
===================================================================
--- tetex-bin/trunk/debian/rules.in 2005-08-27 12:02:44 UTC (rev 180)
+++ tetex-bin/trunk/debian/rules.in 2005-08-27 14:12:21 UTC (rev 181)
@@ -14,6 +14,9 @@
# This is the debhelper compatibility version to use.
export DH_COMPAT=4
+# needed for quilt:
+export QUILT_PATCHES=./debian/patches
+
# debian/rules can never be in eperl_files, because it may not be removed
EPERL_FILES := debian/config debian/preinst debian/postinst debian/prerm debian/postrm \
debian/common.functions debian/tetex-bin_install debian/sarge/recompile.sed
@@ -139,6 +142,8 @@
patch-stamp:
quilt push -a
+ # for debugging pbuilder:
+ env
touch $@
clean-commonstuff:
More information about the Pkg-tetex-commits
mailing list