[Reproducible-commits] [texlive-bin] 13/400: several fixes

Thu Jul 9 21:39:29 UTC 2015

This is an automated email from the git hooks/post-receive script.

akira-guest pushed a commit to branch master
in repository texlive-bin.

commit d2b97d905c9b0391f16292280aef712c1c29e60a
Author: Norbert Preining <preining at debian.org>
Date:   Mon Feb 27 00:33:23 2012 +0000

    several fixes
---
 debian/mupdmap.pl                        |  2 +-
 debian/patches/53_builtin-searchpath-fix | 41 +++++++++++++++++++++++++-------
 debian/rules                             |  4 ++++
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/debian/mupdmap.pl b/debian/mupdmap.pl
index c9a8b16..ca1c6fe 100755
--- a/debian/mupdmap.pl
+++ b/debian/mupdmap.pl
@@ -33,7 +33,7 @@ BEGIN {
     exit 1;
   }
   chomp($TEXMFROOT);
-  unshift (@INC, "$TEXMFROOT/tlpkg");
+  unshift (@INC, "/usr/share/texlive/tlpkg");
 }
 
 
diff --git a/debian/patches/53_builtin-searchpath-fix b/debian/patches/53_builtin-searchpath-fix
index 01c6e25..bf4782f 100644
--- a/debian/patches/53_builtin-searchpath-fix
+++ b/debian/patches/53_builtin-searchpath-fix
@@ -4,14 +4,14 @@
 ## DP: adjust built-in search paths for kpathsea library to Debian standard
 
 @DPATCH@
- texk/kpathsea/texmf.cnf |   14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
+ texk/kpathsea/texmf.cnf |   23 +++++++++++++----------
+ 1 file changed, 13 insertions(+), 10 deletions(-)
 
-Index: texlive-bin-2011.20120216/texk/kpathsea/texmf.cnf
+Index: texlive-bin-2011.20120226/texk/kpathsea/texmf.cnf
 ===================================================================
---- texlive-bin-2011.20120216.orig/texk/kpathsea/texmf.cnf	2011-12-22 08:58:58.000000000 +0900
-+++ texlive-bin-2011.20120216/texk/kpathsea/texmf.cnf	2012-02-17 10:44:42.948485022 +0900
-@@ -53,19 +53,19 @@
+--- texlive-bin-2011.20120226.orig/texk/kpathsea/texmf.cnf	2012-02-26 22:24:25.000000000 +0900
++++ texlive-bin-2011.20120226/texk/kpathsea/texmf.cnf	2012-02-27 07:50:06.340884511 +0900
+@@ -53,19 +53,22 @@
  
  % The tree containing runtime files related to the specific
  % distribution and version.
@@ -21,6 +21,9 @@ Index: texlive-bin-2011.20120216/texk/kpathsea/texmf.cnf
  % The main tree of packages, distribution-agnostic:
 -TEXMFDIST = $TEXMFROOT/texmf-dist
 +TEXMFDIST = /usr/share/texlive/texmf-dist
++
++% The Debian search tree
++TEXMFDEBIAN = /usr/share/texmf
  
  % Local additions to the distribution trees.
 -TEXMFLOCAL = $TEXMFROOT/../texmf-local
@@ -36,7 +39,29 @@ Index: texlive-bin-2011.20120216/texk/kpathsea/texmf.cnf
  
  % Per-user texmf tree(s) -- organized per the TDS, as usual.  To define
  % more than one per-user tree, set this to a list of directories in
-@@ -111,7 +111,7 @@
+@@ -92,7 +95,7 @@
+ % versions should take precedence over those -- although it is generally
+ % a source of confusion to have different versions of a package
+ % installed, whatever the trees, so try to avoid it.
+-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
++TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDEBIAN,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
+ 
+ % 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.
+@@ -100,18 +103,18 @@
+ % does not create ls-R files in the non-!! elements -- because if an
+ % ls-R is present, it will be used, and the disk will not be searched.
+ % This is arguably a bug in kpathsea.
+-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
++TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDEBIAN,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
+ 
+ % The system trees.  These are the trees that are shared by all users.
+ % If a tree appears in this list, the mktex* scripts will use
+ % VARTEXFONTS for generated files, if the original tree isn't writable;
+ % otherwise the current working directory is used.
+-SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
++SYSTEXMF = $TEXMFSYSVAR;$TEXMFDEBIAN;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
+ 
  % Where generated fonts may be written.  This tree is used when the sources
  % were found in a system tree and either that tree wasn't writable, or the
  % varfonts feature was enabled in MT_FEATURES in mktex.cnf.
@@ -45,7 +70,7 @@ Index: texlive-bin-2011.20120216/texk/kpathsea/texmf.cnf
  
  % On some systems, there will be a system tree which contains all the font
  % files that may be created as well as the formats.  For example
-@@ -463,7 +463,7 @@
+@@ -463,7 +466,7 @@
  % 
  % For security reasons, it is better not to include . in this path.
  %
diff --git a/debian/rules b/debian/rules
index 126d835..876e322 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,10 @@ override_dh_install:
 	# use mupdmap (multi!)
 	rm debian/texlive-binaries/usr/bin/updmap
 	cp debian/mupdmap.pl debian/texlive-binaries/usr/bin/updmap
+	# remove texlive directories, they should not be shipped here
+	rm -rf debian/texlive-binaries/usr/share/texlive
+	rm -rf debian/texlive-binaries/usr/share/info
+	rm -rf debian/texlive-binaries/usr/share/man
 	# for alternatives treatment we rename usr/bin/bibtex to
 	# usr/bin/bibtex.original
 	mv debian/texlive-binaries/usr/bin/bibtex \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/texlive-bin.git

