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

[Markus Koschany]

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

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

commit 023cfcfd72a8472698fb8c636aa8d5d268fc2b6b
Merge: 5c3b186 7ba39a2
Author: Markus Koschany <apo at gambaru.de>
Date:   Sun Aug 30 12:44:25 2015 +0200

    Merge branch 'master' into trusty-ppa

 debian/README.source                     |   7 -
 debian/bin/freeorion                     |   5 -
 debian/changelog                         |  76 +++++++++
 debian/control                           |  14 +-
 debian/copyright                         | 267 +++++++++++++++----------------
 debian/freeorion-data.links              |   4 +-
 debian/freeorion.install                 |   1 -
 debian/patches/GG-verbose-makefile.patch |  25 ---
 debian/patches/OISInput-config.patch     |  25 ---
 debian/patches/series                    |   2 -
 debian/rules                             |  45 +-----
 debian/watch                             |   4 +-
 12 files changed, 219 insertions(+), 256 deletions(-)

diff --cc debian/changelog
index ca62c05,56fd50c..e91f0dc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,79 +1,85 @@@
+ 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) experimental; urgency=medium
+ 
+   * New upstream git snapshot.
+     - OIS and Ogre are gone and were replaced by SDL2.
+       Remove all references to them. OISInput.cfg is no longer required and can
+       be safely removed. This should also fix keyboard issues with OIS. See
+       #730405 for reference.
+   * Update debian/copyright for new release. Change Source field.
+     The FreeOrion project moved to GitHub.
+   * debian/rules:
+     - Update get-orig-source target for Github.
+     - Remove --sourcedirectory option for dh sequencer. All files are present
+       in the root directory now.
+     - Add mips and mipsel back to WEAK_HOSTS.
+   * debian/control:
+     - Drop libbullet-dev, libltdl-dev, libois-dev and libogre-dev from
+       Build-Depends. They are obsolete now.
+     - Add libsdl2-dev and libglew-dev to Build-Depends.
+     - Vcs-Browser: Switch to cgit.
+     - Try architecture:any for this release again.
+   * Update debian/watch for new github address.
+ 
+  -- Markus Koschany <apo at gambaru.de>  Fri, 27 Mar 2015 17:51:18 +0100
+ 
+ freeorion (0.4.4-2) unstable; urgency=medium
+ 
+   * Switch build-dependency from libjpeg8-dev to libjpeg-dev due to the
+     libjpeg-turbo transition.
+     Thanks to Ondřej Surý for the report and patch. (Closes: #763471)
+   * Update debian/watch. Detect RC and normal releases.
+   * Declare compliance with Debian Policy 3.9.6.
+ 
+  -- Markus Koschany <apo at gambaru.de>  Tue, 30 Sep 2014 20:43:21 +0200
+ 
 +freeorion (0.4.4-1~ppa1~trusty1) trusty; urgency=medium
 +
 +  * Rebuild for Trusty.
 +
 + -- Markus Koschany <apo at gambaru.de>  Fri, 05 Sep 2014 12:59:35 +0200
 +
  freeorion (0.4.4-1) unstable; urgency=medium
  
    * New upstream release 0.4.4 r7640.

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