[libpgobject-simple-perl] 04/04: Merge packaging branch into debian integration branch.

[Robert James Clay]

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

jame-guest pushed a commit to branch master
in repository libpgobject-simple-perl.

commit e8c774a0ae15ab2f8f4e95b9892321f9c33add0e
Merge: 0e4c2fd e71bd2b
Author: Robert James Clay <jame at rocasa.us>
Date:   Mon Apr 14 22:10:27 2014 -0400

    Merge packaging branch into debian integration branch.

 debian/changelog |  5 +++++
 debian/copyright | 26 +++++++++-----------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index 49df266,b903350..a4fea77
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,6 +1,6 @@@
 -libpgobject-simple-perl (1.3-1) UNRELEASED; urgency=low
 +libpgobject-simple-perl (1.6-1) UNRELEASED; urgency=low
  
+   [ Robert James Clay ]
    TODO:
      - Detail Copyright & License as necessary.
      - Updates to debian/control as necessary.
@@@ -7,4 -8,8 +8,8 @@@
      - Determine package Requires/Recommends/Suggests.
    * Initial Release. (Closes: #712408)
  
+   [ Axel Beckert ]
+   * debian/copyright: migrate pre-1.0 format to 1.0 using "cme fix dpkg-
+     copyright"
+ 
 - -- Robert James Clay <jame at rocasa.us>  Mon, 24 Jun 2013 14:13:59 -0400
 + -- Robert James Clay <jame at rocasa.us>  Mon, 15 Apr 2014 21:52:13 -0400

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