[libchi-driver-redis-perl] 05/05: Merge branch 'master' of ssh://git.debian.org/git/pkg-perl/packages/libchi-driver-redis-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 libchi-driver-redis-perl.

commit fa8042515c6c0605bc3e2ca844bfb9ab1cebcb62
Merge: 68b99f1 a790ec8
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Sun Jan 31 11:31:59 2016 +0000

    Merge branch 'master' of ssh://git.debian.org/git/pkg-perl/packages/libchi-driver-redis-perl
    
    Conflicts:
    	debian/changelog

 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 765466f,d9c0923..be80076
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,21 +1,12 @@@
 -libchi-driver-redis-perl (0.09-1) UNRELEASED; urgency=low
 +libchi-driver-redis-perl (0.10-1) unstable; urgency=low
  
+   [ Christopher Hoskin ]
 -  TODO:
 -  - d/copyright: IMO, the Copyright field for * should just say
 -    "Copyright: 2009, Cold Hard Code, LLC.". at least that's the only
 -    reference to copyright holders I see (and the only year).
 -    The two guys are only mentioned as author/contributor but since we have an
 -    explicit copyright holder we don't need to invoke the magic Berne
 -    Convention spell here :)
 -  - d/control: are the libtest-* packages (except for libtest-mock-redis-perl)
 -    really needed at runtime?
 -  - d/control: wrapping (wrap-and-sort or cme) would make the lists more
 -    readable :)
+ 
    * Initial Release. Closes: #812132
 +  * New upstream release (0.10)
  
+   [ Salvatore Bonaccorso ]
+   * debian/control: Use HTTPS transport protocol for Vcs-Git URI
+ 
 - -- Christopher Hoskin <christopher.hoskin at gmail.com>  Wed, 20 Jan 2016 22:29:32 +0000
++
 + -- Christopher Hoskin <christopher.hoskin at gmail.com>  Sun, 31 Jan 2016 11:22:42 +0000
diff --cc debian/control
index 54b41fa,b030d4d..0183d59
--- a/debian/control
+++ b/debian/control
@@@ -4,18 -4,10 +4,18 @@@ Priority: optiona
  Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
  Uploaders: Christopher Hoskin <christopher.hoskin at gmail.com>
  Build-Depends: debhelper (>= 9)
 -Build-Depends-Indep: perl, libchi-perl, libtest-deep-perl, libtest-exception-perl, libtest-warn-perl, libtest-class-perl, libredis-perl, libtest-mock-redis-perl, liburi-perl 
 +Build-Depends-Indep: libchi-perl,
 + libmoo-perl,
 + libredis-perl,
 + libtest-class-perl,
 + libtest-mock-redis-perl,
 + liburi-perl,
 + perl (>= 5.15.2),
 + libtest-deep-perl,
 + libtest-warn-perl
  Standards-Version: 3.9.6
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libchi-driver-redis-perl.git
- Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libchi-driver-redis-perl.git
+ Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libchi-driver-redis-perl.git
  Homepage: https://metacpan.org/release/CHI-Driver-Redis
  Testsuite: autopkgtest-pkg-perl
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libchi-driver-redis-perl.git