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

Frank Küster frank at costa.debian.org
Mon Aug 29 14:36:10 UTC 2005


Author: frank
Date: 2005-08-29 14:36:09 +0000 (Mon, 29 Aug 2005)
New Revision: 182

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/control
   tetex-bin/trunk/debian/patches/patch-deb
   tetex-bin/trunk/debian/postinst.in
   tetex-bin/trunk/debian/rules
   tetex-bin/trunk/debian/rules.in
   tetex-bin/trunk/debian/tetex-bin_install.in
Log:
- don't call update-texmf with --quiet
- remove ia64 special case from rules.in; hopefully no longer needed
- really patch updmap-sys - forgot to add the file to the files to patch in patch-deb
- clean up replaces/conflicts
- rename fmt.d/??tetex.cnf

Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2005-08-27 14:12:21 UTC (rev 181)
+++ tetex-bin/trunk/debian/changelog	2005-08-29 14:36:09 UTC (rev 182)
@@ -1,9 +1,9 @@
-tetex-bin (3.0-6.1) UNRELEASED; urgency=low
+tetex-bin (3.0-7) experimental; urgency=low
 
   * Fix a syntax error in the postinst script, thanks to Jörg Sommer
     <joerg at alea.gnuu.de> (closes: #323826) [frank]
-  * Make all update-* calls use the --quiet option (closes: #323827)
-    [frank] 
+  * Make all calls to update-updmap and update-fmtutil use the --quiet
+    option (closes: #323827) [frank]
   * Install the symlink for mfw in TEXMFVAR/web2c, where it belongs, not in
     TEXMFMAIN/web2c [frank]
   * Correct ebb's usage message (patch-tmp), and refine its manpage
@@ -15,21 +15,24 @@
     <Ralf.Stubner at physik.uni-erlangen.de> [frank]
   * Add a manpage for updmap.cfg, thanks to Hilmar (closes: #320781)
     [frank] 
-  * updmap(-sys) now does the right thing when called with --disable or
-    --enable.  Changing options does not yet work, though [frank]
   * Drop our home-made dsf-patch system, and build-depend on quilt
     instead [frank]
   * Do no longer install our outdated version of cweb.el.  An updated
     version will (hopefully) soon show up in emacs-goodies-el (see
     #170773) [frank]
+  * updmap(-sys) now does the right thing when called with --disable,
+    --enable, or --setoptions  (closes: 299936) [frank].
   * Until maintainer scripts have switched to using updmap-sys, add a uid
     check to updmap and execute updmap-sys if we are root (unless the
     --root-home option is given).  The same code in fmtutil has been
     refined, and the manpages adapted.  texconfig doesn't need this hack,
     since it shouldn't be called in maintainer scripts, anyway (closes:
-    #322181) [frank]
+    #322181, #299644) [frank]
+  * Rename 00tetex.cnf to 01tetex.cnf (closes: #321066)
+  * Drop the CFLAGS special case for ia64, to test whether it is in fact
+    still needed.
 
- -- Frank Küster <frank at debian.org>  Sat, 27 Aug 2005 16:07:08 +0200
+ -- Frank Küster <frank at debian.org>  Mon, 29 Aug 2005 16:35:06 +0200
 
 tetex-bin (3.0-6) experimental; urgency=low
 

Modified: tetex-bin/trunk/debian/control
===================================================================
--- tetex-bin/trunk/debian/control	2005-08-27 14:12:21 UTC (rev 181)
+++ tetex-bin/trunk/debian/control	2005-08-29 14:36:09 UTC (rev 182)
@@ -10,9 +10,9 @@
 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)
+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

Modified: tetex-bin/trunk/debian/patches/patch-deb
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb	2005-08-27 14:12:21 UTC (rev 181)
+++ tetex-bin/trunk/debian/patches/patch-deb	2005-08-29 14:36:09 UTC (rev 182)
@@ -1,7 +1,7 @@
 Index: configure
 ===================================================================
---- configure.orig	2005-08-26 11:51:29.000000000 +0200
-+++ configure	2005-08-26 11:51:43.000000000 +0200
+--- configure.orig	2005-08-29 13:13:10.051772421 +0200
++++ configure	2005-08-29 13:13:42.002247121 +0200
 @@ -4213,12 +4213,13 @@
  
  
@@ -24,8 +24,8 @@
  if test -z "$xdvik_standalone"; then
 Index: texk/kpathsea/mktexlsr
 ===================================================================
---- texk/kpathsea/mktexlsr.orig	2005-08-26 11:51:29.000000000 +0200
-+++ texk/kpathsea/mktexlsr	2005-08-26 11:51:43.000000000 +0200
+--- texk/kpathsea/mktexlsr.orig	2005-08-29 13:13:10.059771538 +0200
++++ texk/kpathsea/mktexlsr	2005-08-29 13:13:42.015245686 +0200
 @@ -103,9 +103,9 @@
    db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
  
@@ -68,8 +68,8 @@
  exit 0
 Index: texk/make/paths.mk
 ===================================================================
---- texk/make/paths.mk.orig	2005-08-26 11:51:29.000000000 +0200
-+++ texk/make/paths.mk	2005-08-26 11:51:43.000000000 +0200
+--- 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
 @@ -47,7 +47,7 @@
  texmf = @texmfmain@
  
@@ -81,8 +81,8 @@
  texinputdir = $(texmf)/tex
 Index: texk/tetex/Makefile.in
 ===================================================================
---- texk/tetex/Makefile.in.orig	2005-08-26 11:51:29.000000000 +0200
-+++ texk/tetex/Makefile.in	2005-08-26 11:51:43.000000000 +0200
+--- 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
 @@ -35,7 +35,7 @@
  
  # Auxiliary files.
@@ -103,8 +103,8 @@
  	$(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
 Index: texk/tetex/texconfig
 ===================================================================
---- texk/tetex/texconfig.orig	2005-08-26 11:51:29.000000000 +0200
-+++ texk/tetex/texconfig	2005-08-27 16:03:05.650137738 +0200
+--- texk/tetex/texconfig.orig	2005-08-29 13:13:10.067770656 +0200
++++ texk/tetex/texconfig	2005-08-29 13:13:42.019245245 +0200
 @@ -883,8 +883,8 @@
  
      faq)
@@ -126,8 +126,8 @@
                    rc=1
 Index: texk/tetex/fmtutil
 ===================================================================
---- texk/tetex/fmtutil.orig	2005-08-26 11:51:29.000000000 +0200
-+++ texk/tetex/fmtutil	2005-08-27 15:49:28.577189250 +0200
+--- texk/tetex/fmtutil.orig	2005-08-29 13:13:10.067770656 +0200
++++ texk/tetex/fmtutil	2005-08-29 13:13:42.021245025 +0200
 @@ -25,7 +25,13 @@
  #  --cnffile file             set configfile for fmtutil
  #  --fmtdir directory         set destination directory for format files
@@ -184,8 +184,8 @@
  ###############################################################################
 Index: texk/tetex/fmtutil-sys
 ===================================================================
---- texk/tetex/fmtutil-sys.orig	2005-08-26 11:51:29.000000000 +0200
-+++ texk/tetex/fmtutil-sys	2005-08-26 11:51:43.000000000 +0200
+--- 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
 @@ -23,6 +23,7 @@
  
  TEXMFVAR="$v"
@@ -197,8 +197,8 @@
  exec fmtutil ${1+"$@"}
 Index: texk/tetex/fmtutil.man
 ===================================================================
---- texk/tetex/fmtutil.man.orig	2005-08-26 11:51:29.000000000 +0200
-+++ texk/tetex/fmtutil.man	2005-08-27 16:02:34.874529455 +0200
+--- 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
 @@ -41,6 +41,14 @@
  .IP "\fB--cnffile\fP \fIfile\fP" 
  specify the configuration
@@ -232,8 +232,8 @@
  .PP 
 Index: texk/web2c/fmtutil.in
 ===================================================================
---- texk/web2c/fmtutil.in.orig	2005-08-26 11:51:29.000000000 +0200
-+++ texk/web2c/fmtutil.in	2005-08-26 11:51:43.000000000 +0200
+--- 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
 @@ -55,7 +55,7 @@
  
  # Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
@@ -245,8 +245,8 @@
  # if you want babel support in pdfamstex:
 Index: texk/web2c/cwebdir/cweb.1
 ===================================================================
---- texk/web2c/cwebdir/cweb.1.orig	2005-08-26 11:51:29.000000000 +0200
-+++ texk/web2c/cwebdir/cweb.1	2005-08-26 11:51:43.000000000 +0200
+--- 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
 @@ -100,19 +100,19 @@
  .
  .SH FILES
@@ -274,8 +274,8 @@
  .SH "SEE ALSO"
 Index: texk/tetex/updmap.man
 ===================================================================
---- texk/tetex/updmap.man.orig	2005-08-26 11:51:29.000000000 +0200
-+++ texk/tetex/updmap.man	2005-08-27 16:01:15.728252003 +0200
+--- 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
 @@ -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
@@ -349,8 +349,8 @@
  .PP
 Index: texk/tetex/updmap
 ===================================================================
---- texk/tetex/updmap.orig	2005-08-26 11:51:43.000000000 +0200
-+++ texk/tetex/updmap	2005-08-27 15:47:50.061046415 +0200
+--- texk/tetex/updmap.orig	2005-08-29 13:13:10.068770545 +0200
++++ texk/tetex/updmap	2005-08-29 13:13:42.045242377 +0200
 @@ -15,6 +15,8 @@
  #   --nohash                   do not run texhash
  #   --nomkmap                  do not recreate map files
@@ -448,3 +448,16 @@
    cmd=
    log=
  
+Index: 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
+@@ -23,6 +23,7 @@
+ 
+ TEXMFVAR="$v"
+ TEXMFCONFIG="$c"
+-export TEXMFVAR TEXMFCONFIG
++progname=updmap-sys
++export TEXMFVAR TEXMFCONFIG progname
+ 
+ exec updmap ${1+"$@"}

Modified: tetex-bin/trunk/debian/postinst.in
===================================================================
--- tetex-bin/trunk/debian/postinst.in	2005-08-27 14:12:21 UTC (rev 181)
+++ tetex-bin/trunk/debian/postinst.in	2005-08-29 14:36:09 UTC (rev 182)
@@ -75,7 +75,7 @@
 # normal install    
 
     # create and sanitize texmf.cnf, introducing TEXMFSYSVAR:
-    update-texmf --quiet
+    update-texmf
 # upgrade since woody
     # This should have updated it correctly, but it need not: If the
     # user has edited it and refused to accept our changes (or if

Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules	2005-08-27 14:12:21 UTC (rev 181)
+++ tetex-bin/trunk/debian/rules	2005-08-29 14:36:09 UTC (rev 182)
@@ -33,11 +33,12 @@
 
 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
@@ -45,6 +46,7 @@
   CFLAGS += -O2
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+  # this or dh_strip...
   INSTALL_PROGRAM += -s
 endif
 

Modified: tetex-bin/trunk/debian/rules.in
===================================================================
--- tetex-bin/trunk/debian/rules.in	2005-08-27 14:12:21 UTC (rev 181)
+++ tetex-bin/trunk/debian/rules.in	2005-08-29 14:36:09 UTC (rev 182)
@@ -38,11 +38,12 @@
 
 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
@@ -50,6 +51,7 @@
   CFLAGS += -O2
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+  # this or dh_strip...
   INSTALL_PROGRAM += -s
 endif
 

Modified: tetex-bin/trunk/debian/tetex-bin_install.in
===================================================================
--- tetex-bin/trunk/debian/tetex-bin_install.in	2005-08-27 14:12:21 UTC (rev 181)
+++ tetex-bin/trunk/debian/tetex-bin_install.in	2005-08-29 14:36:09 UTC (rev 182)
@@ -90,7 +90,7 @@
     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
+      sed -n -e '0,/^# initex (or another/ d;p' $fmtutil_source > $debetc/fmt.d/01tetex.cnf
       mv $fmtutil_source $sharedir/tetex-bin
       # remove texmf.cnf (is now in tex-common)
       rm $txmfdir/web2c/texmf.cnf




More information about the Pkg-tetex-commits mailing list