[texlive-nonbin] 01/01: include prerex again

[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 c453909a35e18dda53fdef921083126f2f858ddd
Author: Norbert Preining <preining@debian.org>
Date:   Tue Jan 2 18:56:24 2018 +0900

    include prerex again
---
 all/debian/cfg.d/debian-replacement.cfg | 6 ------
 all/debian/tpm2deb.cfg                  | 8 ++++++++
 texlive-base/debian/changelog           | 7 +++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/all/debian/cfg.d/debian-replacement.cfg b/all/debian/cfg.d/debian-replacement.cfg
index 62742e1..79ef662 100644
--- a/all/debian/cfg.d/debian-replacement.cfg
+++ b/all/debian/cfg.d/debian-replacement.cfg
@@ -140,12 +140,6 @@ blacklist;tpm;feynmf;*
 recommends;texlive-metapost;feynmf  
 depends;texlive-full;feynmf
 #
-# prerex: separate package, use only suggests due to
-# Ubuntu request bug #808776
-blacklist;tpm;prerex;*
-suggests;texlive-pictures;prerex
-depends;texlive-full;prerex
-#
 # poppler-data ships all our CMap files
 blacklist;tpm;adobemapping;*
 depends;texlive-lang-cjk;poppler-data
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index ac98b4d..d37ed0a 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -295,6 +295,14 @@ filemove;texlive-luatex;texlive-pictures-doc;2017.20171022
 filemove;texlive-latex-extra;texlive-pstricks;2017.20171031
 filemove;texlive-latex-extra-doc;texlive-pstricks-doc;2017.20171031
 
+# include prerex again
+# use only suggests due to Ubuntu request bug #808776
+breaks;texlive-pictures;prerex (<= 6.5.3-1)
+replaces;texlive-pictures;prerex (<= 6.5.3-1)
+suggests;texlive-pictures;vprerex (>> 6.5.3-1)
+suggests;texlive-pictures;prerex (>> 6.5.3-1)
+depends;texlive-full;prerex (>> 6.5.3-1)
+depends;texlive-full;vprerex (>> 6.5.3-1)
 
 #
 # Additional packages, no tpms/collections exist
diff --git a/texlive-base/debian/changelog b/texlive-base/debian/changelog
index 43a387d..a983b4e 100644
--- a/texlive-base/debian/changelog
+++ b/texlive-base/debian/changelog
@@ -1,3 +1,10 @@
+texlive-base (2017.20171128-2) UNRELEASED; urgency=medium
+
+  * new upstream checkout
+  * include prerex, thanks to Ryan Kavanagh for patches
+
+ -- Norbert Preining <preining@debian.org>  Tue, 02 Jan 2018 18:55:46 +0900
+
 texlive-base (2017.20171128-1) unstable; urgency=medium
 
   * new upstream checkout

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