[libconfig-model-dpkg-perl] 16/33: fixed dpkg pan-copyright-upgrade-update test

dod at debian.org dod at debian.org
Mon Mar 30 17:41:41 UTC 2015


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 fbc2272f7497f53f1b5f9e294be31459c43ae6c1
Author: Dominique Dumont <dod at debian.org>
Date:   Thu Mar 26 18:41:03 2015 +0100

    fixed dpkg pan-copyright-upgrade-update test
---
 .../pan-copyright-upgrade-update/debian/fix.scanned.copyright     | 8 ++------
 t/model_tests.d/dpkg-test-conf.pl                                 | 3 ++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/fix.scanned.copyright b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/fix.scanned.copyright
index eee7d7c..29d1ede 100644
--- a/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/fix.scanned.copyright
+++ b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/fix.scanned.copyright
@@ -1,7 +1,3 @@
-# MIT license text is filled by Config::Model
-#! copyright License:MIT
-#
 ! copyright Files:"pan/general/map-vector.h" Copyright=~"s/\n.*Addison-Wesley//"
-#  License short_name=MIT full_license~
-#! copyright Files:~/.*/ Copyright=~s/\s*all\s*rights\s*reserved\s*//i
-
+! copyright Files:~pan/gui/e-charset.c Copyright=~"s/\s\(.*\)//"
+! copyright Files:"pan/gui/license.h" Copyright=~"s/\s*,\s*Inc.*//s"
\ No newline at end of file
diff --git a/t/model_tests.d/dpkg-test-conf.pl b/t/model_tests.d/dpkg-test-conf.pl
index 3111cb5..567cfc9 100644
--- a/t/model_tests.d/dpkg-test-conf.pl
+++ b/t/model_tests.d/dpkg-test-conf.pl
@@ -82,7 +82,8 @@ my $del_home = sub {
             => 'yada yada show-copyright stuff',
             'copyright Files:pan/general/sorted-vector.h Copyright'
             => '2002, Martin Holzherr (holzherr at infobrain.com).',
-            'copyright Files:pan/general/sorted-vector.h License short_name' => 'public-domain'
+            'copyright Files:pan/general/sorted-vector.h License short_name' => 'public-domain',
+            qq'copyright Files:"uulib/fptools.c\n uulib/fptools.h" Copyright' => 'Unknown',
         },
         wr_check => {
             "copyright License:GPL-2 text" => {value => undef, mode => 'custom'},

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



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