[subversion-commit] SVN tetex commit + diffs: r206 - in tetex-bin/trunk/debian: . patches

Frank Küster frank at costa.debian.org
Thu Oct 6 13:08:28 UTC 2005 

Author: frank
Date: 2005-10-06 13:08:25 +0000 (Thu, 06 Oct 2005)
New Revision: 206

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/patches/patch-CAN-2004-0888
   tetex-bin/trunk/debian/patches/patch-CAN-2005-0064
   tetex-bin/trunk/debian/patches/patch-deb
   tetex-bin/trunk/debian/patches/patch-libtool
   tetex-bin/trunk/debian/patches/patch-src
   tetex-bin/trunk/debian/patches/patch-tds
   tetex-bin/trunk/debian/patches/patch-texdoc
   tetex-bin/trunk/debian/patches/patch-texdoctk
   tetex-bin/trunk/debian/patches/patch-texmfcnf
   tetex-bin/trunk/debian/patches/patch-tmp
   tetex-bin/trunk/debian/patches/patch-xdvi-300109
   tetex-bin/trunk/debian/patches/series
   tetex-bin/trunk/debian/preinst.in
Log:
  * move fmt.d/00tetex.cnf to 01tetex.cnf in preinst
  * Switched patches to use -p1


Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2005-10-06 13:05:36 UTC (rev 205)
+++ tetex-bin/trunk/debian/changelog	2005-10-06 13:08:25 UTC (rev 206)
@@ -2,8 +2,10 @@
 
   * install the links to omfonts and clean up the manpage and format links
     (closes: #327129) [stubner]
+  * move fmt.d/00tetex.cnf to 01tetex.cnf in preinst
+  * Switched patches to use -p1
 
- -- Ralf Stubner <ralf.stubner at web.de>  Tue, 27 Sep 2005 16:49:17 +0200
+ -- Frank Küster <frank at debian.org>  Thu,  6 Oct 2005 15:07:55 +0200
 
 tetex-bin (3.0-7) experimental; urgency=low
 

Modified: tetex-bin/trunk/debian/patches/patch-CAN-2004-0888
===================================================================
--- tetex-bin/trunk/debian/patches/patch-CAN-2004-0888	2005-10-06 13:05:36 UTC (rev 205)
+++ tetex-bin/trunk/debian/patches/patch-CAN-2004-0888	2005-10-06 13:08:25 UTC (rev 206)
@@ -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/trunk/debian/patches/patch-CAN-2005-0064
===================================================================
--- tetex-bin/trunk/debian/patches/patch-CAN-2005-0064	2005-10-06 13:05:36 UTC (rev 205)
+++ tetex-bin/trunk/debian/patches/patch-CAN-2005-0064	2005-10-06 13:08:25 UTC (rev 206)
@@ -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/trunk/debian/patches/patch-deb
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb	2005-10-06 13:05:36 UTC (rev 205)
+++ tetex-bin/trunk/debian/patches/patch-deb	2005-10-06 13:08:25 UTC (rev 206)
@@ -1,7 +1,22 @@
-Index: configure
+ 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
 ===================================================================
---- configure.orig	2005-08-29 13:13:10.051772421 +0200
-+++ configure	2005-08-29 13:13:42.002247121 +0200
+--- 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 @@
  
  
@@ -22,10 +37,10 @@
  
  # more customizations for standalone xdvik
  if test -z "$xdvik_standalone"; then
-Index: texk/kpathsea/mktexlsr
+Index: tetex-bin-3.0/texk/kpathsea/mktexlsr
 ===================================================================
---- texk/kpathsea/mktexlsr.orig	2005-08-29 13:13:10.059771538 +0200
-+++ texk/kpathsea/mktexlsr	2005-08-29 13:13:42.015245686 +0200
+--- 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
  
@@ -66,10 +81,10 @@
  done
  tty -s && echo "$progname: Done." >&2
  exit 0
-Index: texk/make/paths.mk
+Index: tetex-bin-3.0/texk/make/paths.mk
 ===================================================================
---- texk/make/paths.mk.orig	2005-08-29 13:13:10.059771538 +0200
-+++ texk/make/paths.mk	2005-08-29 13:13:42.016245576 +0200
+--- 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@
  
@@ -79,10 +94,10 @@
  
  # Regular input files.
  texinputdir = $(texmf)/tex
-Index: texk/tetex/Makefile.in
+Index: tetex-bin-3.0/texk/tetex/Makefile.in
 ===================================================================
---- texk/tetex/Makefile.in.orig	2005-08-29 13:13:10.067770656 +0200
-+++ texk/tetex/Makefile.in	2005-08-29 13:13:42.017245466 +0200
+--- 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.
@@ -101,10 +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
-Index: texk/tetex/texconfig
+Index: tetex-bin-3.0/texk/tetex/texconfig
 ===================================================================
---- texk/tetex/texconfig.orig	2005-08-29 13:13:10.067770656 +0200
-+++ texk/tetex/texconfig	2005-08-29 13:13:42.019245245 +0200
+--- 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)
@@ -124,10 +139,10 @@
                  else
                    echo "$progname: setting up vardir failed. Reason: no permission to write file \`$tfc'" >&2
                    rc=1
