[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/all-2012.20121125-1-12-g2ec4329
The following commit has been merged in the master branch:
commit 15e2b57ca64fbacae06add0fd5552c12ad8e529d
Author: Norbert Preining <preining@debian.org>
Date: Thu Dec 6 01:13:33 2012 +0900
fix two bugs wrt to upgrade and location of texmfcnf.lua
diff --git a/Makefile b/Makefile
index 3088849..2a1d410 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@ debdiff:
for i in *.debdiff ; do \
grep -v share/doc $$i | \
grep -v texlive/texmf/doc | \
- grep -v texlive/texmf-dist/doc > $i.nodoc; \
+ grep -v texlive/texmf-dist/doc > $$i.nodoc; \
done || true
mkdir -p log
mv pool/*.debdiff pool/*.nodoc log
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index f7a5b2a..32ce948 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -216,9 +216,9 @@ ignore;texmf-dist/doc/latex/mathpazo/mapppl.tex
ignore;texmf-dist/doc/latex/mathpazo/mapzplm.tex
#
# files that are in ps2eps are not installed
-ignore;texmf/doc/man/man1/bbox.1;;
+kill;texmf/doc/man/man1/bbox.1;;
ignore;texmf/doc/man/man1/bbox.man1.pdf;;
-ignore;texmf/doc/man/man1/ps2eps.1;;
+kill;texmf/doc/man/man1/ps2eps.1;;
ignore;texmf/doc/man/man1/ps2eps.man1.pdf;;
ignore;texmf/scripts/ps2eps/ps2eps.pl;;
#
diff --git a/texlive-base/debian/texlive-base.links.dist b/texlive-base/debian/texlive-base.links.dist
index e5d666f..bf034b1 100644
--- a/texlive-base/debian/texlive-base.links.dist
+++ b/texlive-base/debian/texlive-base.links.dist
@@ -1,4 +1,5 @@
usr/share/texlive/texmf/web2c/texmf.cnf usr/share/texmf/web2c/texmf.cnf
+usr/share/texlive/texmf/web2c/texmfcnf.lua usr/share/texmf/web2c/texmfcnf.lua
var/lib/texmf/tex/generic/config/language.dat usr/share/texlive/texmf/tex/generic/config/language.dat
var/lib/texmf/tex/generic/config/language.dat.lua usr/share/texlive/texmf/tex/generic/config/language.dat.lua
var/lib/texmf/tex/generic/config/language.def usr/share/texlive/texmf/tex/generic/config/language.def
--
Debian packaging of texlive-nonbin)
Reply to: