The following commit has been merged in the master branch:
commit b9c82a9db20dc3a9955982b7e5917699d5e52038
Author: Raphaël Hertzog <[email protected]>
Date: Sun Sep 13 15:15:53 2009 +0200
Rename Dpkg::Cdata into Dpkg::Control
Update all scripts and modules to use the new module names.
diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm
index 8c37f13..8caf37d 100644
--- a/scripts/Dpkg/Changelog.pm
+++ b/scripts/Dpkg/Changelog.pm
@@ -41,7 +41,7 @@ use English;
use Dpkg;
use Dpkg::Gettext;
use Dpkg::ErrorHandling qw(:DEFAULT report);
-use Dpkg::Cdata;
+use Dpkg::Control;
use Dpkg::Fields;
use Dpkg::Version qw(compare_versions);
diff --git a/scripts/Dpkg/Cdata.pm b/scripts/Dpkg/Control.pm
similarity index 93%
rename from scripts/Dpkg/Cdata.pm
rename to scripts/Dpkg/Control.pm
index 58fdc3a..c5badcc 100644
--- a/scripts/Dpkg/Cdata.pm
+++ b/scripts/Dpkg/Control.pm
@@ -14,7 +14,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-package Dpkg::Cdata;
+package Dpkg::Control;
use strict;
use warnings;
@@ -28,18 +28,18 @@ our @EXPORT = qw(parsecdata);
=head1 NAME
-Dpkg::Cdata - parse and manipulate a block of RFC822-like fields
+Dpkg::Control - parse and manipulate a block of RFC822-like fields
=head1 DESCRIPTION
-The Dpkg::Cdata module exports one function 'parsecdata' that reads a
+The Dpkg::Control module exports one function 'parsecdata' that reads a
block of data (usually a block following the debian/control format)
=head1 FUNCTIONS
=over 4
-=item $obj = Dpkg::Cdata::parsecdata($input, $file, %options)
+=item $obj = Dpkg::Control::parsecdata($input, $file, %options)
$input is a filehandle, $file is the name of the file corresponding to
$input. %options can contain two parameters: allow_pgp=>1 allows the parser
diff --git a/scripts/Dpkg/Control/Info.pm b/scripts/Dpkg/Control/Info.pm
index 31ca1bc..0ada49f 100644
--- a/scripts/Dpkg/Control/Info.pm
+++ b/scripts/Dpkg/Control/Info.pm
@@ -19,7 +19,7 @@ package Dpkg::Control::Info;
use strict;
use warnings;
-use Dpkg::Cdata;
+use Dpkg::Control;
use Dpkg::ErrorHandling;
use Dpkg::Gettext;
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index 3d98d95..6821ff1 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -22,7 +22,7 @@ use warnings;
use Dpkg::Gettext;
use Dpkg::ErrorHandling;
use Dpkg::Fields;
-use Dpkg::Cdata;
+use Dpkg::Control;
use Dpkg::Checksums;
use Dpkg::Version qw(parseversion check_version);
use Dpkg::Deps qw(@src_dep_fields);
diff --git a/scripts/Dpkg/Vendor.pm b/scripts/Dpkg/Vendor.pm
index 0061c29..5120654 100644
--- a/scripts/Dpkg/Vendor.pm
+++ b/scripts/Dpkg/Vendor.pm
@@ -21,7 +21,7 @@ use warnings;
use Dpkg::ErrorHandling;
use Dpkg::Gettext;
-use Dpkg::Cdata;
+use Dpkg::Control;
use base qw(Exporter);
our @EXPORT_OK = qw(get_vendor_info get_current_vendor get_vendor_file
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 5e75b93..e15e45e 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -91,11 +91,11 @@ perllibdir = $(PERL_LIBDIR)
nobase_dist_perllib_DATA = \
Dpkg/Arch.pm \
Dpkg/BuildOptions.pm \
- Dpkg/Cdata.pm \
Dpkg/Changelog.pm \
Dpkg/Changelog/Debian.pm \
Dpkg/Checksums.pm \
Dpkg/Compression.pm \
+ Dpkg/Control.pm \
Dpkg/Control/Info.pm \
Dpkg/Deps.pm \
Dpkg/ErrorHandling.pm \
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index e5f4387..97a66cf 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -14,7 +14,7 @@ use Dpkg::Arch qw(get_host_arch debarch_eq debarch_is);
use Dpkg::Fields qw(:list capit unknown);
use Dpkg::Compression;
use Dpkg::Control::Info;
-use Dpkg::Cdata;
+use Dpkg::Control;
use Dpkg::Substvars;
use Dpkg::Vars;
use Dpkg::Changelog qw(parse_changelog);
diff --git a/scripts/dpkg-name.pl b/scripts/dpkg-name.pl
index a17cab2..0df15d2 100755
--- a/scripts/dpkg-name.pl
+++ b/scripts/dpkg-name.pl
@@ -29,7 +29,7 @@ use File::Path;
use Dpkg;
use Dpkg::Gettext;
use Dpkg::ErrorHandling;
-use Dpkg::Cdata;
+use Dpkg::Control;
use Dpkg::Arch qw(get_host_arch);
textdomain("dpkg-dev");
diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl
index 39ad9a5..ad4483d 100755
--- a/scripts/dpkg-scansources.pl
+++ b/scripts/dpkg-scansources.pl
@@ -31,7 +31,7 @@ use warnings;
use Dpkg;
use Dpkg::Gettext;
use Dpkg::ErrorHandling;
-use Dpkg::Cdata;
+use Dpkg::Control;
use Dpkg::Checksums;
textdomain("dpkg-dev");
diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in
index b5fb758..914ea50 100644
--- a/scripts/po/POTFILES.in
+++ b/scripts/po/POTFILES.in
@@ -15,10 +15,10 @@ scripts/dpkg-shlibdeps.pl
scripts/dpkg-source.pl
scripts/changelog/debian.pl
scripts/Dpkg/Arch.pm
-scripts/Dpkg/Cdata.pm
scripts/Dpkg/Changelog.pm
scripts/Dpkg/Changelog/Debian.pm
scripts/Dpkg/Checksums.pm
+scripts/Dpkg/Control.pm
scripts/Dpkg/Control/Info.pm
scripts/Dpkg/Deps.pm
scripts/Dpkg/ErrorHandling.pm
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
