[libhtml-mason-perl] 02/02: update changelog

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libhtml-mason-perl.

commit 4791731cf20bd06babb179220ef6583b6651a5dc
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Jun 19 19:32:55 2017 +0200

    update changelog
    
    Gbp-Dch: Ignore
---
 debian/changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 906149f..d583d0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ libhtml-mason-perl (1:1.56-2) UNRELEASED; urgency=medium
   * debian/copyright: change Copyright-Format 1.0 URL to HTTPS.
   * debian/upstream/metadata: change GitHub/CPAN URL(s) to HTTPS.
   * debian/upstream/metadata: use HTTPS for GitHub URLs.
+  * Add debian/gbp.conf to tell gbp import-orig to merge the upstream
+    branch instead of replacing it, which is the new default. This is
+    needed as we use git-debcherry in this package.
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Sat, 30 Jan 2016 20:04:36 +0100
 

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