[libconfig-model-dpkg-perl] 03/04: better fix license split in short names

[dod at debian.org]

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 7d48d86f41506ab4925f0b651f15ffaa7827c7d4
Author: Dominique Dumont <dod at debian.org>
Date:   Wed May 24 17:05:25 2017 +0200

    better fix license split in short names
    
    tests #863052, but requires Config::Model::Tester 2.061 (soon to be
    released)
---
 t/model_tests.d/dpkg-examples/open-nebula/debian/copyright   |  3 +++
 .../open-nebula/debian/fill.copyright.blanks.yml             |  1 +
 t/model_tests.d/dpkg-test-conf.pl                            | 12 +++++++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/t/model_tests.d/dpkg-examples/open-nebula/debian/copyright b/t/model_tests.d/dpkg-examples/open-nebula/debian/copyright
index dd6b2fe..a1b5eba 100644
--- a/t/model_tests.d/dpkg-examples/open-nebula/debian/copyright
+++ b/t/model_tests.d/dpkg-examples/open-nebula/debian/copyright
@@ -212,3 +212,6 @@ License: GPL-3+
  .
  On Debian systems, the complete text of version 3 of the GNU General
  Public License can be found in '/usr/share/common-licenses/GPL-3'.
+
+License: unicode
+ unicode blah-blah
diff --git a/t/model_tests.d/dpkg-examples/open-nebula/debian/fill.copyright.blanks.yml b/t/model_tests.d/dpkg-examples/open-nebula/debian/fill.copyright.blanks.yml
index 818bdc6..633e5ff 100644
--- a/t/model_tests.d/dpkg-examples/open-nebula/debian/fill.copyright.blanks.yml
+++ b/t/model_tests.d/dpkg-examples/open-nebula/debian/fill.copyright.blanks.yml
@@ -9,6 +9,7 @@ Tebian:
   license: Apache-2.0
 share/pkgs/openSUSE/systemd/onedsetup:
   copyright: 2015, Marcel Mezigue
+  override-license: 'GPL-3+ or Apache-2.0, and unicode'
 share/vendor/ruby/gems/rbvmomi/:
   copyright: 2010-2012, VMware, Inc.
   license: Expat
diff --git a/t/model_tests.d/dpkg-test-conf.pl b/t/model_tests.d/dpkg-test-conf.pl
index 9fb6e3a..0eb034e 100644
--- a/t/model_tests.d/dpkg-test-conf.pl
+++ b/t/model_tests.d/dpkg-test-conf.pl
@@ -187,7 +187,15 @@ sub add {
     {
         # Debian bug #795195
         name => 'open-nebula',
-        update => { in => path('t/scanner/examples/open-nebula.in'), quiet => 1 },
+        update => {
+            in => path('t/scanner/examples/open-nebula.in'),
+            quiet => 1,
+            # fill.copyright.blanks tests #863052. Unfortunately, the
+            # only symptom is a warning showing up during upgrade,
+            # hence this update_warnings which works only from
+            # Config::Model::Tester 2.061 (ignored otherwise)
+            update_warnings => []
+        },
         file_contents_like => {
             'debian/copyright' => [
                 qr!Files: src/im_mad/remotes/az.d/\*!
@@ -199,6 +207,8 @@ sub add {
             'copyright Files:"share/vendor/*" Copyright' => '2010-2012, VMware, Inc.',
             'copyright Files:"src/sunstone/public/css/novnc-custom.css" Copyright' => qr/Mannehed/,
             'copyright Files:"src/cloud/ec2/lib/net_ssh_replacement.rb" Copyright' => qr/Jamis/,
+            'copyright Files:"share/pkgs/openSUSE/systemd/onedsetup" Copyright' => '2015, Marcel Mezigue',
+            'copyright Files:"share/pkgs/openSUSE/systemd/onedsetup" License short_name' => 'GPL-3+ or Apache-2.0, and unicode'
 
         },
         file_contents_unlike => {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git