-Index: texk/tetex/fmtutil
+Index: tetex-bin-3.0/texk/tetex/fmtutil
 ===================================================================
---- texk/tetex/fmtutil.orig	2005-08-29 13:13:10.067770656 +0200
-+++ texk/tetex/fmtutil	2005-08-29 13:13:42.021245025 +0200
+--- 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
@@ -182,10 +197,10 @@
  # cleanup()
  #   clean up the temp area and exit with proper exit status
  ###############################################################################
-Index: texk/tetex/fmtutil-sys
+Index: tetex-bin-3.0/texk/tetex/fmtutil-sys
 ===================================================================
---- texk/tetex/fmtutil-sys.orig	2005-08-29 13:13:10.067770656 +0200
-+++ texk/tetex/fmtutil-sys	2005-08-29 13:13:42.038243149 +0200
+--- 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"
@@ -195,10 +210,10 @@
 +export TEXMFVAR TEXMFCONFIG progname
  
  exec fmtutil ${1+"$@"}
-Index: texk/tetex/fmtutil.man
+Index: tetex-bin-3.0/texk/tetex/fmtutil.man
 ===================================================================
---- texk/tetex/fmtutil.man.orig	2005-08-29 13:13:10.067770656 +0200
-+++ texk/tetex/fmtutil.man	2005-08-29 13:13:42.039243039 +0200
+--- 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
@@ -230,10 +245,10 @@
  .PP 
  .SH "FILES" 
  .PP 
-Index: texk/web2c/fmtutil.in
+Index: tetex-bin-3.0/texk/web2c/fmtutil.in
 ===================================================================
---- texk/web2c/fmtutil.in.orig	2005-08-29 13:13:10.068770545 +0200
-+++ texk/web2c/fmtutil.in	2005-08-29 13:13:42.040242928 +0200
+--- 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"
@@ -243,10 +258,10 @@
  
  # Change "pdfamstex.ini -> pdfbamstex.ini" and "- -> language.dat"
  # if you want babel support in pdfamstex:
-Index: texk/web2c/cwebdir/cweb.1
+Index: tetex-bin-3.0/texk/web2c/cwebdir/cweb.1
 ===================================================================
---- texk/web2c/cwebdir/cweb.1.orig	2005-08-29 13:13:10.068770545 +0200
-+++ texk/web2c/cwebdir/cweb.1	2005-08-29 13:13:42.041242818 +0200
+--- 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
@@ -272,10 +287,10 @@
  Directory for cweb "include" files.
  .
  .SH "SEE ALSO"
-Index: texk/tetex/updmap.man
+Index: tetex-bin-3.0/texk/tetex/updmap.man
 ===================================================================
---- texk/tetex/updmap.man.orig	2005-08-29 13:13:10.068770545 +0200
-+++ texk/tetex/updmap.man	2005-08-29 13:13:42.042242708 +0200
+--- 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
@@ -347,10 +362,10 @@
  \fBgsftopk\fP(1), \fBpdftex\fP(1), \fBps2pk\fP(1),
  \fBtexhash\fP(1), \fBxdvi\fP(1)\&.
  .PP
-Index: texk/tetex/updmap
+Index: tetex-bin-3.0/texk/tetex/updmap
 ===================================================================
---- texk/tetex/updmap.orig	2005-08-29 13:13:10.068770545 +0200
-+++ texk/tetex/updmap	2005-08-29 13:13:42.045242377 +0200
+--- 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
@@ -448,10 +463,10 @@
    cmd=
    log=
  
-Index: texk/tetex/updmap-sys
+Index: tetex-bin-3.0/texk/tetex/updmap-sys
 ===================================================================
---- texk/tetex/updmap-sys.orig	2005-08-29 13:17:22.131982434 +0200
-+++ texk/tetex/updmap-sys	2005-08-29 13:17:34.434625255 +0200
+--- 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"

Modified: tetex-bin/trunk/debian/patches/patch-libtool
===================================================================
--- tetex-bin/trunk/debian/patches/patch-libtool	2005-10-06 13:05:36 UTC (rev 205)
+++ tetex-bin/trunk/debian/patches/patch-libtool	2005-10-06 13:08:25 UTC (rev 206)
@@ -1,7 +1,12 @@
-Index: 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
 ===================================================================
---- texk/libtool.m4.orig	2005-08-16 19:48:58.000000000 +0200
-+++ texk/libtool.m4	2005-08-25 16:36:22.492265922 +0200
+--- 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 @@
      ;;
  
@@ -29,10 +34,10 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-Index: texk/configure
+Index: tetex-bin-3.0/texk/configure
 ===================================================================
---- texk/configure.orig	2005-08-16 19:48:58.000000000 +0200
-+++ texk/configure	2005-08-25 16:36:22.582255991 +0200
+--- 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
    ;;
@@ -60,10 +65,10 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-Index: texk/kpathsea/configure
+Index: tetex-bin-3.0/texk/kpathsea/configure
 ===================================================================
---- texk/kpathsea/configure.orig	2005-08-16 19:48:58.000000000 +0200
-+++ texk/kpathsea/configure	2005-08-25 16:36:22.843227193 +0200
+--- 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
    ;;

Modified: tetex-bin/trunk/debian/patches/patch-src
===================================================================
--- tetex-bin/trunk/debian/patches/patch-src	2005-10-06 13:05:36 UTC (rev 205)
+++ tetex-bin/trunk/debian/patches/patch-src	2005-10-06 13:08:25 UTC (rev 206)
@@ -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/trunk/debian/patches/patch-tds
===================================================================
--- tetex-bin/trunk/debian/patches/patch-tds	2005-10-06 13:05:36 UTC (rev 205)
+++ tetex-bin/trunk/debian/patches/patch-tds	2005-10-06 13:08:25 UTC (rev 206)
@@ -1,7 +1,10 @@
-Index: texk/tetex/updmap
+ texk/tetex/updmap |   15 ++++++++++++---
+ 1 files changed, 12 insertions(+), 3 deletions(-)
+
+Index: tetex-bin-3.0/texk/tetex/updmap
 ===================================================================
---- texk/tetex/updmap.orig	2005-08-25 16:33:35.649674005 +0200
-+++ texk/tetex/updmap	2005-08-25 16:34:10.513826727 +0200
+--- 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

