[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/all-2012.20121205-1-1-g8a0b0c1

["Norbert Preining" <preining@debian.org>]

The following commit has been merged in the master branch:
commit 8a0b0c1cc144785cfd8c7bc29221af60e33b8310
Author: Norbert Preining <preining@debian.org>
Date:   Tue Dec 18 07:30:47 2012 +0900

    add necessary breaks/replaces for texmfcnf.lua takeover

diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index 32ce948..5431af4 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -118,6 +118,9 @@ depends;texlive-formats-extra;texlive-latex-base
 replaces;texlive-font-utils;texlive-binaries (<< 2012.20121120)
 replaces;texlive-lang-cyrillic;texlive-binaries (<< 2012.20121120)
 replaces;texlive-base;texlive-binaries (<< 2012.20121120)
+# texlive-base takes over texmfcnf.lua
+replaces;texlive-base;context (<< 2012.05.30.20121209)
+breaks;texlive-base;context (<< 2012.05.30.20121209)
 # that is a bit stupid, we have to specify replacements for doc splitting!
 replaces;texlive-latex-extra;texlive-pictures (<< 2012.20121120)
 replaces;texlive-latex-extra-doc;texlive-pictures-doc (<< 2012.20121120)
diff --git a/texlive-base/debian/changelog b/texlive-base/debian/changelog
index fd9f1e4..0167da1 100644
--- a/texlive-base/debian/changelog
+++ b/texlive-base/debian/changelog
@@ -1,3 +1,10 @@
+texlive-base (2012.20121205-2) UNRELEASED; urgency=low
+
+  * replace/breaks with older context versions shipping texmfcnf.lua
+    (Closes: #696169)
+
+ -- Norbert Preining <preining@debian.org>  Tue, 18 Dec 2012 07:28:28 +0900
+
 texlive-base (2012.20121205-1) experimental; urgency=low
 
   * new upstream checkout

-- 
Debian packaging of texlive-nonbin)