Dpkg::BuildEnv: Rename to Dpkg::Build::Env

11 files changed, 88 insertions, 87 deletions

diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
index 373d0b144..10e2f85ad 100644
--- a/scripts/Dpkg/Arch.pm
+++ b/scripts/Dpkg/Arch.pm
@@ -62,7 +62,7 @@ use Dpkg ();
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
 use Dpkg::Util qw(:list);
-use Dpkg::BuildEnv;
+use Dpkg::Build::Env;
 
 my (@cpu, @os);
 my (%cputable, %ostable);
@@ -111,7 +111,7 @@ if available.
 
 sub get_build_arch()
 {
-    return Dpkg::BuildEnv::get('DEB_BUILD_ARCH') || get_raw_build_arch();
+    return Dpkg::Build::Env::get('DEB_BUILD_ARCH') || get_raw_build_arch();
 }
 
 {
@@ -191,7 +191,7 @@ if available.
 
 sub get_host_arch()
 {
-    return Dpkg::BuildEnv::get('DEB_HOST_ARCH') || get_raw_host_arch();
+    return Dpkg::Build::Env::get('DEB_HOST_ARCH') || get_raw_host_arch();
 }
 
 =item @arch_list = get_valid_arches()
diff --git a/scripts/Dpkg/BuildEnv.pm b/scripts/Dpkg/Build/Env.pm
index ff8faa13a..9312d2d3c 100644
--- a/scripts/Dpkg/BuildEnv.pm
+++ b/scripts/Dpkg/Build/Env.pm
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-package Dpkg::BuildEnv;
+package Dpkg::Build::Env;
 
 use strict;
 use warnings;
@@ -27,11 +27,11 @@ my %env_accessed = ();
 
 =head1 NAME
 
-Dpkg::BuildEnv - track build environment
+Dpkg::Build::Env - track build environment
 
 =head1 DESCRIPTION
 
-The Dpkg::BuildEnv module is used by dpkg-buildflags to track the build
+The Dpkg::Build::Env module is used by dpkg-buildflags to track the build
 environment variables being used and modified.
 
 =head1 FUNCTIONS
diff --git a/scripts/Dpkg/BuildFlags.pm b/scripts/Dpkg/BuildFlags.pm
index 41c46d846..06ae9e705 100644
--- a/scripts/Dpkg/BuildFlags.pm
+++ b/scripts/Dpkg/BuildFlags.pm
@@ -22,7 +22,7 @@ our $VERSION = '1.03';
 
 use Dpkg ();
 use Dpkg::Gettext;
-use Dpkg::BuildEnv;
+use Dpkg::Build::Env;
 use Dpkg::BuildOptions;
 use Dpkg::ErrorHandling;
 use Dpkg::Vendor qw(run_vendor_hook);
@@ -152,20 +152,20 @@ sub load_environment_config {
 
     foreach my $flag (keys %{$self->{flags}}) {
 	my $envvar = 'DEB_' . $flag . '_SET';
-	if (Dpkg::BuildEnv::has($envvar)) {
-	    $self->set($flag, Dpkg::BuildEnv::get($envvar), 'env');
+	if (Dpkg::Build::Env::has($envvar)) {
+	    $self->set($flag, Dpkg::Build::Env::get($envvar), 'env');
 	}
 	$envvar = 'DEB_' . $flag . '_STRIP';
-	if (Dpkg::BuildEnv::has($envvar)) {
-	    $self->strip($flag, Dpkg::BuildEnv::get($envvar), 'env');
+	if (Dpkg::Build::Env::has($envvar)) {
+	    $self->strip($flag, Dpkg::Build::Env::get($envvar), 'env');
 	}
 	$envvar = 'DEB_' . $flag . '_APPEND';
-	if (Dpkg::BuildEnv::has($envvar)) {
-	    $self->append($flag, Dpkg::BuildEnv::get($envvar), 'env');
+	if (Dpkg::Build::Env::has($envvar)) {
+	    $self->append($flag, Dpkg::Build::Env::get($envvar), 'env');
 	}
 	$envvar = 'DEB_' . $flag . '_PREPEND';
-	if (Dpkg::BuildEnv::has($envvar)) {
-	    $self->prepend($flag, Dpkg::BuildEnv::get($envvar), 'env');
+	if (Dpkg::Build::Env::has($envvar)) {
+	    $self->prepend($flag, Dpkg::Build::Env::get($envvar), 'env');
 	}
     }
 }
@@ -182,20 +182,20 @@ sub load_maintainer_config {
 
     foreach my $flag (keys %{$self->{flags}}) {
 	my $envvar = 'DEB_' . $flag . '_MAINT_SET';
-	if (Dpkg::BuildEnv::has($envvar)) {
-	    $self->set($flag, Dpkg::BuildEnv::get($envvar), undef, 1);
+	if (Dpkg::Build::Env::has($envvar)) {
+	    $self->set($flag, Dpkg::Build::Env::get($envvar), undef, 1);
 	}
 	$envvar = 'DEB_' . $flag . '_MAINT_STRIP';
-	if (Dpkg::BuildEnv::has($envvar)) {
-	    $self->strip($flag, Dpkg::BuildEnv::get($envvar), undef, 1);
+	if (Dpkg::Build::Env::has($envvar)) {
+	    $self->strip($flag, Dpkg::Build::Env::get($envvar), undef, 1);
 	}
 	$envvar = 'DEB_' . $flag . '_MAINT_APPEND';
-	if (Dpkg::BuildEnv::has($envvar)) {
-	    $self->append($flag, Dpkg::BuildEnv::get($envvar), undef, 1);
+	if (Dpkg::Build::Env::has($envvar)) {
+	    $self->append($flag, Dpkg::Build::Env::get($envvar), undef, 1);
 	}
 	$envvar = 'DEB_' . $flag . '_MAINT_PREPEND';
-	if (Dpkg::BuildEnv::has($envvar)) {
-	    $self->prepend($flag, Dpkg::BuildEnv::get($envvar), undef, 1);
+	if (Dpkg::Build::Env::has($envvar)) {
+	    $self->prepend($flag, Dpkg::Build::Env::get($envvar), undef, 1);
 	}
     }
 }
diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm
index 8ca285962..92b0bb7c5 100644
--- a/scripts/Dpkg/BuildOptions.pm
+++ b/scripts/Dpkg/BuildOptions.pm
@@ -24,7 +24,7 @@ our $VERSION = '1.01';
 
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
-use Dpkg::BuildEnv;
+use Dpkg::Build::Env;
 
 =encoding utf8
 
@@ -60,7 +60,7 @@ sub new {
 	envvar => $opts{envvar} // 'DEB_BUILD_OPTIONS',
     };
     bless $self, $class;
-    $self->merge(Dpkg::BuildEnv::get($self->{envvar}), $self->{envvar});
+    $self->merge(Dpkg::Build::Env::get($self->{envvar}), $self->{envvar});
     return $self;
 }
 
@@ -183,7 +183,7 @@ sub export {
     my ($self, $var) = @_;
     $var //= $self->{envvar};
     my $content = $self->output();
-    Dpkg::BuildEnv::set($var, $content);
+    Dpkg::Build::Env::set($var, $content);
     return $content;
 }
 
diff --git a/scripts/Dpkg/BuildProfiles.pm b/scripts/Dpkg/BuildProfiles.pm
index 781613766..85d24febe 100644
--- a/scripts/Dpkg/BuildProfiles.pm
+++ b/scripts/Dpkg/BuildProfiles.pm
@@ -29,7 +29,7 @@ our @EXPORT_OK = qw(
 use Exporter qw(import);
 
 use Dpkg::Util qw(:list);
-use Dpkg::BuildEnv;
+use Dpkg::Build::Env;
 
 my $cache_profiles;
 my @build_profiles;
@@ -59,8 +59,8 @@ the environment variable B<DEB_BUILD_PROFILES>.
 sub get_build_profiles {
     return @build_profiles if $cache_profiles;
 
-    if (Dpkg::BuildEnv::has('DEB_BUILD_PROFILES')) {
-        @build_profiles = split /\s+/, Dpkg::BuildEnv::get('DEB_BUILD_PROFILES');
+    if (Dpkg::Build::Env::has('DEB_BUILD_PROFILES')) {
+        @build_profiles = split /\s+/, Dpkg::Build::Env::get('DEB_BUILD_PROFILES');
     }
     $cache_profiles = 1;
 
@@ -79,7 +79,7 @@ sub set_build_profiles {
 
     $cache_profiles = 1;
     @build_profiles = @profiles;
-    Dpkg::BuildEnv::set('DEB_BUILD_PROFILES', join ' ', @profiles);
+    Dpkg::Build::Env::set('DEB_BUILD_PROFILES', join ' ', @profiles);
 }
 
 =item @profiles = parse_build_profiles($string)
diff --git a/scripts/Dpkg/Vendor.pm b/scripts/Dpkg/Vendor.pm
index fcb2d3fdd..4ddcc8414 100644
--- a/scripts/Dpkg/Vendor.pm
+++ b/scripts/Dpkg/Vendor.pm
@@ -34,7 +34,7 @@ use Exporter qw(import);
 use Dpkg ();
 use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
-use Dpkg::BuildEnv;
+use Dpkg::Build::Env;
 use Dpkg::Control::HashCore;
 
 my $origins = "$Dpkg::CONFDIR/origins";
@@ -131,8 +131,8 @@ If that file doesn't exist, it returns undef.
 
 sub get_current_vendor() {
     my $f;
-    if (Dpkg::BuildEnv::has('DEB_VENDOR')) {
-        $f = get_vendor_info(Dpkg::BuildEnv::get('DEB_VENDOR'));
+    if (Dpkg::Build::Env::has('DEB_VENDOR')) {
+        $f = get_vendor_info(Dpkg::Build::Env::get('DEB_VENDOR'));
         return $f->{'Vendor'} if defined $f;
     }
     $f = get_vendor_info();
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index e00f92e7a..b4fa5328a 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -55,10 +55,10 @@ CLEANFILES = \
 perllibdir = $(PERL_LIBDIR)
 nobase_dist_perllib_DATA = \
 	Dpkg/Arch.pm \
-	Dpkg/BuildEnv.pm \
 	Dpkg/BuildFlags.pm \
 	Dpkg/BuildOptions.pm \
 	Dpkg/BuildProfiles.pm \
+	Dpkg/Build/Env.pm \
 	Dpkg/Build/Types.pm \
 	Dpkg/Changelog.pm \
 	Dpkg/Changelog/Debian.pm \
@@ -202,10 +202,10 @@ test_scripts = \
 	t/Dpkg_Package.t \
 	t/Dpkg_Shlibs_Cppfilt.t \
 	t/Dpkg_Shlibs.t \
-	t/Dpkg_BuildEnv.t \
 	t/Dpkg_BuildFlags.t \
 	t/Dpkg_BuildOptions.t \
 	t/Dpkg_BuildProfiles.t \
+	t/Dpkg_Build_Env.t \
 	t/Dpkg_Build_Types.t \
 	t/Dpkg_Checksums.t \
 	t/Dpkg_ErrorHandling.t \
diff --git a/scripts/dpkg-buildflags.pl b/scripts/dpkg-buildflags.pl
index 9408c5f46..0f90d370f 100755
--- a/scripts/dpkg-buildflags.pl
+++ b/scripts/dpkg-buildflags.pl
@@ -24,6 +24,7 @@ use warnings;
 use Dpkg ();
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling qw(:DEFAULT report);
+use Dpkg::Build::Env;
 use Dpkg::BuildFlags;
 use Dpkg::Vendor qw(get_current_vendor);
 
@@ -151,7 +152,7 @@ if ($action eq 'list') {
     # First print all environment variables that might have changed the
     # results (only existing ones, might make sense to add an option to
     # also show which ones could have set to modify it).
-    my @envvars = Dpkg::BuildEnv::list_accessed();
+    my @envvars = Dpkg::Build::Env::list_accessed();
     for my $envvar (@envvars) {
 	if (exists $ENV{$envvar}) {
 	    printf report('status', 'environment variable %s=%s',
diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in
index d60116556..c225de62d 100644
--- a/scripts/po/POTFILES.in
+++ b/scripts/po/POTFILES.in
@@ -18,9 +18,9 @@ scripts/dpkg-source.pl
 scripts/dpkg-vendor.pl
 scripts/changelog/debian.pl
 scripts/Dpkg/Arch.pm
-scripts/Dpkg/BuildEnv.pm
 scripts/Dpkg/BuildFlags.pm
 scripts/Dpkg/BuildOptions.pm
+scripts/Dpkg/Build/Env.pm
 scripts/Dpkg/Build/Types.pm
 scripts/Dpkg/Changelog.pm
 scripts/Dpkg/Changelog/Debian.pm
diff --git a/scripts/t/Dpkg_BuildEnv.t b/scripts/t/Dpkg_BuildEnv.t
deleted file mode 100644
index a53c7702f..000000000
--- a/scripts/t/Dpkg_BuildEnv.t
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/perl
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-use strict;
-use warnings;
-
-use Test::More tests => 14;
-
-BEGIN {
-    use_ok('Dpkg::BuildEnv');
-}
-
-$ENV{DPKG_TEST_VAR_A} = 100;
-$ENV{DPKG_TEST_VAR_B} = 200;
-delete $ENV{DPKG_TEST_VAR_Z};
-
-is(scalar Dpkg::BuildEnv::list_accessed(), 0, 'no accessed variables');
-is(scalar Dpkg::BuildEnv::list_modified(), 0, 'no modified variables');
-
-is(Dpkg::BuildEnv::get('DPKG_TEST_VAR_A'), 100, 'get value');
-
-is(scalar Dpkg::BuildEnv::list_accessed(), 1, '1 accessed variables');
-is(scalar Dpkg::BuildEnv::list_modified(), 0, 'no modified variables');
-
-is(Dpkg::BuildEnv::get('DPKG_TEST_VAR_B'), 200, 'get value');
-Dpkg::BuildEnv::set('DPKG_TEST_VAR_B', 300);
-is(Dpkg::BuildEnv::get('DPKG_TEST_VAR_B'), 300, 'set value');
-
-is(scalar Dpkg::BuildEnv::list_accessed(), 2, '2 accessed variables');
-is(scalar Dpkg::BuildEnv::list_modified(), 1, '1 modified variable');
-
-ok(Dpkg::BuildEnv::has('DPKG_TEST_VAR_A'), 'variables is present');
-ok(!Dpkg::BuildEnv::has('DPKG_TEST_VAR_Z'), 'variables is not present');
-
-is(scalar Dpkg::BuildEnv::list_accessed(), 3, '2 accessed variables');
-is(scalar Dpkg::BuildEnv::list_modified(), 1, '1 modified variable');
-
-1;
diff --git a/scripts/t/Dpkg_Build_Env.t b/scripts/t/Dpkg_Build_Env.t
new file mode 100644
index 000000000..90733d56c
--- /dev/null
+++ b/scripts/t/Dpkg_Build_Env.t
@@ -0,0 +1,50 @@
+#!/usr/bin/perl
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+use strict;
+use warnings;
+
+use Test::More tests => 14;
+
+BEGIN {
+    use_ok('Dpkg::Build::Env');
+}
+
+$ENV{DPKG_TEST_VAR_A} = 100;
+$ENV{DPKG_TEST_VAR_B} = 200;
+delete $ENV{DPKG_TEST_VAR_Z};
+
+is(scalar Dpkg::Build::Env::list_accessed(), 0, 'no accessed variables');
+is(scalar Dpkg::Build::Env::list_modified(), 0, 'no modified variables');
+
+is(Dpkg::Build::Env::get('DPKG_TEST_VAR_A'), 100, 'get value');
+
+is(scalar Dpkg::Build::Env::list_accessed(), 1, '1 accessed variables');
+is(scalar Dpkg::Build::Env::list_modified(), 0, 'no modified variables');
+
+is(Dpkg::Build::Env::get('DPKG_TEST_VAR_B'), 200, 'get value');
+Dpkg::Build::Env::set('DPKG_TEST_VAR_B', 300);
+is(Dpkg::Build::Env::get('DPKG_TEST_VAR_B'), 300, 'set value');
+
+is(scalar Dpkg::Build::Env::list_accessed(), 2, '2 accessed variables');
+is(scalar Dpkg::Build::Env::list_modified(), 1, '1 modified variable');
+
+ok(Dpkg::Build::Env::has('DPKG_TEST_VAR_A'), 'variables is present');
+ok(!Dpkg::Build::Env::has('DPKG_TEST_VAR_Z'), 'variables is not present');
+
+is(scalar Dpkg::Build::Env::list_accessed(), 3, '2 accessed variables');
+is(scalar Dpkg::Build::Env::list_modified(), 1, '1 modified variable');
+
+1;