[wesnoth] 01/02: Merge branch 'devel' into trusty-ppa
Vincent Cheng
vcheng at moszumanska.debian.org
Mon Aug 29 03:16:28 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 a263579b32fb2f2e8f8ffcab7df0083c4d273cf9
Merge: d38799c 97c8f4b
Author: Vincent Cheng <vcheng at debian.org>
Date: Sun Aug 28 20:15:48 2016 -0700
Merge branch 'devel' into trusty-ppa
debian/changelog | 9 +
debian/control | 2 +-
debian/control.in | 2 +-
debian/patches/03wesnothd-name | 4 +-
debian/patches/03wesnothd-name.in | 4 +-
debian/wesnoth-1.13-core.install | 2 -
debian/wesnoth-1.13-core.menu | 14 --
debian/wesnoth-1.13-data.install | 3 +
debian/wesnoth-1.13-icon.xpm | 294 -------------------------------
debian/wesnoth-1.13_editor-icon.xpm | 225 -----------------------
debian/wesnoth-BRANCH-core.install.in | 2 -
debian/wesnoth-BRANCH-core.menu.in | 14 --
debian/wesnoth-BRANCH-data.install.in | 3 +
debian/wesnoth-BRANCH-icon.xpm.in | 294 -------------------------------
debian/wesnoth-BRANCH_editor-icon.xpm.in | 225 -----------------------
15 files changed, 21 insertions(+), 1076 deletions(-)
diff --cc debian/changelog
index 085a3e4,d546700..5d2698d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
+ wesnoth-1.13 (1:1.13.5-1) experimental; urgency=medium
+
+ * New upstream devel release.
+ - Refresh patches.
+ * Remove debian/menu file as per tech-ctte decision in #741573.
+ * Bump to Standards-Version 3.9.8.
+
+ -- Vincent Cheng <vcheng at debian.org> Sat, 27 Aug 2016 21:17:33 -0700
+
+wesnoth-1.13 (1:1.13.4-1~ppa1~trusty1) trusty; urgency=medium
+
+ * Backport devel release from Debian sid.
+
+ -- Vincent Cheng <vcheng at debian.org> Wed, 06 Apr 2016 17:10:41 -0700
+
wesnoth-1.13 (1:1.13.4-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