Merge branch 'master' into postgresql

diff --cc bin/wanna-build
index cd04f18376e27af936085924204a5536e2d6adf9,028242745c7286742ef858b523c13c8511780a64..3035153a165626ffe8099fe54797fa280c19d161
--- 1/bin/wanna-build
--- 2/bin/wanna-build
+++ b/bin/wanna-build
@@@ -936,12 -1030,16 +936,16 @@@ sub add_one_needsbuild 
                          "Skipping.\n";
                return;
        }
-       change_state( \$pkg, 'BD-Uninstallable' );
-       $pkg->{'bd_problem'} = "Installability of build dependencies not tested yet";
-       delete $pkg->{'builder'};
-       delete $pkg->{'depends'};
+       if ($distribution eq "unstable") {
+               change_state( \$pkg, 'BD-Uninstallable' );
 -              $pkg->{'BD-Problem'} = "Installability of build dependencies not tested yet";
++              $pkg->{'bd_problem'} = "Installability of build dependencies not tested yet";
+       } else {
+               change_state( \$pkg, 'Needs-Build' );
+       }
 -      delete $pkg->{'Builder'};
 -      delete $pkg->{'Depends'};
++      $pkg->{'builder'} = undef;
++      $pkg->{'depends'} = undef;
        log_ta( $pkg, "--give-back" );
 -      $db{$name} = $pkg;
 +      update_source_info($pkg);
        print "$name: given back\n" if $verbose;
  }