[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/all-2012.20130111-1-24-g89558a6

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

The following commit has been merged in the master branch:
commit 89558a69ebcb1c9d84114ed919dd5f74fa66c0c1
Author: Norbert Preining <preining@debian.org>
Date:   Sun May 19 15:22:13 2013 +0900

    conflict with texlive-base << 2013 for all packages

diff --git a/all/debian/tpm2debcommon.pm b/all/debian/tpm2debcommon.pm
index 47e5751..f17b0cd 100755
--- a/all/debian/tpm2debcommon.pm
+++ b/all/debian/tpm2debcommon.pm
@@ -220,9 +220,13 @@ sub build_data_hash {
 		#
 		# other relations
 		#
+		my @conflicts;
+		push @conflicts, "texlive-base (<< 2013)";
 		if (defined($Config{'conflicts'}{$pkg})) {
-			$TeXLive{'binary'}{$pkg}{'conflicts'} = [ @{$Config{'conflicts'}{$pkg}} ];
+			push @conflicts, @{$Config{'conflicts'}{$pkg}};
 		}
+		$TeXLive{'binary'}{$pkg}{'conflicts'} = [ @conflicts ];
+		#
 		if (defined($Config{'suggests'}{$pkg})) {
 			$TeXLive{'binary'}{$pkg}{'suggests'} = [ @{$Config{'suggests'}{$pkg}} ];
 		}

-- 
Debian packaging of texlive-nonbin)