[subversion-commit] SVN tetex commit + diffs: r224 - in tetex-bin/branches/changelog_for_unstable/debian: . md5sums patches

Frank Küster frank at costa.debian.org
Fri Oct 14 13:55:35 UTC 2005


Author: frank
Date: 2005-10-14 13:55:34 +0000 (Fri, 14 Oct 2005)
New Revision: 224

Added:
   tetex-bin/branches/changelog_for_unstable/debian/debianize-updmap
   tetex-bin/branches/changelog_for_unstable/debian/libkpathsea4-dev.README.Debian
   tetex-bin/branches/changelog_for_unstable/debian/md5sums/01tetex.cnf.md5sum
   tetex-bin/branches/changelog_for_unstable/debian/patches/series
Modified:
   tetex-bin/branches/changelog_for_unstable/debian/README.Debian
   tetex-bin/branches/changelog_for_unstable/debian/TODO
   tetex-bin/branches/changelog_for_unstable/debian/common.functions.in
   tetex-bin/branches/changelog_for_unstable/debian/common.variables
   tetex-bin/branches/changelog_for_unstable/debian/config.in
   tetex-bin/branches/changelog_for_unstable/debian/control
   tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2004-0888
   tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2005-0064
   tetex-bin/branches/changelog_for_unstable/debian/patches/patch-deb
   tetex-bin/branches/changelog_for_unstable/debian/patches/patch-libtool
   tetex-bin/branches/changelog_for_unstable/debian/patches/patch-src
   tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tds
   tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoc
   tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoctk
   tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texmfcnf
   tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tmp
   tetex-bin/branches/changelog_for_unstable/debian/patches/patch-xdvi-300109
   tetex-bin/branches/changelog_for_unstable/debian/postinst.functions
   tetex-bin/branches/changelog_for_unstable/debian/postinst.in
   tetex-bin/branches/changelog_for_unstable/debian/postrm.in
   tetex-bin/branches/changelog_for_unstable/debian/preinst.in
   tetex-bin/branches/changelog_for_unstable/debian/rules
   tetex-bin/branches/changelog_for_unstable/debian/rules.in
   tetex-bin/branches/changelog_for_unstable/debian/templates
   tetex-bin/branches/changelog_for_unstable/debian/tetex-bin_install.in
   tetex-bin/branches/changelog_for_unstable/debian/variables
Log:
merging trunk changes into branch "changelog for unstable": file additions and modifications

Modified: tetex-bin/branches/changelog_for_unstable/debian/README.Debian
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/README.Debian	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/README.Debian	2005-10-14 13:55:34 UTC (rev 224)
@@ -41,6 +41,11 @@
     2.3 PDF and DVI output
     2.4 "TeX capacity exceeded" and similar errors
 3. How to install additional or updated (La)TeX packages or fonts. 
+    3.1 (La)TeX input files
+    3.2 Complex installations
+    3.3 Font installation
+    3.3 User-specific installation
+
 4. Problems, bug reports
 
 
@@ -234,13 +239,10 @@
 leads to that error, or to a similar error message. The package
 documentation, the google archive, or TeX-related mailinglists or
 newsgroups will be helpful to find out which parameter needs to be
-changed in /etc/texmf/texmf.cnf. 
+changed in /etc/texmf/texmf.cnf (or rather in
+/etc/texmf/texmf.d/95NonPath.cnf, see 1.3.1 above). 
 
-As described above (1.3.1), please do not edit this file
-directly. Rather edit the files in /etc/texmf/texmf.d/ and invoke
-update-texmf. 
 
-
 3. How to install additional or updated (La)TeX packages or fonts. 
 ================================================================
 
@@ -249,13 +251,22 @@
 a) install it at a place where TeX can find it
 b) register it properly.
 
+This can generally be done site-wide (by an administrator who has write
+access to at least /usr/local/share/texmf and /etc/texmf), or on a
+per-user basis.  This can be done by any use on the system, without
+requiring write access to system directories.  Some people might also
+find it more convenient in case they share their home directory between
+a couple of machines, even if they do have administrator rights.
+
+In the following, we first explain the principles by describing a
+site-wide setup, then we explain the details for user-specific setup. 
+
 3.1 (La)TeX input files
 ----------------------
 
-This is usually quite easy. You can either install them in your
-$HOMETEXMF tree, that is, into a directory called "texmf" in your home
-directory. Or, if you are the local administrator, you can put it in
-$LOCALTEXMF which is the directory tree below /usr/local/share/texmf.
+This is usually quite easy.  Put the files in an appropriate directory
+below $LOCALTEXMF which is the directory tree rooted at
+/usr/local/share/texmf.
 
    For LaTeX packages, create the directory tex/latex/<packagename>
    within that tree (or use tex/latex/misc) and put the files
@@ -279,7 +290,8 @@
 package. The Debian-specific part comes in when the configuration
 files texmf.cnf, fmtutil.cnf or updmap.cfg need to be changed. See the
 description above (1.3), and the manpages for update-updmap,
-update-texmf and update-fmtutil.
+update-texmf and update-fmtutil, and the section on font installation
+below.
 
 3.3 Font installation
 ---------------------
@@ -366,6 +378,55 @@
 users on the system.
 
 
+3.4 User-specific installation
+------------------------------
+
+Instead of a system-wide installation, one can also install fonts in the 
+private $TEXMFHOME, which is set to $HOME/texmf by default.  Compared to
+the system-wide installation explained above, the following changes have
+to be made:
+
+a) In step a), copy all relevant files to the appropriate subdirectories in
+   $TEXMFHOME.  
+
+b) The configuration file created in step b) should be placed in
+   $TEXMFCONFIG ($HOME/.texmf-config by default).  An appropriate place
+   would be $TEXMFCONFIG/updmap.d. Note that most likely you will have
+   to create this directory first.
+
+c) In step c), one then calls "update-updmap" to create updmap.cfg in
+   $TEXMFVAR/web2c ($HOME/.texmf-var/web2c by default):
+
+$ update-updmap --conf-dir $HOME/.texmf-config/updmap.d \
+                --output-file $HOME/.texmf-var/web2c/updmap.cfg
+
+   This creates $HOME/.texmf-var/web2c/updmap.cfg based on the
+   configuration files in $HOME/.texmf-config/updmap.d *and* in
+   /etc/texmf/updmap.d.  If a file exists in both directories, the
+   version in $TEXMFCONFIG takes precedence. 
+
+e) After updating the ls-R files with "mktexlsr" or "texhash" (step d),
+   one has to generate the map files in step e).  This is done by running
+   the program "updmap" instead of "updmap-sys".  The generated files
+   are also created in directories below $TEXMFVAR.
+
+Note that "update-updmap" merges the configuration files in
+$HOME/.texmf-config/web2c/updmap.d and in /etc/texmf/updmap.d.
+Therefore, all system-wide installed fonts are accessible without
+dublicating their configuration files.  Merging the configuration files
+is done on the basis of file names: If a file exists in both
+directories, the version in $TEXMFCONFIG takes precedence.  Thus, you
+can also use this mechanism to change settings compared to the site-wide
+configuration, e.g. by keeping a changed copy of 00updmap.cfg in
+$TEXMFCONFIG/updmap.d.
+
+Keep in mind that you still have to call "update-updmap" with the above
+options whenever the system-wide installation changes.  If you keep a
+changed copy of a file from the site-wide directories, you need to
+manually merge any changes to this file, if desired.
+
+
+
 4. Problems, bug reports
 ========================
 

Modified: tetex-bin/branches/changelog_for_unstable/debian/TODO
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/TODO	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/TODO	2005-10-14 13:55:34 UTC (rev 224)
@@ -14,4 +14,4 @@
 - add patch-mandash, forward upstream
 
 - document the dropping of debconf questions about update-foo in
-   NEWS.Debian 
\ No newline at end of file
+   NEWS.Debian 

Modified: tetex-bin/branches/changelog_for_unstable/debian/common.functions.in
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/common.functions.in	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/common.functions.in	2005-10-14 13:55:34 UTC (rev 224)
@@ -193,6 +193,16 @@
   fi
 }
 
+select_lsrfile() {
+    case $1 in
+     main) LSR=$TEXMFSYSVAR/ls-R-TEXMFMAIN ;;
+     var)  LSR=$TEXMFSYSVAR/ls-R ;;
+     cache) LSR=/var/cache/fonts/ls-R ;;
+     *) echo "select_lsr: don't know how to set this: $1" >&2 ;;
+    esac
+    echo $LSR
+}
+
 #################################################################
 ##  End of function definitions from file common.functions
 #################################################################

Modified: tetex-bin/branches/changelog_for_unstable/debian/common.variables
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/common.variables	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/common.variables	2005-10-14 13:55:34 UTC (rev 224)
@@ -3,8 +3,8 @@
 <:# $Id$:>//
 <:# this list is from dpkg-1.10.9/include/dpkg.h.in:  :>//
 <:$DPKG_EXTENSIONS="'~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist":>//
-<:$PREINST_MOVE_EXT="preinst-bak":>//
-<:$POSTINST_MOVE_EXT="postinst-bak":>//
+<:$PREINST_MOVE_EXT=".preinst-bak":>//
+<:$POSTINST_MOVE_EXT=".postinst-bak":>//
 <:$PURGE_EXTENSIONS="$DPKG_EXTENSIONS $PREINST_MOVE_EXT $POSTINST_MOVE_EXT":>//
 <:# package specific:>//
 <:$ETC="/etc/":>//

Modified: tetex-bin/branches/changelog_for_unstable/debian/config.in
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/config.in	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/config.in	2005-10-14 13:55:34 UTC (rev 224)
@@ -2,7 +2,7 @@
 #!/bin/sh -e
 # 
 # config maintainer script for the Debian <:=${PACKAGE}:> package.
-# $Id: config.in,v 1.1.2.1 2004/12/21 11:29:05 frank Exp $
+# $Id$
 <:=@COPYRIGHT:>//
 
 # Give names to the commandline arguments
@@ -26,24 +26,6 @@
 fi
 
 
-## do the things we have to do always
-
-# ls-R handling (taken from old config script, copyright?)
-db_input low tetex-bin/lsr-perms || true
-db_go
-
-db_get tetex-bin/lsr-perms
-if [ x"$RET" = x"true" ]; then
-    db_beginblock
-    db_input low tetex-bin/groupname || true
-    db_input low tetex-bin/groupperm || true
-    db_input low tetex-bin/userperm || true
-    db_endblock
-fi
-
-db_go
-
-
 # Local Variables:
 # mode: shell-script
 # skeleton-pair: t

Modified: tetex-bin/branches/changelog_for_unstable/debian/control
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/control	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/control	2005-10-14 13:55:34 UTC (rev 224)
@@ -4,18 +4,18 @@
 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.0
-Build-Depends-Indep: tex-common
-Build-Depends: debhelper (>= 4.1.16), ed, libpng12-dev, zlib1g-dev, libxaw8-dev | libxaw7-dev, flex, bison, tetex-base (>= 2.95), libt1-dev (>= 5.0.0-3), po-debconf, autotools-dev, libpaper-dev, texinfo, eperl, debiandoc-sgml
+Build-Depends-Indep: 
+Build-Depends: debhelper (>= 4.1.16), ed, libpng12-dev, zlib1g-dev, libxaw8-dev | libxaw7-dev, flex, bison, tetex-base (>= 2.95), libt1-dev (>= 5.0.0-3), po-debconf, autotools-dev, libpaper-dev, texinfo, eperl, debiandoc-sgml, quilt
 
 Package: tetex-bin
 Priority: optional
 Architecture: any
-Replaces: texbin, xdvik, mflib, kpathsea, makeindex, ps2pk, latex, texidoc, dvipdfm, cweb, ctie, texdoctk
-Conflicts: texbin, xdvik, mflib, kpathsea, makeindex, ps2pk, latex, nextawg (<= 0.5.1-34), nextaw (<< 0.8-2), dvipdfm, alml (<< 2002.08.29-4), jbibtex-bin (<< 3.0.5+0.04-2), jtex-bin (<= 1.8-5.1), passivetex (<< 1.21-5), ptex-bin (<< 3.0.5+0.04-2), xmltex (<< 1.9-4), cweb, ctie, arabtex (<= 3.10-5), tetex-base (<< 2.96.1), tetex-extra (<< 2.96.1), jadetex (<= 3.13-3)
-Provides: tex, latex, dvips, dvipsk, xdvi, metafont, dvipdfm, cweb, texdoctk
+Replaces: texidoc, dvipdfm, cweb, ctie, texdoctk
+Conflicts: dvipdfm, alml (<< 2002.08.29-4), jbibtex-bin (<< 3.0.5+0.04-2), jtex-bin (<= 1.8-5.1), passivetex (<< 1.21-5), ptex-bin (<< 3.0.5+0.04-2), xmltex (<< 1.9-4), cweb, ctie, arabtex (<= 3.10-5), tetex-base (<< 2.96.1), tetex-extra (<< 2.96.1), jadetex (<= 3.13-3), aleph (<< 1:0)
+Provides: dvipdfm, cweb, texdoctk
 Pre-Depends: dpkg (>= 1.6.8)
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, tetex-base (>= 3.0-4), ed, debianutils (>= 1.13.1), mime-support, sed (>= 4.0.5), ucf (>= 1.02)
-Suggests: gs-gpl | gs-esp | gs-afpl, gv | postscript-viewer, xpdf-reader | pdf-viewer, tetex-extra, texinfo, texi2html, dvipng, chktex | lacheck, rubber
+Suggests: gs-gpl | gs-esp | gs-afpl, gv | postscript-viewer, xpdf-reader | pdf-viewer, tetex-extra, texinfo, texi2html, dvipng, chktex | lacheck, rubber, sam2p
 Recommends: dialog | whiptail, psutils, perl-tk, libxml-parser-perl
 Description: The teTeX binary files
  This is the binary part of teTeX. This package contains all the

Copied: tetex-bin/branches/changelog_for_unstable/debian/debianize-updmap (from rev 222, tetex-bin/trunk/debian/debianize-updmap)

Copied: tetex-bin/branches/changelog_for_unstable/debian/libkpathsea4-dev.README.Debian (from rev 222, tetex-bin/trunk/debian/libkpathsea4-dev.README.Debian)

Copied: tetex-bin/branches/changelog_for_unstable/debian/md5sums/01tetex.cnf.md5sum (from rev 222, tetex-bin/trunk/debian/md5sums/01tetex.cnf.md5sum)

Modified: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2004-0888
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2004-0888	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2004-0888	2005-10-14 13:55:34 UTC (rev 224)
@@ -1,5 +1,11 @@
---- libs/xpdf/xpdf/Catalog.cc.orig	2005-02-25 14:36:18.000000000 +0100
-+++ libs/xpdf/xpdf/Catalog.cc	2005-02-25 14:36:18.000000000 +0100
+ libs/xpdf/xpdf/Catalog.cc |   11 +++++++++++
+ libs/xpdf/xpdf/XRef.cc    |    8 ++++++++
+ 2 files changed, 19 insertions(+)
+
+Index: tetex-bin-3.0/libs/xpdf/xpdf/Catalog.cc
+===================================================================
+--- tetex-bin-3.0.orig/libs/xpdf/xpdf/Catalog.cc	2005-10-06 15:03:59.011332464 +0200
++++ tetex-bin-3.0/libs/xpdf/xpdf/Catalog.cc	2005-10-06 15:04:41.153814298 +0200
 @@ -64,6 +64,12 @@
    }
    pagesSize = numPages0 = (int)obj.getNum();
@@ -25,8 +31,10 @@
  	pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *));
  	pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref));
  	for (j = pagesSize - 32; j < pagesSize; ++j) {
---- libs/xpdf/xpdf/XRef.cc.orig	2005-02-25 14:36:18.000000000 +0100
-+++ libs/xpdf/xpdf/XRef.cc	2005-02-25 14:36:18.000000000 +0100
+Index: tetex-bin-3.0/libs/xpdf/xpdf/XRef.cc
+===================================================================
+--- tetex-bin-3.0.orig/libs/xpdf/xpdf/XRef.cc	2005-10-06 15:03:59.011332464 +0200
++++ tetex-bin-3.0/libs/xpdf/xpdf/XRef.cc	2005-10-06 15:04:41.155814083 +0200
 @@ -718,6 +718,10 @@
  		    error(-1, "Bad object number");
  		    return gFalse;

Modified: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2005-0064
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2005-0064	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-CAN-2005-0064	2005-10-14 13:55:34 UTC (rev 224)
@@ -1,5 +1,10 @@
---- libs/xpdf/xpdf/Decrypt.cc.orig	2005-02-25 14:40:35.000000000 +0100
-+++ libs/xpdf/xpdf/Decrypt.cc	2005-02-25 14:40:35.000000000 +0100
+ libs/xpdf/xpdf/Decrypt.cc |    3 +++
+ 1 files changed, 3 insertions(+)
+
+Index: tetex-bin-3.0/libs/xpdf/xpdf/Decrypt.cc
+===================================================================
+--- tetex-bin-3.0.orig/libs/xpdf/xpdf/Decrypt.cc	2005-10-06 15:03:59.072325925 +0200
++++ tetex-bin-3.0/libs/xpdf/xpdf/Decrypt.cc	2005-10-06 15:04:37.458210510 +0200
 @@ -135,6 +135,9 @@
    int len, i, j;
    GBool ok;

Modified: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-deb
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-deb	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-deb	2005-10-14 13:55:34 UTC (rev 224)
@@ -1,5 +1,22 @@
---- configure.orig	2005-08-02 18:55:29.120999860 +0200
-+++ configure	2005-08-02 18:55:29.252985294 +0200
+ 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(-)
+
+Index: tetex-bin-3.0/configure
+===================================================================
+--- tetex-bin-3.0.orig/configure	2005-10-06 15:03:59.308300626 +0200
++++ tetex-bin-3.0/configure	2005-10-06 15:04:34.461531789 +0200
 @@ -4213,12 +4213,13 @@
  
  
@@ -20,8 +37,10 @@
  
  # more customizations for standalone xdvik
  if test -z "$xdvik_standalone"; then
---- texk/kpathsea/mktexlsr.orig	2005-08-02 18:55:29.125999308 +0200
-+++ texk/kpathsea/mktexlsr	2005-08-02 18:55:29.254985073 +0200
+Index: tetex-bin-3.0/texk/kpathsea/mktexlsr
+===================================================================
+--- tetex-bin-3.0.orig/texk/kpathsea/mktexlsr	2005-10-06 15:03:59.308300626 +0200
++++ tetex-bin-3.0/texk/kpathsea/mktexlsr	2005-10-06 15:04:34.471530717 +0200
 @@ -103,9 +103,9 @@
    db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
  
@@ -62,8 +81,10 @@
  done
  tty -s && echo "$progname: Done." >&2
  exit 0
---- texk/make/paths.mk.orig	2005-08-02 18:55:29.128998977 +0200
-+++ texk/make/paths.mk	2005-08-02 18:55:29.254985073 +0200
+Index: tetex-bin-3.0/texk/make/paths.mk
+===================================================================
+--- tetex-bin-3.0.orig/texk/make/paths.mk	2005-10-06 15:03:59.308300626 +0200
++++ tetex-bin-3.0/texk/make/paths.mk	2005-10-06 15:04:34.472530609 +0200
 @@ -47,7 +47,7 @@
  texmf = @texmfmain@
  
@@ -73,8 +94,10 @@
  
  # Regular input files.
  texinputdir = $(texmf)/tex
---- texk/tetex/Makefile.in.orig	2005-08-02 18:55:29.131998646 +0200
-+++ texk/tetex/Makefile.in	2005-08-02 18:55:29.255984963 +0200
+Index: tetex-bin-3.0/texk/tetex/Makefile.in
+===================================================================
+--- tetex-bin-3.0.orig/texk/tetex/Makefile.in	2005-10-06 15:03:59.326298696 +0200
++++ tetex-bin-3.0/texk/tetex/Makefile.in	2005-10-06 15:04:34.478529966 +0200
 @@ -35,7 +35,7 @@
  
  # Auxiliary files.
@@ -93,8 +116,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
---- texk/tetex/texconfig.orig	2005-08-02 18:55:29.135998205 +0200
-+++ texk/tetex/texconfig	2005-08-02 18:55:29.260984411 +0200
+Index: tetex-bin-3.0/texk/tetex/texconfig
+===================================================================
+--- tetex-bin-3.0.orig/texk/tetex/texconfig	2005-10-06 15:03:59.327298589 +0200
++++ tetex-bin-3.0/texk/tetex/texconfig	2005-10-06 15:04:34.481529645 +0200
 @@ -883,8 +883,8 @@
  
      faq)
@@ -114,8 +139,10 @@
                  else
                    echo "$progname: setting up vardir failed. Reason: no permission to write file \`$tfc'" >&2
                    rc=1
---- texk/tetex/fmtutil.orig	2005-08-02 18:55:29.138997874 +0200
-+++ texk/tetex/fmtutil	2005-08-02 18:57:46.673838136 +0200
+Index: tetex-bin-3.0/texk/tetex/fmtutil
+===================================================================
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil	2005-10-06 15:03:59.327298589 +0200
++++ tetex-bin-3.0/texk/tetex/fmtutil	2005-10-06 15:04:34.483529430 +0200
 @@ -25,7 +25,13 @@
  #  --cnffile file             set configfile for fmtutil
  #  --fmtdir directory         set destination directory for format files
@@ -131,7 +158,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+"$@"}'='"$@"'
  
@@ -140,11 +167,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."
@@ -156,18 +188,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
---- texk/tetex/fmtutil-sys.orig	2005-08-02 18:55:29.141997543 +0200
-+++ texk/tetex/fmtutil-sys	2005-08-02 18:55:51.429537861 +0200
+ ###############################################################################
+Index: tetex-bin-3.0/texk/tetex/fmtutil-sys
+===================================================================
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil-sys	2005-10-06 15:03:59.327298589 +0200
++++ tetex-bin-3.0/texk/tetex/fmtutil-sys	2005-10-06 15:04:34.487529001 +0200
 @@ -23,6 +23,7 @@
  
  TEXMFVAR="$v"
@@ -177,10 +210,27 @@
 +export TEXMFVAR TEXMFCONFIG progname
  
  exec fmtutil ${1+"$@"}
---- texk/tetex/fmtutil.man.orig	2005-08-02 18:55:29.144997212 +0200
-+++ texk/tetex/fmtutil.man	2005-08-02 18:55:29.262984191 +0200
-@@ -53,6 +53,15 @@
+Index: tetex-bin-3.0/texk/tetex/fmtutil.man
+===================================================================
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil.man	2005-10-06 15:03:59.327298589 +0200
++++ tetex-bin-3.0/texk/tetex/fmtutil.man	2005-10-06 15:04:34.488528894 +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
@@ -195,8 +245,10 @@
  .PP 
  .SH "FILES" 
  .PP 
---- texk/web2c/fmtutil.in.orig	2005-08-02 18:55:29.147996881 +0200
-+++ texk/web2c/fmtutil.in	2005-08-02 18:55:29.263984080 +0200
+Index: tetex-bin-3.0/texk/web2c/fmtutil.in
+===================================================================
+--- tetex-bin-3.0.orig/texk/web2c/fmtutil.in	2005-10-06 15:03:59.328298482 +0200
++++ tetex-bin-3.0/texk/web2c/fmtutil.in	2005-10-06 15:04:34.502527393 +0200
 @@ -55,7 +55,7 @@
  
  # Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
@@ -206,8 +258,10 @@
  
  # Change "pdfamstex.ini -> pdfbamstex.ini" and "- -> language.dat"
  # if you want babel support in pdfamstex:
---- texk/web2c/cwebdir/cweb.1.orig	2005-08-02 18:55:29.150996550 +0200
-+++ texk/web2c/cwebdir/cweb.1	2005-08-02 18:55:29.264983970 +0200
+Index: tetex-bin-3.0/texk/web2c/cwebdir/cweb.1
+===================================================================
+--- tetex-bin-3.0.orig/texk/web2c/cwebdir/cweb.1	2005-10-06 15:03:59.328298482 +0200
++++ tetex-bin-3.0/texk/web2c/cwebdir/cweb.1	2005-10-06 15:04:34.503527286 +0200
 @@ -100,19 +100,19 @@
  .
  .SH FILES
@@ -233,9 +287,49 @@
  Directory for cweb "include" files.
  .
  .SH "SEE ALSO"
---- texk/tetex/updmap.man.orig	2005-08-02 18:55:29.194991694 +0200
-+++ texk/tetex/updmap.man	2005-08-02 18:55:29.265983860 +0200
-@@ -98,10 +98,10 @@
+Index: tetex-bin-3.0/texk/tetex/updmap.man
+===================================================================
+--- tetex-bin-3.0.orig/texk/tetex/updmap.man	2005-10-06 15:03:59.327298589 +0200
++++ tetex-bin-3.0/texk/tetex/updmap.man	2005-10-06 15:04:34.504527179 +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"
@@ -248,7 +342,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
@@ -259,7 +353,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
@@ -268,3 +362,117 @@
  \fBgsftopk\fP(1), \fBpdftex\fP(1), \fBps2pk\fP(1),
  \fBtexhash\fP(1), \fBxdvi\fP(1)\&.
  .PP
+Index: tetex-bin-3.0/texk/tetex/updmap
+===================================================================
+--- tetex-bin-3.0.orig/texk/tetex/updmap	2005-10-06 15:04:23.993654067 +0200
++++ tetex-bin-3.0/texk/tetex/updmap	2005-10-06 15:04:34.506526965 +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
+-version=1107552857 # seconds since `00:00:00 1970-01-01 UTC'
++version=1107552857-debian # seconds since `00:00:00 1970-01-01 UTC'
+                    # date '+%s' (with GNU date)
+ 
+ ###############################################################################
++# 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
++    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
+ ###############################################################################
+@@ -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.
+ ###############################################################################
++# for Debian, this is superseded by a function defined in debianize-updmap
++# (see below)
+ enableMap()
+ {
+   case $1 in
+@@ -373,6 +406,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 }' \
+@@ -385,6 +420,11 @@
+ }
+ 
+ ###############################################################################
++# source Debian-specific changes, superseding the last three functions
++###############################################################################
++. /usr/share/tetex-bin/debianize-updmap
++
++###############################################################################
+ # psADOBE()
+ #   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=
+ 
+Index: tetex-bin-3.0/texk/tetex/updmap-sys
+===================================================================
+--- tetex-bin-3.0.orig/texk/tetex/updmap-sys	2005-10-06 15:03:59.328298482 +0200
++++ tetex-bin-3.0/texk/tetex/updmap-sys	2005-10-06 15:04:34.526524821 +0200
+@@ -23,6 +23,7 @@
+ 
+ TEXMFVAR="$v"
+ TEXMFCONFIG="$c"
+-export TEXMFVAR TEXMFCONFIG
++progname=updmap-sys
++export TEXMFVAR TEXMFCONFIG progname
+ 
+ exec updmap ${1+"$@"}

Modified: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-libtool
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-libtool	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-libtool	2005-10-14 13:55:34 UTC (rev 224)
@@ -1,5 +1,12 @@
---- texk/libtool.m4.orig
-+++ texk/libtool.m4
+ texk/configure          |    6 +++---
+ texk/kpathsea/configure |    6 +++---
+ texk/libtool.m4         |    6 +++---
+ 3 files changed, 9 insertions(+), 9 deletions(-)
+
+Index: tetex-bin-3.0/texk/libtool.m4
+===================================================================
+--- tetex-bin-3.0.orig/texk/libtool.m4	2005-10-06 15:03:59.412289477 +0200
++++ tetex-bin-3.0/texk/libtool.m4	2005-10-06 15:04:31.523846743 +0200
 @@ -1617,7 +1617,7 @@
      ;;
  
@@ -27,8 +34,10 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
---- texk/configure.orig
-+++ texk/configure
+Index: tetex-bin-3.0/texk/configure
+===================================================================
+--- tetex-bin-3.0.orig/texk/configure	2005-10-06 15:03:59.416289048 +0200
++++ tetex-bin-3.0/texk/configure	2005-10-06 15:04:31.602838274 +0200
 @@ -2860,7 +2860,7 @@
    esac
    ;;
@@ -56,8 +65,10 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
---- texk/kpathsea/configure.orig
-+++ texk/kpathsea/configure
+Index: tetex-bin-3.0/texk/kpathsea/configure
+===================================================================
+--- tetex-bin-3.0.orig/texk/kpathsea/configure	2005-10-06 15:03:59.421288512 +0200
++++ tetex-bin-3.0/texk/kpathsea/configure	2005-10-06 15:04:31.833813511 +0200
 @@ -1839,7 +1839,7 @@
    esac
    ;;
@@ -84,4 +95,4 @@
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
-   =no
+   need_version=no

Modified: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-src
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-src	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-src	2005-10-14 13:55:34 UTC (rev 224)
@@ -1,5 +1,12 @@
---- texk/dvipdfm/Makefile.in.orig.0	Wed Feb  9 11:55:14 2005
-+++ texk/dvipdfm/Makefile.in	Wed Feb  9 11:55:15 2005
+ texk/dvipdfm/Makefile.in |    7 +++++--
+ texk/dvipdfm/dvipdfm.1   |    3 ++-
+ texk/dvipdfm/dvipdfm.c   |   38 ++++++++++++++++++++++++++++++--------
+ 3 files changed, 37 insertions(+), 11 deletions(-)
+
+Index: tetex-bin-3.0/texk/dvipdfm/Makefile.in
+===================================================================
+--- tetex-bin-3.0.orig/texk/dvipdfm/Makefile.in	2005-10-06 15:03:59.495280579 +0200
++++ tetex-bin-3.0/texk/dvipdfm/Makefile.in	2005-10-06 15:04:28.246198145 +0200
 @@ -12,7 +12,10 @@
  LIBPNGDEP = @LIBPNGDEP@
  LDLIBPNG = @LDLIBPNG@
@@ -21,8 +28,10 @@
  
  ebb: $(eobjects) $(kpathsea) $(ALL_LIBS_DEP)
  	$(kpathsea_link) $(eobjects) $(LD_ALL_LIBS) $(LOADLIBES)
---- texk/dvipdfm/dvipdfm.c.orig.0	Wed Feb  9 11:55:15 2005
-+++ texk/dvipdfm/dvipdfm.c	Wed Feb  9 11:55:15 2005
+Index: tetex-bin-3.0/texk/dvipdfm/dvipdfm.c
+===================================================================
+--- tetex-bin-3.0.orig/texk/dvipdfm/dvipdfm.c	2005-10-06 15:03:59.495280579 +0200
++++ tetex-bin-3.0/texk/dvipdfm/dvipdfm.c	2005-10-06 15:04:28.248197931 +0200
 @@ -27,6 +27,7 @@
  #include <string.h>
  #include <limits.h>
@@ -118,8 +127,10 @@
  
    do_args (argc, argv);
  
---- texk/dvipdfm/dvipdfm.1.orig.0	Wed Feb  9 11:55:15 2005
-+++ texk/dvipdfm/dvipdfm.1	Wed Feb  9 11:55:15 2005
+Index: tetex-bin-3.0/texk/dvipdfm/dvipdfm.1
+===================================================================
+--- tetex-bin-3.0.orig/texk/dvipdfm/dvipdfm.1	2005-10-06 15:03:59.495280579 +0200
++++ tetex-bin-3.0/texk/dvipdfm/dvipdfm.1	2005-10-06 15:04:28.262196430 +0200
 @@ -139,7 +139,8 @@
  .TP 5
  .B \-\^p " paper"

Modified: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tds
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tds	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tds	2005-10-14 13:55:34 UTC (rev 224)
@@ -1,5 +1,10 @@
---- texk/tetex/updmap.orig.0	Wed Feb  9 11:58:06 2005
-+++ texk/tetex/updmap	Wed Feb  9 11:58:06 2005
+ texk/tetex/updmap |   15 ++++++++++++---
+ 1 files changed, 12 insertions(+), 3 deletions(-)
+
+Index: tetex-bin-3.0/texk/tetex/updmap
+===================================================================
+--- tetex-bin-3.0.orig/texk/tetex/updmap	2005-10-06 15:03:59.646264392 +0200
++++ tetex-bin-3.0/texk/tetex/updmap	2005-10-06 15:04:23.993654067 +0200
 @@ -635,12 +635,15 @@
      else
        if test -f "$file2"; then
@@ -41,23 +46,3 @@
      ;;
    notFound)
      warn "
---- texk/kpathsea/texmf.in-teTeX.orig.0	Wed Feb  9 11:58:06 2005
-+++ texk/kpathsea/texmf.in-teTeX	Wed Feb  9 11:58:06 2005
-@@ -295,7 +295,7 @@
- MISCFONTS = .;$TEXMF/fonts/misc//
- 
- % font name map files.
--TEXFONTMAPS = .;$TEXMF/fonts/map//
-+TEXFONTMAPS = .;$TEXMF/fonts/map//;$TEXMF/dvips//
- 
- % support non"k"-xdvi:
- PKFONTS.XDvi    = .:$TEXMF/%s:$VARTEXFONTS/pk/{%m,modeless}//
-@@ -337,7 +337,7 @@
- INDEXSTYLE = .;$TEXMF/makeindex//
- 
- % Font encoding files (.enc).
--ENCFONTS = .;$TEXMF/fonts/enc//
-+ENCFONTS = .;$TEXMF/fonts/enc//;$TEXMF/dvips//
- 
- % CMap files.
- CMAPFONTS = .;$TEXMF/fonts/cmap//

Modified: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoc
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoc	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoc	2005-10-14 13:55:34 UTC (rev 224)
@@ -1,5 +1,11 @@
---- texk/tetex/texdoc.orig	2005-03-24 18:01:03.000000000 +0100
-+++ texk/tetex/texdoc	2005-03-24 18:01:03.000000000 +0100
+ texk/tetex/texdoc     |   73 +++++++++++++++++++++++++++++++-------------------
+ texk/tetex/texdoc.man |   32 +++++++++++++++++----
+ 2 files changed, 71 insertions(+), 34 deletions(-)
+
+Index: tetex-bin-3.0/texk/tetex/texdoc
+===================================================================
+--- tetex-bin-3.0.orig/texk/tetex/texdoc	2005-10-06 15:03:59.700258603 +0200
++++ tetex-bin-3.0/texk/tetex/texdoc	2005-10-06 15:04:20.869988961 +0200
 @@ -17,6 +17,15 @@
  #
  # Support for compressed documentation implemented by adopting changes
@@ -140,8 +146,10 @@
          eval "$uncompress $filename > $tmpdir/$src"
          filename=$tmpdir/$src
          viewer=`eval echo $viewer | sed -e "s|%s|$filename; rm -f $filename; cleanup|"`
---- texk/tetex/texdoc.man.orig	2005-03-24 18:01:03.000000000 +0100
-+++ texk/tetex/texdoc.man	2005-03-24 18:01:22.000000000 +0100
+Index: tetex-bin-3.0/texk/tetex/texdoc.man
+===================================================================
+--- tetex-bin-3.0.orig/texk/tetex/texdoc.man	2005-10-06 15:03:59.701258496 +0200
++++ tetex-bin-3.0/texk/tetex/texdoc.man	2005-10-06 15:04:20.870988854 +0200
 @@ -28,12 +28,17 @@
  .PP 
  .SH "OPTIONS" 

Modified: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoctk
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoctk	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texdoctk	2005-10-14 13:55:34 UTC (rev 224)
@@ -1,5 +1,10 @@
---- texk/tetex/texdoctk.orig	2005-03-21 17:56:41.000000000 +0100
-+++ texk/tetex/texdoctk	2005-03-21 17:56:58.000000000 +0100
+ texk/tetex/texdoctk |   26 +++++++++++++++++++++++---
+ 1 files changed, 23 insertions(+), 3 deletions(-)
+
+Index: tetex-bin-3.0/texk/tetex/texdoctk
+===================================================================
+--- tetex-bin-3.0.orig/texk/tetex/texdoctk	2005-10-06 15:03:59.769251207 +0200
++++ tetex-bin-3.0/texk/tetex/texdoctk	2005-10-06 15:04:18.050291265 +0200
 @@ -9,11 +9,30 @@
  # and the full disclaimer.
  ###############################################################################

Modified: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texmfcnf
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texmfcnf	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-texmfcnf	2005-10-14 13:55:34 UTC (rev 224)
@@ -1,5 +1,11 @@
---- texk/kpathsea/texmf.in-teTeX.orig	2005-03-21 13:41:56.000000000 +0100
-+++ texk/kpathsea/texmf.in-teTeX	2005-03-21 13:42:22.000000000 +0100
+ texk/kpathsea/Makefile.in    |    1 +
+ texk/kpathsea/texmf.in-teTeX |   17 +++++++++++------
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+Index: tetex-bin-3.0/texk/kpathsea/texmf.in-teTeX
+===================================================================
+--- tetex-bin-3.0.orig/texk/kpathsea/texmf.in-teTeX	2005-10-06 15:03:59.821245632 +0200
++++ tetex-bin-3.0/texk/kpathsea/texmf.in-teTeX	2005-10-06 15:04:14.662654460 +0200
 @@ -59,12 +59,15 @@
  TEXMFMAIN = @texmf@
  
@@ -56,8 +62,10 @@
  
  % 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.
---- texk/kpathsea/Makefile.in.orig	2005-03-21 13:41:56.000000000 +0100
-+++ texk/kpathsea/Makefile.in	2005-03-21 13:41:56.000000000 +0100
+Index: tetex-bin-3.0/texk/kpathsea/Makefile.in
+===================================================================
+--- tetex-bin-3.0.orig/texk/kpathsea/Makefile.in	2005-10-06 15:03:59.821245632 +0200
++++ tetex-bin-3.0/texk/kpathsea/Makefile.in	2005-10-06 15:04:14.677652852 +0200
 @@ -88,6 +88,7 @@
  	echo '/^[% ]*TEXMFCONFIG[ =]/s%\$$TEXMF%$(texmf)%' >>$@
  	echo '/^[% ]*TEXMFVAR[ =]/s%$(texmf)MAIN%\$$TEXMFMAIN%' >>$@

Modified: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tmp
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tmp	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-tmp	2005-10-14 13:55:34 UTC (rev 224)
@@ -1,5 +1,13 @@
---- texk/tetex/epstopdf.orig	2005-02-25 15:28:17.000000000 +0100
-+++ texk/tetex/epstopdf	2005-02-25 15:28:00.000000000 +0100
+ texk/dvipdfm/ebb.1      |    6 ++----
+ texk/dvipdfm/ebb.c      |    2 +-
+ texk/tetex/epstopdf     |    3 ++-
+ texk/tetex/epstopdf.man |    8 +++++---
+ 4 files changed, 10 insertions(+), 9 deletions(-)
+
+Index: tetex-bin-3.0/texk/tetex/epstopdf
+===================================================================
+--- tetex-bin-3.0.orig/texk/tetex/epstopdf	2005-10-06 15:03:59.875239843 +0200
++++ tetex-bin-3.0/texk/tetex/epstopdf	2005-10-06 15:04:11.255019798 +0200
 @@ -205,7 +205,8 @@
  ### open output file
  if ($::opt_gs) {
@@ -10,8 +18,10 @@
    debug "Ghostscript pipe:", $pipe;
    open(OUT,"|$pipe") or error "Cannot open Ghostscript for piped input";
  }
---- texk/tetex/epstopdf.man.orig	2005-02-25 15:28:17.000000000 +0100
-+++ texk/tetex/epstopdf.man	2005-02-25 15:27:46.000000000 +0100
+Index: tetex-bin-3.0/texk/tetex/epstopdf.man
+===================================================================
+--- tetex-bin-3.0.orig/texk/tetex/epstopdf.man	2005-10-06 15:03:59.875239843 +0200
++++ tetex-bin-3.0/texk/tetex/epstopdf.man	2005-10-06 15:04:11.255019798 +0200
 @@ -14,10 +14,12 @@
  .P
  If the bounding box is not right, of course, you have problems...
@@ -28,3 +38,34 @@
  .IP "\fB--\fP[\fBno\fP]\fBgs\fP"
  run ghostscript       (default: --gs).
  .IP "\fB--\fP[\fBno\fP]\fBcompress\fP"
+Index: tetex-bin-3.0/texk/dvipdfm/ebb.c
+===================================================================
+--- tetex-bin-3.0.orig/texk/dvipdfm/ebb.c	2005-10-06 15:03:59.875239843 +0200
++++ tetex-bin-3.0/texk/dvipdfm/ebb.c	2005-10-06 15:04:11.256019691 +0200
+@@ -49,7 +49,7 @@
+   fprintf (stderr, "ebb comes with ABSOLUTELY NO WARRANTY.\n");
+   fprintf (stderr, "This is free software, and you are welcome to redistribute it\n");
+   fprintf (stderr, "under certain conditions.  Details are distributed with the software.\n");
+-  fprintf (stderr, "\nUsage: [-v] [-b] ebb [files]\n");
++  fprintf (stderr, "\nUsage: ebb [-v] [-b] [files]\n");
+   fprintf (stderr, "\t-b\t\tWrite .bb file in binary mode\n");
+   fprintf (stderr, "\t-v\t\tVerbose\n");
+   exit(1);
+Index: tetex-bin-3.0/texk/dvipdfm/ebb.1
+===================================================================
+--- tetex-bin-3.0.orig/texk/dvipdfm/ebb.1	2005-10-06 15:03:59.875239843 +0200
++++ tetex-bin-3.0/texk/dvipdfm/ebb.1	2005-10-06 15:04:11.257019583 +0200
+@@ -18,11 +18,9 @@
+ .HP
+ \fB\-v\fR : be verbose
+ .HP
+-\fB\-b\fR : Write .bb file in binary mode
++\fB\-b\fR : Write .bb file in binary mode (has no effect on Linux and
++other systems conforming to POSIX).
+ .HP
+-.SH "BUGS" 
+-.PP 
+-I cannot find a difference between binary and standard .bb files\&.
+ .PP 
+ .SH "AUTHOR" 
+ .PP 

Modified: tetex-bin/branches/changelog_for_unstable/debian/patches/patch-xdvi-300109
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/patches/patch-xdvi-300109	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/patches/patch-xdvi-300109	2005-10-14 13:55:34 UTC (rev 224)
@@ -1,5 +1,10 @@
---- texk/xdvik/xdvi.c.orig	2005-02-04 14:24:39.000000000 +0100
-+++ texk/xdvik/xdvi.c	2005-03-21 17:47:03.000000000 +0100
+ texk/xdvik/xdvi.c |    9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+Index: tetex-bin-3.0/texk/xdvik/xdvi.c
+===================================================================
+--- tetex-bin-3.0.orig/texk/xdvik/xdvi.c	2005-10-06 15:03:59.962230517 +0200
++++ tetex-bin-3.0/texk/xdvik/xdvi.c	2005-10-06 15:04:03.811817796 +0200
 @@ -3964,8 +3964,13 @@
  	
      if (real_filename == NULL)

Copied: tetex-bin/branches/changelog_for_unstable/debian/patches/series (from rev 222, tetex-bin/trunk/debian/patches/series)

Modified: tetex-bin/branches/changelog_for_unstable/debian/postinst.functions
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/postinst.functions	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/postinst.functions	2005-10-14 13:55:34 UTC (rev 224)
@@ -6,14 +6,13 @@
 # sanitize /etc/texmf/texmf.cnf
 #
 # First the setting of TEXMFSYSVAR
-  insertedtext="
-% TEXMFSYSVAR *must* be set to /var/lib/texmf in Debian; the old
-% name VARTEXMF is no longer used
-%
-% This variable was forcibly introduced by the postinst script.
-TEXMFSYSVAR = /var/lib/texmf'
-
-
+  insertedtext="% TEXMFSYSVAR *must* be set to /var/lib/texmf in Debian; the old \\
+% name VARTEXMF is no longer used \\
+% \\
+% This variable was forcibly introduced by the postinst script.\\
+TEXMFSYSVAR = /var/lib/texmf \\
+\\
+\\
 "
   if ! grep '^[[:space:]]*TEXMFSYSVAR' $TEXMFCNF >/dev/null; then
     # the needed entry is missing, we have to edit - therefore create a tempfile
@@ -26,22 +25,24 @@
       # the setting line). We put the new setting after the paragraph in
       # which TEXMFSYSVAR first occurs.
       perl -e "
-open(MYFILE,qq($TEXMFCNF));
-my (\$found, \$written) = (0,0);
-while (<MYFILE>){
-print;
-if (! \$found && /TEXMFSYSVAR/){\$found=1}
-if (\$found && ! \$written && /^\$/){
-\$written=1;
-print qq($insertedtext);
-}
-}" > $tempfile
+my \$insertedtext=qq($insertedtext);	   
+\$insertedtext=~s/\\$/\n/;		   
+open(MYFILE,qq($TEXMFCNF));		   
+my (\$found, \$written) = (0,0);	   
+while (<MYFILE>){			   
+print;					   
+if (! \$found && /TEXMFSYSVAR/){\$found=1} 
+if (\$found && ! \$written && /^\$/){	   
+\$written=1;				   
+print qq(\$insertedtext);		   
+}					   
+}" > $tempfile                             
       savemove $tempfile $TEXMFCNF
     else
       # there is no mention of TEXMFSYSVAR at all (Strange). Is VARTEXMF set?
       if grep '^[[:space:]]*VARTEXMF' $TEXMFCNF >/dev/null; then
 	# yes, we replace it
-	sed -e "/^[[:space:]]*TEXMFSYSVAR/{i\
+	sed -e "/^[[:space:]]*VARTEXMF/{i\
 $insertedtext
 ;d}" texmf.d/05TeXMF.cnf > $tempfile
       else
@@ -49,6 +50,8 @@
 	if grep VARTEXMF $TEXMFCNF >/dev/null; then
 	  # we put the new entry after that paragraph
 	  perl -e "
+my \$insertedtext=qq($insertedtext);
+\$insertedtext=~s/\\$/\n/;
 open(MYFILE,qq($TEXMFCNF));
 my (\$found, \$written) = (0,0);
 while (<MYFILE>){
@@ -56,7 +59,7 @@
 if (! \$found && /VARTEXMF/){\$found=1}
 if (\$found && ! \$written && /^\$/){
 \$written=1;
-print qq($insertedtext);
+print qq(\$insertedtext);
 }
 }" > $tempfile
 	  savemove $tempfile $TEXMFCNF
@@ -65,6 +68,8 @@
 	  # at the beginning of the part that comes from 05TeXMF.cnf, which
 	  # must always be there
 	  perl -e "
+my \$insertedtext=qq($insertedtext);
+\$insertedtext=~s/\\$/\n/;
 open(MYFILE,qq($TEXMFCNF));
 my (\$found, \$written) = (0,0);
 while (<MYFILE>){
@@ -72,7 +77,7 @@
 if (! \$found && /^%%% From file: /etc/texmf/texmf.d/05TeXMF.cnf/){\$found=1}
 if (\$found && ! \$written && /^\$/){
 \$written=1;
-print qq($insertedtext);
+print qq(\$insertedtext);
 }
 }" > $tempfile
 	  savemove $tempfile $TEXMFCNF

Modified: tetex-bin/branches/changelog_for_unstable/debian/postinst.in
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/postinst.in	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/postinst.in	2005-10-14 13:55:34 UTC (rev 224)
@@ -2,7 +2,7 @@
 #!/bin/sh -e
 # 
 # postinst maintainer script for the Debian <:=${PACKAGE}:> package.
-# $Id: postinst.in,v 1.1.2.6 2005/03/14 15:32:13 frank Exp $
+# $Id$
 <:=@COPYRIGHT:>//
 
 ## Define static variables we need
@@ -13,8 +13,13 @@
 DFLT=/usr/share/tetex-base/language.dflt
 LSRS="<:=$LSRS:>"
 TEXMFCNF=<:=$TEXMF_CNF:>
+#UCF="ucf --verbose -d --debconf-ok"
+UCF="ucf --debconf-ok"
 
+
 # Variables needed for upgrading
+UCF_FILES=<:=$UCF_FILES:>
+UCF_SOURCEDIR=/usr/share/tetex-bin
 OLD_WEB2C=<:=$OLD_WEB2C:>
 SYMLINK_MOVE_EXT=<:=$SYMLINK_MOVE_EXT:>
 WOODY_FMTCNF=<:=$WOODY_FMTCNF:>
@@ -25,7 +30,10 @@
 LDAT_PATTERNS="<:=$LDAT_PATTERNS:>"
 LDAT_VERSION=2.0.2a-1 # this should be the version of tetex-base
                       # that ships the correct language.dflt    
+OBSOLETE_DEBCONFQ="tetex-bin/lsr-perms tetex-bin/groupname tetex-bin/groupperm tetex-bin/userperm"
 
+
+
 umask 022
 
 # Give names to the commandline arguments - only the first 
@@ -89,10 +97,19 @@
     # around this.  
     sanitize_texmfcnf
 
+# upgrade from sarge:  fmtutil snippet renamed
+    for name in $UCF_FILES; do
+      filename=`basename $name`
+      $UCF $UCF_SOURCEDIR/$filename /etc/texmf/$name
+    done
+
+
 # upgrade from woody    
     # handling of fmtutil.cnf
     # determine which kind of fmtutil setup was used previously
-    if dpkg --compare-versions "old_version" lt 1.0.7+20021025-7; then
+    # TODO:
+    # what about sarge? It allows a non-generated fmtutil.cnf, too, doesn't it?
+    if dpkg --compare-versions "$old_version" lt 1.0.7+20021025-7; then
       # we use the original file shipped with woody statically
       COMPARE_FMTCNF=$WOODY_FMTCNF
     else
@@ -104,7 +121,7 @@
       mv $TEXMFSYSVAR/fmtutil.cnf $TEXMFSYSVAR/fmtutil.cnf.$MOVE_EXT
     fi
     # now generate the new fmtutil.cnf
-    update-fmtutil
+    update-fmtutil --quiet
     # now we have to check whether there are user-added lines, create a local 
     # configuration file, and run the update program once more if yes.
     if [ -f $ETC_FMTCNF ]; then
@@ -115,7 +132,7 @@
 
 # upgrade from woody
     # updmap.cfg handling
-    update-updmap
+    update-updmap --quiet
     # if  $TEXMFSYSVAR/updmap.cfg is a symlink, we have to move it out of the way.
     if [ -L $TEXMFSYSVAR/updmap.cfg ]; then
       mv $TEXMFSYSVAR/updmap.cfg $TEXMFSYSVAR/updmap.cfg.$MOVE_EXT
@@ -125,7 +142,7 @@
     if [ -f $ETC_MAPCFG ]; then
       create_localconf $ETC_MAPCFG $VAR_MAPCFG \\
 	/etc/texmf/updmap.d/99postinst.cfg update-updmap \
-	&& update-updmap
+	&& update-updmap --quiet
     fi
 
     # xdvi.bin is also provided by other packages
@@ -138,6 +155,22 @@
 	update-alternatives --auto $program
       fi
     done
+
+# upgrade from sarge
+    # deregister unused debconf questions.  We depend on tex-common, therefore it will
+    # be configured first, and since old 3.0 versions are only in experimental, we don't
+    # care about those who upgrade from there and might loose their answers.
+    if dpkg --compare-versions "$old_version" lt 3.0; then
+      # upgrade from sarge or old etch devel versions
+      for question in $OBSOLETE_DEBCONFQ; do
+	db_unregister $question || true
+      done
+    fi
+
+# upgrade from some experimental versions
+    obsolete_fmtf=/etc/texmf/fmt.d/00tetex.cnf
+    # TODO: needs a transition to 01tetex.cnf, including ucf and all that
+
 # normal install
     update-alternatives --install /usr/bin/xdvi.bin xdvi.bin /usr/bin/xdvi.real 30
     update-alternatives --install /usr/bin/oxdvi.bin oxdvi.bin /usr/bin/oxdvi.real 30
@@ -152,33 +185,6 @@
     # now create the font map files.
     create_fontmaps
 
-    # set permissions of ls-R files (copyright?)
-    db_get tetex-bin/lsr-perms || true
-    if [ x"$RET" = x"true" ]; then
-      echo Fixing permissions and group of ls-R as specified by debconf ...
-
-      db_get tetex-bin/groupperm || true
-      if [ x"$RET" = x"true" ]; then
-	LSRPERMS=66
-      else
-	LSRPERMS=64
-      fi
-      db_get tetex-bin/userperm || true
-      if [ x"$RET" = x"true" ]; then
-	LSRPERMS="$LSRPERMS"6
-      else
-	LSRPERMS="$LSRPERMS"4
-      fi
-
-      chmod -v $LSRPERMS $LSRS 2>/dev/null | fgrep changed || true
-
-      db_get tetex-bin/groupname || true
-      chgrp -v $RET $LSRS 2>/dev/null | fgrep changed || true
-    else
-      echo Fixing permissions of ls-R files ...
-      chmod -v 644 $LSRS 2>/dev/null | fgrep changed || true
-    fi
-
     ;;
   *)
     ;;

Modified: tetex-bin/branches/changelog_for_unstable/debian/postrm.in
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/postrm.in	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/postrm.in	2005-10-14 13:55:34 UTC (rev 224)
@@ -2,7 +2,7 @@
 #!/bin/sh -e
 # 
 # postrm maintainer script for the Debian <:=${PACKAGE}:> package.
