[wesnoth] 01/01: Merge branch 'master' into wheezy-backports-sloppy

[Vincent Cheng]

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

vcheng pushed a commit to branch wheezy-backports-sloppy
in repository wesnoth.

commit e1af6d6dccbe5c2bbbc6c5c257684b4bfc7afdda
Merge: bb8645a 35bfbee
Author: Vincent Cheng <vcheng at debian.org>
Date:   Mon May 23 15:59:42 2016 -0700

    Merge branch 'master' into wheezy-backports-sloppy

 debian/changelog                                 |   9 +
 debian/control                                   |  10 +-
 debian/control.in                                |  10 +-
 debian/rules                                     |   2 +-
 debian/wesnoth-1.12-core.install                 |   2 -
 debian/wesnoth-1.12-core.menu                    |  14 --
 debian/wesnoth-1.12-data.install                 |   3 +
 debian/wesnoth-1.12-data.lintian-overrides       |   4 +-
 debian/wesnoth-1.12-icon.xpm                     | 294 -----------------------
 debian/wesnoth-1.12-tools.lintian-overrides      |   3 +
 debian/wesnoth-1.12_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-data.lintian-overrides.in  |   4 +-
 debian/wesnoth-BRANCH-icon.xpm.in                | 294 -----------------------
 debian/wesnoth-BRANCH-tools.lintian-overrides.in |   3 +
 debian/wesnoth-BRANCH_editor-icon.xpm.in         | 225 -----------------
 18 files changed, 38 insertions(+), 1083 deletions(-)

diff --cc debian/changelog
index ce8d5b2,b1eec81..2305a68
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
+ wesnoth-1.12 (1:1.12.6-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Remove debian/menu file as per tech-ctte decision in #741573.
+   * Drop dependency on fonts-droid. (Closes: #804691)
+   * Bump to Standards-Version 3.9.8.
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Fri, 20 May 2016 23:42:57 -0700
+ 
 +wesnoth-1.12 (1:1.12.5-1~bpo7+1) wheezy-backports-sloppy; urgency=medium
 +
 +  * Rebuild for wheezy-backports-sloppy.
 +
 + -- Vincent Cheng <vcheng at debian.org>  Sun, 03 Jan 2016 18:51:07 -0800
 +
  wesnoth-1.12 (1:1.12.5-1) unstable; urgency=medium
  
    [ Vincent Cheng ]
diff --cc debian/control
index 55a442b,7ce6efe..15b0a98
--- a/debian/control
+++ b/debian/control
@@@ -8,8 -8,8 +8,8 @@@ Build-Depends: debhelper (>= 7), libsdl
    libboost-iostreams-dev, libboost-test-dev, libboost-regex-dev,
    libboost-serialization-dev, libboost-system-dev, libboost-thread-dev,
    libboost-program-options-dev, libboost-filesystem-dev, libboost-locale-dev,
 -  libpango1.0-dev, libvorbis-dev, cmake (>= 2.6), dh-systemd (>= 1.5)
 +  libpango1.0-dev, libvorbis-dev, cmake (>= 2.6)
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.8
  Uploaders: Rhonda D'Vine <rhonda at debian.org>,
    Vincent Cheng <vcheng at debian.org>
  Homepage: http://wesnoth.org/
@@@ -18,8 -18,7 +18,12 @@@ Vcs-Browser: https://anonscm.debian.org
  
  Package: wesnoth-1.12-data
  Architecture: all
++<<<<<<< HEAD
 +Depends: ${misc:Depends}, ttf-dejavu-core
 +Recommends: fonts-droid
++=======
+ Depends: ${misc:Depends}, fonts-dejavu-core
++>>>>>>> master
  Suggests: wesnoth-1.12-music
  Description: data files for Wesnoth (branch 1.12)
   This package contains the sound files and graphics for Wesnoth. It is required
diff --cc debian/control.in
index fcd0c62,084ae8a..4d60ac2
--- a/debian/control.in
+++ b/debian/control.in
@@@ -8,8 -8,8 +8,8 @@@ Build-Depends: debhelper (>= 7), libsdl
    libboost-iostreams-dev, libboost-test-dev, libboost-regex-dev,
    libboost-serialization-dev, libboost-system-dev, libboost-thread-dev,
    libboost-program-options-dev, libboost-filesystem-dev, libboost-locale-dev,
 -  libpango1.0-dev, libvorbis-dev, cmake (>= 2.6), dh-systemd (>= 1.5)
 +  libpango1.0-dev, libvorbis-dev, cmake (>= 2.6)
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.8
  Uploaders: Rhonda D'Vine <rhonda at debian.org>,
    Vincent Cheng <vcheng at debian.org>
  Homepage: http://wesnoth.org/
@@@ -18,8 -18,7 +18,12 @@@ Vcs-Browser: https://anonscm.debian.org
  
  Package: wesnoth-BRANCH-data
  Architecture: all
++<<<<<<< HEAD
 +Depends: ${misc:Depends}, ttf-dejavu-core
 +Recommends: fonts-droid
++=======
+ Depends: ${misc:Depends}, fonts-dejavu-core
++>>>>>>> master
  Suggests: wesnoth-BRANCH-music
  Description: data files for Wesnoth (branch BRANCH)
   This package contains the sound files and graphics for Wesnoth. It is required

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