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

[Markus Koschany]

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

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

commit 34f80107cc210915600ec7625fbbff54b3f887ab
Merge: c214ee7 131c938
Author: Markus Koschany <apo at debian.org>
Date:   Sat Jul 8 19:06:25 2017 +0200

    Merge branch 'master' into xenial-ppa

 debian/changelog              | 54 +++++++++++++++++++++++++++++++++++++------
 debian/clean                  |  1 -
 debian/control                |  7 +++---
 debian/copyright              | 54 ++-----------------------------------------
 debian/freeorion-data.install |  1 -
 debian/freeorion.6            |  4 ++--
 debian/freeorion.menu         |  6 -----
 debian/rules                  |  6 +----
 8 files changed, 55 insertions(+), 78 deletions(-)

diff --cc debian/changelog
index 6c869c4,57c5680..ebd595f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,47 +1,56 @@@
- freeorion (0.4.6-1~ppa1~xenial4) xenial; urgency=medium
- 
-   * Build FreeOrion 0.4.6 also on armhf and arm64.
- 
-  -- Markus Koschany <apo at debian.org>  Wed, 30 Nov 2016 20:10:03 +0100
- 
- freeorion (0.4.6-1~ppa1~xenial3) xenial; urgency=medium
++freeorion (0.4.7-2~ppa1~xenial1) xenial; urgency=medium
 +
 +  * Rebuild for Xenial.
 +  * Use compat level 9 again.
 +  * Install libs into Multiarch directories due to Ubuntu CMAKE delta.
 +
 + -- Markus Koschany <apo at debian.org>  Thu, 06 Oct 2016 15:05:53 +0200
++=======
+ freeorion (0.4.7-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+   * Declare compliance with Debian Policy 4.0.0.
+   * Use https for Format field.
+ 
+  -- Markus Koschany <apo at debian.org>  Fri, 23 Jun 2017 23:27:19 +0200
+ 
+ freeorion (0.4.7-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Drop all patches. Fixed upstream.
+   * Drop deprecated freeorion.menu file.
+   * Don't convert and install the xpm icon any more.
+   * Update get-orig-source target for new release.
+   * Drop build-dependency on imagemagick.
+   * Update debian/copyright for the latest release.
+ 
+  -- Markus Koschany <apo at debian.org>  Sat, 06 May 2017 16:31:25 +0200
+ 
+ freeorion (0.4.6-4) unstable; urgency=medium
+ 
+   * Fix Lintian error and build-depend on dh-python.
+   * Add mips64el to the list of supported architectures again.
+     (Closes: #843538)
+ 
+  -- Markus Koschany <apo at debian.org>  Thu, 05 Jan 2017 21:35:19 +0100
+ 
+ freeorion (0.4.6-3) unstable; urgency=medium
+ 
+   * Apply boost1.62.patch to fix FTBFS with Boost 1.62.
+     Thanks to Graham Inggs for the report and patch. (Closes: #843132)
+ 
+  -- Markus Koschany <apo at debian.org>  Fri, 04 Nov 2016 17:26:01 +0100
+ 
+ freeorion (0.4.6-2) unstable; urgency=medium
+ 
+   [ Gianfranco Costamagna ]
+   * d/p/multiarch-fix.patch:
+     - make the package multiarch ready, by fixing a wrong
+       cmake inclusion order
+   * d/{rules,freeorion.install} multiarchify. (Closes: #841824)
+ 
+  -- Markus Koschany <apo at debian.org>  Sun, 23 Oct 2016 18:15:01 +0200
++>>>>>>> master
  
  freeorion (0.4.6-1) unstable; urgency=medium
  
diff --cc debian/control
index 8a49b49,d96e8ec..497964e
--- a/debian/control
+++ b/debian/control
@@@ -6,7 -6,8 +6,8 @@@ Uploaders
   Markus Koschany <apo at debian.org>
  Build-Depends:
   cmake,
 - debhelper (>= 10),
 + debhelper (>= 9),
+  dh-python,
   dpkg-dev (>= 1.17),
   libalut-dev,
   libboost-all-dev,

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