[wesnoth] 01/02: Merge branch 'devel' into trusty-ppa
Vincent Cheng
vcheng at moszumanska.debian.org
Sun Nov 13 07:33:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
vcheng pushed a commit to branch trusty-ppa
in repository wesnoth.
commit 26a3148acee5da49d82d572aafe9b4ee1bcce2bb
Merge: 4b23083 5d681a5
Author: Vincent Cheng <vcheng at debian.org>
Date: Sat Nov 12 23:33:10 2016 -0800
Merge branch 'devel' into trusty-ppa
debian/changelog | 11 +++++++++++
debian/control | 4 ++--
debian/control.in | 4 ++--
debian/patches/03wesnothd-name | 16 ++++++++--------
debian/patches/03wesnothd-name.in | 16 ++++++++--------
debian/rules | 6 +++---
debian/wesnoth-1.13-data.install | 3 +++
debian/wesnoth-BRANCH-data.install.in | 3 +++
8 files changed, 40 insertions(+), 23 deletions(-)
diff --cc debian/changelog
index a37a409,5bf583a..b371295
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,14 +1,28 @@@
+ wesnoth-1.13 (1:1.13.6-1) experimental; urgency=medium
+
+ * New upstream devel release.
+ - Drop build-dep on libsdl2-net-dev.
+ - Bump minimum version of build-dep libsdl2-dev to (>= 2.0.4).
+ - Refresh patches.
+ * Build with -std=c++11 to fix FTBFS on older distros (e.g. Debian 8,
+ Ubuntu 16.04) where this flag is not enabled by gcc by default.
+
+ -- Vincent Cheng <vcheng at debian.org> Fri, 11 Nov 2016 14:59:19 -0800
+
+wesnoth-1.13 (1:1.13.5-1~ppa1~trusty2) trusty; urgency=medium
+
+ * Backport devel release from Debian experimental.
+ * Build with -std=c++11 to fix FTBFS on older distros (e.g. Debian 8,
+ Ubuntu 16.04) where this flag is not enabled by gcc by default.
+
+ -- Vincent Cheng <vcheng at debian.org> Sun, 28 Aug 2016 22:10:21 -0700
+
+wesnoth-1.13 (1:1.13.5-1~ppa1~trusty1) trusty; urgency=medium
+
+ * Backport devel release from Debian experimental.
+
+ -- Vincent Cheng <vcheng at debian.org> Sun, 28 Aug 2016 20:15:54 -0700
+
wesnoth-1.13 (1:1.13.5-1) experimental; urgency=medium
* New upstream devel release.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/wesnoth.git
More information about the Pkg-games-commits
mailing list