On 12/05/2012 02:57 PM, Roger Leigh wrote:
> On Wed, Dec 05, 2012 at 02:40:20PM +0100, Roland Stigge wrote:
>> On 12/05/2012 01:57 PM, Andreas Tille wrote:
>>> what about NMUing the package right now once you have found a proper
>>> patch? If there are any reasons that might prevent you from uploading
>>> just ping me about this.
>>
>> I just wanted to see if any buildd-tools developer wanted to upload.
>
> I've not yet had time to review and apply the patch you sent, but
> thanks for making it. Hopefully I'll have time later in the week.
> However, even if I fix and upload it now, it won't be deployed
> on the buildds immediately, so it won't resolve the problem you
> have with the -0 version right now.
Oops, I just uploaded the NMU (patch attached) to DELAYED/5, before I
got your mail.
But don't worry - it's just a minor change and at least fixes the issue
for the protocol. ;-) So others won't be disturbed by it during bug
squashing.
Thanks,
Roland
diff -ruN sbuild-0.63.2.orig/debian/changelog sbuild-0.63.2/debian/changelog
--- sbuild-0.63.2.orig/debian/changelog 2012-08-18 14:50:59.888729403 +0200
+++ sbuild-0.63.2/debian/changelog 2012-12-05 14:46:44.252552547 +0100
@@ -1,3 +1,10 @@
+sbuild (0.63.2-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix building packages with revision "0" (Closes: #687396)
+
+ -- Roland Stigge <sti...@antcom.de> Wed, 05 Dec 2012 14:44:45 +0100
+
sbuild (0.63.2-1) unstable; urgency=low
[ Roger Leigh ]
diff -ruN sbuild-0.63.2.orig/lib/Sbuild/Build.pm sbuild-0.63.2/lib/Sbuild/Build.pm
--- sbuild-0.63.2.orig/lib/Sbuild/Build.pm 2012-08-18 14:50:59.892729471 +0200
+++ sbuild-0.63.2/lib/Sbuild/Build.pm 2012-12-05 14:50:41.704555931 +0100
@@ -177,16 +177,14 @@
my ($pkg, $version) = split /_/, $pkgv;
my $pver = Dpkg::Version->new($version, check => 1);
return if (!defined($pkg) || !defined($version) || !defined($pver));
- my ($o_version, $o_revision);
+ my ($o_version);
$o_version = $pver->version();
- $o_revision = $pver->revision();
- $o_revision = "" if $pver->{'no_revision'};
# Original version (no binNMU or other addition)
my $oversion = $version;
# Original version with stripped epoch
my $osversion = $o_version;
- $osversion .= '-' . $o_revision if $o_revision;
+ $osversion .= '-' . $pver->revision() unless $pver->{'no_revision'};
# Add binNMU to version if needed.
if ($self->get_conf('BIN_NMU') || $self->get_conf('APPEND_TO_VERSION')) {
