[libconfig-model-dpkg-perl] 05/05: Merge branch 'jessie'

[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 9c3f0b4ffa0f89c802cfa20738ac9183da1ddfc6
Merge: 9b7f2fe 59bcd2d
Author: Dominique Dumont <dod at debian.org>
Date:   Fri Nov 7 13:43:34 2014 +0100

    Merge branch 'jessie'
    
    Conflicts:
    	debian/changelog
    	t/dpkg.t

 debian/changelog                                      | 11 +++++++++--
 lib/Config/Model/models/Dpkg/Copyright/LicenseSpec.pl | 15 ++++++++++-----
 t/dpkg.t                                              | 16 ++++++++++++++++
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index f93809f,1a17cbf..719f549
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,11 +1,20 @@@
- libconfig-model-dpkg-perl (2.059) UNRELEASED; urgency=medium
++libconfig-model-dpkg-perl (2.060) UNRELEASED; urgency=medium
 +
 +  release to experimental until jessie is out
 +
-   * cosmetic changes by Data::Dumper
 +  * Dpkg::Source: 'cme migrate' sets TestSuite to autopkgtest-pkg-perl
 +    for pkg-perl team packages
 +
 + -- Dominique Dumont <dod at debian.org>  Thu, 23 Oct 2014 13:10:07 +0200
 +
+ libconfig-model-dpkg-perl (2.059) unstable; urgency=medium
+ 
+   * Copyright license text (Closes: #767494):
+     * fix (really) automatic import of license summary or text
+     * suppress misleading warning
+ 
+  -- Dominique Dumont <dod at debian.org>  Fri, 31 Oct 2014 14:06:18 +0100
+ 
  libconfig-model-dpkg-perl (2.058) unstable; urgency=medium
  
    * Team upload.
diff --cc t/dpkg.t
index 2b69e63,454b51b..cfa2526
--- a/t/dpkg.t
+++ b/t/dpkg.t
@@@ -98,12 -100,18 +100,26 @@@ $root->load('control source Maintainer=
  is($root->grab_value("my_config package-dependency-filter:foopkg"),
      'lenny', "check package-dependency-filter");
  
 +is($root->grab_value("control source Testsuite"), undef,'check Testsuite default output');
 +
 +$root->load('control source Maintainer="Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>"');
 +is($root->grab_value("control source Testsuite"), 'autopkgtest-pkg-perl','check Testsuite pkg-perl output');
 +
 +$root->load('control source Maintainer="Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>"');
 +is($root->grab_value("control source Testsuite"), 'autopkgtest-pkg-ruby','check Testsuite pkg-ruby output');
 +
+ 
+ my $lic_text = $root->grab("copyright License:FooBar text");
+ is($lic_text->fetch, undef, "test unknown lic text") ;
+ 
+ say "store lic_text" if $trace ;
+ $lic_text->store("yada yada");
+ 
+ say "test stored lic_text" if $trace ;
+ is($lic_text->fetch, 'yada yada', "test specified lic text") ;
+ 
+ my $lic_gpl = $root->grab("copyright License:GPL-1 text");
+ like($lic_gpl->fetch,qr!/usr/share/common-licenses/GPL-1!
+      , "retrieved license text summary") ;
+ 
  memory_cycle_ok($model);

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