[freeorion] 01/02: Merge branch 'master' into trusty-ppa

[Markus Koschany]

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

apo pushed a commit to branch trusty-ppa
in repository freeorion.

commit 4e72d6d776e032103cb41b7dac4713d2a97d6afb
Merge: 58129c0 b53ab6f
Author: Markus Koschany <apo at debian.org>
Date:   Thu Oct 6 15:24:23 2016 +0200

    Merge branch 'master' into trusty-ppa

 debian/README.source          |  14 ++
 debian/changelog              |  52 ++++-
 debian/compat                 |   2 +-
 debian/control                |   9 +-
 debian/copyright              |  12 +-
 debian/freeorion-data.install |   1 +
 debian/freeorion-data.links   |   8 +-
 debian/freeorion.6            | 533 +++++++++++++++++++++++++-----------------
 debian/freeorion.install      |   2 +-
 debian/rules                  |  11 +-
 debian/source/local-options   |   1 -
 debian/watch                  |   2 +-
 12 files changed, 415 insertions(+), 232 deletions(-)

diff --cc debian/changelog
index b913e9b,2b86acc..1cd712c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,53 +1,54 @@@
- freeorion (0.4.5-1~ppa1~trusty1) trusty; urgency=medium
+ freeorion (0.4.6-1) unstable; urgency=medium
  
-   * Rebuild for trusty.
+   * New upstream release.
+   * Switch to compat level 10.
+   * Update get-orig-source target.
+   * Update freeorion.6 man page for latest release.
+   * Remove source/local-options file.
+ 
+  -- Markus Koschany <apo at debian.org>  Tue, 27 Sep 2016 15:04:12 +0200
+ 
+ freeorion (0.4.6~RC1-1) unstable; urgency=medium
+ 
+   * New upstream release candidate.
+   * Update get-orig-source target.
+   * d/rules: Limit MaxParallel to 2 to avoid memory exhaustion on buildds.
+   * Drop all patches. Fixed upstream.
+   * freeorion-data: Depend on fonts-roboto-unhinted and use Debian's system
+     fonts.
+   * d/rules: Remove more extra license files to make Lintian happy.
+   * d/copyright: Mention Apache-2.0 license of Roboto fonts.
+   * Install CONTRIBUTING.md with freeorion-data.install file.
+ 
+  -- Markus Koschany <apo at debian.org>  Mon, 12 Sep 2016 21:19:38 +0200
+ 
+ freeorion (0.4.5+git20160707-2) unstable; urgency=medium
+ 
+   * Add boost1.61.patch and make-destructors-public.patch to work around a bug
+     in Boost 1.61. (Closes: #833773)
+ 
+  -- Markus Koschany <apo at debian.org>  Mon, 22 Aug 2016 01:39:06 +0200
+ 
+ freeorion (0.4.5+git20160707-1) unstable; urgency=medium
+ 
+   * New upstream snapshot.
+     - Fixes segfault on entry of dead_macron. (Closes: #825932)
+ 
+  -- Markus Koschany <apo at debian.org>  Fri, 08 Jul 2016 23:24:12 +0200
+ 
+ freeorion (0.4.5+git20160501-1) unstable; urgency=medium
+ 
+   * New upstream snapshot.
+     - Game performance has improved. FreeOrion does not lag anymore.
+       (Closes: #818524)
+   * Install Changelog.md as upstream changelog.
+   * Declare compliance with Debian Policy 3.9.8.
+   * Vcs-fields: Use https.
+   * Update my e-mail address.
+   * debian/watch: Use version=4.
  
-  -- Markus Koschany <apo at gambaru.de>  Tue, 08 Sep 2015 17:23:02 +0200
+  -- Markus Koschany <apo at debian.org>  Mon, 02 May 2016 11:35:52 +0200
++>>>>>>> master
  
  freeorion (0.4.5-1) unstable; urgency=medium
  

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