[Debian-tex-commits] SVN tetex-bin commit + diffs: r2014 - in tetex-bin/trunk/debian: . patches

Frank Küster frank at alioth.debian.org
Wed Dec 6 23:39:16 CET 2006 

Author: frank
Date: 2006-12-06 23:39:15 +0100 (Wed, 06 Dec 2006)
New Revision: 2014

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/patches/patch-deb
Log:
Apply patch by Julian Gilbey <jdg at debian.org> to prevent mktexlsr from
creating ls-R in root's home directory (closes: #294197)


Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2006-12-06 22:38:17 UTC (rev 2013)
+++ tetex-bin/trunk/debian/changelog	2006-12-06 22:39:15 UTC (rev 2014)
@@ -1,3 +1,12 @@
+tetex-bin (3.0-27~1) UNRELEASED; urgency=low
+
+  * Apply patch by Julian Gilbey <jdg at debian.org> to prevent mktexlsr from
+    creating ls-R in root's home directory (closes: #294197)
+  * Add a missing hunk for the patch in the last upload, this should
+    really make texdoctk work
+
+ -- Frank Küster <frank at debian.org>  Wed,  6 Dec 2006 23:38:51 +0100
+
 tetex-bin (3.0-26) unstable; urgency=low
 
   * Hardcode the two possible TEXMFDIST paths in texdoctk.  This makes it

Modified: tetex-bin/trunk/debian/patches/patch-deb
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb	2006-12-06 22:38:17 UTC (rev 2013)
+++ tetex-bin/trunk/debian/patches/patch-deb	2006-12-06 22:39:15 UTC (rev 2014)
@@ -1,5 +1,5 @@
  configure                  |   13 +-
- texk/kpathsea/mktexlsr     |   17 +--
+ texk/kpathsea/mktexlsr     |   19 +--
  texk/make/paths.mk         |    2 
  texk/tetex/Makefile.in     |   10 +-
  texk/tetex/fmtutil         |   53 +++++++++-
@@ -14,12 +14,12 @@
  texk/web2c/cwebdir/cweb.1  |   10 +-
  texk/web2c/fmtutil.in      |    2 
  texk/web2c/man/Makefile.in |    1 
- 16 files changed, 415 insertions(+), 68 deletions(-)
+ 16 files changed, 417 insertions(+), 68 deletions(-)
 
 Index: trunk/configure
 ===================================================================
---- trunk.orig/configure	2006-11-03 14:28:42.000000000 +0100
-+++ trunk/configure	2006-11-03 14:29:03.000000000 +0100
+--- trunk.orig/configure	2006-12-06 23:30:24.000000000 +0100
++++ trunk/configure	2006-12-06 23:30:28.000000000 +0100
 @@ -4213,12 +4213,13 @@
  
  
@@ -42,9 +42,25 @@
  if test -z "$xdvik_standalone"; then
 Index: trunk/texk/kpathsea/mktexlsr
 ===================================================================
