[SCM] Debian native package for Config::Model::Dpkg branch, master, updated. debian/2.031-13-gecb3c3b

Salvatore Bonaccorso carnil at debian.org
Thu Jan 3 18:31:46 UTC 2013


The following commit has been merged in the master branch:
commit f234de5586ff87f1afc0f1a72782b499eaac60eb
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Thu Jan 3 19:26:41 2013 +0100

    Warn if Built-Using field is not filled via substvars
    
    Add a regular expression matching the allowed variable substitution
    names for Built-Using field and warn unless it matches. See
    deb-substvars(5).
    
    Expand the built-using test using a 'fake' variable substitution.

diff --git a/lib/Config/Model/models/Dpkg/Control/Binary.pl b/lib/Config/Model/models/Dpkg/Control/Binary.pl
index 1d4782e..94cff5a 100644
--- a/lib/Config/Model/models/Dpkg/Control/Binary.pl
+++ b/lib/Config/Model/models/Dpkg/Control/Binary.pl
@@ -179,6 +179,11 @@ A package may specify an architecture wildcard. Architecture wildcards are in th
       {
         'cargo' => {
           'value_type' => 'uniline',
+          'warn_unless_match' => {
+            '\$\{[a-zA-Z0-9][a-zA-Z0-9\-:]+\}' => {
+              'msg' => 'Built-Using should be filled with a substvar.'
+            }
+          },
           'class' => 'Config::Model::Dpkg::Dependency',
           'type' => 'leaf'
         },
diff --git a/t/model_tests.d/debian-dpkg-control-examples/built-using b/t/model_tests.d/debian-dpkg-control-examples/built-using
index e4887fa..8c7084b 100644
--- a/t/model_tests.d/debian-dpkg-control-examples/built-using
+++ b/t/model_tests.d/debian-dpkg-control-examples/built-using
@@ -19,7 +19,7 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Built-Using: gcc-4.6 (= ${gcc:Version})
+Built-Using: ${foo:Built-Using}
 Description: Simple DirectMedia Layer
  SDL is a library that allows programs portable low level access to
  a video framebuffer, audio output, mouse, and keyboard.

-- 
Debian native package for Config::Model::Dpkg



More information about the Pkg-perl-cvs-commits mailing list