The following commit has been merged in the master branch:
commit 0d39e351ea97c5541252640f64d8d09ded6ec045
Author: Raphaël Hertzog <[email protected]>
Date: Mon Sep 14 23:46:10 2009 +0200
Replace old capit() by field_capitalize() everywhere
capit() is provided by Dpkg::Fields while field_capitalize() is part
of the new Dpkg::Control::Fields API.
diff --git a/scripts/Dpkg/Control.pm b/scripts/Dpkg/Control.pm
index e27f82b..60c458f 100644
--- a/scripts/Dpkg/Control.pm
+++ b/scripts/Dpkg/Control.pm
@@ -21,7 +21,6 @@ use warnings;
use Dpkg::Gettext;
use Dpkg::ErrorHandling;
-use Dpkg::Fields qw(capit);
use Dpkg::Control::Types;
use Dpkg::Control::Hash;
use Dpkg::Control::Fields;
diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm
b/scripts/Dpkg/Shlibs/SymbolFile.pm
index 265ca38..22208ae 100644
--- a/scripts/Dpkg/Shlibs/SymbolFile.pm
+++ b/scripts/Dpkg/Shlibs/SymbolFile.pm
@@ -22,7 +22,7 @@ use warnings;
use Dpkg::Gettext;
use Dpkg::ErrorHandling;
use Dpkg::Version qw(vercmp);
-use Dpkg::Fields qw(capit);
+use Dpkg::Control::Fields;
use Dpkg::Shlibs::Symbol;
use Dpkg::Arch qw(get_host_arch);
@@ -177,7 +177,7 @@ sub load {
push @{$self->{objects}{$$obj_ref}{deps}}, "$1";
} elsif (/^\*\s*([^:]+):\s*(.*\S)\s*$/) {
# Add meta-fields
- $self->{objects}{$$obj_ref}{fields}{capit($1)} = $2;
+ $self->{objects}{$$obj_ref}{fields}{field_capitalize($1)} = $2;
} elsif (/^(\S+)\s+(.*)$/) {
# New object and dependency template
$$obj_ref = $1;
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 997c390..35523d4 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -11,7 +11,7 @@ use Dpkg::Gettext;
use Dpkg::Checksums;
use Dpkg::ErrorHandling;
use Dpkg::Arch qw(get_host_arch debarch_eq debarch_is);
-use Dpkg::Fields qw(:list capit unknown);
+use Dpkg::Fields qw(:list unknown);
use Dpkg::Compression;
use Dpkg::Control::Info;
use Dpkg::Control;
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index e404624..d18ae97 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -18,9 +18,9 @@ use Dpkg::Shlibs qw(find_library @librarypaths);
use Dpkg::Shlibs::Objdump;
use Dpkg::Shlibs::SymbolFile;
use Dpkg::Arch qw(get_host_arch);
-use Dpkg::Fields qw(capit);
use Dpkg::Deps;
use Dpkg::Control::Info;
+use Dpkg::Control::Fields;
use constant {
@@ -78,7 +78,7 @@ foreach (@ARGV) {
-d $admindir ||
error(_g("administrative directory '%s' does not exist"),
$admindir);
} elsif (m/^-d(.*)$/) {
- $dependencyfield = capit($1);
+ $dependencyfield = field_capitalize($1);
defined($depstrength{$dependencyfield}) ||
warning(_g("unrecognised dependency field \`%s'"),
$dependencyfield);
} elsif (m/^-e(.*)$/) {
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 2184d20..0feeb79 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -9,9 +9,10 @@ use Dpkg::Gettext;
use Dpkg::ErrorHandling;
use Dpkg::Arch qw(debarch_eq);
use Dpkg::Deps qw(@src_dep_fields %dep_field_type);
-use Dpkg::Fields qw(:list capit unknown);
+use Dpkg::Fields qw(:list unknown);
use Dpkg::Compression;
use Dpkg::Control::Info;
+use Dpkg::Control::Fields;
use Dpkg::Substvars;
use Dpkg::Version qw(check_version);
use Dpkg::Vars;
@@ -170,7 +171,7 @@ if ($options{'opmode'} eq 'build') {
($fields->{$_} = $v) =~ s/[\r\n]//g; # Merge in a single-line
} elsif (m/^Build-(Depends|Conflicts)(-Indep)?$/i) {
my $dep;
- my $type = $dep_field_type{capit($_)};
+ my $type = $dep_field_type{field_capitalize($_)};
$dep = Dpkg::Deps::parse($v, union => $type eq 'union');
error(_g("error occurred while parsing %s"), $_) unless defined
$dep;
my $facts = Dpkg::Deps::KnownFacts->new();
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
