[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/base-2013.20130520-2-3-g0bffc84
The following commit has been merged in the master branch:
commit 0bffc845565876f5aaa730a987a7b162b5290995
Author: Norbert Preining <preining@debian.org>
Date: Thu May 23 14:30:41 2013 +0900
thailatex takeover, tlmgr activation
diff --git a/all/debian/cfg.d/additional-packages.cfg b/all/debian/cfg.d/additional-packages.cfg
index af51942..5c394da 100644
--- a/all/debian/cfg.d/additional-packages.cfg
+++ b/all/debian/cfg.d/additional-packages.cfg
@@ -1,6 +1,7 @@
#
# Additional packages, no tpms/collections exist
-addpackages;;texlive;texlive-full;texlive-lang-all;ptex-bin;texpower;pdfjam;texlive-latex3
+addpackages;;texlive;texlive-full;texlive-lang-all;ptex-bin;texpower;pdfjam;texlive-latex3;thailatex
+#
# all should be part of the texlive-base source package
name;collection-foobar;texlive;texlive-base
name;collection-foobar;texlive-full;texlive-base
@@ -22,7 +23,7 @@ description;texlive-full;The distribution also includes extensive general docume
description;texlive-full;TeX, as well as the documentation accompanying the included software
description;texlive-full;packages.
# texlive-full should not depend on these meta- or transitional packages
-dependsnot;texlive-full;texlive-full;texlive;texlive-lang-all;ptex-bin;texpower;pdfjam;texlive-latex3
+dependsnot;texlive-full;texlive-full;texlive;texlive-lang-all;ptex-bin;texpower;pdfjam;texlive-latex3;thailatex
depends;texlive-full;context
#
# texlive
@@ -47,6 +48,8 @@ description;texlive-lang-all;packages.
#
# ptex-bin
title;ptex-bin;transitional dummy package
+bin-section;ptex-bin;oldlibs
+bin-priority;ptex-bin;extra
description;ptex-bin;This is a transitional package for ptex-bin to ensure proper
description;ptex-bin;upgrade to texlive-lang-cjk. It can be safely removed after the installation is complete.
depends;ptex-bin;texlive-lang-cjk (>= 2011)
@@ -55,6 +58,8 @@ conflicts;ptex-bin;ptex-base
#
# thailatex
title;thailatex;transitional dummy package
+bin-section;thailatex;oldlibs
+bin-priority;thailatex;extra
description;thailatex;This is a transitional package for thailatex to ensure proper
description;thailatex;upgrade to texlive-lang-other. It can be safely removed after the installation is complete.
depends;thailatex;texlive-lang-other (>= 2013.20130523)
@@ -62,12 +67,16 @@ recommends;texlive-lang-other;latex-fonts-thai-tlwg, swath, texlive-latex-extra
#
# texpower
title;texpower;transitional dummy package
+bin-section;texpower;oldlibs
+bin-priority;texpower;extra
description;texpower;This is a transitional package for texpower to ensure proper
description;texpower;upgrade to texlive-latex-extra. It can be safely removed after the installation is complete.
depends;texpower;texlive-latex-extra (>= 2011), texlive-fonts-extra (>= 2011)
#
# pdfjam
title;pdfjam;transitional dummy package
+bin-section;pdfjam;oldlibs
+bin-priority;pdfjam;extra
description;pdfjam;This is a transitional package for pdfjam to ensure proper
description;pdfjam;upgrade to texlive-extra-utils. It can be safely removed after the installation is complete.
depends;pdfjam;texlive-extra-utils (>= 2011)
@@ -75,6 +84,8 @@ provides;texlive-extra-utils;pdfjam
#
# texlive-latex3
title;texlive-latex3;transitional dummy package
+bin-section;texlive-latex3;oldlibs
+bin-priority;texlive-latex3;extra
description;texlive-latex3;This is a transitional package for texlive-latex3 to ensure proper
description;texlive-latex3;upgrade to texlive-latex-recommended. It can be safely removed after the installation is complete.
depends;texlive-latex3;texlive-latex-recommended (>= 2011)
diff --git a/all/debian/cfg.d/package-naming.cfg b/all/debian/cfg.d/package-naming.cfg
index 0fec66a..7219560 100644
--- a/all/debian/cfg.d/package-naming.cfg
+++ b/all/debian/cfg.d/package-naming.cfg
@@ -41,8 +41,8 @@ replaces;texlive-lang-english;texlive-doc-en
replaces;texlive-lang-french;texlive-doc-fr
replaces;texlive-lang-german;texlive-doc-de
replaces;texlive-lang-italian;texlive-doc-it
-replaces;texlive-lang-cjk;texlive-doc-ja, texlive-doc-ko, texlive-doc-th
-replaces;texlive-lang-other;texlive-doc-mn, texlive-doc-vi
+replaces;texlive-lang-cjk;texlive-doc-ja, texlive-doc-ko
+replaces;texlive-lang-other;texlive-doc-mn, texlive-doc-vi, texlive-doc-th
replaces;texlive-lang-polish;texlive-doc-pl
replaces;texlive-lang-portuguese;texlive-doc-pt
replaces;texlive-lang-cyrillic;texlive-doc-ru, texlive-doc-rs, texlive-doc-uk, texlive-doc-bg, texlive-doc-mn
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index 85b8a0d..6f6e68e 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -23,15 +23,7 @@ uploaders;*;Norbert Preining <preining@debian.org>, Frank Küster <frank@debian.
section;*;tex
bin-section;texlive-fonts-recommended;fonts
bin-section;texlive-fonts-extra;fonts
-bin-section;ptex-bin;oldlibs
-bin-section;texpower;oldlibs
-bin-section;pdfjam;oldlibs
-bin-section;texlive-latex3;oldlibs
priority;*;optional
-bin-priority;ptex-bin;extra
-bin-priority;texpower;extra
-bin-priority;pdfjam;extra
-bin-priority;texlive-latex3;extra
standards;*;3.9.3
# last texlive-base version all packages should depend on
texlive-base-version;2013.20130512
diff --git a/texlive-base/debian/changelog b/texlive-base/debian/changelog
index 2dd5cbf..63527c8 100644
--- a/texlive-base/debian/changelog
+++ b/texlive-base/debian/changelog
@@ -1,3 +1,10 @@
+texlive-base (2013.20130523-1) unstable; urgency=low
+
+ * new upstream checkout
+ * turn user mode permanently on in tlmgr, and make tlmgr actually work
+
+ -- Norbert Preining <preining@debian.org> Thu, 23 May 2013 12:56:48 +0900
+
texlive-base (2013.20130520-2) unstable; urgency=low
* fix wrong definition of TEXMFLOCAL
diff --git a/texlive-base/debian/patches/debian-tlmgr-usermode b/texlive-base/debian/patches/debian-tlmgr-usermode
new file mode 100644
index 0000000..836fdb0
--- /dev/null
+++ b/texlive-base/debian/patches/debian-tlmgr-usermode
@@ -0,0 +1,83 @@
+---
+ texmf-dist/doc/man/man1/tlmgr.1 | 2 +
+ texmf-dist/scripts/texlive/tlmgr.pl | 43 ++++--------------------------------
+ 2 files changed, 7 insertions(+), 38 deletions(-)
+
+--- texlive-base-2013.20130523.orig/texmf-dist/scripts/texlive/tlmgr.pl
++++ texlive-base-2013.20130523/texmf-dist/scripts/texlive/tlmgr.pl
+@@ -19,7 +19,7 @@
+ $tlmgrrevision .= " ($datrev)";
+
+ our $Master;
+-our $ismain;
++our $ismain = 1;
+ our $loadmediasrcerror;
+ our $packagelogfile;
+ our $packagelogged;
+@@ -28,44 +28,8 @@
+
+ BEGIN {
+ $^W = 1;
+- $ismain = (__FILE__ eq $0);
+- # WARNING
+- # The only use anticipated for tlmgr.pl as library for the 2009 release
+- # is the Windows w32client prototype script.
+- # Unix-specific problems with use as library will probably go undetected.
+-
+- # make subprograms (including kpsewhich) have the right path:
+- my ($bindir, $kpsewhichname);
+- if ($^O =~ /^MSWin/i) {
+- # on w32 $0 and __FILE__ point directly to tlmgr.pl; they can be relative
+- $Master = __FILE__;
+- $Master =~ s!\\!/!g;
+- $Master =~ s![^/]*$!../../..!
+- unless ($Master =~ s!/texmf-dist/scripts/texlive/tlmgr\.pl$!!i);
+- $bindir = "$Master/bin/win32";
+- $kpsewhichname = "kpsewhich.exe";
+- # path already set by wrapper batchfile
+- } else {
+- $Master = __FILE__;
+- $Master =~ s,/*[^/]*$,,;
+- if ($ismain) {
+- $bindir = $Master;
+- $Master = "$Master/../..";
+- } else {
+- # for the time being, this code will not be used or tested
+- $Master = "$Master/../../..";
+- # no code yet for $bindir; would have to detect platform
+- }
+- # make subprograms (including kpsewhich) have the right path:
+- $ENV{"PATH"} = "$bindir:$ENV{PATH}";
+- $kpsewhichname = "kpsewhich";
+- }
+- if (-r "$bindir/$kpsewhichname") {
+- # if not in bootstrapping mode => kpsewhich exists, so use it to get $Master
+- chomp($Master = `kpsewhich -var-value=SELFAUTOPARENT`);
+- }
++ $Master = "/usr/share/texlive";
+ $::installerdir = $Master;
+-
+ #
+ # make Perl find our packages first:
+ unshift (@INC, "$Master/tlpkg");
+@@ -237,6 +201,9 @@
+
+ GetOptions(\%opts, keys(%optarg)) or pod2usage(2);
+
++ $opts{"usermode"} = 1;
++ print "(running on Debian, switching to user mode!)\n";
++
+ $::debug_translation = 0;
+ $::debug_translation = 1 if $opts{"debug-translation"};
+
+--- texlive-base-2013.20130523.orig/texmf-dist/doc/man/man1/tlmgr.1
++++ texlive-base-2013.20130523/texmf-dist/doc/man/man1/tlmgr.1
+@@ -145,6 +145,8 @@
+ <http://tug.org/texlive/tlmgr.html>, along with procedures for updating
+ \&\f(CW\*(C`tlmgr\*(C'\fR itself and information about test versions.
+ .PP
++WARNING: tlmgr in Debian runs always in user mode
++.PP
+ TeX Live is organized into a few top-level \fIschemes\fR, each of which is
+ specified as a different set of \fIcollections\fR and \fIpackages\fR, where a
+ collection is a set of packages, and a package is what contains actual
diff --git a/texlive-base/debian/patches/dvipdfmx-config-paper-factorization b/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
index 2fd03f4..07324d1 100644
--- a/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
+++ b/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
@@ -5,7 +5,7 @@
3 files changed, 14 insertions(+), 8 deletions(-)
--- /dev/null
-+++ texlive-base-2013.20130509/texmf-dist/dvipdfmx/dvipdfmx-paper.cfg
++++ texlive-base-2013.20130523/texmf-dist/dvipdfmx/dvipdfmx-paper.cfg
@@ -0,0 +1,11 @@
+%% PDF Document Settings
+%%
@@ -18,8 +18,8 @@
+
+p a4
+
---- texlive-base-2013.20130509.orig/texmf-dist/dvipdfmx/dvipdfmx.cfg
-+++ texlive-base-2013.20130509/texmf-dist/dvipdfmx/dvipdfmx.cfg
+--- texlive-base-2013.20130523.orig/texmf-dist/dvipdfmx/dvipdfmx.cfg
++++ texlive-base-2013.20130523/texmf-dist/dvipdfmx/dvipdfmx.cfg
@@ -27,14 +27,8 @@
%% PDF Document Settings
@@ -37,9 +37,9 @@
%% Annotation Box Margin:
%%
---- texlive-base-2013.20130509.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2013.20130509/tlpkg/texlive.tlpdb
-@@ -56673,6 +56673,7 @@
+--- texlive-base-2013.20130523.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2013.20130523/tlpkg/texlive.tlpdb
+@@ -56597,6 +56597,7 @@
texmf-dist/doc/man/man1/extractbb.man1.pdf
runfiles size=42
texmf-dist/dvipdfmx/dvipdfmx.cfg
diff --git a/texlive-base/debian/patches/dvips-config-paper-factorization b/texlive-base/debian/patches/dvips-config-paper-factorization
index 36b8fa5..529da40 100644
--- a/texlive-base/debian/patches/dvips-config-paper-factorization
+++ b/texlive-base/debian/patches/dvips-config-paper-factorization
@@ -5,7 +5,7 @@
3 files changed, 532 insertions(+), 518 deletions(-)
--- /dev/null
-+++ texlive-base-2013.20130509/texmf-dist/dvips/config/config-paper.ps
++++ texlive-base-2013.20130523/texmf-dist/dvips/config/config-paper.ps
@@ -0,0 +1,524 @@
+%
+% config-paper.ps
@@ -531,8 +531,8 @@
+@+ if
+@+ %%EndPaperSize
+
---- texlive-base-2013.20130509.orig/texmf-dist/dvips/config/config.ps
-+++ texlive-base-2013.20130509/texmf-dist/dvips/config/config.ps
+--- texlive-base-2013.20130523.orig/texmf-dist/dvips/config/config.ps
++++ texlive-base-2013.20130523/texmf-dist/dvips/config/config.ps
@@ -67,524 +67,13 @@
%
% emacs-page
@@ -1065,9 +1065,9 @@
% use -t unknown with a \special{papersize=...} for a nonstandard page size.
@ unknown 0in 0in
---- texlive-base-2013.20130509.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2013.20130509/tlpkg/texlive.tlpdb
-@@ -57467,6 +57467,7 @@
+--- texlive-base-2013.20130523.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2013.20130523/tlpkg/texlive.tlpdb
+@@ -57391,6 +57391,7 @@
texmf-dist/dvips/config/config.mirrorprint
texmf-dist/dvips/config/config.ot2
texmf-dist/dvips/config/config.ps
diff --git a/texlive-base/debian/patches/pdftex-config-paper-factorization b/texlive-base/debian/patches/pdftex-config-paper-factorization
index 76e5aec..893d8b3 100644
--- a/texlive-base/debian/patches/pdftex-config-paper-factorization
+++ b/texlive-base/debian/patches/pdftex-config-paper-factorization
@@ -5,14 +5,14 @@
3 files changed, 7 insertions(+), 2 deletions(-)
--- /dev/null
-+++ texlive-base-2013.20130509/texmf-dist/tex/generic/config/pdftexconfig-paper.tex
++++ texlive-base-2013.20130523/texmf-dist/tex/generic/config/pdftexconfig-paper.tex
@@ -0,0 +1,4 @@
+% paper size settings, included from pdftexconfig.tex for pdftex
+\pdfpagewidth=210 true mm
+\pdfpageheight=297 true mm
+\endinput
---- texlive-base-2013.20130509.orig/texmf-dist/tex/generic/config/pdftexconfig.tex
-+++ texlive-base-2013.20130509/texmf-dist/tex/generic/config/pdftexconfig.tex
+--- texlive-base-2013.20130523.orig/texmf-dist/tex/generic/config/pdftexconfig.tex
++++ texlive-base-2013.20130523/texmf-dist/tex/generic/config/pdftexconfig.tex
@@ -3,8 +3,8 @@
\pdfoutput=1
\pdfcompresslevel=9
@@ -24,9 +24,9 @@
\pdfhorigin=1 true in
\pdfvorigin=1 true in
\pdfpkresolution=600
---- texlive-base-2013.20130509.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2013.20130509/tlpkg/texlive.tlpdb
-@@ -133059,6 +133059,7 @@
+--- texlive-base-2013.20130523.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2013.20130523/tlpkg/texlive.tlpdb
+@@ -133347,6 +133347,7 @@
texmf-dist/scripts/simpdftex/simpdftex
texmf-dist/tex/generic/config/pdftex-dvi.tex
texmf-dist/tex/generic/config/pdftexconfig.tex
diff --git a/texlive-base/debian/patches/series b/texlive-base/debian/patches/series
index 3c22401..0aab5a6 100644
--- a/texlive-base/debian/patches/series
+++ b/texlive-base/debian/patches/series
@@ -28,3 +28,4 @@ debian-texconfig-adaptions
texdoc-see-and-zip
fix-natbib-add-spaces
upstream_fix_babel_french_days
+debian-tlmgr-usermode
diff --git a/texlive-base/debian/patches/xdvi-config-paper-factorization b/texlive-base/debian/patches/xdvi-config-paper-factorization
index d0dae63..58f3c0d 100644
--- a/texlive-base/debian/patches/xdvi-config-paper-factorization
+++ b/texlive-base/debian/patches/xdvi-config-paper-factorization
@@ -4,8 +4,8 @@
tlpkg/texlive.tlpdb | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
---- texlive-base-2013.20130509.orig/texmf-dist/xdvi/XDvi
-+++ texlive-base-2013.20130509/texmf-dist/xdvi/XDvi
+--- texlive-base-2013.20130523.orig/texmf-dist/xdvi/XDvi
++++ texlive-base-2013.20130523/texmf-dist/xdvi/XDvi
@@ -21,7 +21,7 @@
!!! and greater flexibility for shrink values. Generating MF fonts shouldn't be an
!!! issue when using T1lib.
@@ -16,12 +16,12 @@
!!! This should be the best choice for modern displays with large color depth.
*thorough: true
--- /dev/null
-+++ texlive-base-2013.20130509/texmf-dist/xdvi/XDvi-paper
++++ texlive-base-2013.20130523/texmf-dist/xdvi/XDvi-paper
@@ -0,0 +1 @@
+*paper: a4
---- texlive-base-2013.20130509.orig/tlpkg/texlive.tlpdb
-+++ texlive-base-2013.20130509/tlpkg/texlive.tlpdb
-@@ -199535,6 +199535,7 @@
+--- texlive-base-2013.20130523.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2013.20130523/tlpkg/texlive.tlpdb
+@@ -199552,6 +199552,7 @@
runfiles size=9
texmf-dist/dvips/xdvi/config.xdvi
texmf-dist/xdvi/XDvi
diff --git a/texlive-extra/debian/changelog b/texlive-extra/debian/changelog
index 2e0b07e..f1dc64e 100644
--- a/texlive-extra/debian/changelog
+++ b/texlive-extra/debian/changelog
@@ -1,3 +1,9 @@
+texlive-extra (2013.20130523-1) unstable; urgency=low
+
+ * new upstream checkout
+
+ -- Norbert Preining <preining@debian.org> Thu, 23 May 2013 12:36:41 +0900
+
texlive-extra (2013.20130520-1) unstable; urgency=low
* new upstream checkout
diff --git a/texlive-lang/debian/changelog b/texlive-lang/debian/changelog
index f1bf7d9..0625823 100644
--- a/texlive-lang/debian/changelog
+++ b/texlive-lang/debian/changelog
@@ -1,10 +1,11 @@
-texlive-lang (2013.2013052NNNNNN-1) UNRELEASED; urgency=low
+texlive-lang (2013.20130523-1) unstable; urgency=low
* new upstream checkout
- * add another few replaces against old doc pkgs (Closes: #709227, #709233)
+ * add another few replaces against old doc pkgs
+ (Closes: #709227, #709233)
* include thailatex again, provide transitional thailatex package
- -- Norbert Preining <preining@debian.org> Thu, 23 May 2013 12:28:52 +0900
+ -- Norbert Preining <preining@debian.org> Thu, 23 May 2013 12:37:01 +0900
texlive-lang (2013.20130520-1) unstable; urgency=low
--
Debian packaging of texlive-nonbin)
Reply to: