[libconfig-model-dpkg-perl] 09/13: cme edit dpkg: added scan-copyright-patterns

2016-02-07 Thread dod 
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 d65d129c97dad7e662b3261b15109c4267e87d67
Author: Dominique Dumont 
Date:   Sun Feb 7 16:13:51 2016 +0100

cme edit dpkg: added scan-copyright-patterns
---
 lib/Config/Model/models/Dpkg.pl|  8 ++
 .../Model/models/Dpkg/Copyright/ScanPatterns.pl| 29 ++
 .../models/Dpkg/Copyright/ScanPatterns/Lists.pl| 27 
 3 files changed, 64 insertions(+)

diff --git a/lib/Config/Model/models/Dpkg.pl b/lib/Config/Model/models/Dpkg.pl
index 4e71bf9..6ba6a5a 100644
--- a/lib/Config/Model/models/Dpkg.pl
+++ b/lib/Config/Model/models/Dpkg.pl
@@ -27,6 +27,14 @@
 'type' => 'leaf',
 'value_type' => 'string'
   },
+  'scan-copyright-patterns',
+  {
+'config_class_name' => 'Dpkg::Copyright::ScanPatterns',
+'description' => 'This parameter is used by "cme update 
dpkg-copyright". This command scans all source files to get copyright and 
license information. By default, the decision whether to scan a file or not is 
left to licensecheck. You can override this behavior using this parameter.
+
+See L for more 
details.',
+'type' => 'node'
+  },
   'copyright',
   {
 'config_class_name' => 'Dpkg::Copyright',
diff --git a/lib/Config/Model/models/Dpkg/Copyright/ScanPatterns.pl 
b/lib/Config/Model/models/Dpkg/Copyright/ScanPatterns.pl
new file mode 100644
index 000..ecf80a4
--- /dev/null
+++ b/lib/Config/Model/models/Dpkg/Copyright/ScanPatterns.pl
@@ -0,0 +1,29 @@
+[
+  {
+'element' => [
+  'check',
+  {
+'config_class_name' => 'Dpkg::Copyright::ScanPatterns::Lists',
+'description' => 'Files matching any of these patterns will be scanned 
by L. See L',
+'type' => 'node'
+  },
+  'ignore',
+  {
+'config_class_name' => 'Dpkg::Copyright::ScanPatterns::Lists',
+'description' => 'Files matching any of these patterns will be ignored 
by L. See L',
+'type' => 'node'
+  }
+],
+'name' => 'Dpkg::Copyright::ScanPatterns',
+'read_config' => [
+  {
+'auto_create' => '1',
+'backend' => 'Yaml',
+'config_dir' => 'debian',
+'file' => 'copyright-scan-patterns.yml'
+  }
+]
+  }
+]
+;
+
diff --git a/lib/Config/Model/models/Dpkg/Copyright/ScanPatterns/Lists.pl 
b/lib/Config/Model/models/Dpkg/Copyright/ScanPatterns/Lists.pl
new file mode 100644
index 000..efdb0ad
--- /dev/null
+++ b/lib/Config/Model/models/Dpkg/Copyright/ScanPatterns/Lists.pl
@@ -0,0 +1,27 @@
+[
+  {
+'element' => [
+  'suffixes',
+  {
+'cargo' => {
+  'type' => 'leaf',
+  'value_type' => 'uniline'
+},
+'description' => 'Files matching any of these suffixes will be scanned 
by L. Default suffixes of L will also be sued. See 
L',
+'type' => 'list'
+  },
+  'pattern',
+  {
+'cargo' => {
+  'type' => 'leaf',
+  'value_type' => 'uniline'
+},
+'description' => 'Files matching any of these patterns will be scanned 
by L. See L',
+'type' => 'list'
+  }
+],
+'name' => 'Dpkg::Copyright::ScanPatterns::Lists'
+  }
+]
+;
+

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

___
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

[libconfig-model-dpkg-perl] 04/13: control: added forgotten Depends on libyaml-perl

2016-02-07 Thread dod 
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 7e1988dda4237f24aadb617deef757caccf2bcd0
Author: Dominique Dumont 
Date:   Sat Feb 6 20:47:36 2016 +0100

control: added forgotten Depends on libyaml-perl
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index b497cb5..489b267 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,7 @@ Depends: ${misc:Depends},
  libtext-levenshtein-damerau-perl,
  liburi-perl,
  libwww-perl,
+ libyaml-perl,
  lintian,
  perl (>= 5.15.1) | libmodule-corelist-perl (>= 2.54)
 Recommends: libconfig-model-tkui-perl

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

___
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

[libconfig-model-dpkg-perl] 10/13: cme edit dpkg: added fill-copyright-blanks

2016-02-07 Thread dod 
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 55ec31db0d68edb8eea676aee76dc868d9508adb
Author: Dominique Dumont 
Date:   Sun Feb 7 16:15:19 2016 +0100

cme edit dpkg: added fill-copyright-blanks
---
 lib/Config/Model/models/Dpkg.pl|  9 ++
 .../Model/models/Dpkg/Copyright/FillBlanks.pl  | 28 +++
 .../models/Dpkg/Copyright/FillBlanks/Pattern.pl| 32 ++
 3 files changed, 69 insertions(+)

diff --git a/lib/Config/Model/models/Dpkg.pl b/lib/Config/Model/models/Dpkg.pl
index 6ba6a5a..decc19b 100644
--- a/lib/Config/Model/models/Dpkg.pl
+++ b/lib/Config/Model/models/Dpkg.pl
@@ -35,6 +35,15 @@
 See L for more 
details.',
 'type' => 'node'
   },
