[libconfig-model-lcdproc-perl] 08/08: Merge branch 'master' of ssh://git.debian.org/git/pkg-perl/packages/libconfig-model-lcdproc-perl

[dod at debian.org]

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

dod pushed a commit to branch master
in repository libconfig-model-lcdproc-perl.

commit eeeced5401ecb6a29f5843b3b432df1e488b673d
Merge: 74b26a3 28a7dce
Author: Dominique Dumont <dod at debian.org>
Date:   Sun Jan 31 18:51:52 2016 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-perl/packages/libconfig-model-lcdproc-perl
    
    # Conflicts:
    #	debian/changelog

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

diff --cc debian/changelog
index eb478b7,fa0663d..e71c547
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,8 +1,19 @@@
 -libconfig-model-lcdproc-perl (2.043-2) UNRELEASED; urgency=medium
 +libconfig-model-lcdproc-perl (2.046-1) unstable; urgency=medium
  
++  [ Salvatore Bonaccorso ]
+   * debian/control: Use HTTPS transport protocol for Vcs-Git URI
+ 
 - -- Salvatore Bonaccorso <carnil at debian.org>  Sat, 30 Jan 2016 20:03:33 +0100
++  [ Dominique Dumont ]
 +  * Imported Upstream version 2.046
 +    This release fix a limitation of "cme edit lcdproc". User can now
 +    enable more than one driver (i.e. set lirc and imonlcd drivers)
 +  * copyright: updated years
 +  * control: depends on libconfig-model-perl 2.076
 +  * patches:
 +    * re-ordered the series to help tweak tests
 +    * updated new upstream test for Debian setup
 +
 + -- Dominique Dumont <dod at debian.org>  Sun, 31 Jan 2016 17:51:24 +0100
  
  libconfig-model-lcdproc-perl (2.043-1) unstable; urgency=medium
  

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