[SCM] libmodule-install-copyright-perl Debian packaging branch, master, updated. debian/0.007-1-5-g31274e4

Jonas Smedegaard dr at jones.dk
Thu May 9 14:48:49 UTC 2013


The following commit has been merged in the master branch:
commit 8b45b59f96788991a22abdf1255ad0e1e23cced7
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu May 9 16:42:31 2013 +0200

    Imported Upstream version 0.009

diff --git a/CREDITS b/CREDITS
index b58a9e0..7c94f8e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2,5 +2,5 @@ Maintainer:
 - Toby Inkster (cpan:TOBYINK) <mailto:tobyink at cpan.org>
 
 Thanks:
-- Jonas Smedegaard (cpan:JONASS) <JONASS at cpan.org>
+- Jonas Smedegaard (cpan:JONASS) <mailto:jonass at cpan.org>
 
diff --git a/Changes b/Changes
index 56b54f9..03d6427 100644
--- a/Changes
+++ b/Changes
@@ -6,6 +6,15 @@ Home page:    <https://metacpan.org/release/Module-Install-Copyright>
 Bug tracker:  <http://rt.cpan.org/Dist/Display.html?Queue=Module-Install-Copyright>
 Maintainer:   Toby Inkster <mailto:tobyink at cpan.org>
 
+0.009  2013-05-03
+
+ - Don't include 'mailto:' in x_contributors for META.yml; MetaCPAN doesn't
+   seem to like it.
+
+0.008  2013-05-01
+
+ - (Bugfix) Fix auto-generated CPAN e-mail addresses in CREDITS file.
+
 0.007  2013-04-14  # Bond; James Bond
 
  - Only list contributors in 'x_contributors', not thanked people.
diff --git a/META.ttl b/META.ttl
index a54bfab..4153420 100644
--- a/META.ttl
+++ b/META.ttl
@@ -58,6 +58,8 @@ dist:project
 	doap:release      dist:v_0-005;
 	doap:release      dist:v_0-006;
 	doap:release      dist:v_0-007;
+	doap:release      dist:v_0-008;
+	doap:release      dist:v_0-009;
 	doap:shortdesc    "package a COPYRIGHT file with a distribution".
 
 dist:v_0-001
@@ -154,6 +156,34 @@ dist:v_0-007
 	doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/Module-Install-Copyright-0.007.tar.gz>;
 	doap:revision     "0.007"^^xsd:string.
 
+dist:v_0-008
+	a                 doap:Version;
+	dc:identifier     "Module-Install-Copyright-0.008"^^xsd:string;
+	dc:issued         "2013-05-01"^^xsd:date;
+	dcs:changeset     [
+		dcs:item [
+			a dcs:Bugfix;
+			rdfs:label "Fix auto-generated CPAN e-mail addresses in CREDITS file.";
+		];
+	];
+	dcs:released-by   cpan:tobyink;
+	doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/Module-Install-Copyright-0.008.tar.gz>;
+	doap:revision     "0.008"^^xsd:string.
+
+dist:v_0-009
+	a                 doap:Version;
+	dc:identifier     "Module-Install-Copyright-0.009"^^xsd:string;
+	dc:issued         "2013-05-03"^^xsd:date;
+	dcs:changeset     [
+		dcs:item [
+			a dcs:Change;
+			rdfs:label "Don't include 'mailto:' in x_contributors for META.yml; MetaCPAN doesn't seem to like it.";
+		];
+	];
+	dcs:released-by   cpan:tobyink;
+	doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/Module-Install-Copyright-0.009.tar.gz>;
+	doap:revision     "0.009"^^xsd:string.
+
 cpan:jonass
 	a                 foaf:Person;
 	foaf:name         "Jonas Smedegaard";
diff --git a/META.yml b/META.yml
index deeeb8a..01f59c7 100644
--- a/META.yml
+++ b/META.yml
@@ -36,4 +36,4 @@ resources:
   bugtracker: http://rt.cpan.org/Dist/Display.html?Queue=Module-Install-Copyright
   homepage: https://metacpan.org/release/Module-Install-Copyright
   license: http://dev.perl.org/licenses/
-version: 0.007
+version: 0.009
diff --git a/SIGNATURE b/SIGNATURE
index 27622d4..2861f29 100644
--- a/SIGNATURE
+++ b/SIGNATURE
@@ -16,12 +16,12 @@ Hash: SHA1
 
 SHA1 f983c18fdb491c4b733235d54e8ca7563b67a6a3 CONTRIBUTING
 SHA1 63395fdebebecf0b66dc23ecbe1f6e0ac74cc686 COPYRIGHT
-SHA1 29f04b9210938da3dd2b07d97c8f54895215cfce CREDITS
-SHA1 c0e714c069c89fc7c6b13fc96a0fc8abf1076771 Changes
+SHA1 7b4e459d40351ea80ea47a89c2e4e9fa9e587253 CREDITS
+SHA1 72f9bdfdd62919019dcd059d21725188171f0726 Changes
 SHA1 937d452c5c4069f4cda9ffaf45a33f1eb5f060e8 LICENSE
 SHA1 dca0ca04c70f200b60387e727b847b1f7dcdb396 MANIFEST
-SHA1 ff1906aff5ac6ab6bd381605379502ad6abe8dcb META.ttl
-SHA1 f8300275e2f9b34d6f9a099bb850e4079cc6881e META.yml
+SHA1 e1111482b14a36b08a24a0f89d56e626779357ff META.ttl
+SHA1 e9d39c81abbbeb207d88f9a2701e25970c734212 META.yml
 SHA1 cdb0a8b531e0a5b24063c5cca2ad1b6f825fe96a Makefile.PL
 SHA1 29ac1310a311e93aa33991a2b6ce85055bb757a3 README
 SHA1 27efdd555ae5015fe23e4a653ae8ae6deeb95cdd examples/example-output.txt
@@ -42,11 +42,11 @@ SHA1 c3a6d0d5b84feb3280622e9599e86247d58b0d18 inc/Module/Install/WriteAll.pm
 SHA1 26d58a041cd6b3d21db98b32e8fd1841aae21204 inc/Module/Package.pm
 SHA1 5a2f84a7a82eee0d1e5ed3628fe503a608efc10f inc/Module/Package/Dist/RDF.pm
 SHA1 feb933cefe2e3762e8322bd6071a2499f3440da1 inc/YAML/Tiny.pm
-SHA1 09edeb51afec26290997f19d8c8ea043c86629b6 lib/Module/Install/Admin/Copyright.pm
-SHA1 6eeed973b17fb669c6766413d441cf3ff2cf1a6d lib/Module/Install/Admin/Credits.pm
-SHA1 e835e78ccf80a35d3b237335d07f1be45fb94f64 lib/Module/Install/Copyright.pm
-SHA1 5368e69f1adf6b69db87a73ad5fcd6c34765d5dd lib/Module/Install/Credits.pm
-SHA1 31be593efe1378676a35dab3b8e7d5e9ebacf3e6 meta/changes.pret
+SHA1 ea318ca8b7a11f4ebd0eb3af3395ecfd38f90dff lib/Module/Install/Admin/Copyright.pm
+SHA1 dfeff4a9ce1f003655e30c344773831669a52aba lib/Module/Install/Admin/Credits.pm
+SHA1 feb32ba8e65c5f2befe25c8bd4243a1f7a22c9e0 lib/Module/Install/Copyright.pm
+SHA1 c628849a31fcbb8844d8af51b1086e46eaf8dd9e lib/Module/Install/Credits.pm
+SHA1 26635566c5ce2798c49f8ed9dc60eb2adbd37e3f meta/changes.pret
 SHA1 251e2bad3922e9ff03b3aae2e653a73b8a990dbb meta/doap.pret
 SHA1 71b4fece05f70aec21eb88332322caabf4183af6 meta/makefile.pret
 SHA1 4634788f46ffa00591446a2fe9f8d9e5364e5485 meta/people.pret
@@ -54,7 +54,7 @@ SHA1 2a09529a43f0a9fce64da320ebd76d898d339a71 t/01basic.t
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
-iEYEARECAAYFAlFqbYsACgkQzr+BKGoqfTkzQgCdGHZgVwe+1kr1h4eZNUH0DRPF
-BuMAmwWBG4Gzd+wmtwRs/45+/7msNRqB
-=IsLl
+iEYEARECAAYFAlGDe/8ACgkQzr+BKGoqfTmsJACdGKtR1GON9Uk2A2OQlPHqCw3K
+g14AnjI9XjwFdo3fupEhm1Lt782ZjIjs
+=/Ztq
 -----END PGP SIGNATURE-----
