[Debian-tex-commits] SVN tetex-bin commit + diffs: r2124 - in tetex-bin/branches/etch/debian: . patches

Florent Rougon frn at alioth.debian.org
Thu Dec 28 00:10:43 CET 2006 

Author: frn
Date: 2006-12-28 00:10:42 +0100 (Thu, 28 Dec 2006)
New Revision: 2124

Modified:
   tetex-bin/branches/etch/debian/changelog
   tetex-bin/branches/etch/debian/patches/README.patches
   tetex-bin/branches/etch/debian/patches/patch-deb
Log:
In patch-deb:

  * mktexlsr: print a useful message instead of "no" when called by root
    with no arguments (closes: #402763).
  * mktexlsr.man: document the change due to the patch closing bug #294197
    (cf. first changelog entry for 3.0-27).

and mention the related changes in README.patches.


Modified: tetex-bin/branches/etch/debian/changelog
===================================================================
--- tetex-bin/branches/etch/debian/changelog	2006-12-27 21:05:32 UTC (rev 2123)
+++ tetex-bin/branches/etch/debian/changelog	2006-12-27 23:10:42 UTC (rev 2124)
@@ -1,3 +1,12 @@
+tetex-bin (3.0-28) unstable; urgency=low
+
+  * mktexlsr: print a useful message instead of "no" when called by root
+    with no arguments (closes: #402763).
+  * mktexlsr.man: document the change due to the patch closing bug #294197
+    (cf. first changelog entry for 3.0-27).
+
+ -- Florent Rougon <frn at debian.org>  Wed, 27 Dec 2006 23:22:03 +0100
+
 tetex-bin (3.0-27) unstable; urgency=low
 
   * Apply patch by Julian Gilbey <jdg at debian.org> to prevent mktexlsr from

Modified: tetex-bin/branches/etch/debian/patches/README.patches
===================================================================
--- tetex-bin/branches/etch/debian/patches/README.patches	2006-12-27 21:05:32 UTC (rev 2123)
+++ tetex-bin/branches/etch/debian/patches/README.patches	2006-12-27 23:10:42 UTC (rev 2124)
@@ -41,7 +41,16 @@
 	- Do not require directory write access if the ls-R file
 	  exists and is writeable
 	- tempfile and mktemp are only available in Debian
+        - don't create nor update ls-R in directories under $HOME/
+          (presumably, TEXMFHOME) when called by root, unless the directories
+          were explicitely given on the command line (closes: #294197).
 
+texk/kpathsea/mktexlsr.man:
+        - document that ls-R files for TEXMF trees under $HOME/ won't be
+          created nor updated by mktexlsr when called by root, unless the
+          directories are explicitely given on the command line (cf. bug
+          #294197).
+
 texk/make/paths.mk:
 	Shouldn't this be changed to /var/cache/fonts? Is this
 	change necessary at all?

Modified: tetex-bin/branches/etch/debian/patches/patch-deb
===================================================================
--- tetex-bin/branches/etch/debian/patches/patch-deb	2006-12-27 21:05:32 UTC (rev 2123)
+++ tetex-bin/branches/etch/debian/patches/patch-deb	2006-12-27 23:10:42 UTC (rev 2124)
@@ -16,10 +16,10 @@
  texk/web2c/man/Makefile.in |    1 
  16 files changed, 417 insertions(+), 68 deletions(-)
 
-Index: trunk/configure
+Index: etch/configure
 ===================================================================
---- trunk.orig/configure	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/configure	2006-12-06 23:30:28.000000000 +0100
+--- etch.orig/configure	2006-12-27 23:19:59.000000000 +0100
++++ etch/configure	2006-12-27 23:34:26.000000000 +0100
 @@ -4213,12 +4213,13 @@
  
  
@@ -40,27 +40,32 @@
  
  # more customizations for standalone xdvik
  if test -z "$xdvik_standalone"; then
-Index: trunk/texk/kpathsea/mktexlsr
+Index: etch/texk/kpathsea/mktexlsr
 ===================================================================
---- trunk.orig/texk/kpathsea/mktexlsr	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/kpathsea/mktexlsr	2006-12-06 23:34:13.000000000 +0100
-@@ -73,6 +73,7 @@
+--- etch.orig/texk/kpathsea/mktexlsr	2006-12-27 23:19:59.000000000 +0100
++++ etch/texk/kpathsea/mktexlsr	2006-12-27 23:34:26.000000000 +0100
+@@ -73,6 +73,9 @@
  '
    set x `kpsewhich --show-path=ls-R | tr : '
  ' | sort | uniq`; shift
-+  if test "`id -u`" -eq 0; then NOROOTHOME=true; echo "no"; fi;
++  if test "`id -u`" -eq 0; then
++      NOROOTHOME=true
++  fi
    IFS=$OIFS
  }
  
-@@ -80,6 +81,7 @@
+@@ -80,6 +83,10 @@
    # Prepend cwd if the directory was relative.
    case "$TEXMFLS_R" in
    "") continue ;;  # Strictly speaking, it is an error if this case is taken.
-+  $HOME/*) if test -n "$NOROOTHOME"; then continue; fi ;;
++  $HOME/*) if test -n "$NOROOTHOME"; then
++               tty -s && echo "$progname: Skipping $TEXMFLS_R" >&2
++               continue
++           fi ;;
    /* | [A-z]:/*) ;;
    *)  TEXMFLS_R="`pwd`/$TEXMFLS_R"
    esac
-@@ -103,9 +105,9 @@
+@@ -103,9 +110,9 @@
    db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
  
    test -d "$db_dir" || continue
@@ -71,7 +76,7 @@
      cp /dev/null "$db_file"
      # Use same permissions as parent directory, minus x,s, or t bits.
      chmod `kpsestat -xst "$db_dir"` "$db_file"
-@@ -119,11 +121,8 @@
+@@ -119,11 +126,8 @@
    # Skip if we cannot write the file:
    kpseaccess -w "$db_file" || { echo "$progname: $db_file: no write permission. Skipping..." >&2; continue; }
  
@@ -85,7 +90,7 @@
  
    tty -s && echo "$progname: Updating $db_file... " >&2
    echo "$ls_R_magic" >"$db_file_tmp"
-@@ -137,12 +136,8 @@
+@@ -137,12 +141,8 @@
    (cd "$TEXMFLS_R" && \ls -LRa 2>/dev/null) |
      sed '/^$/{n;s%^\./%%;s%^%./%;}; /^\.$/d; /^\.\.$/d; /^[\.\/]*lsR[0-9]*\.tmp:*$/d' >>"$db_file_tmp"
  
@@ -100,10 +105,10 @@
  done
  tty -s && echo "$progname: Done." >&2
  exit 0
-Index: trunk/texk/make/paths.mk
+Index: etch/texk/make/paths.mk
 ===================================================================
---- trunk.orig/texk/make/paths.mk	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/make/paths.mk	2006-12-06 23:30:28.000000000 +0100
+--- etch.orig/texk/make/paths.mk	2006-12-27 23:19:59.000000000 +0100
++++ etch/texk/make/paths.mk	2006-12-27 23:34:26.000000000 +0100
 @@ -47,7 +47,7 @@
  texmf = @texmfmain@
  
@@ -113,10 +118,10 @@
  
  # Regular input files.
  texinputdir = $(texmf)/tex
-Index: trunk/texk/tetex/Makefile.in
+Index: etch/texk/tetex/Makefile.in
 ===================================================================
---- trunk.orig/texk/tetex/Makefile.in	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/Makefile.in	2006-12-06 23:30:28.000000000 +0100
+--- etch.orig/texk/tetex/Makefile.in	2006-12-27 23:19:59.000000000 +0100
++++ etch/texk/tetex/Makefile.in	2006-12-27 23:34:26.000000000 +0100
 @@ -35,7 +35,7 @@
  
  # Auxiliary files.
@@ -145,10 +150,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: trunk/texk/tetex/texconfig
+Index: etch/texk/tetex/texconfig
 ===================================================================
---- trunk.orig/texk/tetex/texconfig	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/texconfig	2006-12-06 23:30:28.000000000 +0100
+--- etch.orig/texk/tetex/texconfig	2006-12-27 23:19:59.000000000 +0100
++++ etch/texk/tetex/texconfig	2006-12-27 23:34:26.000000000 +0100
 @@ -883,8 +883,8 @@
  
      faq)
@@ -177,10 +182,10 @@
              if cmp "$tcBatchHFEdit" "$tcBatchHFOrig" >/dev/null 2>&1; then
                echo "$progname: configuration unchanged." >&2
              else
-Index: trunk/texk/tetex/fmtutil
+Index: etch/texk/tetex/fmtutil
 ===================================================================
---- trunk.orig/texk/tetex/fmtutil	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/fmtutil	2006-12-06 23:30:28.000000000 +0100
+--- etch.orig/texk/tetex/fmtutil	2006-12-27 23:19:59.000000000 +0100
++++ etch/texk/tetex/fmtutil	2006-12-27 23:34:26.000000000 +0100
 @@ -25,7 +25,13 @@
  #  --cnffile file             set configfile for fmtutil
  #  --fmtdir directory         set destination directory for format files
@@ -270,10 +275,10 @@
      esac
    do test $# -gt 0 && shift; done
  
-Index: trunk/texk/tetex/fmtutil-sys
+Index: etch/texk/tetex/fmtutil-sys
 ===================================================================
---- trunk.orig/texk/tetex/fmtutil-sys	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/fmtutil-sys	2006-12-06 23:30:28.000000000 +0100
+--- etch.orig/texk/tetex/fmtutil-sys	2006-12-27 23:19:59.000000000 +0100
++++ etch/texk/tetex/fmtutil-sys	2006-12-27 23:34:26.000000000 +0100
 @@ -23,6 +23,12 @@
  
  TEXMFVAR="$v"
@@ -289,10 +294,10 @@
 +  *)
 +    exec fmtutil ${1+"$@"} ;;
 +esac
-Index: trunk/texk/tetex/fmtutil.man
+Index: etch/texk/tetex/fmtutil.man
 ===================================================================
---- trunk.orig/texk/tetex/fmtutil.man	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/fmtutil.man	2006-12-06 23:30:28.000000000 +0100
+--- etch.orig/texk/tetex/fmtutil.man	2006-12-27 23:19:59.000000000 +0100
++++ etch/texk/tetex/fmtutil.man	2006-12-27 23:34:26.000000000 +0100
 @@ -1,4 +1,4 @@
 -.TH "fmtutil" "8" "February 2005" "teTeX" "teTeX" 
 +.TH "fmtutil" "1" "February 2005" "teTeX" "teTeX"
@@ -330,10 +335,10 @@
  .PP 
  .SH "FILES" 
  .PP 
-Index: trunk/texk/web2c/fmtutil.in
+Index: etch/texk/web2c/fmtutil.in
 ===================================================================
---- trunk.orig/texk/web2c/fmtutil.in	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/web2c/fmtutil.in	2006-12-06 23:30:28.000000000 +0100
+--- etch.orig/texk/web2c/fmtutil.in	2006-12-27 23:19:59.000000000 +0100
++++ etch/texk/web2c/fmtutil.in	2006-12-27 23:34:26.000000000 +0100
 @@ -55,7 +55,7 @@
  
  # Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
@@ -343,10 +348,10 @@
  
  # Change "pdfamstex.ini -> pdfbamstex.ini" and "- -> language.dat"
  # if you want babel support in pdfamstex:
-Index: trunk/texk/web2c/cwebdir/cweb.1
+Index: etch/texk/web2c/cwebdir/cweb.1
 ===================================================================
---- trunk.orig/texk/web2c/cwebdir/cweb.1	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/web2c/cwebdir/cweb.1	2006-12-06 23:30:28.000000000 +0100
+--- etch.orig/texk/web2c/cwebdir/cweb.1	2006-12-27 23:19:59.000000000 +0100
++++ etch/texk/web2c/cwebdir/cweb.1	2006-12-27 23:34:26.000000000 +0100
 @@ -100,19 +100,19 @@
  .
  .SH FILES
@@ -372,10 +377,10 @@
  Directory for cweb "include" files.
  .
  .SH "SEE ALSO"
-Index: trunk/texk/tetex/updmap.man
+Index: etch/texk/tetex/updmap.man
 ===================================================================
---- trunk.orig/texk/tetex/updmap.man	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/updmap.man	2006-12-06 23:30:28.000000000 +0100
+--- etch.orig/texk/tetex/updmap.man	2006-12-27 23:19:59.000000000 +0100
++++ etch/texk/tetex/updmap.man	2006-12-27 23:34:26.000000000 +0100
 @@ -32,11 +32,20 @@
  line, \fBupdmap\fP will write generated map files to a directory of
  your choosing (via one of the \fB--*outputdir\fP options), or automatically
@@ -449,10 +454,10 @@
  \fBgsftopk\fP(1), \fBpdftex\fP(1), \fBps2pk\fP(1),
  \fBtexhash\fP(1), \fBxdvi\fP(1)\&.
  .PP
-Index: trunk/texk/tetex/updmap
+Index: etch/texk/tetex/updmap
 ===================================================================
---- trunk.orig/texk/tetex/updmap	2006-12-06 23:30:28.000000000 +0100
-+++ trunk/texk/tetex/updmap	2006-12-06 23:30:28.000000000 +0100
+--- etch.orig/texk/tetex/updmap	2006-12-27 23:34:26.000000000 +0100
++++ etch/texk/tetex/updmap	2006-12-27 23:34:26.000000000 +0100
 @@ -15,6 +15,8 @@
  #   --nohash                   do not run texhash
  #   --nomkmap                  do not recreate map files
@@ -606,10 +611,10 @@
        setoption)
          setOption "$setoptionOpt" "$setoptionVal";;
        enable)
-Index: trunk/texk/tetex/updmap-sys
+Index: etch/texk/tetex/updmap-sys
 ===================================================================
---- trunk.orig/texk/tetex/updmap-sys	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/updmap-sys	2006-12-06 23:30:28.000000000 +0100
+--- etch.orig/texk/tetex/updmap-sys	2006-12-27 23:19:59.000000000 +0100
++++ etch/texk/tetex/updmap-sys	2006-12-27 23:34:26.000000000 +0100
 @@ -23,6 +23,7 @@
  
  TEXMFVAR="$v"
@@ -619,10 +624,10 @@
 +export TEXMFVAR TEXMFCONFIG RUNNING_AS_SYS
  
  exec updmap ${1+"$@"}
-Index: trunk/texk/tetex/texconfig-sys
+Index: etch/texk/tetex/texconfig-sys
 ===================================================================
---- trunk.orig/texk/tetex/texconfig-sys	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/texconfig-sys	2006-12-06 23:30:28.000000000 +0100
+--- etch.orig/texk/tetex/texconfig-sys	2006-12-27 23:19:59.000000000 +0100
++++ etch/texk/tetex/texconfig-sys	2006-12-27 23:34:26.000000000 +0100
 @@ -23,6 +23,7 @@
  
  TEXMFVAR="$v"
@@ -632,10 +637,10 @@
 +export TEXMFVAR TEXMFCONFIG RUNNING_AS_SYS
  
  exec texconfig ${1+"$@"}
-Index: trunk/texk/web2c/man/Makefile.in
+Index: etch/texk/web2c/man/Makefile.in
 ===================================================================
---- trunk.orig/texk/web2c/man/Makefile.in	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/web2c/man/Makefile.in	2006-12-06 23:30:28.000000000 +0100
+--- etch.orig/texk/web2c/man/Makefile.in	2006-12-27 23:19:59.000000000 +0100
++++ etch/texk/web2c/man/Makefile.in	2006-12-27 23:34:26.000000000 +0100
 @@ -38,7 +38,6 @@
  	dvicopy.1	\
  	dvitomp.1	\
@@ -644,10 +649,10 @@
  	etex.1		\
  	gftodvi.1	\
  	gftopk.1	\
-Index: trunk/texk/tetex/texconfig.man
+Index: etch/texk/tetex/texconfig.man
 ===================================================================
---- trunk.orig/texk/tetex/texconfig.man	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/texconfig.man	2006-12-06 23:30:28.000000000 +0100
+--- etch.orig/texk/tetex/texconfig.man	2006-12-27 23:19:59.000000000 +0100
++++ etch/texk/tetex/texconfig.man	2006-12-27 23:34:26.000000000 +0100
 @@ -6,22 +6,230 @@
  .SH SYNOPSIS
  .B texconfig
@@ -887,3 +892,26 @@
 +environment variable.
  .SH AUTHOR
  Thomas Esser <te at dbs.uni-hannover.de>
+Index: etch/texk/kpathsea/mktexlsr.man
+===================================================================
+--- etch.orig/texk/kpathsea/mktexlsr.man	2006-12-27 23:19:59.000000000 +0100
++++ etch/texk/kpathsea/mktexlsr.man	2006-12-27 23:35:05.000000000 +0100
+@@ -1,4 +1,4 @@
+-.TH MKTEXLSR 1 "4 January 1998" "Kpathsea @VERSION@"
++.TH MKTEXLSR 1 "27 December 2006" "Kpathsea @VERSION@"
+ .\"=====================================================================
+ .if n .ds MP MetaPost
+ .if t .ds MP MetaPost
+@@ -44,3 +44,12 @@
+ .B --version
+ .rb
+ Print version information and exit.
++.\"=====================================================================
++.SH NOTES
++When called by root with no arguments, \fBmktexlsr\fP in Debian ignores
++TEXMF trees under \fI$HOME\fP. This is to avoid creating undesirable files
++such as \fI/root/texmf/ls-R\fP when doing usual maintainance (it is generally
++a bad idea to work with TeX as root, therefore having a file such as
++\fI/root/texmf/ls-R\fP in the first place is rather pointless). If you really
++want to update the ls-R databases for such TEXMF trees, simply list them
++explicitely on the command-line.

More information about the Debian-tex-commits mailing list