[libmime-lite-tt-perl] 02/02: Merge branch 'master' of ssh://git.debian.org/git/pkg-perl/packages/libmime-lite-tt-perl

[Christopher Hoskin]

This is an automated email from the git hooks/post-receive script.

grinorcole-guest pushed a commit to branch master
in repository libmime-lite-tt-perl.

commit 43da9fca70fbbf6d5d565c9c7776d1681c9bbfec
Merge: 3a31f92 c3777b2
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Fri Feb 20 19:08:58 2015 +0000

    Merge branch 'master' of ssh://git.debian.org/git/pkg-perl/packages/libmime-lite-tt-perl
    
    Conflicts:
    	debian/changelog

 debian/changelog | 13 +++++++++++++
 debian/control   |  6 +++---
 debian/copyright |  4 ++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index bae119d,a58a9e4..5caa284
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,14 +1,18 @@@
 -libmime-lite-tt-perl (0.02-1) UNRELEASED; urgency=low
 +libmime-lite-tt-perl (0.02-1) unstable; urgency=low
  
++<<<<<<< HEAD
 +  * Initial Release. Closes: #778854
++=======
+   TODO [I saw the "UNRELEASED" too late :)]:
+   - the upstream code "only" has an author but no copyright holder. either
+     check with them or (quicker and easier) use the "Berne convention" comment
+     from http://pkg-perl.alioth.debian.org/copyright.html#berne_convention
+   - d/control:
+     + s/libtemplate-toolkit-perl/libtemplate-perl/g
+     + short description should be a noun phrase
+   (haven't built the package)
+ 
+   * Initial Release. Closes #778854
++>>>>>>> c3777b2a0043941e2b7acd0318eb9d3cc16fd865
  
 - -- Christopher Hoskin <christopher.hoskin at gmail.com>  Fri, 20 Feb 2015 06:20:22 +0000
 + -- Christopher Hoskin <christopher.hoskin at gmail.com>  Fri, 20 Feb 2015 19:03:05 +0000
diff --cc debian/control
index 88ae38c,88ae38c..59a876c
--- a/debian/control
+++ b/debian/control
@@@ -5,7 -5,7 +5,7 @@@ Maintainer: Debian Perl Group <pkg-perl
  Uploaders: Christopher Hoskin <christopher.hoskin at gmail.com>
  Build-Depends: debhelper (>= 9)
  Build-Depends-Indep: libmime-lite-perl,
-- libtemplate-toolkit-perl,
++ libtemplate-perl,
   perl
  Standards-Version: 3.9.6
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libmime-lite-tt-perl.git
@@@ -17,8 -17,8 +17,8 @@@ Package: libmime-lite-tt-per
  Architecture: all
  Depends: ${misc:Depends}, ${perl:Depends},
   libmime-lite-perl,
-- libtemplate-toolkit-perl
++ libtemplate-perl
  Description: generates MIME messages from Template Toolkit templates
   MIME::Lite::TT is a wrapper around MIME::Lite which is used to create MIME
-- messages. The text part of the message is generated from a Template::Toolkit
++ messages. The text part of the message is generated from a Template Toolkit
   template.
diff --cc debian/copyright
index 5b45fbe,5b45fbe..fd81c05
--- a/debian/copyright
+++ b/debian/copyright
@@@ -6,6 -6,6 +6,10 @@@ Upstream-Name: MIME-Lite-T
  Files: *
  Copyright: 2004, Yasuhiro Horiuchi <horiuchi at vcube.com>
  License: Artistic or GPL-1+ 
++Comment: The upstream distribution does not contain an explicit statement of
++ copyright ownership. Pursuant to the Berne Convention for the Protection of
++ Literary and Artistic Works, it is assumed that all content is copyright by
++ its respective authors unless otherwise stated.
  
  Files: debian/*
  Copyright: 2015, Christopher Hoskin <christopher.hoskin at gmail.com>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmime-lite-tt-perl.git