[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/base-2013.20130520-2-2-g9b8556f



The following commit has been merged in the master branch:
commit 9b8556f6b9929a997e491ac91b49728736a08316
Author: Norbert Preining <preining@debian.org>
Date:   Thu May 23 12:29:42 2013 +0900

    include thailatex files, provide transitional package for thailatex

diff --git a/all/debian/cfg.d/additional-packages.cfg b/all/debian/cfg.d/additional-packages.cfg
index 8480086..af51942 100644
--- a/all/debian/cfg.d/additional-packages.cfg
+++ b/all/debian/cfg.d/additional-packages.cfg
@@ -6,6 +6,7 @@ name;collection-foobar;texlive;texlive-base
 name;collection-foobar;texlive-full;texlive-base
 name;collection-foobar;texlive-lang-all;texlive-lang
 name;collection-foobar;ptex-bin;texlive-lang
+name;collection-foobar;thailatex;texlive-lang
 name;collection-foobar;texpower;texlive-extra
 name;collection-foobar;pdfjam;texlive-extra
 name;collection-foobar;texlive-latex3;texlive-extra
@@ -52,6 +53,13 @@ depends;ptex-bin;texlive-lang-cjk (>= 2011)
 conflicts;texlive-lang-cjk;ptex-base
 conflicts;ptex-bin;ptex-base
 #
+# thailatex
+title;thailatex;transitional dummy package
+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)
+recommends;texlive-lang-other;latex-fonts-thai-tlwg, swath, texlive-latex-extra
+#
 # texpower
 title;texpower;transitional dummy package
 description;texpower;This is a transitional package for texpower to ensure proper
diff --git a/all/debian/cfg.d/debian-replacement.cfg b/all/debian/cfg.d/debian-replacement.cfg
index 82fdf5f..091ada7 100644
--- a/all/debian/cfg.d/debian-replacement.cfg
+++ b/all/debian/cfg.d/debian-replacement.cfg
@@ -166,17 +166,12 @@ blacklist;tpm;cjk;*
 blacklist;tpm;cjkpunct;*
 blacklist;tpm;cjkutils;*
 blacklist;tpm;dnp;*
-blacklist;tpm;fonts-tlwg;*
-blacklist;tpm;garuda-c90;*
-blacklist;tpm;norasi-c90;*
-blacklist;tpm;thailatex;*
 blacklist;tpm;wadalab;*
 recommends;texlive-lang-cjk;latex-cjk-all (>= 4.6.0+cvs20060714-2)
-recommends;texlive-lang-cjk;thailatex
-depends;texlive-full;latex-cjk-all (>= 4.6.0+cvs20060714-2), thailatex
 provides;texlive-lang-cjk;vfdata-morisawa5, okumura-clsfiles, ptex-jisfonts
 conflicts;texlive-lang-cjk;ptex-jisfonts
 replaces;texlive-lang-cjk;mendexk
+depends;texlive-full;latex-cjk-all (>= 4.6.0+cvs20060714-2)
 #
 # jadetex, xmltex, passivetex
 # all packages which were contained in texlive-xmlhtml
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index 003b1f1..85b8a0d 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -143,6 +143,8 @@ replaces;texlive-base;texlive-common (<< 2013)
 replaces;texlive-lang-arabic;texlive-publishers-doc (<< 2013)
 replaces;texlive-lang-arabic;texlive-latex-extra-doc (<< 2013)
 replaces;texlive-lang-cyrillic;texlive-latex-extra-doc (<< 2013)
+# thai stuff moved from lang-cjk to lang-other
+replaces;texlive-lang-other;texlive-lang-cjk (<< 2013.20130523)
 
 #
 # Additional packages, no tpms/collections exist
diff --git a/texlive-lang/debian/changelog b/texlive-lang/debian/changelog
index f8f2138..f1bf7d9 100644
--- a/texlive-lang/debian/changelog
+++ b/texlive-lang/debian/changelog
@@ -1,8 +1,10 @@
-texlive-lang (2013.20130520-2) UNRELEASED; urgency=low
+texlive-lang (2013.2013052NNNNNN-1) UNRELEASED; urgency=low
 
+  * new upstream checkout
   * add another few replaces against old doc pkgs (Closes: #709227, #709233)
+  * include thailatex again, provide transitional thailatex package
 
- -- Norbert Preining <preining@debian.org>  Wed, 22 May 2013 09:28:44 +0900
+ -- Norbert Preining <preining@debian.org>  Thu, 23 May 2013 12:28:52 +0900
 
 texlive-lang (2013.20130520-1) unstable; urgency=low
 

-- 
Debian packaging of texlive-nonbin)


Reply to: