Hi!
On Fri, 2017-02-17 at 06:08:25 +0100, Guillem Jover wrote:
> On Thu, 2017-02-16 at 17:23:00 +0000, Ximin Luo wrote:
> > Control: tags + patch
>
> > I've done an initial implementation here:
> >
> > https://anonscm.debian.org/cgit/collab-maint/devscripts.git/log/?h=pu/debsign-buildinfo
> >
> > Please review!
>
> I think something like the attached patch on top of your branch HEAD
> is also needed.
Here's another patch to support the finalized format 1.0 sitting now
in dpkg's git master, pending upload to unstable.
Thanks,
Guillem
From d21172ba5d15f920929892e72ccc7bd83024628f Mon Sep 17 00:00:00 2001
From: Guillem Jover <guil...@debian.org>
Date: Tue, 28 Feb 2017 00:13:52 +0100
Subject: [PATCH] Add support for finalized .buildinfo format 1.0
---
scripts/debsign.sh | 2 +-
scripts/dscverify.pl | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/debsign.sh b/scripts/debsign.sh
index 4b2b22cb..2eb23df5 100755
--- a/scripts/debsign.sh
+++ b/scripts/debsign.sh
@@ -462,7 +462,7 @@ fixup_control() {
}
fixup_buildinfo() {
- fixup_control '$major != 0 or $minor > 2' dsc buildinfo "$@"
+ fixup_control '($major != 0 or $minor > 2) and ($major != 1 or $minor > 0)' dsc buildinfo "$@"
}
fixup_changes() {
diff --git a/scripts/dscverify.pl b/scripts/dscverify.pl
index 381ebff5..45f2c605 100755
--- a/scripts/dscverify.pl
+++ b/scripts/dscverify.pl
@@ -208,7 +208,8 @@ sub process_file {
$major += 0;
$minor += 0;
if ($file =~ /\.changes$/ and ($major != 1 or $minor > 8) or
- $file =~ /\.buildinfo$/ and ($major != 0 or $minor > 2)) {
+ $file =~ /\.buildinfo$/ and (($major != 0 or $minor > 2) and
+ ($major != 1 or $minor > 0))) {
xwarn "$file is an unsupported format: $format\n";
return;
}
--
2.12.0.rc1.440.g5b76565f74
_______________________________________________
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
