[SCM] Debian native package for Config::Model::Dpkg branch, master, updated. 2e47bb04483ba458f2b1fbf48b5f36ffcf5a54fc
Dominique Dumont
dod at debian.org
Sun Sep 30 13:45:31 UTC 2012
The following commit has been merged in the master branch:
commit 7561c9e26bea15d13e4a7891a82c1aab05e19602
Author: Dominique Dumont <dod at debian.org>
Date: Sun Sep 30 14:05:57 2012 +0200
renamed all classes from Debian::Dpkg* to Dpkg*
diff --git a/lib/Config/Model/Backend/Dpkg.pm b/lib/Config/Model/Backend/Dpkg.pm
index eca8cb2..f51919c 100644
--- a/lib/Config/Model/Backend/Dpkg.pm
+++ b/lib/Config/Model/Backend/Dpkg.pm
@@ -73,7 +73,7 @@ sub write {
my $dir = $args{root} . $args{config_dir};
mkpath( $dir, { mode => 0755 } ) unless -d $dir;
my $node = $args{object};
- $logger->debug( "Debian::Dpkg write called on node ", $node->name );
+ $logger->debug( "Dpkg write called on node ", $node->name );
# write data from leaf element from the node
foreach my $elt ( $node->get_element_name() ) {
@@ -94,11 +94,11 @@ sub write {
@v = map { "$_\n" } $obj->fetch_all_values;
}
else {
- $logger->debug("Debian::Dpkg write skipped $type $elt");
+ $logger->debug("Dpkg write skipped $type $elt");
}
if (@v) {
- $logger->trace("Debian::Dpkg write opening $file to write");
+ $logger->trace("Dpkg write opening $file to write");
my $fh = new IO::File;
$fh->open( $file, '>' ) or die "Cannot open $file:$!";
$fh->binmode(":utf8");
@@ -130,7 +130,7 @@ Config::Model::Backend::Dpkg - Read and write config as plain file
my $model = Config::Model->new;
my $inst = $model->create_config_class(
- name => "WithDebian::Dpkg",
+ name => "WithDpkg",
element => [
[qw/source new/] => { qw/type leaf value_type uniline/ },
],
@@ -142,7 +142,7 @@ Config::Model::Backend::Dpkg - Read and write config as plain file
],
);
- my $inst = $model->instance(root_class_name => 'WithDebian::Dpkg' );
+ my $inst = $model->instance(root_class_name => 'WithDpkg' );
my $root = $inst->config_root ;
$root->load('source=foo new=yes' );
diff --git a/lib/Config/Model/Backend/Dpkg/Control.pm b/lib/Config/Model/Backend/Dpkg/Control.pm
index c2cf3a0..5c99e0c 100644
--- a/lib/Config/Model/Backend/Dpkg/Control.pm
+++ b/lib/Config/Model/Backend/Dpkg/Control.pm
@@ -239,7 +239,7 @@ Config::Model::Backend::Dpkg::Control - Read and write Debian Dpkg control infor
=head1 SYNOPSIS
-No synopsis. This class is dedicated to configuration class C<Debian::Dpkg::Control>
+No synopsis. This class is dedicated to configuration class C<Dpkg::Control>
=head1 DESCRIPTION
@@ -250,7 +250,7 @@ All C<control> files keyword are read in a case-insensitive manner.
=head1 CONSTRUCTOR
-=head2 new ( node => $node_obj, name => 'Debian::Dpkg::Control' ) ;
+=head2 new ( node => $node_obj, name => 'Dpkg::Control' ) ;
Inherited from L<Config::Model::Backend::Any>. The constructor will be
called by L<Config::Model::AutoRead>.
diff --git a/lib/Config/Model/Backend/Dpkg/Copyright.pm b/lib/Config/Model/Backend/Dpkg/Copyright.pm
index 1d060d6..e9a27f6 100644
--- a/lib/Config/Model/Backend/Dpkg/Copyright.pm
+++ b/lib/Config/Model/Backend/Dpkg/Copyright.pm
@@ -408,10 +408,10 @@ sub write {
#hash_element_cb => $my_hash_element_cb,
#node_element_cb => $my_node_element_cb,
node_dispatch_cb => {
- 'Debian::Dpkg::Copyright::FileLicense' => $file_license_cb ,
- 'Debian::Dpkg::Copyright::GlobalLicense' => $global_license_cb ,
- 'Debian::Dpkg::Copyright::LicenseSpec' => $license_spec_cb ,
- 'Debian::Dpkg::Copyright::Content' => $file_cb,
+ 'Dpkg::Copyright::FileLicense' => $file_license_cb ,
+ 'Dpkg::Copyright::GlobalLicense' => $global_license_cb ,
+ 'Dpkg::Copyright::LicenseSpec' => $license_spec_cb ,
+ 'Dpkg::Copyright::Content' => $file_cb,
}
);
@@ -438,7 +438,7 @@ Config::Model::Backend::Dpkg::Copyright - Read and write Debian Dpkg License inf
=head1 SYNOPSIS
-No synopsis. This class is dedicated to configuration class C<Debian::Dpkg::Copyright>
+No synopsis. This class is dedicated to configuration class C<Dpkg::Copyright>
=head1 DESCRIPTION
@@ -449,7 +449,7 @@ license information in Debian source package format.
=head1 CONSTRUCTOR
-=head2 new ( node => $node_obj, name => 'Debian::Dpkg::Copyright' ) ;
+=head2 new ( node => $node_obj, name => 'Dpkg::Copyright' ) ;
Inherited from L<Config::Model::Backend::Any>. The constructor will be
called by L<Config::Model::AutoRead>.
diff --git a/lib/Config/Model/Backend/Dpkg/Patch.pm b/lib/Config/Model/Backend/Dpkg/Patch.pm
index b1e5d51..d7ca5c1 100644
--- a/lib/Config/Model/Backend/Dpkg/Patch.pm
+++ b/lib/Config/Model/Backend/Dpkg/Patch.pm
@@ -183,7 +183,7 @@ Config::Model::Backend::Dpkg::Patch - Read and write Debian Dpkg Patch informati
=head1 SYNOPSIS
-No synopsis. This class is dedicated to configuration class C<Debian::Dpkg::Patch>
+No synopsis. This class is dedicated to configuration class C<Dpkg::Patch>
=head1 DESCRIPTION
@@ -194,7 +194,7 @@ All C<Patch> files keyword are read in a case-insensitive manner.
=head1 CONSTRUCTOR
-=head2 new ( node => $node_obj, name => 'Debian::Dpkg::Patch' ) ;
+=head2 new ( node => $node_obj, name => 'Dpkg::Patch' ) ;
Inherited from L<Config::Model::Backend::Any>. The constructor will be
called by L<Config::Model::AutoRead>.
diff --git a/lib/Config/Model/Dpkg/Dependency.pm b/lib/Config/Model/Dpkg/Dependency.pm
index 6e8c1c8..3a6247c 100644
--- a/lib/Config/Model/Dpkg/Dependency.pm
+++ b/lib/Config/Model/Dpkg/Dependency.pm
@@ -187,7 +187,7 @@ sub check_debhelper {
# using mode loose because debian-control model can be used alone
# and compat is outside of debian-control
- my $compat = $self->grab_value(mode => 'loose', step => "!Debian::Dpkg compat") ;
+ my $compat = $self->grab_value(mode => 'loose', step => "!Dpkg compat") ;
return unless defined $compat ;
my $min_dep = Lintian::Relation->new("debhelper ( >= $compat)") ;
@@ -403,10 +403,10 @@ sub check_versioned_dep {
return 1 if $vers =~ /^\$/ ; # a dpkg variable
- my $src_pkg_name = $self->grab_value("!Debian::Dpkg::Control source Source") ;
+ my $src_pkg_name = $self->grab_value("!Dpkg::Control source Source") ;
my $filter = $test_filter || $self->grab_value(
- step => qq{!Debian::Dpkg my_config package-dependency-filter:"$src_pkg_name"},
+ step => qq{!Dpkg my_config package-dependency-filter:"$src_pkg_name"},
mode => 'loose',
) || '';
return $self->has_older_version_than ($pkg, $vers, $filter, \@dist_version );
@@ -562,8 +562,8 @@ sub get_available_version {
$requested{$pkg_name} = 1 ;
# async fetch
- my $cv= $self->grab("!Debian::Dpkg::Control")->backend_mgr
- ->get_backend("Debian::Dpkg::Control")->condvar;
+ my $cv= $self->grab("!Dpkg::Control")->backend_mgr
+ ->get_backend("Dpkg::Control")->condvar;
$cv->begin;
say "Connecting to qa.debian.org to check $pkg_name versions. Please wait..." ;
diff --git a/lib/Config/Model/application.d/dpkg b/lib/Config/Model/application.d/dpkg
index e5ad098..bec089c 100644
--- a/lib/Config/Model/application.d/dpkg
+++ b/lib/Config/Model/application.d/dpkg
@@ -1 +1 @@
-model = Debian::Dpkg
+model = Dpkg
diff --git a/lib/Config/Model/application.d/dpkg-control b/lib/Config/Model/application.d/dpkg-control
index 0e48506..0947124 100644
--- a/lib/Config/Model/application.d/dpkg-control
+++ b/lib/Config/Model/application.d/dpkg-control
@@ -1 +1 @@
-model = Debian::Dpkg::Control
+model = Dpkg::Control
diff --git a/lib/Config/Model/application.d/dpkg-copyright b/lib/Config/Model/application.d/dpkg-copyright
index f6e61cc..8c96140 100644
--- a/lib/Config/Model/application.d/dpkg-copyright
+++ b/lib/Config/Model/application.d/dpkg-copyright
@@ -1 +1 @@
-model = Debian::Dpkg::Copyright
+model = Dpkg::Copyright
diff --git a/lib/Config/Model/models/Dpkg.pl b/lib/Config/Model/models/Dpkg.pl
index 560193d..5ec1019 100644
--- a/lib/Config/Model/models/Dpkg.pl
+++ b/lib/Config/Model/models/Dpkg.pl
@@ -5,11 +5,11 @@
{
'auto_create' => '1',
'file' => 'clean',
- 'backend' => 'Debian::Dpkg',
+ 'backend' => 'Dpkg',
'config_dir' => 'debian'
}
],
- 'name' => 'Debian::Dpkg',
+ 'name' => 'Dpkg',
'copyright' => [
'2010,2011 Dominique Dumont'
],
@@ -22,13 +22,13 @@
{
'type' => 'node',
'description' => 'This element contains a set of parameters to tune the behavior of this dpkg editor. You can for instance specify e-mail replacements. These parameters are stored in ~/.dpkg-meta.yml or ~/.local/share/.dpkg-meta.yml. These parameters can be applied to all Debian packages you maintain in this unix account.',
- 'config_class_name' => 'Debian::Dpkg::Meta'
+ 'config_class_name' => 'Dpkg::Meta'
},
'control',
{
'type' => 'node',
'description' => 'Package control file. Specifies the most vital (and version-independent) information about the source package and about the binary packages it creates.',
- 'config_class_name' => 'Debian::Dpkg::Control'
+ 'config_class_name' => 'Dpkg::Control'
},
'rules',
{
@@ -42,12 +42,12 @@
'summary' => 'copyright and license information',
'type' => 'node',
'description' => 'copyright and license information of all files contained in this package',
- 'config_class_name' => 'Debian::Dpkg::Copyright'
+ 'config_class_name' => 'Dpkg::Copyright'
},
'source',
{
'type' => 'node',
- 'config_class_name' => 'Debian::Dpkg::Source'
+ 'config_class_name' => 'Dpkg::Source'
},
'clean',
{
@@ -70,7 +70,7 @@
{
'cargo' => {
'type' => 'node',
- 'config_class_name' => 'Debian::Dpkg::Patch'
+ 'config_class_name' => 'Dpkg::Patch'
},
'ordered' => '1',
'type' => 'hash',
diff --git a/lib/Config/Model/models/Dpkg/Control.pl b/lib/Config/Model/models/Dpkg/Control.pl
index f95a6f0..d71aa84 100644
--- a/lib/Config/Model/models/Dpkg/Control.pl
+++ b/lib/Config/Model/models/Dpkg/Control.pl
@@ -4,11 +4,11 @@
{
'auto_create' => '1',
'file' => 'control',
- 'backend' => 'Debian::Dpkg::Control',
+ 'backend' => 'Dpkg::Control',
'config_dir' => 'debian'
}
],
- 'name' => 'Debian::Dpkg::Control',
+ 'name' => 'Dpkg::Control',
'copyright' => [
'2010,2011 Dominique Dumont'
],
@@ -21,13 +21,13 @@
{
'summary' => 'package source description',
'type' => 'node',
- 'config_class_name' => 'Debian::Dpkg::Control::Source'
+ 'config_class_name' => 'Dpkg::Control::Source'
},
'binary',
{
'cargo' => {
'type' => 'node',
- 'config_class_name' => 'Debian::Dpkg::Control::Binary'
+ 'config_class_name' => 'Dpkg::Control::Binary'
},
'summary' => 'package binary description',
'ordered' => '1',
diff --git a/lib/Config/Model/models/Dpkg/Control/Binary.pl b/lib/Config/Model/models/Dpkg/Control/Binary.pl
index c89ba29..8d61022 100644
--- a/lib/Config/Model/models/Dpkg/Control/Binary.pl
+++ b/lib/Config/Model/models/Dpkg/Control/Binary.pl
@@ -1,6 +1,6 @@
[
{
- 'name' => 'Debian::Dpkg::Control::Binary',
+ 'name' => 'Dpkg::Control::Binary',
'copyright' => [
'2010,2011 Dominique Dumont'
],
diff --git a/lib/Config/Model/models/Dpkg/Control/Source.pl b/lib/Config/Model/models/Dpkg/Control/Source.pl
index 66454a2..705a89f 100644
--- a/lib/Config/Model/models/Dpkg/Control/Source.pl
+++ b/lib/Config/Model/models/Dpkg/Control/Source.pl
@@ -1,6 +1,6 @@
[
{
- 'name' => 'Debian::Dpkg::Control::Source',
+ 'name' => 'Dpkg::Control::Source',
'copyright' => [
'2010,2011 Dominique Dumont'
],
@@ -30,7 +30,7 @@ If the maintainer\'s name contains a full stop then the whole field will not wor
'Uploaders',
{
'cargo' => {
- 'replace_follow' => '!Debian::Dpkg my_config email-updates',
+ 'replace_follow' => '!Dpkg my_config email-updates',
'value_type' => 'uniline',
'type' => 'leaf'
},
diff --git a/lib/Config/Model/models/Dpkg/Copyright.pl b/lib/Config/Model/models/Dpkg/Copyright.pl
index bac53e9..3a5c128 100644
--- a/lib/Config/Model/models/Dpkg/Copyright.pl
+++ b/lib/Config/Model/models/Dpkg/Copyright.pl
@@ -23,7 +23,7 @@ To upgrade your file from an old spec, run:
'type' => 'leaf'
}
],
- 'name' => 'Debian::Dpkg::Copyright',
+ 'name' => 'Dpkg::Copyright',
'copyright' => [
'2010,2011 Dominique Dumont'
],
@@ -118,7 +118,7 @@ To upgrade your file from an old spec, run:
{
'cargo' => {
'type' => 'node',
- 'config_class_name' => 'Debian::Dpkg::Copyright::Content'
+ 'config_class_name' => 'Dpkg::Copyright::Content'
},
'ordered' => '1',
'warn_if_key_match' => '[\\[\\]\\|]',
@@ -129,7 +129,7 @@ To upgrade your file from an old spec, run:
'Global-License',
{
'type' => 'node',
- 'config_class_name' => 'Debian::Dpkg::Copyright::GlobalLicense'
+ 'config_class_name' => 'Dpkg::Copyright::GlobalLicense'
},
'Format-Specification',
{
@@ -179,7 +179,7 @@ To upgrade your file from an old spec, run:
{
'cargo' => {
'type' => 'node',
- 'config_class_name' => 'Debian::Dpkg::Copyright::LicenseSpec'
+ 'config_class_name' => 'Dpkg::Copyright::LicenseSpec'
},
'warn_if_key_match' => '\\s',
'type' => 'hash',
@@ -196,7 +196,7 @@ To upgrade your file from an old spec, run:
{
'auto_create' => '1',
'file' => 'copyright',
- 'backend' => 'Debian::Dpkg::Copyright',
+ 'backend' => 'Dpkg::Copyright',
'config_dir' => 'debian'
}
]
diff --git a/lib/Config/Model/models/Dpkg/Copyright/Content.pl b/lib/Config/Model/models/Dpkg/Copyright/Content.pl
index cc15fdb..73c6793 100644
--- a/lib/Config/Model/models/Dpkg/Copyright/Content.pl
+++ b/lib/Config/Model/models/Dpkg/Copyright/Content.pl
@@ -7,7 +7,7 @@
'type' => 'leaf'
}
],
- 'name' => 'Debian::Dpkg::Copyright::Content',
+ 'name' => 'Dpkg::Copyright::Content',
'copyright' => [
'2010,2011 Dominique Dumont'
],
@@ -40,7 +40,7 @@ The Copyright field may contain the original copyright statement copied exactly
'License',
{
'type' => 'node',
- 'config_class_name' => 'Debian::Dpkg::Copyright::FileLicense'
+ 'config_class_name' => 'Dpkg::Copyright::FileLicense'
},
'License-Alias',
{
diff --git a/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl b/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl
index 36aa676..0da7d6f 100644
--- a/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl
+++ b/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl
@@ -1,6 +1,6 @@
[
{
- 'name' => 'Debian::Dpkg::Copyright::FileLicense',
+ 'name' => 'Dpkg::Copyright::FileLicense',
'copyright' => [
'2010,2011 Dominique Dumont'
],
@@ -21,7 +21,7 @@ license: /\\S+/i
{ # PRD action to check if the license text is provided
my $abbrev = $item[1] ;
$found++ ;
- my $elt = $arg[0]->grab(step => "!Debian::Dpkg::Copyright License", mode => \'strict\', type => \'hash\') ;
+ my $elt = $arg[0]->grab(step => "!Dpkg::Copyright License", mode => \'strict\', type => \'hash\') ;
if ($elt->defined($abbrev) or $arg[0]->grab("- full_license")->fetch) {
$ok &&= 1;
}
diff --git a/lib/Config/Model/models/Dpkg/Copyright/GlobalLicense.pl b/lib/Config/Model/models/Dpkg/Copyright/GlobalLicense.pl
index 505e696..fb45b4b 100644
--- a/lib/Config/Model/models/Dpkg/Copyright/GlobalLicense.pl
+++ b/lib/Config/Model/models/Dpkg/Copyright/GlobalLicense.pl
@@ -1,6 +1,6 @@
[
{
- 'name' => 'Debian::Dpkg::Copyright::GlobalLicense',
+ 'name' => 'Dpkg::Copyright::GlobalLicense',
'copyright' => [
'2010',
'2011 Dominique Dumont'
diff --git a/lib/Config/Model/models/Dpkg/Copyright/LicenseSpec.pl b/lib/Config/Model/models/Dpkg/Copyright/LicenseSpec.pl
index c82ff39..10974de 100644
--- a/lib/Config/Model/models/Dpkg/Copyright/LicenseSpec.pl
+++ b/lib/Config/Model/models/Dpkg/Copyright/LicenseSpec.pl
@@ -9,7 +9,7 @@
'description' => 'license short_name. Example: GPL-1 LPL-2.1+'
}
],
- 'name' => 'Debian::Dpkg::Copyright::LicenseSpec',
+ 'name' => 'Dpkg::Copyright::LicenseSpec',
'copyright' => [
'2010',
'2011 Dominique Dumont'
diff --git a/lib/Config/Model/models/Dpkg/Meta.pl b/lib/Config/Model/models/Dpkg/Meta.pl
index 02037c8..d8562f2 100644
--- a/lib/Config/Model/models/Dpkg/Meta.pl
+++ b/lib/Config/Model/models/Dpkg/Meta.pl
@@ -10,7 +10,7 @@
'config_dir' => '~/'
}
],
- 'name' => 'Debian::Dpkg::Meta',
+ 'name' => 'Dpkg::Meta',
'copyright' => [
'2010,2011 Dominique Dumont'
],
diff --git a/lib/Config/Model/models/Dpkg/Patch.pl b/lib/Config/Model/models/Dpkg/Patch.pl
index 40fce8e..64c83ae 100644
--- a/lib/Config/Model/models/Dpkg/Patch.pl
+++ b/lib/Config/Model/models/Dpkg/Patch.pl
@@ -13,11 +13,11 @@
],
'read_config' => [
{
- 'backend' => 'Debian::Dpkg::Patch',
+ 'backend' => 'Dpkg::Patch',
'config_dir' => 'debian/patches'
}
],
- 'name' => 'Debian::Dpkg::Patch',
+ 'name' => 'Dpkg::Patch',
'element' => [
'Synopsis',
{
diff --git a/lib/Config/Model/models/Dpkg/Source.pl b/lib/Config/Model/models/Dpkg/Source.pl
index 0252342..e1314c2 100644
--- a/lib/Config/Model/models/Dpkg/Source.pl
+++ b/lib/Config/Model/models/Dpkg/Source.pl
@@ -9,7 +9,7 @@ See L<dpkg-source> for details.',
'config_dir' => 'debian/source'
}
],
- 'name' => 'Debian::Dpkg::Source',
+ 'name' => 'Dpkg::Source',
'copyright' => [
'2010,2011 Dominique Dumont'
],
@@ -51,7 +51,7 @@ There may also be a .git shallow file listing revisions for a shallow git clone.
{
'type' => 'node',
'description' => 'Source options as described in L<dpkg-source>',
- 'config_class_name' => 'Debian::Dpkg::Source::Options'
+ 'config_class_name' => 'Dpkg::Source::Options'
}
]
}
diff --git a/lib/Config/Model/models/Dpkg/Source/Options.pl b/lib/Config/Model/models/Dpkg/Source/Options.pl
index cbf84cb..383b868 100644
--- a/lib/Config/Model/models/Dpkg/Source/Options.pl
+++ b/lib/Config/Model/models/Dpkg/Source/Options.pl
@@ -5,7 +5,7 @@
'.*',
{
'value_type' => 'uniline',
- 'warn' => 'There\'s a missing element in Debian::Dpkg::Source::Opion. Please send a mail to config-model-users at lists.sourceforge.com mentioning the missing element and its relevant documentation.',
+ 'warn' => 'There\'s a missing element in Dpkg::Source::Opion. Please send a mail to config-model-users at lists.sourceforge.com mentioning the missing element and its relevant documentation.',
'type' => 'leaf',
'description' => 'Unexpected but possibly right debian source option.'
}
@@ -18,7 +18,7 @@
'config_dir' => 'debian/source'
}
],
- 'name' => 'Debian::Dpkg::Source::Options',
+ 'name' => 'Dpkg::Source::Options',
'author' => [
'Dominique Dumont <domi.dumont at free.fr>'
],
--
Debian native package for Config::Model::Dpkg
More information about the Pkg-perl-cvs-commits
mailing list