-# $Id: postrm.in,v 1.1.2.3 2005/03/14 15:32:13 frank Exp $
+# $Id$
 <:=@COPYRIGHT:>//
 
 ## variables
@@ -13,10 +13,47 @@
 VERYOLD_FONTCACHE=/var/spool/texmf
 OBS_CONFFILES="/etc/texmf/fmtutil.cnf /etc/texmf/updmap.cfg"
 OLD_WEB2C=<:=$OLD_WEB2C:>
+UCF_FILES=<:=$UCF_FILES:>
 
 # give commandline args a name
 action=$1 # remove, purge, upgrade, failed-upgrade, abort-install, abort-upgrade, disappear
 
+# the following two functions are from tetex-base's postrm.functions;  they should
+# be included in a new common.postrm.functions file in tex-common.
+remove_with_backups(){
+  file=$1
+  for extension in $DPKG_EXT; do
+    rm -f $file$extension
+  done
+  rm -f $file
+}
+
+ucf_purge(){
+  directory=/etc/texmf
+  case "$1" in
+    -d|--directory)
+      directory=$2
+      shift 2
+      ;;
+  esac
+  filelist="$@"
+  if [ -x /usr/bin/ucf ]; then # we can't rely on ucf being still installed in postrm
+    purgefile(){ ucf --purge $1; remove_with_backups $1; }
+  else
+    purgefile(){ remove_with_backups $1; }
+  fi
+  for file in $filelist; do
+    # does this filename start with a leading slash?
+    relativename=${file#/}
+    if [ ! "$file" = "$relativename" ]; then 
+      # leading slash, change directory
+      directory=`dirname $file`
+      file=`basename $file`
+    fi
+    purgefile $directory/$file
+  done
+}
+
 <:open(FUNCTIONS,'postrm.functions');@FUNCTIONS=<FUNCTIONS>;close(FUNCTIONS):>//
 <:=@FUNCTIONS:>//
 
@@ -83,6 +120,7 @@
     rm -rf $TEXMFSYSVAR/fonts
     ;;
   purge)
+    ucf_purge $UCF_FILES
     ;;
   *)
     ;;

Modified: tetex-bin/branches/changelog_for_unstable/debian/preinst.in
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/preinst.in	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/preinst.in	2005-10-14 13:55:34 UTC (rev 224)
@@ -2,12 +2,12 @@
 #!/bin/sh -e
 # 
 # preinst maintainer script for the Debian <:=${PACKAGE}:> package.
-# $Id: preinst.in,v 1.1.2.3 2005/03/07 18:49:28 frank Exp $
+# $Id$
 <:=@COPYRIGHT:>//
 
 # Define static variables we need
-UCF_FILES="<:=$UCF_FILES:>"
-ETCTEXMF=/etc/texmf/texmf.d
+#UCF_FILES="<:=$UCF_FILES:>" # only 01tetex.cnf, handled specially without specific reason
+ETCTEXMF=/etc/texmf
 TEXMFSYSVAR=<:=$TEXMFSYSVAR:>
 OLD_WEB2C=<:=$OLD_WEB2C:>
 VARFONTSFILE=/etc/texmf/varfontdirs.debian
@@ -38,15 +38,24 @@
   install|upgrade)
     # make sure we don't end up without a texmf.cnf
     ucf_purge_texmf_maybe
-    # rename old conffiles in texmf.d (handled by ucf now so the user won't get strange questions)
-    for file in $UCF_FILES; do
-      if [ -f $TEXMF_DIR/$file ] && [ ! -f $TEXMF_DIR/$file.cnf ]; then
-	mv $TEXMF_DIR/$file $TEXMF_DIR/$file.cnf
+    # rename 00tetex.cnf to 01tetex.cnf
+    if [ -f $ETCTEXMF/fmt.d/00tetex.cnf ]; then 
+      if [ ! -f $ETCTEXMF/fmt.d/01tetex.cnf ]; then
+	# not yet transitioned
+	mv $ETCTEXMF/fmt.d/00tetex.cnf $ETCTEXMF/fmt.d/01tetex.cnf
+      else
+	# some older experimental version has installed the new file, but not 
+	# transitioned the old one.
+	current_md5sum=`md5sum $ETCTEXMF/fmt.d/00tetex.cnf | cut -d ' ' -f 1`
+	if [ "$current_md5sum" = "55811af3562faf342261dbc3b5e060a2" ]; then
+	  rm $ETCTEXMF/fmt.d/00tetex.cnf
+	else
+	  # we do nothing; experimental users should be able to solve this
+	  :
+	fi
       fi
-    done
+    fi
 
-    # omega and lambda fonts have extension *.oft, but had *.fmt earlier
-    rm -f $TEXMFSYSVAR/web2c/omega.fmt $TEXMFSYSVAR/web2c/lambda.fmt 
     # dpkg won't change a symlink to a directory; therefore we first move it out
     # of the way      
     preinst_move_symlink $OLD_WEB2C
@@ -56,6 +65,12 @@
       INFO_TEXT="<:=$STANDARD_INFO_TEXT:>"
       rename_catinfo $VARFONTSFILE
     fi
+    
+    # rename, file unchanged - hope this works
+    fmtdir=/etc/texmf/fmt.d
+    if [ -f $fmtdir/00tetex.cnf ] &&  [ -f $fmtdir/01tetex.cnf ]; then
+      mv $fmtdir/00tetex.cnf $fmtdir/01tetex.cnf
+    fi
     ;;
   abort-upgrade)
     # make sure we don't end up without a texmf.cnf

Modified: tetex-bin/branches/changelog_for_unstable/debian/rules
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/rules	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/rules	2005-10-14 13:55:34 UTC (rev 224)
@@ -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
@@ -25,16 +28,17 @@
 stampdir=./stampdir
 
 # use the Debian single file patch system
-export DSF-PATCHLIST=debian/patches/patchlist.mk
-include /usr/share/dsfp/dsf-patch.mk
+# export DSF-PATCHLIST=debian/patches/patchlist.mk
+# include /usr/share/dsfp/dsf-patch.mk
 
 SHELL=/bin/bash
 
-ifeq ($(DEB_BUILD_ARCH),ia64)
-  CFLAGS=-g
-else
-  CFLAGS =
-endif
+# commented to test whether this is still needed (see bugs #269039 and #180665)
+# ifeq ($(DEB_BUILD_ARCH),ia64)
+#   CFLAGS=-g
+# else
+#   CFLAGS =
+# endif
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
   CFLAGS += -O0
@@ -42,6 +46,7 @@
   CFLAGS += -O2
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+  # this or dh_strip...
   INSTALL_PROGRAM += -s
 endif
 
@@ -125,6 +130,19 @@
 configure:
 	:
 
+$(stampdir): 
+	mkdir $(stampdir) || touch $(stampdir)
+
+clean-patches:
+	-quilt pop -a
+	rm -f patch-stamp
+
+patch-stamp:
+	quilt push -a
+	# for debugging pbuilder:
+	env
+	touch $@
+
 clean-commonstuff:
 	$(update_commonstuff)
 
@@ -221,6 +239,7 @@
 	debian/tetex-bin_install --conffiles
 	debian/tetex-bin_install --xdvi
 	debian/tetex-bin_install --misc
+	debian/tetex-bin_install --omfonts
 
 
 install-lib: build-stamp
@@ -294,7 +313,7 @@
 	touch debian/rules.in
 	echo "dummy content for dpkg-source" > debian/sid-stamp 
 
-.PHONY: binary binary-arch binary-indep clean checkroot patchclean sarge sid
+.PHONY: binary binary-arch binary-indep clean checkroot clean-patches sarge sid
 
 
 # Local variables:

Modified: tetex-bin/branches/changelog_for_unstable/debian/rules.in
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/rules.in	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/rules.in	2005-10-14 13:55:34 UTC (rev 224)
@@ -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
@@ -30,16 +33,17 @@
 stampdir=./stampdir
 
 # use the Debian single file patch system
-export DSF-PATCHLIST=debian/patches/patchlist.mk
-include /usr/share/dsfp/dsf-patch.mk
+# export DSF-PATCHLIST=debian/patches/patchlist.mk
+# include /usr/share/dsfp/dsf-patch.mk
 
 SHELL=/bin/bash
 
-ifeq ($(DEB_BUILD_ARCH),ia64)
-  CFLAGS=-g
-else
-  CFLAGS =
-endif
+# commented to test whether this is still needed (see bugs #269039 and #180665)
+# ifeq ($(DEB_BUILD_ARCH),ia64)
+#   CFLAGS=-g
+# else
+#   CFLAGS =
+# endif
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
   CFLAGS += -O0
@@ -47,6 +51,7 @@
   CFLAGS += -O2
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+  # this or dh_strip...
   INSTALL_PROGRAM += -s
 endif
 
@@ -130,6 +135,19 @@
 configure:
 	:
 
+$(stampdir): 
+	mkdir $(stampdir) || touch $(stampdir)
+
+clean-patches:
+	-quilt pop -a
+	rm -f patch-stamp
+
+patch-stamp:
+	quilt push -a
+	# for debugging pbuilder:
+	env
+	touch $@
+
 clean-commonstuff:
 	$(update_commonstuff)
 
