[libconfig-model-dpkg-perl] 01/03: Dpkg backend: move Standards-Version before Priority
dod at debian.org
dod at debian.org
Thu Sep 28 18:43:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
dod pushed a commit to branch master
in repository libconfig-model-dpkg-perl.
commit aa70dca8fa0f0011cb52783ee3e60badc79844f0
Author: Dominique Dumont <dod at debian.org>
Date: Thu Sep 28 19:53:46 2017 +0200
Dpkg backend: move Standards-Version before Priority
preparation work for the next commit where Standard-Version is a warp
master for Priority
---
lib/Config/Model/models/Dpkg/Control/Source.pl | 38 +++++++++++++-------------
t/model_tests.d/dpkg-control-test-conf.pl | 14 ++++++----
t/model_tests.d/dpkg-test-conf.pl | 5 ++--
3 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/lib/Config/Model/models/Dpkg/Control/Source.pl b/lib/Config/Model/models/Dpkg/Control/Source.pl
index 3cc90aa..51f04c0 100644
--- a/lib/Config/Model/models/Dpkg/Control/Source.pl
+++ b/lib/Config/Model/models/Dpkg/Control/Source.pl
@@ -62,6 +62,25 @@ If the maintainer\'s name contains a full stop then the whole field will not wor
},
'type' => 'list'
},
+ 'Standards-Version',
+ {
+ 'default' => '4.1.0',
+ 'description' => 'This field indicates the Debian policy version number this package complies to.
+
+Before updating this field, please read L<upgrading-checklist|https://www.debian.org/doc/debian-policy/upgrading-checklist.html> to know what changes came with a new policy version number and apply the required changes (if any) to your package.',
+ 'match' => '\\d+\\.\\d+\\.\\d+(\\.\\d+)?',
+ 'summary' => 'Debian policy version number this package complies to',
+ 'type' => 'leaf',
+ 'value_type' => 'uniline',
+ 'warn_unless' => {
+ 'current' => {
+ 'code' => '$_ eq $self->_fetch_std;',
+ 'fix' => '$_ = undef; # restore default value',
+ 'msg' => 'Current standards version is \'$std_value\'. Please read file:///usr/share/doc/debian-policy/upgrading-checklist.txt.gz to check what changes need to applied to your package to upgrade it from standard version \'$_\' to \'$std_value\'.
+'
+ }
+ }
+ },
'Section',
{
'default' => 'misc',
@@ -350,25 +369,6 @@ A package including binaries from grub2 and loadlin would have this field in its
'summary' => 'Additional source packages used to build the binary',
'type' => 'list'
},
- 'Standards-Version',
- {
- 'default' => '4.1.0',
- 'description' => 'This field indicates the Debian policy version number this package complies to.
-
-Before updating this field, please read L<upgrading-checklist|https://www.debian.org/doc/debian-policy/upgrading-checklist.html> to know what changes came with a new policy version number and apply the required changes (if any) to your package.',
- 'match' => '\\d+\\.\\d+\\.\\d+(\\.\\d+)?',
- 'summary' => 'Debian policy version number this package complies to',
- 'type' => 'leaf',
- 'value_type' => 'uniline',
- 'warn_unless' => {
- 'current' => {
- 'code' => '$_ eq $self->_fetch_std;',
- 'fix' => '$_ = undef; # restore default value',
- 'msg' => 'Current standards version is \'$std_value\'. Please read file:///usr/share/doc/debian-policy/upgrading-checklist.txt.gz to check what changes need to applied to your package to upgrade it from standard version \'$_\' to \'$std_value\'.
-'
- }
- }
- },
'Vcs-Browser',
{
'compute' => {
diff --git a/t/model_tests.d/dpkg-control-test-conf.pl b/t/model_tests.d/dpkg-control-test-conf.pl
index 0da1651..b74ed9f 100644
--- a/t/model_tests.d/dpkg-control-test-conf.pl
+++ b/t/model_tests.d/dpkg-control-test-conf.pl
@@ -35,18 +35,20 @@ providing the following file:
'source Vcs-Browser' ,'https://anonscm.debian.org/cgit/pkg-perl/packages/libdist-zilla-plugins-cjm-perl.git',
'source Vcs-Git', 'https://anonscm.debian.org/git/pkg-perl/packages/libdist-zilla-plugins-cjm-perl.git',
},
- load_warnings => [ qr/dependency/, qr/dual life/, (qr/dependency/) x 2,
- qr/libmodule-build-perl \(>= 0.360000\) \| perl \(>= 5.8.8\)/,
- qr/should be 'libmodule-build-perl \(>= 0.360000\)/,
- qr/standards version/,
- qr/dependency/, qr/dual life/, (qr/dependency/) x 2 ],
+ load_warnings => [
+ qr/standards version/,
+ qr/dependency/, qr/dual life/, (qr/dependency/) x 2,
+ qr/libmodule-build-perl \(>= 0.360000\) \| perl \(>= 5.8.8\)/,
+ qr/should be 'libmodule-build-perl \(>= 0.360000\)/,
+ qr/dependency/, qr/dual life/, (qr/dependency/) x 2
+ ],
apply_fix => 1,
},
{
# t1
check => { 'binary:seaview Recommends:0', 'clustalw', },
- load_warnings => [ qr/dependency is deprecated/,qr/standards version/, qr/Vcs-Browser/, qr/Vcs-Svn/, qr/too long/ ],
+ load_warnings => [ qr/standards version/, qr/dependency is deprecated/,qr/Vcs-Browser/, qr/Vcs-Svn/, qr/too long/ ],
apply_fix => 1,
load => 'binary:seaview Synopsis="multiplatform interface for sequence alignment"',
},
diff --git a/t/model_tests.d/dpkg-test-conf.pl b/t/model_tests.d/dpkg-test-conf.pl
index a872dc2..de0029d 100644
--- a/t/model_tests.d/dpkg-test-conf.pl
+++ b/t/model_tests.d/dpkg-test-conf.pl
@@ -47,7 +47,7 @@ sub add {
load_warnings => [ qr/dual life/ ],
},
{ name => 't1',
- load_warnings => [ qr/compat/, qr/standard/, (qr/canonical/) x 2 ],
+ load_warnings => [ qr/standard/, qr/compat/, (qr/canonical/) x 2 ],
apply_fix => 1 ,
load => qq!patches:fix-spelling Description="more spelling details"!
. qq( ! patches:glib-single-include Synopsis="mega patchchoid")
@@ -69,8 +69,7 @@ sub add {
{
name => 'libversion' ,
- load_warnings => [ qr/unnecessary/, (qr/dual life/) x2,
- qr/standard/, (qr/canonical/) x 2 ],
+ load_warnings => [ qr/standard/, qr/unnecessary/, (qr/dual life/) x2, (qr/canonical/) x 2 ],
apply_fix => 1 ,
check => {
'control source Build-Depends-Indep:0' => 'perl',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git
More information about the Pkg-perl-cvs-commits
mailing list