[Reproducible-commits] [dpkg] 36/37: dpkg-genbuildinfo: Rename Build-Environment to Installed-Build-Depends

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/buildinfo
in repository dpkg.

commit 804090365f0728fe6685cb8228000b2baf33cd07
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sun Jan 31 13:43:31 2016 +0000

    dpkg-genbuildinfo: Rename Build-Environment to Installed-Build-Depends
    
    We need to record some environment variables which makes “Build-Environment”
    more confusing than it was. Let's rename the field to be
    more descriptive. Also rename align the variable name in the code.
---
 scripts/Dpkg/Control/FieldsCore.pm | 14 +++++++-------
 scripts/dpkg-genbuildinfo.pl       | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripts/Dpkg/Control/FieldsCore.pm b/scripts/Dpkg/Control/FieldsCore.pm
index 13cb109..bc9b6de 100644
--- a/scripts/Dpkg/Control/FieldsCore.pm
+++ b/scripts/Dpkg/Control/FieldsCore.pm
@@ -133,12 +133,6 @@ our %FIELDS = (
         dependency => 'normal',
         dep_order => 3,
     },
-    'Build-Environment' => {
-        allowed => CTRL_FILE_BUILDINFO,
-        separator => FIELD_SEP_COMMA,
-        dependency => 'union',
-        dep_order => 11,
-    },
     'Build-Essential' => {
         allowed => ALL_PKG,
     },
@@ -242,6 +236,12 @@ our %FIELDS = (
     'Homepage' => {
         allowed => ALL_SRC | ALL_PKG,
     },
+    'Installed-Build-Depends' => {
+        allowed => CTRL_FILE_BUILDINFO,
+        separator => FIELD_SEP_COMMA,
+        dependency => 'union',
+        dep_order => 11,
+    },
     'Installed-Size' => {
         allowed => ALL_PKG & ~CTRL_INFO_PKG,
     },
@@ -436,7 +436,7 @@ our %FIELD_ORDER = (
         qw(Format Build-Architecture Source Binary Architecture Version
         Binary-Only-Changes),
         @checksum_fields,
-        qw(Build-Path Build-Environment),
+        qw(Build-Path Installed-Build-Depends),
     ],
     CTRL_FILE_CHANGES() => [
         qw(Format Date Source Binary Binary-Only Built-For-Profiles Architecture
diff --git a/scripts/dpkg-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl
index d0296f1..28b6f34 100755
--- a/scripts/dpkg-genbuildinfo.pl
+++ b/scripts/dpkg-genbuildinfo.pl
@@ -311,7 +311,7 @@ if ($include & BUILD_ARCH_INDEP) {
     append_deps(\@unprocessed_pkgs, $control->get_source->{'Build-Depends-Indep'});
 }
 
-my $environment = Dpkg::Deps::AND->new();
+my $installed_deps = Dpkg::Deps::AND->new();
 while (my $pkg_name = shift @unprocessed_pkgs) {
     next if $seen_pkgs{$pkg_name};
     $seen_pkgs{$pkg_name} = 1;
@@ -337,9 +337,9 @@ while (my $pkg_name = shift @unprocessed_pkgs) {
         my $new_deps_str = defined $depends->{$qualified_pkg_name} ? deps_concat(@{$depends->{$qualified_pkg_name}}) : '';
         my $new_deps = deps_parse($new_deps_str);
         if (!defined $required_architecture) {
-            $environment->add(Dpkg::Deps::Simple->new("$pkg_name (= $version)"));
+            $installed_deps->add(Dpkg::Deps::Simple->new("$pkg_name (= $version)"));
         } else {
-            $environment->add(Dpkg::Deps::Simple->new("$qualified_pkg_name (= $version)"));
+            $installed_deps->add(Dpkg::Deps::Simple->new("$qualified_pkg_name (= $version)"));
             # Dependencies of foreign packages are also foreign packages (or Arch:all)
             # so we need to qualify them as well. We figure out if the package is actually
             # foreign by searching for an installed package of the right architecture.
@@ -366,9 +366,9 @@ while (my $pkg_name = shift @unprocessed_pkgs) {
     }
     # else: it's a package in an OR dependency that has been satisfied otherwise
 }
-$environment->sort();
-$environment = "\n" . $environment->output();
-$environment =~ s/, /,\n/g;
-$fields->{'Build-Environment'} = $environment;
+$installed_deps->sort();
+$installed_deps = "\n" . $installed_deps->output();
+$installed_deps =~ s/, /,\n/g;
+$fields->{'Installed-Build-Depends'} = $installed_deps;
 
 $fields->output(\*STDOUT);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git