[texlive-nonbin] 04/12: re-include musixtex, pmx, m-tx back into texlive
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-nonbin.
commit c459ea7c10e47ff3d138d8a21310aeb2624beadf
Author: Norbert Preining <preining@debian.org>
Date: Mon Feb 22 22:05:06 2016 +0900
re-include musixtex, pmx, m-tx back into texlive
---
all/debian/cfg.d/debian-replacement.cfg | 13 -------------
all/debian/cfg.d/info-man-handling.cfg | 3 +++
all/debian/cfg.d/upgrade-transitional-packages.cfg | 3 +++
all/debian/tpm2deb.cfg | 7 +++++++
texlive-extra/debian/changelog | 3 ++-
5 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/all/debian/cfg.d/debian-replacement.cfg b/all/debian/cfg.d/debian-replacement.cfg
index eac28af..b773ad0 100644
--- a/all/debian/cfg.d/debian-replacement.cfg
+++ b/all/debian/cfg.d/debian-replacement.cfg
@@ -104,19 +104,6 @@ blacklist;tpm;tex-gyre-math;*
recommends;texlive-fonts-recommended;tex-gyre
depends;texlive-full;tex-gyre
#
-# musixtex and friends
-blacklist;tpm;musixps;*
-blacklist;tpm;musixtex;*
-blacklist;tpm;musixflx;*
-blacklist;tpm;musixlyr;*
-# musixtex package since 0.114-2 includes musixlyr and musxtex-slurps
-depends;texlive-music;musixtex (>= 1:0.114-2)
-#
-# other things in debian
-blacklist;tpm;m-tx;*
-blacklist;tpm;pmx;*
-depends;texlive-music;m-tx, pmx
-#
# lcdftypetools (with hyphen in Debian, without in TeX Live!)
blacklist;tpm;lcdftypetools;*
depends;texlive-full;lcdf-typetools
diff --git a/all/debian/cfg.d/info-man-handling.cfg b/all/debian/cfg.d/info-man-handling.cfg
index c1ef90a..8bbee9f 100644
--- a/all/debian/cfg.d/info-man-handling.cfg
+++ b/all/debian/cfg.d/info-man-handling.cfg
@@ -95,8 +95,11 @@ kill;texmf-dist/doc/man/man1/pk2bm.1
kill;texmf-dist/doc/man/man1/pktogf.1
kill;texmf-dist/doc/man/man1/pktype.1
kill;texmf-dist/doc/man/man1/pltotf.1
+kill;texmf-dist/doc/man/man1/pmxab.1
kill;texmf-dist/doc/man/man1/pooltype.1
+kill;texmf-dist/doc/man/man1/prepmx.1
kill;texmf-dist/doc/man/man1/ps2pk.1
+kill;texmf-dist/doc/man/man1/scor2prt.1
kill;texmf-dist/doc/man/man1/synctex.1
kill;texmf-dist/doc/man/man1/tangle.1
kill;texmf-dist/doc/man/man1/tex.1
diff --git a/all/debian/cfg.d/upgrade-transitional-packages.cfg b/all/debian/cfg.d/upgrade-transitional-packages.cfg
index c70cc82..7103a49 100644
--- a/all/debian/cfg.d/upgrade-transitional-packages.cfg
+++ b/all/debian/cfg.d/upgrade-transitional-packages.cfg
@@ -1,3 +1,6 @@
+# WARNING
+# when adding new packages here they need to be added to
+# the list at the top if this file, too!!!!!!!!!
addpackages;;etoolbox;luasseq
#
# etoolbox replacement in jessie
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index b7a54c9..aface50 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -174,6 +174,13 @@ breaks;texlive-latex-extra;texlive-science (<< 2015.20151225)
replaces;texlive-science-doc;texlive-latex-extra-doc (<< 2015.20151225)
breaks;texlive-latex-extra-doc;texlive-science-doc (<< 2015.20151225)
+
+#
+# reinclusion of musixtex, pmx, m-tx
+replaces;texlive-music;musixtex (<< 1:1.20.ctan20151216-3), pmx (<< 2.7.0.ctan20150301-3), m-tx (<< 0.61.ctan20151217-2)
+provides;texlive-music;musixtex, pmx, m-tx
+breaks;texlive-music;musixtex (<< 1:1.20.ctan20151216-3), pmx (<< 2.7.0.ctan20150301-3), m-tx (<< 0.61.ctan20151217-2)
+
#
# texlive-pstricks needs pgf in any case ..
depends;texlive-pstricks;texlive-pictures
diff --git a/texlive-extra/debian/changelog b/texlive-extra/debian/changelog
index 1c3389e..cc2fef4 100644
--- a/texlive-extra/debian/changelog
+++ b/texlive-extra/debian/changelog
@@ -3,8 +3,9 @@ texlive-extra (2015.20160222-1) UNRELEASED; urgency=medium
* new upstream checkout
* ensure proper upgrade from intermediate sid releases
(replaces for texlive-math-extra vs texlive-latex-extra)
+ * reinclusion of musixtex, pmx, m-tx in texlive-music
- -- Norbert Preining <preining@debian.org> Mon, 22 Feb 2016 20:32:20 +0900
+ -- Norbert Preining <preining@debian.org> Mon, 22 Feb 2016 22:03:50 +0900
texlive-extra (2015.20160215-1) unstable; urgency=medium
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-nonbin.git
Reply to: