[libpg-hstore-perl] 02/04: Merge branch 'master' into wheezy-backports

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch wheezy-backports
in repository libpg-hstore-perl.

commit bbefcd5eff6e50c13e1f57406e8910a7a3e6373e
Merge: a60b919 242bcbe
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 18 18:21:48 2015 +0200

    Merge branch 'master' into wheezy-backports
    
    Conflicts:
    	debian/changelog

 Changes                  |  1 +
 README                   |  2 +-
 debian/changelog         | 22 ++++++++++++++++++++++
 debian/control           | 16 ++++++++++------
 debian/copyright         |  4 ++--
 debian/gbp.conf          | 16 ++++++++++++++++
 debian/upstream/metadata |  9 +++++++++
 hstore.xs                |  6 ++++--
 lib/Pg/hstore.pm         |  4 ++--
 t/leaks.t                | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 10 files changed, 115 insertions(+), 13 deletions(-)

diff --cc debian/changelog
index 6aa2c41,20bfd8d..5cd6147
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,25 +1,31 @@@
+ libpg-hstore-perl (1.05-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update Repository URLs in upstream metadata for move
+     from code.google.com to BitBucket.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 18 Apr 2015 12:33:57 +0200
+ 
+ libpg-hstore-perl (1.04-2~exp1) unstable; urgency=low
+ 
+   [ Bas Couwenberg ]
+   * Bump Standards-Version to 3.9.6, no changes required.
+   * Add upstream metadata.
+   * Restructure control file with cme.
+   * Add gbp.conf to use pristine-tar by default.
+   * Update my email to @debian.org address.
+ 
+   [ Salvatore Bonaccorso ]
+   * Update Vcs-Browser URL to cgit web frontend
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 04 Feb 2015 21:52:40 +0100
+ 
 +libpg-hstore-perl (1.04-1~bpo70+1linuxminded1) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 18 Oct 2013 01:22:05 +0200
 +
  libpg-hstore-perl (1.04-1) unstable; urgency=low
  
    * New upstream release.

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