+  'fill-copyright-blanks',
+  {
+'config_class_name' => 'Dpkg::Copyright::FillBlanks',
+'description' => 'This paramter is used by "cme update dpkg-copyright 
command".
+
+Sometimes, upstream coders are not perfect: some source files cannot be parsed 
correctly or some legal information is missing. A file without copyright and 
license information is skipped. On the other hand, a file with either copyright 
or license missing will be used. Unfortunately, this will prevent a correct 
grouping and merging of copyright entries. Instead of patching upstream source 
files to fill the blank, you can specify the missing information in a special 
file.',
+'summary' => 'Provides missing copyright info for cme update',
+'type' => 'node'
+  },
   'copyright',
   {
 'config_class_name' => 'Dpkg::Copyright',
diff --git a/lib/Config/Model/models/Dpkg/Copyright/FillBlanks.pl 
b/lib/Config/Model/models/Dpkg/Copyright/FillBlanks.pl
new file mode 100644
index 000..4724648
--- /dev/null
+++ b/lib/Config/Model/models/Dpkg/Copyright/FillBlanks.pl
@@ -0,0 +1,28 @@
+[
+  {
+'element' => [
+  'path',
+  {
+'cargo' => {
+  'config_class_name' => 'Dpkg::Copyright::FillBlanks::Pattern',
+  'type' => 'node'
+},
+'description' => 'Patterns are matched from the beginning a path. I.e. 
C pattern will match C but will not 
match C. See L for more details.',
+'index_type' => 'string',
+'summary' => 'Perl pattern to match file path',
+'type' => 'hash'
+  }
+],
+'name' => 'Dpkg::Copyright::FillBlanks',
+'read_config' => [
+  {
+'auto_create' => '1',
+'backend' => 'Yaml',
+'config_dir' => 'debian',
+'file' => 'fill.copyright.blanks.yml'
+  }
+]
+  }
+]
+;
+
diff --git a/lib/Config/Model/models/Dpkg/Copyright/FillBlanks/Pattern.pl 
b/lib/Config/Model/models/Dpkg/Copyright/FillBlanks/Pattern.pl
new file mode 100644
index 000..2492f33
--- /dev/null
+++ b/lib/Config/Model/models/Dpkg/Copyright/FillBlanks/Pattern.pl
@@ -0,0 +1,32 @@
+[
+  {
+'element' => [
+  'copyright',
+  {
+'type' => 'leaf',
+'value_type' => 'string'
+  },
+  'override-copyright',
+  {
+'description' => 'C key is used to ignore the 
copyright information coming from the source and provide the correct 
information. Use this as last resort for instance when the encoding of the 
owner is not ascii or utf-8. Note that a warning will be shown each time a 
copyright is overridden.',
+'type' => 'leaf',
+'value_type' => 'string'
+  },
+  'license',
+  {
+'description' => 'license keyword, either similar to the one provided 
by L or license short name as required by Debian copyright 
specification.',
+'type' => 'leaf',
+'value_type' => 'uniline'
+  },
+  'skip',
+  {
+'description' => 'skip the files like a file without any information.',
+'type' => 'leaf',
+'value_type' => 'boolean'
+  }
+],
+'name' => 'Dpkg::Copyright::FillBlanks::Pattern'
+  }
+]
+;
+

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

___
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

[libconfig-model-dpkg-perl] 06/13: fill blanks: apply more specific patterns first

2016-02-07 Thread dod 
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 70c5814be3678c46efe6fd8fa5ce20b3c69485d2
Author: Dominique Dumont 
Date:   Sun Feb 7 15:58:31 2016 +0100

fill blanks: apply more specific patterns first
---
 lib/Dpkg/Copyright/Scanner.pm | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index 4af2596..a9e7d72 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -576,7 +576,7 @@ sub __load_fill_blank_data ($current_dir) {
 
 sub __get_fill_blank ($fbd,$file) {
 
-foreach my $path (sort keys %$fbd) {
+foreach my $path (reverse sort keys %$fbd) {
 if ($file =~ m(^$path)) {
 $fbd->{$path}{used} = 1;
 return $fbd->{$path};
@@ -682,6 +682,10 @@ path. I.e. C pattern will match
 C but will not match
 C.
 
+Patterns are tried in reversed sorted order. I.e. the data attached to
+more specific path (e.g. C<3rdparty/foo/blah.c>) are applied before
+more generic patterns (e.g. C<3rdparty/foo/>
+
 The C key must contain a license short name as returned by
 C.
 

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

___
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

[libconfig-model-dpkg-perl] 01/13: scanner: fix doc mistake

2016-02-07 Thread dod 
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 bd3a163ed0d0518724f6125a2443266f6c522772
Author: Dominique Dumont 
Date:   Fri Feb 5 13:09:17 2016 +0100

scanner: fix doc mistake
---
 lib/Dpkg/Copyright/Scanner.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index 8432ca7..bc877cf 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -638,7 +638,7 @@ match a path. E.g:
  src/sunstone/:
license: Apache-2.0
  src/garbled/:
-   'copyright-override': 2016 Marcel Mézigue
+   'override-copyright': 2016 Marcel Mézigue
 
 Pattern are matched from the beginning a
 path. I.e. C pattern will match

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

___
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

[libconfig-model-dpkg-perl] 02/13: Scanner: fix typo in pod

2016-02-07 Thread dod 
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 e072fa3d6bafef8e556a4c84caec6bd28018d97a
Author: Dominique Dumont 
Date:   Sat Feb 6 20:41:43 2016 +0100

Scanner: fix typo in pod
---
 lib/Dpkg/Copyright/Scanner.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index bc877cf..aff518e 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -640,7 +640,7 @@ match a path. E.g:
  src/garbled/:
'override-copyright': 2016 Marcel Mézigue
 
-Pattern are matched from the beginning a
+Patterns are matched from the beginning a
 path. I.e. C pattern will match
 C but will not match
 C.

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

___
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

[libconfig-model-dpkg-perl] 08/13: Scanner: improve warning about file without info

2016-02-07 Thread dod 
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 8ca38783c1dbeda4ff43e145520d01107931e948
Author: Dominique Dumont 
Date:   Sun Feb 7 16:06:42 2016 +0100

Scanner: improve warning about file without info
---
 lib/Dpkg/Copyright/Scanner.pm | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index 935154d..82d1f50 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -257,12 +257,15 @@ sub scan_files ( %args ) {
 $l = $fill_blank->{license};
 }
 
+my @no_info_found;
 if ( $c =~ /no-info-found/ and $is_debian_package) {
-_warn "Path $f has no copyright info. You may want to add a line 
in debian/fill.copyright.blanks.yml\n";
+push @no_info_found, 'copyright';
 }
 if ( $l =~/unknown/i and $is_debian_package ) {
-_warn "Path $f has no license info. You may want to add a line in 
debian/fill.copyright.blanks.yml\n";
+push @no_info_found, 'license';
 }
+_warn "Path $f has no ".join(' or ', @no_info_found)." info. You may 
want to add a line in debian/fill.copyright.blanks.yml\n"
+if @no_info_found;
 
 #say "Storing '$f' : '$c' '$l'";
 $files->{$f} = $copyrights{$c}{$l} //= $id++;

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

___
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

[libconfig-model-dpkg-perl] 12/13: fix dpkg open-nebula-from-scratch test

2016-02-07 Thread dod 
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 93657ef5e457109a62fb93129e530e8ac6d1
Author: Dominique Dumont 
Date:   Sun Feb 7 17:05:40 2016 +0100

fix dpkg open-nebula-from-scratch test
---
 .../open-nebula-from-scratch/debian/fill.copyright.blanks.yml | 8 ++--
 t/model_tests.d/dpkg-test-conf.pl | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/t/model_tests.d/dpkg-examples/open-nebula-from-scratch/debian/fill.copyright.blanks.yml
 
b/t/model_tests.d/dpkg-examples/open-nebula-from-scratch/debian/fill.copyright.blanks.yml
index cea1c4f..818bdc6 100644
--- 
a/t/model_tests.d/dpkg-examples/open-nebula-from-scratch/debian/fill.copyright.blanks.yml
+++ 
b/t/model_tests.d/dpkg-examples/open-nebula-from-scratch/debian/fill.copyright.blanks.yml
@@ -4,11 +4,15 @@ debian:
 Tebian:
   copyright: 2015, Marcel Mezigue
   license: Expat
+.*:
+  copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+  license: Apache-2.0
 share/pkgs/openSUSE/systemd/onedsetup:
   copyright: 2015, Marcel Mezigue
-share/vendor/ruby/gems/rbvmomi/lib/rbvmomi.*\.rb:
+share/vendor/ruby/gems/rbvmomi/:
+  copyright: 2010-2012, VMware, Inc.
   license: Expat
-.*NOTICE:
+^NOTICE:
   skip: 1
 share/websockify/:
   license: LGPL-2
diff --git a/t/model_tests.d/dpkg-test-conf.pl 
b/t/model_tests.d/dpkg-test-conf.pl
index c20b1f0..36a73d3 100644
--- a/t/model_tests.d/dpkg-test-conf.pl
+++ b/t/model_tests.d/dpkg-test-conf.pl
@@ -141,7 +141,7 @@ my $del_home = sub {
 'debian/copyright' => [
 qr!Files: src/im_mad/\*!,
 qr!Files: share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/\*!,
-qr!NOTICE!,
+qr!Files: NOTICE!,
 qr!Files: debian!,
 ],
 },

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

___
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

[libnet-openssh-perl] annotated tag debian/0.70-1 created (now c5454fc)

2016-02-07 Thread gregor herrmann 
This is an automated email from the git hooks/post-receive script.

gregoa pushed a change to annotated tag debian/0.70-1
in repository libnet-openssh-perl.

at  c5454fc   (tag)
   tagging  3182aab8e8b93cbe562c082a036d99563370e802 (commit)
  replaces  debian/0.68-1
 tagged by  gregor herrmann
on  Sun Feb 7 17:28:28 2016 +0100

- Log -
tagging package libnet-openssh-perl version debian/0.70-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQJ8BAABCgBmBQJWt3CsXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMUUxMzE2RTkzQTc2MEE4MTA0RDg1RkFC
QjNBNjgwMTg2NDlBQTA2AAoJELs6aAGGSaoGwdwP/1op03swjLHFbjA+Q2hvh5GZ
wbsQNpvG72sk/fbph3mpRFkfqvjMmvgY+qn6inyNse/rcnVHj18+w5K52ovkXKG0
VHTACn4/XJiqjYmtRRkQMA8LRBEghz4NENWOpP8mDpXKQzDfCkp62x1CQFWSTUvt
vFqkna/3R0Ak37K96BLrS1Vy1Xava8nR3KWiu7hfYw0ISqYTJYpdRfcELsqGdCZo
dai+RIucqhtdYg0NrIAgiG6+8w55iUzRX/eIt8UXpmfEaeCgN7q0j5dnetJxSG5l
EJxKsWuZLVHzasmRg+iBCkqft4scAc0RyY0ZjM89JizsYdfRHk9RwOtRgI9wVszC
jXQR8MpixTLKLGdLIEA1aV8V6pbUU119PfmR8ma3+ACJpboSyWQhn92RXDZ8or/7
epRRvqj8cKYj996YTGKV3fv8BD37Ih7sOJu6fN45BUU5clwqRC/zfArkDP7K0DGP
ReN6/LGWVseEyzPNNUmHGvt8f6Nt0T+k+uwEetf8vS+A5BOS/Mytt28lAjLpRPau
6uK8ioC/3V93lXaU5GKrv3zQFn8Z7MQlHfn6IFHqCdoldyfq9DV0CSK7imwCocQE
qmcvNiJZ7uJjc813xezwRIrdLqlAgATIClLZ9o4xKw1Y7fMPvaHxk8ksLzGpFyba
gOdzzr9LeBGk6pYJrXhS
=OV0I
-END PGP SIGNATURE-

Salvatore Bonaccorso (2):
  debian/control: Use HTTPS transport protocol for Vcs-Git URI
  update changelog

gregor herrmann (6):
  Imported Upstream version 0.70
  Merge tag 'upstream/0.70'
  Update debian/changelog
  Update years of upstream copyright.
  Declare compliance with Debian Policy 3.9.6.
  releasing package libnet-openssh-perl version 0.70-1

---

This annotated tag includes the following new commits:

   new  49719e3   Merge tag 'upstream/0.70'
   new  a230934   Update debian/changelog
   new  0d973a6   Update years of upstream copyright.
   new  9c4ca64   Declare compliance with Debian Policy 3.9.6.
   new  3182aab   releasing package libnet-openssh-perl version 0.70-1

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-perl/packages/libnet-openssh-perl.git

___
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

[libconfig-model-dpkg-perl] 13/13: fix dpkg open-nebula test

2016-02-07 Thread dod 
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 ff4e9798ba94acd47ba977452203618e40b35595
Author: Dominique Dumont 
Date:   Sun Feb 7 17:11:43 2016 +0100

fix dpkg open-nebula test
---
 .../dpkg-examples/open-nebula/debian/fill.copyright.blanks.yml | 10 ++
 t/model_tests.d/dpkg-test-conf.pl  |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

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 4872a78..818bdc6 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
@@ -4,13 +4,15 @@ debian:
 Tebian:
   copyright: 2015, Marcel Mezigue
   license: Expat
+.*:
+  copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+  license: Apache-2.0
 share/pkgs/openSUSE/systemd/onedsetup:
   copyright: 2015, Marcel Mezigue
-src/cloud/ec2/lib/net_ssh_replacement.rb:
-  'override-copyright': 2008, Jamis Buck and override
-share/vendor/ruby/gems/rbvmomi/lib/rbvmomi.*\.rb:
+share/vendor/ruby/gems/rbvmomi/:
+  copyright: 2010-2012, VMware, Inc.
   license: Expat
-.*NOTICE:
+^NOTICE:
   skip: 1
 share/websockify/:
   license: LGPL-2
diff --git a/t/model_tests.d/dpkg-test-conf.pl 
b/t/model_tests.d/dpkg-test-conf.pl
index 36a73d3..f547e51 100644
--- a/t/model_tests.d/dpkg-test-conf.pl
+++ b/t/model_tests.d/dpkg-test-conf.pl
@@ -162,7 +162,7 @@ my $del_home = sub {
 check => {
 '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/override/,
+'copyright Files:"src/cloud/ec2/lib/net_ssh_replacement.rb" 
Copyright' => qr/Jamis/,
 
 },
 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

___
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

[libconfig-model-dpkg-perl] 03/13: replaced YAML::Tiny by YAML::Any

2016-02-07 Thread dod 
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 033250f82bb55de2ae2eeecaa1a4d8b8bc3d45ad
Author: Dominique Dumont 
Date:   Sat Feb 6 20:46:40 2016 +0100

replaced YAML::Tiny by YAML::Any
---
 debian/control  | 1 -
 lib/Dpkg/Copyright/Scanner.pm   | 2 +-
 t/scanner/pack_files.t  | 2 +-
 t/scanner/squash_copyright_years.t  | 2 +-
 t/scanner/squash_files.t| 2 +-
 t/scanner/squash_swap_copyright_years.t | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 981de2c..b497cb5 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,6 @@ Build-Depends-Indep: bash-completion,
  libtext-levenshtein-damerau-perl,
  libwww-perl,
  libyaml-perl,
- libyaml-tiny-perl,
  lintian,
  perl (>= 5.15.1) | libmodule-corelist-perl (>= 2.54),
  po-debconf
diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index aff518e..d34b691 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -9,7 +9,7 @@ use Exporter::Lite;
 use Array::IntSpan;
 use Path::Tiny;
 use Carp;
-use YAML;
+use YAML::Any;
 
 use feature qw/postderef signatures/;
 no warnings qw/experimental::postderef experimental::signatures/;
diff --git a/t/scanner/pack_files.t b/t/scanner/pack_files.t
index 14bc534..0571623 100644
--- a/t/scanner/pack_files.t
+++ b/t/scanner/pack_files.t
@@ -5,7 +5,7 @@ use 5.010;
 
 use Test::More; # see done_testing()
 use Test::Differences;
-use YAML::Tiny;
+use YAML::Any;
 
 require_ok( 'Dpkg::Copyright::Scanner' );
 
diff --git a/t/scanner/squash_copyright_years.t 
b/t/scanner/squash_copyright_years.t
index c66df64..a0bbd2a 100644
--- a/t/scanner/squash_copyright_years.t
+++ b/t/scanner/squash_copyright_years.t
@@ -5,7 +5,7 @@ use 5.010;
 
 use Test::More;   # see done_testing()
 use Test::Differences;
-use YAML::Tiny;
+use YAML::Any;
 
 use feature qw/postderef signatures/;
 no warnings qw/experimental::postderef experimental::signatures/;
diff --git a/t/scanner/squash_files.t b/t/scanner/squash_files.t
index 6330d1e..645873e 100644
--- a/t/scanner/squash_files.t
+++ b/t/scanner/squash_files.t
@@ -5,7 +5,7 @@ use 5.010;
 
 use Test::More; # see done_testing()
 use Test::Differences;
-use YAML::Tiny;
+use YAML::Any;
 
 require_ok( 'Dpkg::Copyright::Scanner' );
 
diff --git a/t/scanner/squash_swap_copyright_years.t 
b/t/scanner/squash_swap_copyright_years.t
index 0811d49..a777399 100644
--- a/t/scanner/squash_swap_copyright_years.t
+++ b/t/scanner/squash_swap_copyright_years.t
@@ -5,7 +5,7 @@ use 5.010;
 
 use Test::More;   # see done_testing()
 use Test::Differences;
-use YAML::Tiny;
+use YAML::Any;
 
 require_ok( 'Dpkg::Copyright::Scanner' );
 

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

___
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

[libconfig-model-dpkg-perl] 07/13: Scanner: don't skip files without info...

2016-02-07 Thread dod 
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 294da89ed1e2519b3aa0ba59824eab03de14bd3e
Author: Dominique Dumont 
Date:   Sun Feb 7 16:05:40 2016 +0100

Scanner: don't skip files without info...

... filling the blanks may be necessary to reduce the number of warnings
---
 lib/Dpkg/Copyright/Scanner.pm | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index a9e7d72..935154d 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -240,8 +240,6 @@ sub scan_files ( %args ) {
 
 $c = __pack_copyright($c);
 
-next if $l =~ /unknown/i and $c =~ /no-info-found/i;
-
 # this data overrides what's found in current files. This is done 
before
 # the code that merge and coaslesce entries
 my $fill_blank = __get_fill_blank($fill_blank_data, $f);
@@ -648,22 +646,28 @@ Do not specify the dot with the suffixes. This will be 
added by the scanner.
 Sometimes, upstream coders are not perfect: some source files cannot
 be parsed correctly or some legal information is missing.
 
-A file without copyright and license information is skipped.
-
-On the other hand, a file with either copyright or license missing
-will be used. Unfortunately, this will prevent a correct grouping and
-merging of copyright entries.
+All scanned files, even without copyright or license will be used. A
+warning will be shown for each file with missing information.
 
 Instead of patching upstream source files to fill the blank, you can
 specify the missing information in a special file. This file is
 C. It should contain a "mapping"
 YAML structure (i.e. a hash), where the key is a Perl pattern used to
-match a path. E.g:
+match a path. 
+
+If the source of the package contains a lot of files without legal
+information, you may need to specify there information for a whole
+directory (See the C dir in the example below).
+
+For instance:
 
  ---
  debian:
copyright: 2015, Marcel
license: Expat
+ src/:
+   copyright: 2016. Joe
+   license: Expat
  share/pkgs/openSUSE/systemd/onedsetup:
copyright: 2015, Marcel
  share/vendor/ruby/gems/rbvmomi/lib/rbvmomi.*\.rb:

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

___
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

[libconfig-model-dpkg-perl] branch master updated (cd8a294 -> ff4e979)

2016-02-07 Thread dod 
This is an automated email from the git hooks/post-receive script.

dod pushed a change to branch master
in repository libconfig-model-dpkg-perl.

  from  cd8a294   Warn (nd fix) if Vcs-Git uses http transport
   new  bd3a163   scanner: fix doc mistake
   new  e072fa3   Scanner: fix typo in pod
   new  033250f   replaced YAML::Tiny by YAML::Any
   new  7e1988d   control: added forgotten Depends on libyaml-perl
   new  045f9d3   scanner: accepted are added to licensecheck's list
   new  70c5814   fill blanks: apply more specific patterns first
   new  294da89   Scanner: don't skip files without info...
   new  8ca3878   Scanner: improve warning about file without info
   new  d65d129   cme edit dpkg: added scan-copyright-patterns
   new  55ec31d   cme edit dpkg: added fill-copyright-blanks
   new  76eb5ef   added comment field in copyright-scan-patterns
   new  93657ef   fix dpkg open-nebula-from-scratch test
   new  ff4e979   fix dpkg open-nebula test

The 13 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/control |  2 +-
 lib/Config/Model/models/Dpkg.pl| 17 
 .../Model/models/Dpkg/Copyright/FillBlanks.pl  | 28 +++
 .../models/Dpkg/Copyright/FillBlanks/Pattern.pl| 38 +
 .../Model/models/Dpkg/Copyright/ScanPatterns.pl| 29 +++
 .../models/Dpkg/Copyright/ScanPatterns/Lists.pl| 27 +++
 lib/Dpkg/Copyright/Scanner.pm  | 94 --
 .../debian/fill.copyright.blanks.yml   |  8 +-
 .../open-nebula/debian/fill.copyright.blanks.yml   | 10 ++-
 t/model_tests.d/dpkg-test-conf.pl  |  4 +-
 t/scanner/pack_files.t |  2 +-
 t/scanner/squash_copyright_years.t |  2 +-
 t/scanner/squash_files.t   |  2 +-
 t/scanner/squash_swap_copyright_years.t|  2 +-
 14 files changed, 229 insertions(+), 36 deletions(-)
 create mode 100644 lib/Config/Model/models/Dpkg/Copyright/FillBlanks.pl
 create mode 100644 lib/Config/Model/models/Dpkg/Copyright/FillBlanks/Pattern.pl
 create mode 100644 lib/Config/Model/models/Dpkg/Copyright/ScanPatterns.pl
 create mode 100644 lib/Config/Model/models/Dpkg/Copyright/ScanPatterns/Lists.pl

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

___
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

[libconfig-model-dpkg-perl] 11/13: added comment field in copyright-scan-patterns

2016-02-07 Thread dod 
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 76eb5ef803067b16ef55e3154039edcf0d7bb93d
Author: Dominique Dumont 
Date:   Sun Feb 7 16:17:56 2016 +0100

added comment field in copyright-scan-patterns
---
 lib/Config/Model/models/Dpkg/Copyright/FillBlanks/Pattern.pl | 6 ++
 lib/Dpkg/Copyright/Scanner.pm| 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/Config/Model/models/Dpkg/Copyright/FillBlanks/Pattern.pl 
b/lib/Config/Model/models/Dpkg/Copyright/FillBlanks/Pattern.pl
index 2492f33..a9851bc 100644
--- a/lib/Config/Model/models/Dpkg/Copyright/FillBlanks/Pattern.pl
+++ b/lib/Config/Model/models/Dpkg/Copyright/FillBlanks/Pattern.pl
@@ -23,6 +23,12 @@
 'description' => 'skip the files like a file without any information.',
 'type' => 'leaf',
 'value_type' => 'boolean'
+  },
+  'comment',
+  {
+'description' => 'This field is provided for bookkeeping and is not 
used by "cme update dpkg-copyright"',
+'type' => 'leaf',
+'value_type' => 'string'
   }
 ],
 'name' => 'Dpkg::Copyright::FillBlanks::Pattern'
diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index 82d1f50..b12dcc0 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -566,7 +566,7 @@ sub __load_fill_blank_data ($current_dir) {
 
 foreach my $k (keys $fill_blanks{$path}->%*) {
 die "Error in file $file: Unexpected key '$k' in path 
'$path'\n"
-unless $k =~/^(skip|license|(override-)?copyright)$/;
+unless $k 
=~/^(comment|skip|license|(override-)?copyright)$/;
 }
 }
 }

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

___
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

[libconfig-model-dpkg-perl] 05/13: scanner: accepted are added to licensecheck's list

2016-02-07 Thread dod 
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 045f9d329282fa55caa35a388082ca9e2b1cb405
Author: Dominique Dumont 
Date:   Sun Feb 7 15:53:18 2016 +0100

scanner: accepted are added to licensecheck's list
---
 lib/Dpkg/Copyright/Scanner.pm | 53 ---
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index d34b691..4af2596 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -90,8 +90,9 @@ sub _warn ($msg) {
 warn $msg unless $quiet;
 }
 
+my %default ;
 # from licensecheck.pl
-my $default_ignore_regex = qr!
+$default{ignore}= qr!
 # Ignore general backup files
 ~$|
 # Ignore emacs recovery files
@@ -107,9 +108,46 @@ my $default_ignore_regex = qr!
 \.shelf|_MTN|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
 !x;
 
+# also from licensecheck
+$default{check} =
+qr!
+\.(  # search for file suffix
+c(c|pp|xx)?  # c and c++
+   |h(h|pp|xx)?  # header files for c and c++
+   |S
+   |css|less # HTML css and similar
+   |f(77|90)?
+   |go
+   |groovy
+   |lisp
+   |scala
+   |clj
+   |p(l|m)?6?|t|xs|pod6? # perl5 or perl6
+   |sh
+   |php
+   |py(|x)
+   |rb
+   |java
+   |js
+   |vala
+   |el
+   |sc(i|e)
+   |cs
+   |pas
+   |inc
+   |dtd|xsl
+   |mod
+   |m
+   |md|markdown
+   |tex
+   |mli?
+   |(c|l)?hs
+ )
+$
+   !x;
+
 # cleanup the regexp
-$default_ignore_regex =~ s/#.*\n//g;
-$default_ignore_regex =~ s/\n//g;
+map { s/#.*\n//g;  s/\n//g; } values %default;
 
 # option to skip UNKNOWN ?
 # load a file to override some entries ?
@@ -139,8 +177,7 @@ sub scan_files ( %args ) {
 my @opts = ();
 foreach my $what (qw/check ignore/) {
 my $data = $scan_data->{$what} or next;
-my $reg = join( '|' , (map { '\.'.$_.'$'} @{$data->{suffixes} 
|| []}), @{ $data->{pattern} || []});
-$reg .= '|' .$default_ignore_regex if $what eq 'ignore';
+my $reg = join( '|' , (map { '\.'.$_.'$'} @{$data->{suffixes} 
|| []}), @{ $data->{pattern} || []}, $default{$what});
 push @opts, '--skipped', "--$what=$reg";
 }
 @runs = \@opts ;
@@ -580,9 +617,9 @@ the list of files.
 
 By default, the decision whether to scan a file or not is left to 
L.
 
-You can override this behavior in file
+You can change this behavior in file
 C. This YAML file can
-contain a list of suffixes or patterns to scan or to ignore. Any file
+contain a list of suffixes or patterns to scan or to ignore that are added to 
licensecheck's list. Any file
 that is not scanned or ignored will be shown as "skipped".
 
 The file must have the following structure (all fields are optional
@@ -592,7 +629,7 @@ and order does not matter):
  check :
suffixes :
  - PL   # check .PL$
- - pl
+ - asm
pattern:
  - /README$
  ignore :

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

___
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

<    1   2   3   4