diff --git a/lib/Module/Install/Admin/Copyright.pm b/lib/Module/Install/Admin/Copyright.pm
index 150a472..6917064 100644
--- a/lib/Module/Install/Admin/Copyright.pm
+++ b/lib/Module/Install/Admin/Copyright.pm
@@ -71,7 +71,7 @@ sub _serialize_stanza
 
 our $AUTHOR_ONLY = 1;
 our $AUTHORITY   = 'cpan:TOBYINK';
-our $VERSION     = '0.007';
+our $VERSION     = '0.009';
 
 use RDF::Trine::Namespace qw[RDF RDFS OWL XSD];
 my $CPAN = RDF::Trine::Namespace->new('http://purl.org/NET/cpan-uri/terms#');
diff --git a/lib/Module/Install/Admin/Credits.pm b/lib/Module/Install/Admin/Credits.pm
index 28e1ddb..1fd0714 100644
--- a/lib/Module/Install/Admin/Credits.pm
+++ b/lib/Module/Install/Admin/Credits.pm
@@ -6,7 +6,7 @@ use strict;
 
 our $AUTHOR_ONLY = 1;
 our $AUTHORITY   = 'cpan:TOBYINK';
-our $VERSION     = '0.007';
+our $VERSION     = '0.009';
 
 use Module::Install::Contributors 0.001;
 use Module::Install::Admin::RDF 0.003;
@@ -40,8 +40,11 @@ sub write_credits_file
 			
 			if ($role eq "contributor")
 			{
-				my $contributor = $person->{mbox}
-					? sprintf("%s <%s>", ($person->{name}//$person->{nick}//$person->{cpanid}//"Anon"), $person->{mbox})
+				my $mbox = $person->{mbox};
+				$mbox =~ s/^mailto://i if defined $mbox;
+				
+				my $contributor = $mbox
+					? sprintf("%s <%s>", ($person->{name}//$person->{nick}//$person->{cpanid}//"Anon"), $mbox)
 					: sprintf("%s",      ($person->{name}//$person->{nick}//$person->{cpanid}//"Anon"));
 				$self->contributors($contributor);
 			}
@@ -122,7 +125,7 @@ sub _people
 			map  $_->uri,
 			grep $_->is_resource,
 			$model->objects_for_predicate_list($p->{node}, $FOAF->mbox);
-		$p->{mbox} //= "$p->{cpanid}\@cpan.org" if $p->{cpanid};
+		$p->{mbox} //= sprintf('mailto:%s at cpan.org', lc($p->{cpanid})) if $p->{cpanid};
 		
 		($p->{nick}) =
 			map  $_->literal_value,
diff --git a/lib/Module/Install/Copyright.pm b/lib/Module/Install/Copyright.pm
index 6ae1cbb..bc7c42a 100644
--- a/lib/Module/Install/Copyright.pm
+++ b/lib/Module/Install/Copyright.pm
@@ -6,7 +6,7 @@ use strict;
 
 our $AUTHOR_ONLY = 1;
 our $AUTHORITY   = 'cpan:TOBYINK';
-our $VERSION     = '0.007';
+our $VERSION     = '0.009';
 
 sub write_copyright_file
 {
diff --git a/lib/Module/Install/Credits.pm b/lib/Module/Install/Credits.pm
index 92779ee..a3600ea 100644
--- a/lib/Module/Install/Credits.pm
+++ b/lib/Module/Install/Credits.pm
@@ -6,7 +6,7 @@ use strict;
 
 our $AUTHOR_ONLY = 1;
 our $AUTHORITY   = 'cpan:TOBYINK';
-our $VERSION     = '0.007';
+our $VERSION     = '0.009';
 
 sub write_credits_file
 {
diff --git a/meta/changes.pret b/meta/changes.pret
index d4c3310..6cff5d8 100644
--- a/meta/changes.pret
+++ b/meta/changes.pret
@@ -40,3 +40,15 @@
 	changeset [
 		item "Only list contributors in 'x_contributors', not thanked people."^^Change;
 	].
+
+`Module-Install-Copyright 0.008 cpan:TOBYINK`
+	issued  2013-05-01;
+	changeset [
+		item "Fix auto-generated CPAN e-mail addresses in CREDITS file."^^Bugfix;
+	].
+
+`Module-Install-Copyright 0.009 cpan:TOBYINK`
+	issued  2013-05-03;
+	changeset [
+		item "Don't include 'mailto:' in x_contributors for META.yml; MetaCPAN doesn't seem to like it."^^Change;
+	].

-- 
libmodule-install-copyright-perl Debian packaging



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