[SCM] Git repository for devscripts branch, master, updated. v2.13.2-10-g7882a6c

[James McCoy]

The following commit has been merged in the master branch:
commit 7882a6cd0a2df124cb54e2559486fd7c7a1940ca
Author: James McCoy <jamessan at debian.org>
Date:   Fri Jun 14 23:20:28 2013 -0400

    mk-build-deps: Take Build-Conflicts(-Indep) into account.
    
    Closes: #712227
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index ceb77e6..b985f48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ devscripts (2.13.3) UNRELEASED; urgency=low
   * dpkg-buildpackage: Use "dpkg-checkbuilddeps -A" for arch-indep builds.
     Bump dpkg-dev Depends to 1.16.4 accordingly.
   * Suppress "given/when is experimental" warnings when using Perl 5.18.
+  * mk-build-deps: Take Build-Conflicts(-Indep) into account.  (Closes:
+    #712227)
 
   [ Chris Boot ]
   * bts: Fix no-mutt option. (Closes: #709999)
diff --git a/scripts/mk-build-deps.pl b/scripts/mk-build-deps.pl
index 29d1018..11304e1 100755
--- a/scripts/mk-build-deps.pl
+++ b/scripts/mk-build-deps.pl
@@ -253,6 +253,7 @@ while ($control = shift) {
 	my $args = '';
 	my $arch = 'all';
 	my ($build_deps, $build_dep, $build_indep);
+	my ($build_conflicts, $conflict_arch, $conflict_indep);
 
 	if (exists $ctrl->{'Build-Depends'}) {
 	    $build_dep = $ctrl->{'Build-Depends'};
@@ -265,6 +266,17 @@ while ($control = shift) {
 	    $build_deps .= ', ' if $build_deps;
 	    $build_deps .= $build_indep;
 	}
+	if (exists $ctrl->{'Build-Conflicts'}) {
+	    $conflict_arch = $ctrl->{'Build-Conflicts'};
+	    $conflict_arch =~ s/\n/ /g;
+	    $build_conflicts = $conflict_arch;
+	}
+	if (exists $ctrl->{'Build-Conflicts-Indep'}) {
+	    $conflict_indep = $ctrl->{'Build-Conflicts-Indep'};
+	    $conflict_indep =~ s/\n/ /g;
+	    $build_conflicts .= ', ' if $build_conflicts;
+	    $build_conflicts .= $conflict_indep;
+	}
 
 	die "$progname: Unable to find build-deps for $ctrl->{$name}\n" unless $build_deps;
 
@@ -277,6 +289,7 @@ while ($control = shift) {
 	if (!($opt_dep || $opt_indep)) {
 	    push(@pkgInfo,
 		 { depends => $build_deps,
+		   conflicts => $build_conflicts,
 		   name => $ctrl->{$name},
 		   type => 'build-deps',
 		   version => $ctrl->{Version} });
@@ -285,6 +298,7 @@ while ($control = shift) {
 	if ($opt_dep) {
 	    push(@pkgInfo,
 		 { depends => $build_dep,
+		   conflicts => $conflict_arch,
 		   name => $ctrl->{$name},
 		   type => 'build-deps-depends',
 		   version => $ctrl->{Version} });
@@ -292,6 +306,7 @@ while ($control = shift) {
 	if ($opt_indep) {
 	    push(@pkgInfo,
 		 { depends => $build_indep,
+		   conflicts => $conflict_indep,
 		   name => $ctrl->{$name},
 		   type => 'build-deps-indep',
 		   version => $ctrl->{Version} });
@@ -374,6 +389,8 @@ sub build_equiv
     "Architecture: $arch\n".
     "Depends: build-essential, $opts->{depends}\n";
 
+    print EQUIVS "Conflicts: $opts->{conflicts}\n" if $opts->{conflicts};
+
     # Allow the file not to exist to ease testing
     print EQUIVS "Readme: $readme\n" if -r $readme;
 

-- 
Git repository for devscripts