[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/all-2012.20130111-1-15-gb89f662
The following commit has been merged in the master branch:
commit 8738c8233c88088fdc6e19f86c86aeb60687c8ee
Author: Norbert Preining <preining@debian.org>
Date: Sun May 12 19:00:36 2013 +0900
more work on building and running
diff --git a/Makefile b/Makefile
index 4e73133..9f687d1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ MASTER?=/var/www/norbert/tlnet
OLDPKG?=$(PWD)/old
OLDSOURCES?=$(PWD)/src
CURRENTDIR=$(PWD)
-SOURCES ?= texlive-base texlive-doc texlive-lang texlive-extra
+SOURCES ?= texlive-base texlive-lang texlive-extra
TMPDIR?=/var/tmp
# for update-liclines
@@ -23,8 +23,8 @@ first:
@echo "No, I don't do anything without being told exactely what!"
norbert:
- perl tpm2deb-source.pl --master=/src/TeX/texlive-svn/Master make-orig-tar texlive-base texlive-extra texlive-doc texlive-lang
- perl tpm2deb-source.pl --master=/src/TeX/texlive-svn/Master make-deb-source texlive-base texlive-extra texlive-doc texlive-lang
+ perl tpm2deb-source.pl --master=/src/TeX/texlive-svn/Master make-orig-tar texlive-base texlive-extra texlive-lang
+ perl tpm2deb-source.pl --master=/src/TeX/texlive-svn/Master make-deb-source texlive-base texlive-extra texlive-lang
all: sources pbuilder lintian packages debdiff deepdiff alltests
diff --git a/TODO b/TODO
index b45b90f..bc6d5f1 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,14 @@
+- tex-common has /usr/share/texlive/texmf/... hard coded, we need a concerted
+ updated with tex-common and texlive!!! >= 4.03 already prepared!
+
+- need separate upload for context, too!!!!
+
+- the scripts in /usr/share/texlive/texmf-dist/web2c/{tcfmgr,mkupdmap} etc
+ are not executable!?!?!?! Why
+ tpm2deb-source removes all x bits from all files under texmf-dist!!!
+ for now I have disabled the chmod a-x on texmf-dist completely!!!
+
+
- otf font blacklists and links are generated from lintian files via
scripts/create-tl-directives, but we do not reevaluate old blacklists
and change locations
diff --git a/all/debian/create-linked-scripts b/all/debian/create-linked-scripts
index 3fc2f5f..64767b8 100644
--- a/all/debian/create-linked-scripts
+++ b/all/debian/create-linked-scripts
@@ -16,6 +16,6 @@ for i in $texmf_scripts ; do
done
for i in $tl_scripts ; do
- echo "linkedscript;texmf-dist/scripts/$i;$(mbn $i)"
+ echo "linkedscript;texmf-dist/scripts/texlive/$i;$(mbn $i)"
done
diff --git a/all/debian/rules.in b/all/debian/rules.in
index 4be2c10..0e9ba63 100755
--- a/all/debian/rules.in
+++ b/all/debian/rules.in
@@ -70,7 +70,7 @@ binary-indep: build install
dh_installmenu
dh_installdocs -A debian/README.source
<: if ($srcpackage eq "texlive-base") { _:>//
- dh_installdocs -p texlive-common README readme-txt.dir readme-html.dir debian/CHANGES.packaging
+ dh_installdocs -p texlive-base README readme-txt.dir readme-html.dir debian/CHANGES.packaging
# nasty trick
# mptopdf needs a dump, but is a link to a script
# we have to trick dh_installtex to accept it
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index d17bc89..f9599d7 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -54,6 +54,9 @@ old-version;texlive-base;2009-11+squeeze1
### not needed at the moment
#depends;texlive-base;texlive-binaries (>= 2012.20121112)
#
+# we need fixed tex-common
+depends;texlive-base;tex-common (>= 4.03)
+#
#
# collections -> debian package names plus source packages
include-config;cfg.d/package-naming.cfg
@@ -195,9 +198,6 @@ blacklist;tpm;texlive-scripts;*
blacklist;tpm;texlive-msg-translations;*
#
#
-# map all files that somehow are in tlpkg into the nowhere
-# that is currently (AFAIS) only tlpkg/tlpostcode/xetex.pl
-ignore;tlpkg/.*;;
ignore;texmf-dist/doc/fonts/gnu-freefont/tools/generate/buildutils.pyc;;
#
# ignore config files for maps, formats, hyph patterns
diff --git a/do-all b/do-all
index 82e2b5c..a490d2a 100644
--- a/do-all
+++ b/do-all
@@ -1,7 +1,6 @@
bash do-one texlive-base 2>&1 | tee texlive-base.build.log
bash do-one texlive-extra 2>&1 | tee texlive-extra.build.log
-bash do-one texlive-doc 2>&1 | tee texlive-doc.build.log
bash do-one texlive-lang 2>&1 | tee texlive-lang.build.log
mkdir -p pool
diff --git a/texlive-base/debian/changelog b/texlive-base/debian/changelog
index 2625873..85c38e5 100644
--- a/texlive-base/debian/changelog
+++ b/texlive-base/debian/changelog
@@ -1,8 +1,8 @@
-texlive-base (2013.20130509-1) unstable; urgency=low
+texlive-base (2013.20130511-1) unstable; urgency=low
* new upstream checkout
- -- Norbert Preining <preining@debian.org> Thu, 09 May 2013 21:38:52 +0900
+ -- Norbert Preining <preining@debian.org> Sat, 11 May 2013 13:45:39 +0900
texlive-base (2012.20130315-1) experimental; urgency=low
diff --git a/texlive-base/debian/texlive-base.links.dist b/texlive-base/debian/texlive-base.links.dist
index bf034b1..390ffdf 100644
--- a/texlive-base/debian/texlive-base.links.dist
+++ b/texlive-base/debian/texlive-base.links.dist
@@ -1,9 +1,12 @@
-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
+usr/share/texlive/texmf-dist/web2c/texmf.cnf usr/share/texmf/web2c/texmf.cnf
+usr/share/texlive/texmf-dist/web2c/texmfcnf.lua usr/share/texmf/web2c/texmfcnf.lua
+var/lib/texmf/tex/generic/config/language.dat usr/share/texlive/texmf-dist/tex/generic/config/language.dat
+var/lib/texmf/tex/generic/config/language.dat.lua usr/share/texlive/texmf-dist/tex/generic/config/language.dat.lua
+var/lib/texmf/tex/generic/config/language.def usr/share/texlive/texmf-dist/tex/generic/config/language.def
usr/bin/allcm usr/bin/allec
usr/bin/kpsetool usr/bin/kpsepath
usr/bin/kpsetool usr/bin/kpsexpand
usr/bin/fmtutil usr/bin/mktexfmt
+var/lib/texmf/ls-R-TEXLIVEDIST usr/share/texlive/texmf-dist/ls-R
+var/lib/texmf/updmap.cfg-TEXLIVEDIST usr/share/texlive/texmf-dist/web2c/updmap.cfg
+var/lib/texmf/updmap.cfg-DEBIAN usr/share/texmf/web2c/updmap.cfg
diff --git a/texlive-base/debian/texlive-common.NEWS b/texlive-base/debian/texlive-common.NEWS
deleted file mode 100644
index 5a48ac9..0000000
--- a/texlive-base/debian/texlive-common.NEWS
+++ /dev/null
@@ -1,40 +0,0 @@
-texlive-common (2009-5) unstable; urgency=low
-
- * Since about 2006 the font cache for generated pk/mf fonts defaults
- to $HOME/.texmf-var. If you experience problems with fonts please
- make sure that $HOME/.texmf-var/fonts does not contain outdated
- fonts. Please see the NEWS for tex-common for details on how to
- activate a global font cache.
-
- -- Norbert Preining <preining@debian.org> Sun, 20 Dec 2009 17:46:25 +0900
-
-texlive-common (2007-15) unstable; urgency=low
-
- * Reinstalling removed conffiles
-
- Due to a bug in the postrm script of tetex-base in etch, purging this
- package removes essential configuration files of texlive packages.
- The presence of some of these configuration files are essential for
- the configuration and function of TeX Live. This might lead to a
- failure to configure texlive packages. If you encounter problems in
- the configure phase related to any of the files
-
- /etc/texmf/tex/generic/config/pdftexconfig.tex
- /etc/texmf/metafont/misc/modes.mf
-
- missing, you can recreate them simply by reinstalling texlive-base
- and texlive-base-bin. No special options to dpkg are needed, the
- files will be recreated whenever they are detected as missing.
-
- In the unlikely case that you hacked your system to not require these
- files, keep them present as empty files.
-
- -- Frank Küster <frank@debian.org> Sun, 25 May 2008 17:17:06 +0200
-
-texlive-common (2007-3) unstable; urgency=low
-
- * texlive-latex-extra, which is still quite large, has been split a bit
- more. Some parts can now be found in the new texlive-science and
- texlive-humanities packages
-
- -- Frank Küster <frank@debian.org> Fri, 13 Apr 2007 15:40:37 +0200
diff --git a/texlive-base/debian/texlive-common.links.dist b/texlive-base/debian/texlive-common.links.dist
deleted file mode 100644
index 642a9cc..0000000
--- a/texlive-base/debian/texlive-common.links.dist
+++ /dev/null
@@ -1,4 +0,0 @@
-var/lib/texmf/ls-R-TEXLIVEDIST usr/share/texlive/texmf-dist/ls-R
-var/lib/texmf/ls-R-TEXLIVEMAIN usr/share/texlive/texmf/ls-R
-var/lib/texmf/updmap.cfg-TEXLIVEDIST usr/share/texlive/texmf-dist/web2c/updmap.cfg
-var/lib/texmf/updmap.cfg-DEBIAN usr/share/texmf/web2c/updmap.cfg
diff --git a/texlive-extra/debian/changelog b/texlive-extra/debian/changelog
index 81e9000..4a4f080 100644
--- a/texlive-extra/debian/changelog
+++ b/texlive-extra/debian/changelog
@@ -1,8 +1,8 @@
-texlive-extra (2013.20130509-1) unstable; urgency=low
+texlive-extra (2013.20130511-1) unstable; urgency=low
* new upstream checkout
- -- Norbert Preining <preining@debian.org> Thu, 09 May 2013 21:39:14 +0900
+ -- Norbert Preining <preining@debian.org> Sat, 11 May 2013 13:46:07 +0900
texlive-extra (2012.20130315-1) experimental; urgency=low
diff --git a/texlive-lang/debian/changelog b/texlive-lang/debian/changelog
index 3d47325..3adf3df 100644
--- a/texlive-lang/debian/changelog
+++ b/texlive-lang/debian/changelog
@@ -1,8 +1,8 @@
-texlive-lang (2013.20130509-1) unstable; urgency=low
+texlive-lang (2013.20130511-1) unstable; urgency=low
* new upstream checkout
- -- Norbert Preining <preining@debian.org> Thu, 09 May 2013 21:39:21 +0900
+ -- Norbert Preining <preining@debian.org> Sat, 11 May 2013 13:46:15 +0900
texlive-lang (2012.20130315-1) experimental; urgency=low
diff --git a/tpm2deb-source.pl b/tpm2deb-source.pl
index 74e2fea..8091305 100755
--- a/tpm2deb-source.pl
+++ b/tpm2deb-source.pl
@@ -271,13 +271,14 @@ sub make_orig_tar {
system("chmod -R u+w $tmpdir") == 0
or die("Cannot set permissions on $tmpdir");
#
- # and remove x bits from all files under Master/texmf-dist/doc
- # this makes essential scripts in web2c (makeupd etc) not executable!
- # so disable it. We could run over {tex,...} if we want!
- if (-d "$texlivedest/texmf-dist") {
- system("find $texlivedest/texmf-dist/ -type f -print0 | xargs -0 chmod -x") == 0
- or die("Cannot remove unwanted execution permissions");
- }
+ # and remove x bits from all files under Master/texmf-dist
+ # but since this would make essential scripts in web2c (makeupd etc) not executable,
+ # we exclude texmf-dist/web2c and texmf-dist/texconfig for now
+ # MORE SAFE: disable this completely ...
+ #if (-d "$texlivedest/texmf-dist") {
+ # system("find $texlivedest/texmf-dist/ -path $texlivedest/texmf-dist/web2c -prune -o -path $texlivedest/texmf-dist/texconfig -prune -o -type f -print0 | xargs -0 chmod -x") == 0
+ # or die("Cannot remove unwanted execution permissions");
+ #}
# remove any git directories
system("find $texlivedest -name '.git' | xargs rm -rf") == 0
or die("Error while removing git directories");
--
Debian packaging of texlive-nonbin)
Reply to: