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 79cc7c449752c14b699fc1e36d847a245da4947e Author: Dominique Dumont <[email protected]> Date: Tue Oct 7 18:48:42 2014 +0200 Dpkg::Dependency: new build profile syntax. Tx Johannes Schauer (Closes: #763772) --- lib/Config/Model/Dpkg/Dependency.pm | 4 ++-- lib/Config/Model/models/Dpkg/Control/Binary.pl | 4 ++-- t/model_tests.d/dpkg-control-examples/build-profiles | 6 +++--- t/model_tests.d/dpkg-control-test-conf.pl | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/Config/Model/Dpkg/Dependency.pm b/lib/Config/Model/Dpkg/Dependency.pm index 486e8e6..f26f4a8 100644 --- a/lib/Config/Model/Dpkg/Dependency.pm +++ b/lib/Config/Model/Dpkg/Dependency.pm @@ -169,7 +169,7 @@ depend: pkg_dep | variable # For the allowed stuff after ${foo}, see #702792 variable: /\${[\w:\-]+}[\w\.\-~+]*/ -pkg_dep: pkg_name dep_version(?) arch_restriction(?) profile_restriction(?) { +pkg_dep: pkg_name dep_version(?) arch_restriction(?) profile_restriction(s?) { my $dv = $item[2] ; my $ar = $item[3] ; my @ret = ( $item{pkg_name} ) ; @@ -181,7 +181,7 @@ pkg_dep: pkg_name dep_version(?) arch_restriction(?) profile_restriction(?) { profile_restriction: '<' profile(s) '>' -profile: not(?) 'profile.' profile_name +profile: not(?) profile_name profile_name: /[a-z][a-z0-9-]*/ diff --git a/lib/Config/Model/models/Dpkg/Control/Binary.pl b/lib/Config/Model/models/Dpkg/Control/Binary.pl index a499551..907a777 100644 --- a/lib/Config/Model/models/Dpkg/Control/Binary.pl +++ b/lib/Config/Model/models/Dpkg/Control/Binary.pl @@ -304,8 +304,8 @@ supported by the library', }, 'Build-Profiles', { - 'description' => 'A space-separated list of optionally negated profile names', - 'match' => '[!]?[a-z][a-z0-9-]*(\\s+[!]?[a-z][a-z0-9-]*)*', + 'description' => 'A list of lists of (optionally negated) profile names, forming a conjunctive normal form expression in the same syntax as in the Build-Depends field', + 'match' => '<!?[a-z0-9]+(?:\s+!?[a-z0-9]+)*>(?:\s+<!?[a-z0-9]+(?:\s+!?[a-z0-9]+)*>)*', 'type' => 'leaf', 'value_type' => 'uniline' } diff --git a/t/model_tests.d/dpkg-control-examples/build-profiles b/t/model_tests.d/dpkg-control-examples/build-profiles index 1b43b5d..897ffaa 100644 --- a/t/model_tests.d/dpkg-control-examples/build-profiles +++ b/t/model_tests.d/dpkg-control-examples/build-profiles @@ -3,13 +3,13 @@ Section: devel Priority: optional Maintainer: Tollef Fog Heen <[email protected]> Build-Depends: debhelper (>= 9.20140227), dpkg-dev (>= 1.17.2), dh-autoreconf, - libglib2.0-dev <!profile.stage1> + libglib2.0-dev <!stage1> Homepage: http://pkg-config.freedesktop.org Standards-Version: 3.8.4 Package: pkg-config Architecture: any -Build-Profiles: !stage1 +Build-Profiles: <!stage1> Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Description: manage compile and link flags for libraries @@ -22,7 +22,7 @@ Description: manage compile and link flags for libraries Package: pkg-config-stage1 Architecture: any -Build-Profiles: stage1 +Build-Profiles: <stage1> Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Provides: pkg-config diff --git a/t/model_tests.d/dpkg-control-test-conf.pl b/t/model_tests.d/dpkg-control-test-conf.pl index 6664ec6..1918968 100644 --- a/t/model_tests.d/dpkg-control-test-conf.pl +++ b/t/model_tests.d/dpkg-control-test-conf.pl @@ -184,8 +184,8 @@ providing the following file: name => 'build-profiles', load_warnings => [ qr/standards version/ ], check => { - 'binary:pkg-config Build-Profiles' => '!stage1', - 'binary:pkg-config-stage1 Build-Profiles' => 'stage1', + 'binary:pkg-config Build-Profiles' => '<!stage1>', + 'binary:pkg-config-stage1 Build-Profiles' => '<stage1>', }, } ); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
