[libmime-lite-tt-perl] 01/02: "fix" merge conflicts in d/changelog
gregor herrmann
gregoa at debian.org
Fri Feb 20 19:21:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libmime-lite-tt-perl.
commit e45d43785058513785cdc51fd05bdceb4b48b1d2
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Feb 20 20:16:24 2015 +0100
"fix" merge conflicts in d/changelog
Git-Dch: Ignore
---
debian/changelog | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5caa284..eab1dff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,9 @@
-libmime-lite-tt-perl (0.02-1) unstable; urgency=low
+libmime-lite-tt-perl (0.02-1) UNRELEASED; 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
+ TODO:
- 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
+ * Initial Release. Closes: #778854
-- Christopher Hoskin <christopher.hoskin at gmail.com> Fri, 20 Feb 2015 19:03:05 +0000
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmime-lite-tt-perl.git
More information about the Pkg-perl-cvs-commits
mailing list