This is an automated email from the git hooks/post-receive script. dmn pushed a commit to branch master in repository liblingua-en-words2nums-perl.
commit 46ac60a5ad3a9f8a4af5dc269ce36add34b8b6ed Author: Damyan Ivanov <[email protected]> Date: Wed Nov 12 08:40:24 2014 +0000 fix two differences in upstream files Not sure how did these go in. now 'git diff upstream' in master shows only changes in debian/ --- .gitattributes | 1 + Makefile.PL | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..5d42584 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +debian/changelog merge=dpkg-mergechangelogs diff --git a/Makefile.PL b/Makefile.PL index 97778b2..eb68978 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -4,6 +4,7 @@ use ExtUtils::MakeMaker; WriteMakefile( NAME => 'Lingua::EN::Words2Nums', VERSION => getversion(), + LICENSE => 'perl', $] < 5.005 ? () : ( AUTHOR => 'Joey Hess <[email protected]>', ABSTRACT_FROM => 'Words2Nums.pm', -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/liblingua-en-words2nums-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
