[heroes] 03/03: Merge remote-tracking branch 'origin/master' into master

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository heroes.

commit 7ae242089c50192da338463086899991019c5f64
Merge: 510d5e4 b5d3e92
Author: Stephen Kitt <steve at sk2.org>
Date:   Mon Feb 29 20:39:05 2016 +0100

    Merge remote-tracking branch 'origin/master' into master

 debian/changelog       | 4 ++++
 debian/heroes.postinst | 3 +++
 2 files changed, 7 insertions(+)

diff --cc debian/changelog
index 0f4ab2b,fd0365f..e6aa128
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,11 +1,15 @@@
  heroes (0.21-14) UNRELEASED; urgency=medium
  
++  [ Stephen Kitt]
 +  * Handle heroes' permissions in the dh_fixperms override, for
 +    architecture-dependent builds only.
 +  * Preserve the original manpages, help2man can't rebuild the new ones
 +    on buildds.
 +
+   [ Alexandre Detiste ]
 -  * remove extraneous override of dh_fixperms, which also makes
 -    the build reproducible.
 -  * remove leftover /etc/alternatives/heroes (Closes: #813244)
++  * Remove leftover heroes alternative (closes: #813244).
+ 
 - -- Stephen Kitt <skitt at debian.org>  Mon, 29 Feb 2016 10:53:02 +0100
 + -- Stephen Kitt <skitt at debian.org>  Thu, 28 Jan 2016 08:39:22 +0100
  
  heroes (0.21-13) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/heroes.git