[texlive-nonbin] 04/07: merge tl-math-extra into tl-science

[Norbert Preining <preining@debian.org>]

This is an automated email from the git hooks/post-receive script.

preining pushed a commit to branch master
in repository texlive-nonbin.

commit e828b789f20a4e72aff1504f2bc31fbb0e6686c9
Author: Norbert Preining <preining@debian.org>
Date:   Mon Oct 31 15:58:03 2016 +0900

    merge tl-math-extra into tl-science
---
 all/debian/cfg.d/package-naming.cfg | 3 +--
 all/debian/tpm2deb.cfg              | 7 +++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/all/debian/cfg.d/package-naming.cfg b/all/debian/cfg.d/package-naming.cfg
index a2ec0da..2081207 100644
--- a/all/debian/cfg.d/package-naming.cfg
+++ b/all/debian/cfg.d/package-naming.cfg
@@ -19,7 +19,6 @@ name;collection-binextra;texlive-extra-utils;texlive-extra
 name;collection-fontutils;texlive-font-utils;texlive-extra
 name;collection-formatsextra;texlive-formats-extra;texlive-extra
 name;collection-genericextra;texlive-generic-extra;texlive-extra
-name;collection-mathextra;texlive-math-extra;texlive-extra
 name;collection-plainextra;texlive-plain-extra;texlive-extra
 name;collection-latexextra;texlive-latex-extra;texlive-extra
 name;collection-fontsextra;texlive-fonts-extra;texlive-extra
@@ -28,7 +27,7 @@ name;collection-games;texlive-games;texlive-extra
 name;collection-pstricks;texlive-pstricks;texlive-extra
 name;collection-publishers;texlive-publishers;texlive-extra
 name;collection-humanities;texlive-humanities;texlive-extra
-name;collection-science;texlive-science;texlive-extra
+name;collection-mathscience;texlive-science;texlive-extra
 name;collection-htmlxml;texlive-htmlxml;texlive-extra
 #
 # texlive-lang
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index 23db658..b214cf5 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -336,6 +336,13 @@ breaks;texlive-xetex; texlive-lang-arabic (<< 2016.20161008)
 # 20161010 (#840189)
 breaks;texlive-latex-extra; dblatex (<< 0.3.8-2~)
 
+# 20161031
+# merge texlive-math-extra into texlive-science
+# actually new texlive-mathscience but this is a pain
+replaces;texlive-science;texlive-math-extra (<< 2016.20161031-1)
+provides;texlive-science;texlive-math-extra
+conflicts;texlive-science;texlive-math-extra
+
 #
 # Additional packages, no tpms/collections exist
 include-config;cfg.d/additional-packages.cfg

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