---- trunk.orig/texk/kpathsea/mktexlsr	2006-11-03 14:28:42.000000000 +0100
-+++ trunk/texk/kpathsea/mktexlsr	2006-11-03 14:29:03.000000000 +0100
-@@ -103,9 +103,9 @@
+--- 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 @@
+ '
+   set x `kpsewhich --show-path=ls-R | tr : '
+ ' | sort | uniq`; shift
++  if test "`id -u`" -eq 0; then NOROOTHOME=true; echo "no"; fi;
+   IFS=$OIFS
+ }
+ 
+@@ -80,6 +81,7 @@
+   # 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 ;;
+   /* | [A-z]:/*) ;;
+   *)  TEXMFLS_R="`pwd`/$TEXMFLS_R"
+   esac
+@@ -103,9 +105,9 @@
    db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
  
    test -d "$db_dir" || continue
@@ -55,7 +71,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 +119,8 @@
+@@ -119,11 +121,8 @@
    # Skip if we cannot write the file:
    kpseaccess -w "$db_file" || { echo "$progname: $db_file: no write permission. Skipping..." >&2; continue; }
  
@@ -69,7 +85,7 @@
  
    tty -s && echo "$progname: Updating $db_file... " >&2
    echo "$ls_R_magic" >"$db_file_tmp"
-@@ -137,12 +134,8 @@
+@@ -137,12 +136,8 @@
    (cd "$TEXMFLS_R" && \ls -LRa 2>/dev/null) |
      sed '/^$/{n;s%^\./%%;s%^%./%;}; /^\.$/d; /^\.\.$/d; /^[\.\/]*lsR[0-9]*\.tmp:*$/d' >>"$db_file_tmp"
  
@@ -86,8 +102,8 @@
  exit 0
 Index: trunk/texk/make/paths.mk
 ===================================================================
---- trunk.orig/texk/make/paths.mk	2006-11-03 14:28:42.000000000 +0100
-+++ trunk/texk/make/paths.mk	2006-11-03 14:29:03.000000000 +0100
+--- 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
 @@ -47,7 +47,7 @@
  texmf = @texmfmain@
  
@@ -99,8 +115,8 @@
  texinputdir = $(texmf)/tex
 Index: trunk/texk/tetex/Makefile.in
 ===================================================================
---- trunk.orig/texk/tetex/Makefile.in	2006-11-03 14:28:42.000000000 +0100
-+++ trunk/texk/tetex/Makefile.in	2006-11-03 14:29:03.000000000 +0100
+--- 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
 @@ -35,7 +35,7 @@
  
  # Auxiliary files.
@@ -131,8 +147,8 @@
  	$(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
 Index: trunk/texk/tetex/texconfig
 ===================================================================
---- trunk.orig/texk/tetex/texconfig	2006-11-03 14:28:42.000000000 +0100
-+++ trunk/texk/tetex/texconfig	2006-11-03 15:04:15.000000000 +0100
+--- 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
 @@ -883,8 +883,8 @@
  
      faq)
@@ -163,8 +179,8 @@
              else
 Index: trunk/texk/tetex/fmtutil
 ===================================================================
---- trunk.orig/texk/tetex/fmtutil	2006-11-03 14:28:42.000000000 +0100
-+++ trunk/texk/tetex/fmtutil	2006-11-03 14:29:03.000000000 +0100
+--- 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
 @@ -25,7 +25,13 @@
  #  --cnffile file             set configfile for fmtutil
  #  --fmtdir directory         set destination directory for format files
@@ -256,8 +272,8 @@
  
 Index: trunk/texk/tetex/fmtutil-sys
 ===================================================================
---- trunk.orig/texk/tetex/fmtutil-sys	2006-11-03 14:28:42.000000000 +0100
-+++ trunk/texk/tetex/fmtutil-sys	2006-11-03 14:29:03.000000000 +0100
+--- 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
 @@ -23,6 +23,12 @@
  
  TEXMFVAR="$v"
@@ -275,8 +291,8 @@
 +esac
 Index: trunk/texk/tetex/fmtutil.man
 ===================================================================
---- trunk.orig/texk/tetex/fmtutil.man	2006-11-03 14:28:42.000000000 +0100
-+++ trunk/texk/tetex/fmtutil.man	2006-11-03 14:29:03.000000000 +0100
+--- 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
 @@ -1,4 +1,4 @@
 -.TH "fmtutil" "8" "February 2005" "teTeX" "teTeX" 
 +.TH "fmtutil" "1" "February 2005" "teTeX" "teTeX"
@@ -316,8 +332,8 @@
  .PP 
 Index: trunk/texk/web2c/fmtutil.in
 ===================================================================
---- trunk.orig/texk/web2c/fmtutil.in	2006-11-03 14:28:42.000000000 +0100
-+++ trunk/texk/web2c/fmtutil.in	2006-11-03 14:29:03.000000000 +0100
+--- 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
 @@ -55,7 +55,7 @@
  
  # Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
@@ -329,8 +345,8 @@
  # if you want babel support in pdfamstex:
 Index: trunk/texk/web2c/cwebdir/cweb.1
 ===================================================================
---- trunk.orig/texk/web2c/cwebdir/cweb.1	2006-11-03 14:28:42.000000000 +0100
-+++ trunk/texk/web2c/cwebdir/cweb.1	2006-11-03 14:29:03.000000000 +0100
+--- 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
 @@ -100,19 +100,19 @@
  .
  .SH FILES
@@ -358,8 +374,8 @@
  .SH "SEE ALSO"
 Index: trunk/texk/tetex/updmap.man
 ===================================================================
---- trunk.orig/texk/tetex/updmap.man	2006-11-03 14:28:42.000000000 +0100
-+++ trunk/texk/tetex/updmap.man	2006-11-03 14:29:03.000000000 +0100
+--- 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
 @@ -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
@@ -435,8 +451,8 @@
  .PP
 Index: trunk/texk/tetex/updmap
 ===================================================================
---- trunk.orig/texk/tetex/updmap	2006-11-03 14:29:02.000000000 +0100
-+++ trunk/texk/tetex/updmap	2006-11-03 14:29:03.000000000 +0100
+--- 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
 @@ -15,6 +15,8 @@
  #   --nohash                   do not run texhash
  #   --nomkmap                  do not recreate map files
@@ -592,8 +608,8 @@
        enable)
 Index: trunk/texk/tetex/updmap-sys
 ===================================================================
---- trunk.orig/texk/tetex/updmap-sys	2006-11-03 14:28:42.000000000 +0100
-+++ trunk/texk/tetex/updmap-sys	2006-11-03 14:29:03.000000000 +0100
+--- 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
 @@ -23,6 +23,7 @@
  
  TEXMFVAR="$v"
@@ -605,8 +621,8 @@
  exec updmap ${1+"$@"}
 Index: trunk/texk/tetex/texconfig-sys
 ===================================================================
---- trunk.orig/texk/tetex/texconfig-sys	2006-11-03 14:28:42.000000000 +0100
-+++ trunk/texk/tetex/texconfig-sys	2006-11-03 14:29:03.000000000 +0100
+--- 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
 @@ -23,6 +23,7 @@
  
  TEXMFVAR="$v"
@@ -618,8 +634,8 @@
  exec texconfig ${1+"$@"}
 Index: trunk/texk/web2c/man/Makefile.in
 ===================================================================
---- trunk.orig/texk/web2c/man/Makefile.in	2006-11-03 14:28:42.000000000 +0100
-+++ trunk/texk/web2c/man/Makefile.in	2006-11-03 14:29:03.000000000 +0100
+--- 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
 @@ -38,7 +38,6 @@
  	dvicopy.1	\
  	dvitomp.1	\
@@ -630,8 +646,8 @@
  	gftopk.1	\
 Index: trunk/texk/tetex/texconfig.man
 ===================================================================
---- trunk.orig/texk/tetex/texconfig.man	2006-11-03 14:28:42.000000000 +0100
-+++ trunk/texk/tetex/texconfig.man	2006-11-03 15:49:59.000000000 +0100
+--- 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
 @@ -6,22 +6,230 @@
  .SH SYNOPSIS
  .B texconfig

More information about the Debian-tex-commits mailing list