[Buildd-tools-devel] Bug#395271: Bug#395271: tagging 395271

[Roger Leigh]

tags 395271 + fixed-upstream pending
thanks

Lucas Nussbaum <lucas at lucas-nussbaum.net> writes:

> Actually, the patch works very well. The following patches failed to
> build with the current sbuild in unstable, but build fine with the
> patch:

[...]

> Roger, could you apply it?

Done.  Due to refactoring, the patch I applied is to a different
source file, so I attached the changed version below.  It's also at

http://git.debian.org/?p=buildd-tools/sbuild.git;a=commitdiff;h=8bc3477690728ec2c61e8240b63df15b06de933a

> The following packages still fail to build with sbuild:
> libwww-perl_5.812-1 (would need sbuild to understand B-dep: a | b. will
> file bug when this bug is fixed)
>
> libmail-box-perl_2.082-1 (same case as libwww-perl)
>
> svk_2.0.2-1 (version depends on liblocale-maketext-simple-perl, but
> perl-modules conflicts with liblocale-maketext-simple-perl (<< O.16) =>
> bug in svk

OK.  If these are separate bugs in sbuild (which haven't already been
filed--there are some long-standing issues with some build-deps that
really need tackling), please could you file separate bugs.


Thanks,
Roger


diff --git a/debian/changelog b/debian/changelog
index 74f6356..89b6ea1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,12 @@ sbuild (0.57.3-1) unstable; urgency=low
   * --chroot and --arch now work together (Closes: #479714).
   * Use schroot "Session Purged" flag rather than "Session Cloned"
     (Closes: #482804).  Thanks to Timothy G Abbott.
+  * Handle version provides correctly, by using "~*=PROVIDED=*=" in place
+    of "=*=PROVIDED=*=" as the package version (Closes: #395271).  Thanks
+    to Niko Tyni for this patch.
+  * 
 
- -- Roger Leigh <rleigh at debian.org>  Sun, 25 May 2008 21:32:39 +0100
+ -- Roger Leigh <rleigh at debian.org>  Sun, 25 May 2008 21:48:33 +0100
 
 sbuild (0.57.2-1) unstable; urgency=low
 
diff --git a/lib/Sbuild/Build.pm b/lib/Sbuild/Build.pm
index 86be0fc..8ddb9f0 100644
--- a/lib/Sbuild/Build.pm
+++ b/lib/Sbuild/Build.pm
@@ -1375,7 +1375,7 @@ sub get_dpkg_status (\$@) {
 	if ($status !~ /\sinstalled$/) {
 	    $result{$pkg}->{'Installed'} = 0
 		if !(exists($result{$pkg}) &&
-		     $result{$pkg}->{'Version'} eq '=*=PROVIDED=*=');
+		     $result{$pkg}->{'Version'} eq '~*=PROVIDED=*=');
 	    next;
 	}
 	if (!defined $version || $version eq "") {
@@ -1387,7 +1387,7 @@ sub get_dpkg_status (\$@) {
 	if isin( $pkg, @interest );
 	if ($provides) {
 	    foreach (split( /\s*,\s*/, $provides )) {
-		$result{$_} = { Installed => 1, Version => '=*=PROVIDED=*=' }
+		$result{$_} = { Installed => 1, Version => '~*=PROVIDED=*=' }
 		if isin( $_, @interest ) and (not exists($result{$_}) or
 					      ($result{$_}->{'Installed'} == 0));
 	    }


-- 
  .''`.  Roger Leigh
 : :' :  Debian GNU/Linux             http://people.debian.org/~rleigh/
 `. `'   Printing on GNU/Linux?       http://gutenprint.sourceforge.net/
   `-    GPG Public Key: 0x25BFB848   Please GPG sign your mail.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/buildd-tools-devel/attachments/20080525/c190a61f/attachment.pgp