[SCM] Debian native package for Config::Model::Dpkg branch, master, updated. debian/2.034-9-ge488235

[Dominique Dumont]

The following commit has been merged in the master branch:
commit 647dae92f2c5d4bca9a47e2230906f85a8f1b469
Author: Dominique Dumont <dod at debian.org>
Date:   Sun Apr 21 13:00:07 2013 +0200

    parse correctly license short name when a comma is appended to name (Closes: #692131)
    
    with tests

diff --git a/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl b/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl
index 0da7d6f..ead3883 100644
--- a/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl
+++ b/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl
@@ -17,7 +17,7 @@ check: license alternate(s?) <reject: $text or not $found or not $ok >
 alternate: comma(?) oper license 
 comma: \',\'
 oper: \'and\' | \'or\' 
-license: /\\S+/i
+license: /[^\\s,]+/i
    { # PRD action to check if the license text is provided
      my $abbrev = $item[1] ;
      $found++ ;
diff --git a/t/model_tests.d/debian-dpkg-copyright-examples/t14 b/t/model_tests.d/debian-dpkg-copyright-examples/t14
index 9bd41e5..7a4da66 100644
--- a/t/model_tests.d/debian-dpkg-copyright-examples/t14
+++ b/t/model_tests.d/debian-dpkg-copyright-examples/t14
@@ -90,6 +90,20 @@ License: Poetic
 Comment: The text of this license is © 2005 Alexander E Genaud,
  see `http://genaud.net/2005/10/poetic-license/'.
 
+Files: lib/test/unit/diff.rb
+Copyright: Copyright 2001-2008 Python Software Foundation
+           Copyright 2008-2012 Kouhei Sutou <kou at clear-code.com>
+License: BSD-2-clause or Ruby, and PSF
+Comment: test for debian #705596
+
+License: BSD-2-clause
+ yada
+
+License: Ruby
+ yada
+
+License: PSF
+ yada
 
 License: Artistic-2.0
  Copyright (c) 2000-2006, The Perl Foundation.

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