[libpgplot-perl] 02/02: Merge branch 'NMU-809864'

[Salvatore Bonaccorso]

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

carnil pushed a commit to branch master
in repository libpgplot-perl.

commit e1c06c16d68c04054f5d6948980c5c8c84fd4e94
Merge: 72a6fa2 6bab0ca
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Sun Apr 10 10:13:08 2016 +0200

    Merge branch 'NMU-809864'

 debian/changelog | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 5481fdc,710fd3d..2157fdd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,10 +1,17 @@@
 +libpgplot-perl (1:2.21-6) UNRELEASED; urgency=medium
 +
-   [ gregor herrmann ]
-   * Replace libpng12-dev with libpng-dev in Build-Depends.
-     (Closes: #809864)
- 
 +  [ Salvatore Bonaccorso ]
 +  * debian/control: Use HTTPS transport protocol for Vcs-Git URI
 +
 + -- gregor herrmann <gregoa at debian.org>  Tue, 05 Jan 2016 00:32:07 +0100
 +
+ libpgplot-perl (1:2.21-5.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Change B-D from libpng12-dev to libpng-dev (Closes: #809864)
+ 
+  -- Tobias Frost <tobi at debian.org>  Sun, 10 Apr 2016 08:36:24 +0200
+ 
  libpgplot-perl (1:2.21-5) unstable; urgency=medium
  
    * Team upload

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