[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/all-2013.20130530-1-2-ge500aea

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

The following commit has been merged in the master branch:
commit e500aea893990d48b99cf82ad355a1f1a2e3486e
Author: Norbert Preining <preining@debian.org>
Date:   Mon Jun 3 11:01:56 2013 +0900

    conflict with texlive common so that it gets removed (Closes: #710789)

diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index f719922..2e44088 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -120,7 +120,7 @@ replaces;texlive-latex-extra;texlive-pictures (<< 2013)
 replaces;texlive-latex-extra-doc;texlive-pictures-doc (<< 2013)
 # make texlive-base conflict with old texlive-doc-base so that all
 # of them gets removed
-conflicts;texlive-base;texlive-doc-base
+conflicts;texlive-base;texlive-doc-base, texlive-common
 #
 # additional replaces
 replaces;texlive-lang-arabic;texlive-latex-extra (<< 2013), texlive-publishers (<< 2013)
diff --git a/texlive-base/debian/changelog b/texlive-base/debian/changelog
index 322416b..ef1ca1d 100644
--- a/texlive-base/debian/changelog
+++ b/texlive-base/debian/changelog
@@ -1,3 +1,10 @@
+texlive-base (2013.20130530-2) UNRELEASED; urgency=low
+
+  * UNRELEASED
+  * conflict with texlive common so that it gets removed (Closes: #710789)
+
+ -- Norbert Preining <preining@debian.org>  Mon, 03 Jun 2013 11:01:21 +0900
+
 texlive-base (2013.20130530-1) unstable; urgency=low
 
   * new upstream checkout, corresponding to TL2013 DVD release

-- 
Debian packaging of texlive-nonbin)