[libconfig-model-dpkg-perl] 10/11: fix test copyright update within dpkg tests

dod at debian.org dod at debian.org
Fri Jul 3 19:20:13 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 a3d00e3ff8d10ed1f18583aa1a14f765bcbf4e30
Author: Dominique Dumont <dod at debian.org>
Date:   Fri Jul 3 20:12:06 2015 +0200

    fix test copyright update within dpkg tests
    
    Gbp-Dch: Ignore
---
 .../pan-copyright-upgrade-update-more/debian/fix.scanned.copyright      | 1 -
 .../pan-copyright-upgrade-update/debian/fix.scanned.copyright           | 2 +-
 t/model_tests.d/dpkg-test-conf.pl                                       | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update-more/debian/fix.scanned.copyright b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update-more/debian/fix.scanned.copyright
index a2a0f26..3be6a26 100644
--- a/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update-more/debian/fix.scanned.copyright
+++ b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update-more/debian/fix.scanned.copyright
@@ -1,4 +1,3 @@
 ! copyright Files:"pan/general/map-vector.h" Copyright=~"s/\n.*Addison-Wesley//"
 ! copyright Files:~pan/gui/e-charset.c Copyright=~"s/\s\(.*\)//"
-! copyright Files:"pan/gui/license.h" Copyright=~"s/\s*,\s*Inc.*//s"
 ! copyright Files:"uulib/*" Copyright=~"s/\s+The.*//"
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 a2a0f26..e2ac321 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,4 +1,4 @@
 ! copyright Files:"pan/general/map-vector.h" Copyright=~"s/\n.*Addison-Wesley//"
 ! copyright Files:~pan/gui/e-charset.c Copyright=~"s/\s\(.*\)//"
-! copyright Files:"pan/gui/license.h" Copyright=~"s/\s*,\s*Inc.*//s"
+! copyright Files:"pan/gui/xface.c" Copyright=~"s!.*/\s*!!"
 ! copyright Files:"uulib/*" Copyright=~"s/\s+The.*//"
diff --git a/t/model_tests.d/dpkg-test-conf.pl b/t/model_tests.d/dpkg-test-conf.pl
index 7f4f50f..0668565 100644
--- a/t/model_tests.d/dpkg-test-conf.pl
+++ b/t/model_tests.d/dpkg-test-conf.pl
@@ -85,6 +85,7 @@ my $del_home = sub {
             'copyright Files:pan/general/sorted-vector.h License short_name' => 'public-domain',
             # entry "uulib/fptools.c\n uulib/fptools.h"is packed by update
             qq'copyright Files:"uulib/*" Copyright' => '1994-2001, Frank Pilhofer.',
+            'copyright Files:pan/gui/xface.c Copyright' => qr/^James/,
         },
         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