[Reproducible-commits] [texlive-bin] 12/400: more fixes

[Maria Valentina Marin Rodrigues]

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 ec53d9d4788d80819a9db5d03891066f1c01c093
Author: Norbert Preining <preining at debian.org>
Date:   Sun Feb 26 06:42:49 2012 +0000

    more fixes
---
 debian/patches/53_builtin-searchpath-fix | 6 +++---
 debian/rules                             | 3 ---
 debian/texlive-binaries.postinst         | 5 ++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/debian/patches/53_builtin-searchpath-fix b/debian/patches/53_builtin-searchpath-fix
index af8b613..01c6e25 100644
--- a/debian/patches/53_builtin-searchpath-fix
+++ b/debian/patches/53_builtin-searchpath-fix
@@ -16,11 +16,11 @@ Index: texlive-bin-2011.20120216/texk/kpathsea/texmf.cnf
  % The tree containing runtime files related to the specific
  % distribution and version.
 -TEXMFMAIN = $TEXMFROOT/texmf
-+TEXMFMAIN = /usr/share/texmf
++TEXMFMAIN = /usr/share/texlive/texmf
  
  % The main tree of packages, distribution-agnostic:
 -TEXMFDIST = $TEXMFROOT/texmf-dist
-+TEXMFDIST = /usr/share/texmf-dist
++TEXMFDIST = /usr/share/texlive/texmf-dist
  
  % Local additions to the distribution trees.
 -TEXMFLOCAL = $TEXMFROOT/../texmf-local
@@ -50,7 +50,7 @@ Index: texlive-bin-2011.20120216/texk/kpathsea/texmf.cnf
  % For security reasons, it is better not to include . in this path.
  %
 -TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
-+TEXMFCNF = /usr/share/texmf/web2c;/usr/share/texmf-texlive/web2c;/usr/local/share/texmf/web2c
++TEXMFCNF = /etc/texmf/web2c;/usr/share/texlive/texmf/web2c;/usr/share/texlive/texmf-dist/web2c;/usr/local/share/texmf/web2c
  
  % kpathsea 3.5.3 and later sets these at runtime. To avoid empty
  % expansions from binaries linked against an earlier version of the
diff --git a/debian/rules b/debian/rules
index 951220e..126d835 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,9 +53,6 @@ override_dh_install:
 	   debian/texlive-binaries/usr/bin/bibtex.original
 	mv debian/texlive-binaries/usr/share/man/man1/bibtex.1 \
 	   debian/texlive-binaries/usr/share/man/man1/bibtex.original.1
-	# rename texmf-dist to texmf-texlive
-	mv debian/texlive-binaries/usr/share/texmf-dist \
-	   debian/texlive-binaries/usr/share/texmf-texlive
 
 override_dh_installdocs:
 	dh_installdocs
diff --git a/debian/texlive-binaries.postinst b/debian/texlive-binaries.postinst
index a2680a7..d46e0b5 100644
--- a/debian/texlive-binaries.postinst
+++ b/debian/texlive-binaries.postinst
@@ -43,12 +43,11 @@ dhit_build_format ()
 
 case "$1" in
   configure|reconfigure)
-    update-texmf
     update-fmtutil
     if dhit_libkpathsea_configured; then
       # we are shipping mktexlsr, so it must be there!
-      mktexlsr /usr/share/texmf /usr/share/texmf-texlive /var/lib/texmf
-      if [ -r /usr/share/texmf/texconfig/tcfmgr ] ; then
+      mktexlsr /usr/share/texmf /usr/share/texlive/texmf /usr/share/texlive/texmf-dist /var/lib/texmf
+      if [ -r /usr/share/texlive/texmf/texconfig/tcfmgr ] ; then
         dhit_build_format --refresh
       fi
     fi

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