[freeorion] 02/03: Merge branch 'master' into vivid-ppa

[Markus Koschany]

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

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

commit bc657e008b301f91a452bc502b96391e0ec2ece0
Merge: ddd88c1 7ba39a2
Author: Markus Koschany <apo at gambaru.de>
Date:   Sun Aug 30 12:55:34 2015 +0200

    Merge branch 'master' into vivid-ppa

 debian/README.source                     |   7 --
 debian/changelog                         |  42 +++++++++
 debian/control                           |   4 +-
 debian/copyright                         | 154 ++++++++++++++++++++-----------
 debian/freeorion-data.links              |   4 +-
 debian/patches/GG-verbose-makefile.patch |  25 -----
 debian/patches/series                    |   1 -
 debian/rules                             |  38 +-------
 debian/watch                             |   5 +-
 9 files changed, 152 insertions(+), 128 deletions(-)

diff --cc debian/changelog
index 7549630,56fd50c..8e89f56
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,45 +1,57 @@@
+ freeorion (0.4.5~RC1-1) unstable; urgency=medium
+ 
+   * New upstream release candidate.
+   * Stop building on architectures which regularly fail to build FreeOrion.
+     This includes mips and mipsel. Apparently their auto-builders cannot provide
+     enough memory which causes frequent FTBFS and there is no indication that
+     the situation will improve in the near future.
+   * debian/rules: Remove mips, mipsel and sparc from WEAK_HOSTS.
+   * Update get-orig-source target.
+ 
+  -- Markus Koschany <apo at gambaru.de>  Mon, 24 Aug 2015 23:39:16 +0200
+ 
+ freeorion (0.4.5~20150818~a590f7e-1) unstable; urgency=medium
+ 
+   * New upstream pre-release.
+   * debian/copyright: Add missing DejaVu-License.
+ 
+  -- Markus Koschany <apo at gambaru.de>  Wed, 19 Aug 2015 17:11:45 +0200
+ 
+ freeorion (0.4.5~20150803~af01c2f-1) unstable; urgency=medium
+ 
+   * New upstream pre-release. (Closes: #794802)
+     - Rebuild against GCC-5. (Closes: #793238)
+   * Update get-orig-source target for tarball releases.
+   * d/watch: Improve uversionmangle for test releases.
+   * Drop GG-verbose-makefile.patch. Fixed upstream.
+   * Update README.source and explain how to retrieve the original sources.
+   * Update debian/copyright for new release.
+     - log4cpp is no longer included.
+ 
+  -- Markus Koschany <apo at gambaru.de>  Sat, 08 Aug 2015 20:41:36 +0200
+ 
+ freeorion (0.4.4+git20150327-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+   * Set Architecture field to linux-any because FreeBSD and the Hurd are
+     unsupported upstream.
+   * Add sparc to WEAK_HOSTS.
+   * debian/rules: Use first eight characters of Git commit as REV value.
+ 
+  -- Markus Koschany <apo at gambaru.de>  Thu, 30 Apr 2015 12:38:03 +0200
+ 
 +freeorion (0.4.4+git20150327-1~ppa1~vivid2) vivid; urgency=medium
 +
 +  * Reduce amount of parallel jobs to prevent a FTBFS.
 +
 + -- Markus Koschany <apo at gambaru.de>  Sat, 28 Mar 2015 12:31:02 +0100
 +
 +freeorion (0.4.4+git20150327-1~ppa1~vivid1) vivid; urgency=medium
 +
 +  * Rebuild for Vivid Vervet.
 +
 + -- Markus Koschany <apo at gambaru.de>  Fri, 27 Mar 2015 22:08:59 +0100
 +
  freeorion (0.4.4+git20150327-1) experimental; urgency=medium
  
    * New upstream git snapshot.
diff --cc debian/rules
index 2ea4b29,426671f..4bc4c7f
--- a/debian/rules
+++ b/debian/rules
@@@ -12,9 -6,9 +6,9 @@@ WEAK_HOSTS := armel armh
  
  ifneq (,$(findstring $(DEB_HOST_ARCH),$(WEAK_HOSTS)))
  	MAX  := 1
 -	TYPE := MinSizeRel
 +	TYPE := RelWithDebInfo
  else
--	MAX  := 4
++	MAX  := 1
  	TYPE := RelWithDebInfo
  endif
  

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