[wesnoth] 01/02: Merge tag 'debian/1.13.1-1' into utopic-ppa

[Vincent Cheng]

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

vcheng pushed a commit to branch utopic-ppa
in repository wesnoth.

commit e89bdf0469dc0708c70b1817fe7684d37486bfd9
Merge: 007b052 6492055
Author: Vincent Cheng <vcheng at debian.org>
Date:   Tue Jul 7 02:00:05 2015 -0700

    Merge tag 'debian/1.13.1-1' into utopic-ppa
    
    Debian release 1:1.13.1-1
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   |   73 +-
 debian/control                                     |  233 +-
 debian/control.in                                  |   15 +-
 debian/copyright                                   |   63 +
 debian/missing-sources/README.txt                  |    9 +
 debian/missing-sources/jquery.js                   | 3549 ++++++++++++++++++++
 debian/missing-sources/tablesorter.js              | 1031 ++++++
 debian/patches/02wesnoth-nolog-desktop-file        |    8 +-
 debian/patches/03wesnothd-name                     |   32 +-
 debian/patches/03wesnothd-name.in                  |   28 +-
 debian/rules                                       |   16 +-
 debian/wesnoth-1.11-aoi.install                    |    2 -
 debian/wesnoth-1.11-core.install                   |   10 -
 debian/wesnoth-1.11-core.lintian-overrides         |    4 -
 debian/wesnoth-1.11-core.menu                      |   14 -
 debian/wesnoth-1.11-data.dirs                      |    2 -
 debian/wesnoth-1.11-data.doc-base                  |    9 -
 debian/wesnoth-1.11-data.install                   |   33 -
 debian/wesnoth-1.11-data.lintian-overrides         |    7 -
 debian/wesnoth-1.11-did.install                    |    2 -
 debian/wesnoth-1.11-dm.install                     |    2 -
 debian/wesnoth-1.11-dw.install                     |    2 -
 debian/wesnoth-1.11-ei.install                     |    2 -
 debian/wesnoth-1.11-httt.install                   |    2 -
 debian/wesnoth-1.11-l.install                      |    2 -
 debian/wesnoth-1.11-low.install                    |    2 -
 debian/wesnoth-1.11-music.install                  |    1 -
 debian/wesnoth-1.11-nr.install                     |    2 -
 debian/wesnoth-1.11-server.default                 |   13 -
 debian/wesnoth-1.11-server.lintian-overrides       |    1 -
 debian/wesnoth-1.11-sof.install                    |    2 -
 debian/wesnoth-1.11-sof.lintian-overrides          |    2 -
 debian/wesnoth-1.11-sotbe.install                  |    2 -
 debian/wesnoth-1.11-thot.install                   |    2 -
 debian/wesnoth-1.11-tools.install                  |   16 -
 debian/wesnoth-1.11-tools.lintian-overrides        |    3 -
 debian/wesnoth-1.11-trow.install                   |    2 -
 debian/wesnoth-1.11-tsg.install                    |    2 -
 debian/wesnoth-1.11-ttb.install                    |    2 -
 debian/wesnoth-1.11-utbs.install                   |    2 -
 debian/wesnoth-1.11.lintian-overrides              |    1 -
 debian/wesnoth-1.13-aoi.install                    |    2 +
 debian/wesnoth-1.13-core.install                   |   10 +
 debian/wesnoth-1.13-core.lintian-overrides         |    4 +
 debian/wesnoth-1.13-core.menu                      |   14 +
 ...11-core.postinst => wesnoth-1.13-core.postinst} |   14 +-
 ...oth-1.11-core.prerm => wesnoth-1.13-core.prerm} |    4 +-
 debian/wesnoth-1.13-data.dirs                      |    2 +
 debian/wesnoth-1.13-data.doc-base                  |    9 +
 ...snoth-1.11-data.docs => wesnoth-1.13-data.docs} |    2 +-
 debian/wesnoth-1.13-data.install                   |   34 +
 debian/wesnoth-1.13-data.lintian-overrides         |    7 +
 debian/wesnoth-1.13-did.install                    |    2 +
 debian/wesnoth-1.13-dm.install                     |    2 +
 debian/wesnoth-1.13-dw.install                     |    2 +
 debian/wesnoth-1.13-ei.install                     |    2 +
 debian/wesnoth-1.13-httt.install                   |    2 +
 ...wesnoth-1.11-icon.xpm => wesnoth-1.13-icon.xpm} |    0
 debian/wesnoth-1.13-l.install                      |    2 +
 debian/wesnoth-1.13-low.install                    |    2 +
 debian/wesnoth-1.13-music.install                  |    1 +
 debian/{wesnoth-1.11-nolog => wesnoth-1.13-nolog}  |    2 +-
 debian/wesnoth-1.13-nr.install                     |    2 +
 debian/wesnoth-1.13-server.default                 |   13 +
 ...11-server.init.d => wesnoth-1.13-server.init.d} |   12 +-
 ...-server.install => wesnoth-1.13-server.install} |    2 +-
 debian/wesnoth-1.13-server.lintian-overrides       |    1 +
 debian/wesnoth-1.13-server.service                 |   10 +
 debian/wesnoth-1.13-server.tmpfile                 |    1 +
 ...wesnoth-1.11-smallgui => wesnoth-1.13-smallgui} |    0
 debian/wesnoth-1.13-sof.install                    |    2 +
 debian/wesnoth-1.13-sof.lintian-overrides          |    2 +
 debian/wesnoth-1.13-sotbe.install                  |    2 +
 debian/wesnoth-1.13-thot.install                   |    2 +
 debian/wesnoth-1.13-tools.install                  |    2 +
 debian/wesnoth-1.13-tools.lintian-overrides        |    3 +
 debian/wesnoth-1.13-trow.install                   |    2 +
 debian/wesnoth-1.13-tsg.install                    |    2 +
 debian/wesnoth-1.13-ttb.install                    |    2 +
 debian/wesnoth-1.13-utbs.install                   |    2 +
 debian/wesnoth-1.13.lintian-overrides              |    1 +
 .../{wesnoth-1.11_editor => wesnoth-1.13_editor}   |    0
 ...ditor-icon.xpm => wesnoth-1.13_editor-icon.xpm} |    0
 debian/wesnoth-BRANCH-data.docs.in                 |    2 +-
 debian/wesnoth-BRANCH-data.install.in              |    1 +
 debian/wesnoth-BRANCH-nolog.in                     |    2 +-
 debian/wesnoth-BRANCH-server.service.in            |   10 +
 debian/wesnoth-BRANCH-server.tmpfile.in            |    1 +
 debian/wesnoth-BRANCH-tools.install.in             |   18 +-
 89 files changed, 5061 insertions(+), 360 deletions(-)

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