[libchart-clicker-perl] 05/05: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-perl/packages/libchart-clicker-perl

[Jotam Jr. Trejo]

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

jotamjr-guest pushed a commit to branch master
in repository libchart-clicker-perl.

commit 504b172216ef973ed6d8a145c227a564df24944b
Merge: f88cac8 03d0035
Author: Jotam Jr. Trejo <jotamjr at debian.org.sv>
Date:   Tue Mar 4 21:21:59 2014 -0600

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-perl/packages/libchart-clicker-perl
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 6 +++++-
 debian/control   | 2 +-
 debian/copyright | 2 +-
 debian/watch     | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 021c98c,f9d2bf4..19f1394
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,14 @@@
 -libchart-clicker-perl (2.87-1) UNRELEASED; urgency=medium
 +libchart-clicker-perl (2.87-1) unstable; urgency=medium
  
+   [ Jotam Jr. Trejo ]
    * Imported Upstream version 2.87
 +  * Updated years of upstream and packaging copyright.
 +  * Upgraded Standards-Version compliance to 3.9.5
  
-  -- Jotam Jr. Trejo <jotamjr at debian.org.sv>  Tue, 04 Mar 2014 21:02:36 -0600
+   [ gregor herrmann ]
+   * Strip trailing slash from metacpan URLs.
+ 
 - -- Jotam Jr. Trejo <jotamjr at debian.org.sv>  Wed, 29 Jan 2014 22:42:44 -0600
++ -- Jotam Jr. Trejo <jotamjr at debian.org.sv>  Tue, 04 Mar 2014 21:21:41 -0600
  
  libchart-clicker-perl (2.86-1) unstable; urgency=low
  
diff --cc debian/control
index 08ad7fa,5ced958..9846879
--- a/debian/control
+++ b/debian/control
@@@ -22,8 -22,8 +22,8 @@@ Uploaders: Jonathan Yu <jawnsy at cpan.org
   Chris Butler <chrisb at debian.org>,
   Jotam Jr. Trejo <jotamjr at debian.org.sv>,
   gregor herrmann <gregoa at debian.org>
 -Standards-Version: 3.9.4
 +Standards-Version: 3.9.5
- Homepage: https://metacpan.org/release/Chart-Clicker/
+ Homepage: https://metacpan.org/release/Chart-Clicker
  Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libchart-clicker-perl.git
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libchart-clicker-perl.git
  
diff --cc debian/copyright
index 5c60892,98b2800..7daeb89
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,10 -1,10 +1,10 @@@
  Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
  Upstream-Name: Chart-Clicker
  Upstream-Contact: Cory G Watson <gphat at cpan.org>
- Source: https://metacpan.org/release/Chart-Clicker/
+ Source: https://metacpan.org/release/Chart-Clicker
  
  Files: *
 -Copyright: 2011-2013, Cold Hard Code, LLC.
 +Copyright: 2011-2014, Cold Hard Code, LLC.
  License: Artistic or GPL-1+
  
  Files: debian/*

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