Modified: tetex-bin/trunk/debian/patches/patch-texdoc
===================================================================
--- tetex-bin/trunk/debian/patches/patch-texdoc	2005-10-06 13:05:36 UTC (rev 205)
+++ tetex-bin/trunk/debian/patches/patch-texdoc	2005-10-06 13:08:25 UTC (rev 206)
@@ -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/trunk/debian/patches/patch-texdoctk
===================================================================
--- tetex-bin/trunk/debian/patches/patch-texdoctk	2005-10-06 13:05:36 UTC (rev 205)
+++ tetex-bin/trunk/debian/patches/patch-texdoctk	2005-10-06 13:08:25 UTC (rev 206)
@@ -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/trunk/debian/patches/patch-texmfcnf
===================================================================
--- tetex-bin/trunk/debian/patches/patch-texmfcnf	2005-10-06 13:05:36 UTC (rev 205)
+++ tetex-bin/trunk/debian/patches/patch-texmfcnf	2005-10-06 13:08:25 UTC (rev 206)
@@ -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/trunk/debian/patches/patch-tmp
===================================================================
--- tetex-bin/trunk/debian/patches/patch-tmp	2005-10-06 13:05:36 UTC (rev 205)
+++ tetex-bin/trunk/debian/patches/patch-tmp	2005-10-06 13:08:25 UTC (rev 206)
@@ -1,5 +1,13 @@
---- texk/tetex/epstopdf.orig	2005-08-23 17:15:24.861747349 +0200
-+++ texk/tetex/epstopdf	2005-08-23 17:15:24.908742250 +0200
+ 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-08-23 17:15:24.864747023 +0200
-+++ texk/tetex/epstopdf.man	2005-08-23 17:15:24.908742250 +0200
+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,8 +38,10 @@
  .IP "\fB--\fP[\fBno\fP]\fBgs\fP"
  run ghostscript       (default: --gs).
  .IP "\fB--\fP[\fBno\fP]\fBcompress\fP"
---- texk/dvipdfm/ebb.c.orig	2005-08-23 17:15:24.866746806 +0200
-+++ texk/dvipdfm/ebb.c	2005-08-23 17:15:24.909742142 +0200
+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");
@@ -39,8 +51,10 @@
    fprintf (stderr, "\t-b\t\tWrite .bb file in binary mode\n");
    fprintf (stderr, "\t-v\t\tVerbose\n");
    exit(1);
---- texk/dvipdfm/ebb.1.orig	2005-08-23 17:15:24.869746481 +0200
-+++ texk/dvipdfm/ebb.1	2005-08-23 17:15:24.909742142 +0200
+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

Modified: tetex-bin/trunk/debian/patches/patch-xdvi-300109
===================================================================
--- tetex-bin/trunk/debian/patches/patch-xdvi-300109	2005-10-06 13:05:36 UTC (rev 205)
+++ tetex-bin/trunk/debian/patches/patch-xdvi-300109	2005-10-06 13:08:25 UTC (rev 206)
@@ -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)

Modified: tetex-bin/trunk/debian/patches/series
===================================================================
--- tetex-bin/trunk/debian/patches/series	2005-10-06 13:05:36 UTC (rev 205)
+++ tetex-bin/trunk/debian/patches/series	2005-10-06 13:08:25 UTC (rev 206)
@@ -1,11 +1,11 @@
-patch-xdvi-300109 -p0
-patch-tmp -p0
-patch-texmfcnf -p0
-patch-texdoctk -p0
-patch-texdoc -p0
-patch-tds -p0
-patch-src -p0
-patch-libtool -p0
-patch-deb -p0
-patch-CAN-2005-0064 -p0
-patch-CAN-2004-0888 -p0
+patch-xdvi-300109 
+patch-tmp 
+patch-texmfcnf 
+patch-texdoctk 
+patch-texdoc 
+patch-tds 
+patch-src 
+patch-libtool 
+patch-deb 
+patch-CAN-2005-0064 
+patch-CAN-2004-0888 

Modified: tetex-bin/trunk/debian/preinst.in
===================================================================
--- tetex-bin/trunk/debian/preinst.in	2005-10-06 13:05:36 UTC (rev 205)
+++ tetex-bin/trunk/debian/preinst.in	2005-10-06 13:08:25 UTC (rev 206)
@@ -2,7 +2,7 @@
 #!/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
@@ -56,6 +56,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

More information about the Pkg-tetex-commits mailing list