@@ -226,6 +244,7 @@
 	debian/tetex-bin_install --conffiles
 	debian/tetex-bin_install --xdvi
 	debian/tetex-bin_install --misc
+	debian/tetex-bin_install --omfonts
 
 
 install-lib: build-stamp
@@ -299,7 +318,7 @@
 	touch debian/rules.in
 	echo "dummy content for dpkg-source" > debian/sid-stamp 
 
-.PHONY: binary binary-arch binary-indep clean checkroot patchclean sarge sid
+.PHONY: binary binary-arch binary-indep clean checkroot clean-patches sarge sid
 
 
 # Local variables:

Modified: tetex-bin/branches/changelog_for_unstable/debian/templates
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/templates	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/templates	2005-10-14 13:55:34 UTC (rev 224)
@@ -1,40 +1,3 @@
-Template: tetex-bin/lsr-perms
-Type: boolean
-Default: true
-_Description: Use debconf to manage permissions of ls-R files?
- A lot of font files have to be generated before they can be used by
- xdvi, dvips etc. These files are stored in /var/cache/fonts, so that
- they do not need to be regenerated every time. ls-R files tell the
- system which files already exist, and where to find them.
- .
- Accepting this option will allow you to easily manage the permissions of
- those ls-R files using debconf. Otherwise you will have to manually
- ensure that they get useful but safe permissions.
-
-Template: tetex-bin/groupname
-Type: string
-Default: users
-_Description: Which group should own the ls-R files?
- Modification of ls-R files can be restricted to the members of one group
- which owns them.  To take advantage of this, add the users to the group of
- your choice, and enter that group name here.  The default group, 'users', is
- appropriate for most systems.
-
-Template: tetex-bin/groupperm
-Type: boolean
-Default: true
-_Description: Allow group members to modify ls-R files?
- Accepting this option will allow members of the owning group to modify the
- ls-R files.
-
-Template: tetex-bin/userperm
-Type: boolean
-Default: false
-_Description: Allow all users to modify ls-R files?
- Accepting this option will allow all users to modify ls-R files.  This is
- generally not a good idea for security reasons; you should instead
- restrict such access to members of one group.
-
 Template: tetex-bin/cnf_name
 Type: note
 _Description: Change of name of files in /etc/texmf/texmf.d/

Modified: tetex-bin/branches/changelog_for_unstable/debian/tetex-bin_install.in
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/tetex-bin_install.in	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/tetex-bin_install.in	2005-10-14 13:55:34 UTC (rev 224)
@@ -2,12 +2,13 @@
 #!/bin/sh -e
 # 
 # tetex-bin_install maintainer script for the Debian <:=${PACKAGE}:> package.
-# $Id: tetex-bin_install.in,v 1.1.2.7 2005/07/20 10:10:50 frank Exp $
+# $Id$
 <:=@COPYRIGHT:>//
 
 # assign static variables
 package=<:=$PACKAGE:>
 sharedir=debian/$package/usr/share
+txmfvardir=debian/$package/var/lib/texmf
 txmfdir=$sharedir/texmf
 etcdir=/etc/texmf
 debetc=debian/$package/$etcdir
@@ -40,39 +41,34 @@
   --manpage-links)
     if [ $ACTION = install ]; then
       ln -s tangle.1 $sharedir/man/man1/otangle.1
-      ln -s pdfetex.1 $sharedir/man/man1/pdfelatex.1
-      ln -s pdfetex.1 $sharedir/man/man1/inipdfetex.1
-      ln -s pdfetex.1 $sharedir/man/man1/virpdfetex.1
+      # no manpage for aleph
+      #ln -s aleph.1 $sharedir/man/man1/lamed.1
       ln -s xdvi.1 $sharedir/man/man1/xdvi.bin.1
       ln -s xdvi.1 $sharedir/man/man1/xdvi.real.1
     else
       rm $sharedir/man/man1/otangle.1
-      rm $sharedir/man/man1/pdfelatex.1
-      rm $sharedir/man/man1/inipdfetex.1
-      rm $sharedir/man/man1/virpdfetex.1
+      #rm $sharedir/man/man1/lamed.1
       rm $sharedir/man/man1/xdvi.bin.1
       rm $sharedir/man/man1/xdvi.real.1
     fi
     ;;
   --format-links)
     if [ $ACTION = install ]; then
-      ln -s mf.base $txmfdir/web2c/mfw.base
+      ln -s mf.base $txmfvardir/web2c/mfw.base
       ln -s $main_engine debian/$package/usr/bin/amstex
       ln -s $main_engine debian/$package/usr/bin/latex
-      ln -s $main_engine debian/$package/usr/bin/elatex
       ln -s omega debian/$package/usr/bin/lambda
+      ln -s aleph debian/$package/usr/bin/lamed
       ln -s $main_engine debian/$package/usr/bin/pdflatex
-      ln -s $main_engine debian/$package/usr/bin/pdfelatex
       ln -s $main_engine debian/$package/usr/bin/etex
       ln -s $main_engine debian/$package/usr/bin/pdftex
     else
       rm $txmfdir/web2c/mfw.base
       rm debian/$package/usr/bin/amstex
       rm debian/$package/usr/bin/latex
-      rm debian/$package/usr/bin/elatex
       rm debian/$package/usr/bin/lambda
+      rm debian/$package/usr/bin/lamed
       rm debian/$package/usr/bin/pdflatex
-      rm debian/$package/usr/bin/pdfelatex
       rm debian/$package/usr/bin/etex
       rm debian/$package/usr/bin/pdftex
     fi
@@ -80,6 +76,7 @@
   --debianprogs)
     if [ $ACTION = install ]; then
       install -m 755 debian/tetex-xwarn debian/$package/usr/bin
+      install debian/debianize-updmap debian/$package/usr/share/tetex-bin
     else
       rm debian/$package/usr/bin/tetex-xwarn
     fi
@@ -87,14 +84,14 @@
   --conffiles)
     if [ $ACTION = install ]; then
       fmtutil_source=$txmfdir/web2c/fmtutil.cnf
-      # cut away from configuration files the parts already in tex-common
-      sed -n -e '0,/^# initex (or another/ d;p' $fmtutil_source > $debetc/fmt.d/00tetex.cnf
-      mv $fmtutil_source $sharedir/tetex-bin
+      # cut away from configuration files the parts that are already in tex-common
+      sed -n -e '0,/^# initex (or another/ d;p' $fmtutil_source > $sharedir/$package/01tetex.cnf
+      mv $fmtutil_source $sharedir/$package
       # remove texmf.cnf (is now in tex-common)
       rm $txmfdir/web2c/texmf.cnf
     else
       mv $sharedir/tetex-bin/fmtutil.cnf $txmfdir/web2c/
-      rm $debetc/fmt.d/00tetex.cnf
+      #rm $debetc/fmt.d/00tetex.cnf
     fi
     ;;
   --xdvi)
@@ -114,12 +111,26 @@
   --misc)
     if [ $ACTION = install ]; then
       ln -s ../bin/texconfig debian/$package/usr/sbin/
-      cp texk/web2c/cwebdir/cweb.el $sharedir/emacs/site-lisp/
+      # outdated file, should be in an Emacs package
+      # cp texk/web2c/cwebdir/cweb.el $sharedir/emacs/site-lisp/
     else
       rm debian/$package/usr/sbin/texconfig
-      rm $sharedir/emacs/site-lisp/cweb.el
+      # rm $sharedir/emacs/site-lisp/cweb.el
     fi
     ;;
+  --omfonts)
+    if [ $ACTION = install ]; then
+      ln -s omfonts debian/$package/usr/bin/ofm2opl
+      ln -s omfonts debian/$package/usr/bin/opl2ofm
+      ln -s omfonts debian/$package/usr/bin/ovf2ovp
+      ln -s omfonts debian/$package/usr/bin/ovp2ovf
+    else
+      rm debian/$package/usr/bin/ofm2opl
+      rm debian/$package/usr/bin/opl2ofm
+      rm debian/$package/usr/bin/ovf2ovp
+      rm debian/$package/usr/bin/ovp2ovf
+    fi
+    ;;
 #   --option)
 #     if [ $ACTION = install ]; then
 #     else

Modified: tetex-bin/branches/changelog_for_unstable/debian/variables
===================================================================
--- tetex-bin/branches/changelog_for_unstable/debian/variables	2005-10-14 13:54:41 UTC (rev 223)
+++ tetex-bin/branches/changelog_for_unstable/debian/variables	2005-10-14 13:55:34 UTC (rev 224)
@@ -13,6 +13,7 @@
 <:$SYMLINK_MOVE_EXT="moved-by-preinst":>//
 <:$WOODY_FMTCNF="$PKG_SHAREDIR/fmtutil.cnf.1.0.7":>//
 <:### Variables needed for upgrades since sarge:>//
+<:$UCF_FILES="fmt.d/01tetex.cnf":>//
 <:# Misc package variables:>//
 <:$INFOSEC="Document Preparation":>//
 <:$EPRIORITY="50":>//




More information about the Pkg-tetex-commits mailing list