[flatzebra] 08/08: Merge branch 'master' of git://anonscm.debian.org/pkg-games/flatzebra

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository flatzebra.

commit 3d9033e298f187a971d6fb1588358a9878e188da
Merge: 495e9f1 5890b24
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Aug 7 12:33:02 2015 +0200

    Merge branch 'master' of git://anonscm.debian.org/pkg-games/flatzebra

 debian/changelog | 13 ++++++++++---
 debian/control   |  8 ++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 31abf0a,5abdf1f..a2ffdd7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,18 @@@
- flatzebra (0.1.6-3) unstable; urgency=medium
++flatzebra (0.1.6-4) UNRELEASED; urgency=medium
 +
-   * Rename binary package for GCC-5 transition and append v5.
 +  * Declare compliance with Debian Policy 3.9.6.
 +  * Switch Vcs-Browser field to cgit.
 +  * Update copyright years.
 +
-  -- Markus Koschany <apo at gambaru.de>  Thu, 06 Aug 2015 14:32:47 +0200
++ -- Markus Koschany <apo at gambaru.de>  Fri, 07 Aug 2015 12:32:23 +0200
++
+ flatzebra (0.1.6-3) unstable; urgency=medium
+ 
+   * Team upload
+   * C++ ABI transition: rename libflatzebra-0.1-2 to libflatzebra-0.1-2v5
+     (starts transition for: #791035)
+ 
+  -- Simon McVittie <smcv at debian.org>  Fri, 07 Aug 2015 10:43:18 +0100
  
  flatzebra (0.1.6-2) unstable; urgency=low
  

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