Bug#384137: [Buildd-tools-devel] Bug#384137: binNMU versioning change

[Roger Leigh]

tags 384137 + patch fixed-upstream pending
thanks

Clint Adams <schizo at debian.org> writes:

>> I think it was probably an oversight; it looks like it needs applying.
>> Could you point me to the original mail in the archives--I can't find
>> it?
>
> No idea.  I grabbed the function from DSA's sbuild.

Ah, OK.

I tested the patch, and it appears to work OK.  I committed the
following patch to SVN:

Index: debian/changelog
===================================================================
--- debian/changelog	(revision 1005)
+++ debian/changelog	(working copy)
@@ -8,8 +8,10 @@
     - verify_md5sums: Only run md5sum if there is one or more md5sum to
       verify, to prevent md5sum waiting forever on stdin if there are no
       files to check.  Thanks to Daniel Stone.
+  * Sbuild.pm: Use new binNMU versioning scheme (+bn), taken from
+    wanna-build SVN.  Thanks to Clint Adams (Closes: #384137).
 
- -- Roger Leigh <rleigh at debian.org>  Sat, 12 Aug 2006 12:24:34 +0100
+ -- Roger Leigh <rleigh at debian.org>  Tue, 22 Aug 2006 22:42:07 +0100
 
 sbuild (0.49) unstable; urgency=low
 
Index: Sbuild.pm
===================================================================
--- Sbuild.pm	(revision 1005)
+++ Sbuild.pm	(working copy)
@@ -165,23 +165,7 @@
 	my $v = shift;
 	my $binNMUver = shift;
 
-	if ($v =~ /^(.*)-([^-]+)$/) {
-		my ($upstream, $debian) = ($1, $2);
-		my @parts = split( /\./, $debian );
-		if (@parts == 1) {
-			return "$upstream-$debian.0.$binNMUver";
-		}
-		elsif (@parts == 2) {
-			return "$upstream-$debian.$binNMUver";
-		}
-		else {
-			$parts[$#parts]+=$binNMUver;
-			return "$upstream-".join( ".", @parts );
-		}
-	}
-	else {
-		return "$v.0.$binNMUver";
-	}
+	return "$v+b$binNMUver";
 }
 
 1;


Regards,
Roger

-- 
  .''`.  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/20060822/d6dbe078/attachment-0001.pgp