Add .travis.yml to .gitignore master
authorVincent Cheng <vcheng@debian.org>
Thu, 13 Feb 2014 08:31:20 +0000 (00:31 -0800)
committerVincent Cheng <vcheng@debian.org>
Thu, 13 Feb 2014 08:31:20 +0000 (00:31 -0800)
97 files changed:
.gitignore
debian/README.source
debian/branchcheck
debian/changelog
debian/control
debian/control.in
debian/copyright
debian/patches/02wesnoth-nolog-desktop-file
debian/patches/02wesnoth-nolog-desktop-file.in
debian/patches/03wesnothd-name
debian/patches/03wesnothd-name.in
debian/rules
debian/source/format [new file with mode: 0644]
debian/wesnoth-1.10-aoi.install [new file with mode: 0644]
debian/wesnoth-1.10-core.install [new file with mode: 0644]
debian/wesnoth-1.10-core.lintian-overrides [new file with mode: 0644]
debian/wesnoth-1.10-core.menu [new file with mode: 0644]
debian/wesnoth-1.10-core.postinst [moved from debian/wesnoth-1.8-core.postinst with 53% similarity]
debian/wesnoth-1.10-core.prerm [moved from debian/wesnoth-1.8-core.prerm with 66% similarity]
debian/wesnoth-1.10-data.dirs [new file with mode: 0644]
debian/wesnoth-1.10-data.doc-base [new file with mode: 0644]
debian/wesnoth-1.10-data.docs [moved from debian/wesnoth-1.8-data.docs with 100% similarity]
debian/wesnoth-1.10-data.install [new file with mode: 0644]
debian/wesnoth-1.10-data.lintian-overrides [new file with mode: 0644]
debian/wesnoth-1.10-did.install [new file with mode: 0644]
debian/wesnoth-1.10-dm.install [new file with mode: 0644]
debian/wesnoth-1.10-dw.install [new file with mode: 0644]
debian/wesnoth-1.10-ei.install [new file with mode: 0644]
debian/wesnoth-1.10-httt.install [new file with mode: 0644]
debian/wesnoth-1.10-icon.xpm [moved from debian/wesnoth-1.8-icon.xpm with 100% similarity]
debian/wesnoth-1.10-l.install [new file with mode: 0644]
debian/wesnoth-1.10-low.install [new file with mode: 0644]
debian/wesnoth-1.10-music.install [new file with mode: 0644]
debian/wesnoth-1.10-nolog [moved from debian/wesnoth-1.8-nolog with 100% similarity]
debian/wesnoth-1.10-nr.install [new file with mode: 0644]
debian/wesnoth-1.10-server.default [new file with mode: 0644]
debian/wesnoth-1.10-server.init.d [moved from debian/wesnoth-1.8-server.init.d with 86% similarity]
debian/wesnoth-1.10-server.install [moved from debian/wesnoth-1.8-server.install with 70% similarity]
debian/wesnoth-1.10-server.lintian-overrides [new file with mode: 0644]
debian/wesnoth-1.10-smallgui [moved from debian/wesnoth-1.8-smallgui with 100% similarity]
debian/wesnoth-1.10-sof.install [new file with mode: 0644]
debian/wesnoth-1.10-sof.lintian-overrides [new file with mode: 0644]
debian/wesnoth-1.10-sotbe.install [new file with mode: 0644]
debian/wesnoth-1.10-thot.install [new file with mode: 0644]
debian/wesnoth-1.10-tools.install [new file with mode: 0644]
debian/wesnoth-1.10-tools.lintian-overrides [new file with mode: 0644]
debian/wesnoth-1.10-trow.install [new file with mode: 0644]
debian/wesnoth-1.10-tsg.install [new file with mode: 0644]
debian/wesnoth-1.10-ttb.install [new file with mode: 0644]
debian/wesnoth-1.10-utbs.install [new file with mode: 0644]
debian/wesnoth-1.10.lintian-overrides [new file with mode: 0644]
debian/wesnoth-1.10_editor [moved from debian/wesnoth-1.8_editor with 100% similarity]
debian/wesnoth-1.10_editor-icon.xpm [moved from debian/wesnoth-1.8_editor-icon.xpm with 100% similarity]
debian/wesnoth-1.8-aoi.install [deleted file]
debian/wesnoth-1.8-core.install [deleted file]
debian/wesnoth-1.8-core.lintian-overrides [deleted file]
debian/wesnoth-1.8-core.menu [deleted file]
debian/wesnoth-1.8-core.postrm [deleted file]
debian/wesnoth-1.8-data.dirs [deleted file]
debian/wesnoth-1.8-data.doc-base [deleted file]
debian/wesnoth-1.8-data.install [deleted file]
debian/wesnoth-1.8-data.lintian-overrides [deleted file]
debian/wesnoth-1.8-did.install [deleted file]
debian/wesnoth-1.8-dm.install [deleted file]
debian/wesnoth-1.8-ei.install [deleted file]
debian/wesnoth-1.8-httt.install [deleted file]
debian/wesnoth-1.8-l.install [deleted file]
debian/wesnoth-1.8-low.install [deleted file]
debian/wesnoth-1.8-music.install [deleted file]
debian/wesnoth-1.8-nr.install [deleted file]
debian/wesnoth-1.8-server.default [deleted file]
debian/wesnoth-1.8-server.lintian-overrides [deleted file]
debian/wesnoth-1.8-sof.install [deleted file]
debian/wesnoth-1.8-sof.lintian-overrides [deleted file]
debian/wesnoth-1.8-sotbe.install [deleted file]
debian/wesnoth-1.8-thot.install [deleted file]
debian/wesnoth-1.8-tools.install [deleted file]
debian/wesnoth-1.8-trow.install [deleted file]
debian/wesnoth-1.8-tsg.install [deleted file]
debian/wesnoth-1.8-ttb.install [deleted file]
debian/wesnoth-1.8-utbs.install [deleted file]
debian/wesnoth-BRANCH-core.install.in
debian/wesnoth-BRANCH-core.lintian-overrides.in
debian/wesnoth-BRANCH-core.postinst.in
debian/wesnoth-BRANCH-core.postrm.in [deleted file]
debian/wesnoth-BRANCH-data.install.in
debian/wesnoth-BRANCH-data.lintian-overrides.in
debian/wesnoth-BRANCH-dw.install.in [new file with mode: 0644]
debian/wesnoth-BRANCH-server.install.in
debian/wesnoth-BRANCH-tools.lintian-overrides.in [new file with mode: 0644]
debian/wesnoth-BRANCH.lintian-overrides.in [new file with mode: 0644]
debian/wesnoth-core.postinst
debian/wesnoth-core.postinst.in
debian/wesnoth-music.postinst [new file with mode: 0644]
debian/wesnoth-music.postinst.in [new file with mode: 0644]
debian/wesnoth.postinst
debian/wesnoth.postinst.in

index 4f49b90..67fcee0 100644 (file)
@@ -1,52 +1,44 @@
-/.pc
 /ABOUT-NLS
-/aclocal.m4
-/attic
+/attic/
 /autogen.sh
-/autom4te.cache
-/*-stamp
+/build/
 /changelog
-/cmake
+/cmake/
 /CMakeLists.txt
-/config
-/config.h
+/config/
 /config.h.cmake
-/config.h.in
-/config.log
-/config.status
-/configure
 /configure.ac
 /COPYING
 /copyright
-/data
-/doc
+/data/
+/doc/
 /Doxyfile
-/fonts
-/graphincludes
-/icons
-/images
+/fonts/
+/graphincludes/
+/icons/
+/images/
 /INSTALL
 /l10n-spec
 /l10n-track
-/m4
-/Makefile
+/locale/
+/m4/
 /Makefile.am
-/Makefile.in
-/misc
-/packaging
+/misc/
+/NaCl-LICENSE
+/packaging/
+/.pc/
 /players_changelog
-/po
-/projectfiles
+/po/
+/projectfiles/
 /py-compile
 /README
 /RELEASE_NOTES
-/scons
+/scons/
 /SConstruct
-/sounds
-/src
-/stamp-h1
-/translations
-/utils
+/sounds/
+/src/
+/.travis.yml
+/utils/
 /wesnoth.kdevelop
 /debian/files
 /debian/*.debhelper.log
@@ -54,3 +46,4 @@
 /debian/*.substvars
 /debian/tmp/
 /debian/wesnoth-*/
+/debian/stamp-*
index 8fb4885..56540d9 100644 (file)
@@ -8,18 +8,6 @@ file also require the same change in the corresponding *.in file.
 
 --------------------------------------------------------------------------
 
- Upstream ships their tarballs as .tar.bz2 files - which the Debian pool
-unfortunately doesn't like (yet). All I do with them is piping them
-through bzcat and gzip, like this for e.g. the 1.4.3 release:
-
-bzcat wesnoth-1.4.3.tar.bz2 | gzip > wesnoth-1.4_1.4.3.orig.tar.gz
-
- PLEASE NOTICE that the branch version is part of the source package
-name now, that is, wesnoth-1.4 as package name derived from the upstream
-version 1.4.3.
-
---------------------------------------------------------------------------
-
  If one wants to switch and upgrade to a new branch (like, from
 1.X.something 1.Y.something) several things need to be done:
 
@@ -27,3 +15,6 @@ version 1.4.3.
 
 -) Call "sh debian/branchcheck" to generate the rest of the files
 automatically.
+
+-) Get rid of the files that carry the old branchname below the debian
+   subdirectory.
index bd66d97..755fe78 100644 (file)
@@ -1,18 +1,21 @@
 #!/bin/sh
-# Copyright (C) 2009-2010 Gerfried Fuchs <rhonda@debian.at>
+# Copyright (C) 2009-2012 Gerfried Fuchs <rhonda@debian.org>
 # Licenced under WTFPLv2
 
-set -ex
+# Description: rebuild files from .in files
+#              This script will (re)generate the branched files from the
+#              corresponding .in files.
+#              To be called as "sh debian/branchcheck"
+
+set -e
 
 BRANCH=$(dpkg-parsechangelog | grep "^Version:" | cut -d" " -f2 | cut -d. -f1,2 | cut -d: -f2 | cut -d- -f1 | sed -e 's/[a-z].*//')
 BRANODOT=$(echo $BRANCH | tr -d .)
 
-if head -1 debian/control | grep -v "^Source: wesnoth-$BRANCH" >/dev/null ; then \
-       for i in debian/*.in debian/patches/*.in; do
-               new=$(basename $i .in | sed -e s/BRANCH/$BRANCH/)
-               dir=$(dirname $i)
-               cp $i $dir/$new
-               sed -i -e "s/BRANCH/$BRANCH/g"   $dir/$new
-               sed -i -e "s/BRANODOT/$BRANODOT/g" $dir/$new
-       done
-fi
+for i in debian/*.in debian/patches/*.in; do
+       new=$(basename $i .in | sed -e s/BRANCH/$BRANCH/)
+       dir=$(dirname $i)
+       cp $i $dir/$new
+       sed -i -e "s/BRANCH/$BRANCH/g"   $dir/$new
+       sed -i -e "s/BRANODOT/$BRANODOT/g" $dir/$new
+done
index 5f53185..6783bea 100644 (file)
@@ -1,3 +1,222 @@
+wesnoth-1.10 (1:1.10.7-2) UNRELEASED; urgency=medium
+
+  * Update email address.
+
+ -- Vincent Cheng <vcheng@debian.org>  Wed, 15 Jan 2014 14:23:59 -0800
+
+wesnoth-1.10 (1:1.10.7-1) unstable; urgency=low
+
+  * New upstream stable release.
+    - Refresh patches.
+  * Fix FTBFS on alpha due to relocation errors during linking.
+    (Closes: #720158)
+  * Fully enable build hardening.
+  * Depend on fonts-dejavu-core (instead of transitional ttf-dejavu package).
+  * Bump to Standards-Version 3.9.4.
+  * Fix lintian warning vcs-field-not-canonical.
+
+ -- Vincent Cheng <Vincentc1208@gmail.com>  Mon, 19 Aug 2013 01:07:46 -0700
+
+wesnoth-1.10 (1:1.10.6-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Vincent Cheng <Vincentc1208@gmail.com>  Mon, 06 May 2013 01:09:02 -0700
+
+wesnoth-1.10 (1:1.10.6-1) experimental; urgency=low
+
+  * New upstream stable release.
+  * Enable build hardening.
+  * Update lintian overrides.
+
+ -- Vincent Cheng <Vincentc1208@gmail.com>  Thu, 21 Mar 2013 22:29:33 -0700
+
+wesnoth-1.10 (1:1.10.5-1) experimental; urgency=low
+
+  * Upload to experimental.
+  * Add myself to Uploaders.
+  * New upstream release.
+  * Revert /usr/share/doc/wesnoth back into a symlink. (closes: #688712)
+
+ -- Vincent Cheng <Vincentc1208@gmail.com>  Fri, 23 Nov 2012 21:19:41 -0800
+
+wesnoth-1.10 (1:1.10.4-1) experimental; urgency=low
+
+  * New upstream stable release.
+  * Remove the extra ln handling in debian/rules.
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Mon, 03 Sep 2012 12:49:56 +0200
+
+wesnoth-1.10 (1:1.10.3-2) unstable; urgency=low
+
+  [ Vincent Cheng ]
+  * Fix broken font symlink in debian/rules. (closes: #681556)
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Sun, 02 Sep 2012 13:11:51 +0200
+
+wesnoth-1.10 (1:1.10.3-1) unstable; urgency=low
+
+  * New upstream stable release (closes: #676460)
+  * Remove divert handling which was for wesnoth 1.6 (LP: #999378)
+  * Update package descriptions with data from campaigns (closes: #675170)
+  * Update lintian overrides files.
+  * Get rid of wesnoth-all package.
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Fri, 08 Jun 2012 01:04:39 +0200
+
+wesnoth-1.10 (1:1.10.2-1) unstable; urgency=low
+
+  * New upstream stable release.
+  * Also install wesnoth-help translations into -data package, thanks to Petr
+    Gajdůšek for noticing (closes: #664164)
+  * Bump to Standards-Version 3.9.3.
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Sun, 08 Apr 2012 16:16:17 +0200
+
+wesnoth-1.10 (1:1.10.1-1) unstable; urgency=low
+
+  * New upstream stable release, making fix-xdg-path patch obsolete.
+  * Use proper name for the nolog alternative. Thanks to Paul Wise for
+    noticing (closes: #658078)
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Tue, 28 Feb 2012 00:44:18 +0100
+
+wesnoth-1.10 (1:1.10-1) unstable; urgency=low
+
+  * New upstream stable release!  \o/
+  * Containing fixes for:
+    - long trait list breaks display (closes: #557907)
+    - FTBFS with boost1.48 (closes: #653806)
+  * Pull fix-xdg-path patch from upstream bug #19318.
+  * Install icons into conventional path (closes: #655671)
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Tue, 24 Jan 2012 09:42:45 +0100
+
+wesnoth-1.9 (1:1.9.14-1) unstable; urgency=low
+
+  * New upstream 1.10 release candidate.
+  * Upstream now uses fonts-droid instead of ttf-wqy-zenhei.
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Thu, 12 Jan 2012 12:12:12 +0100
+
+wesnoth-1.9 (1:1.9.13-1) unstable; urgency=low
+
+  * New upstream devel release.
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Mon, 19 Dec 2011 18:33:56 +0100
+
+wesnoth-1.9 (1:1.9.12-1) unstable; urgency=low
+
+  * New upstream devel release.
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Tue, 06 Dec 2011 11:50:17 +0100
+
+wesnoth-1.9 (1:1.9.11-1) unstable; urgency=low
+
+  * New upstream devel release.
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Fri, 25 Nov 2011 13:38:21 +0100
+
+wesnoth-1.9 (1:1.9.10-1) unstable; urgency=low
+
+  * New upstream devel release.
+  * Remove incorporated patch sdl-compile-fix.
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Tue, 08 Nov 2011 10:34:32 +0100
+
+wesnoth-1.9 (1:1.9.9-1) unstable; urgency=low
+
+  * New upstream devel release.
+  * Switch to source format 3.0 (quilt).  Adjust debian/README.source,
+    debian/rules and debian/control* for that change.
+  * Add patch from Mark de Wever to make it compile on all archs again
+    (closes: #636193)
+  * Add recommended targets build-arch and build-indep.
+  * Adjust some more lintian overrides.
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Tue, 06 Sep 2011 09:01:27 +0200
+
+wesnoth-1.9 (1:1.9.8-1) unstable; urgency=low
+
+  * New upstream devel release.
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Fri, 29 Jul 2011 18:23:22 +0200
+
+wesnoth-1.9 (1:1.9.7-1) unstable; urgency=low
+
+  * New upstream devel release:
+    - Requires new Build-Depends on libboost-program-options-dev.
+    - Contains fix for building on kfreebsd (closes: #626313)
+  * Drop liblua from Build-Depends, because of troubles linking liblua with
+    c++ code the included one is used.
+  * Add -DCMAKE_VERBOSE_MAKEFILE=on to make build logs more useful. Thanks to
+    Sune Vuorela for the suggestion.
+  * Add -DENABLE_OMP=ON to give openmp a try (closes: #626229)
+  * Adjust patch wesnothd-name for split out source file.
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Sun, 19 Jun 2011 23:03:37 +0200
+
+wesnoth-1.9 (1:1.9.6-1) unstable; urgency=low
+
+  * New upstream devel release.
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Mon, 09 May 2011 21:53:25 +0200
+
+wesnoth-1.9 (1:1.9.5-1) unstable; urgency=low
+
+  * New upstream devel release (closes: #617265)
+  * New wesnoth-data directory to install: data/core/encyclopedia.
+  * Replace Build-Depends on automake with cmake, building with autotools got
+    removed upstream. Adjusted debian/rules accordingly, also some debhelper
+    install files.
+  * Switch off USE_ANA_NETWORK, it makes the server segfault.
+  * Bump Standards-Version to 3.9.2.
+  * Fix patch wesnothd-name to really find the proper binary (closes: #617945)
+
+ -- Gerfried Fuchs <rhonda@debian.org>  Wed, 13 Apr 2011 00:07:02 +0200
+
+wesnoth-1.9 (1:1.9.3-1) unstable; urgency=low
+
+  * New upstream devel release.
+  * Fix wesnoth-*-core.postinst code to not return error (closes: #601859)
+
+ -- Gerfried Fuchs <rhonda@debian.at>  Tue, 14 Dec 2010 21:00:31 +0100
+
+wesnoth-1.9 (1:1.9.2-1) unstable; urgency=low
+
+  * New upstream devel release.
+  * New tool: imgcheck.
+  * Remove src/lua/Makefile.in in clean target explicitly which doesn't get
+    removed on distclean.
+  * Adjust linenumber in wesnoth-X-core postinst file.
+
+ -- Gerfried Fuchs <rhonda@debian.at>  Wed, 10 Nov 2010 19:30:13 +0100
+
+wesnoth-1.9 (1:1.9.1-1) unstable; urgency=low
+
+  * New upstream devel release.
+  * New campaign "Dead Water" (-dw).
+  * Call ./configure explicitly again, autogen.sh doesn't do it anymore.
+  * New Build-Depends on libboost-system-dev and libboost-thread-dev.
+  * Fix dpkg-divert handling to not fail when wesnoth-1.8-core and
+    wesnoth-1.9-core are installed.
+
+ -- Gerfried Fuchs <rhonda@debian.at>  Sun, 17 Oct 2010 22:19:17 +0200
+
+wesnoth-1.8 (1:1.8.5-1) unstable; urgency=low
+
+  * New upstream stable release.
+
+ -- Gerfried Fuchs <rhonda@debian.at>  Thu, 30 Sep 2010 08:47:42 +0200
+
+wesnoth-1.8 (1:1.8.4-1) unstable; urgency=low
+
+  * New upstream stable release.
+  * Also create metapackages for wesnoth-music and transitional packages for
+    wesnoth-editor and wesnoth-all to ease upgrades (closes: #594317)
+
+ -- Gerfried Fuchs <rhonda@debian.at>  Sun, 26 Sep 2010 22:19:05 +0200
+
 wesnoth-1.8 (1:1.8.3-5) unstable; urgency=low
 
   * Brown paper bag release.
index 8f1824f..afaf4b8 100644 (file)
@@ -1,24 +1,27 @@
-Source: wesnoth-1.8
+Source: wesnoth-1.10
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7), quilt, libsdl-image1.2-dev, libfreetype6-dev,
+Build-Depends: debhelper (>= 7), libsdl-image1.2-dev, libfreetype6-dev,
   libsdl-mixer1.2-dev, libsdl-net1.2-dev, libfribidi-dev, libsdl1.2-dev,
   libsdl-ttf2.0-dev (>= 2.0.8), python-support, libdbus-1-dev,
   libboost-iostreams-dev, libboost-test-dev, libboost-regex-dev,
-  libboost-serialization-dev, libpango1.0-dev, automake, liblua5.1-0-dev
-Standards-Version: 3.9.1
-Uploaders: Gerfried Fuchs <rhonda@debian.at>
+  libboost-serialization-dev, libboost-system-dev, libboost-thread-dev,
+  libboost-program-options-dev,
+  libpango1.0-dev, cmake (>= 2.6)
+Standards-Version: 3.9.4
+Uploaders: Gerfried Fuchs <rhonda@debian.org>,
+  Vincent Cheng <vcheng@debian.org>
 Homepage: http://wesnoth.org/
-Vcs-Git: git://git.debian.org/git/pkg-games/wesnoth.git
-Vcs-Browser: http://git.debian.org/?p=pkg-games/wesnoth.git;a=summary
+Vcs-Git: git://anonscm.debian.org/pkg-games/wesnoth.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/wesnoth.git
 
-Package: wesnoth-1.8-data
+Package: wesnoth-1.10-data
 Architecture: all
-Depends: ${misc:Depends}, ttf-dejavu
-Recommends: ttf-wqy-zenhei (>= 0.8.38-1)
-Suggests: wesnoth-1.8-music
-Description: data files for Wesnoth (branch 1.8)
+Depends: ${misc:Depends}, fonts-dejavu-core
+Recommends: fonts-droid
+Suggests: wesnoth-1.10-music
+Description: data files for Wesnoth (branch 1.10)
  This package contains the sound files and graphics for Wesnoth. It is required
  for being able to play wesnoth or create maps with the editor.
  .
@@ -27,16 +30,16 @@ Description: data files for Wesnoth (branch 1.8)
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-core
+Package: wesnoth-1.10-core
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
-  wesnoth-1.8-data (= ${source:Version})
+  wesnoth-1.10-data (= ${source:Version})
 Suggests: wesnoth
-Description: fantasy turn-based strategy game (branch 1.8)
+Description: fantasy turn-based strategy game (branch 1.10)
  This package contains the main program for wesnoth. It can be used to play
  multiplayer games.  If you want to play campaigns you will have to install
  them individually, but if you prefer to have all the official campaigns
- installed please be advised to install the wesnoth-1.8 package which depends
+ installed please be advised to install the wesnoth-1.10 package which depends
  on all of them.
  .
  Battle for control of villages, using variety of units which have advantages
@@ -46,8 +49,8 @@ Description: fantasy turn-based strategy game (branch 1.8)
 
 Package: wesnoth-core
 Architecture: all
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${binary:Version}),
-  wesnoth-1.8-data (= ${source:Version})
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${binary:Version}),
+  wesnoth-1.10-data (= ${source:Version})
 Suggests: wesnoth
 Description: fantasy turn-based strategy game (metapackage)
  This metapackage pulls in the core wesnoth package which allows you to play
@@ -58,13 +61,13 @@ Description: fantasy turn-based strategy game (metapackage)
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-dbg
+Package: wesnoth-1.10-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${misc:Depends}, wesnoth-1.8-core (= ${binary:Version}),
-  wesnoth-1.8-data (= ${source:Version})
-Description: fantasy turn-based strategy game (debugging symbols for branch 1.8)
+Depends: ${misc:Depends}, wesnoth-1.10-core (= ${binary:Version}),
+  wesnoth-1.10-data (= ${source:Version})
+Description: fantasy turn-based strategy game (debugging symbols for branch 1.10)
  This package contains the debugging symbols for the wesnoth binaries.
  .
  Battle for control of villages, using variety of units which have advantages
@@ -72,34 +75,35 @@ Description: fantasy turn-based strategy game (debugging symbols for branch 1.8)
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8
+Package: wesnoth-1.10
 Architecture: all
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${binary:Version}),
-  wesnoth-1.8-core (<< ${binary:Version}.~),
-  wesnoth-1.8-data (= ${source:Version}),
-  wesnoth-1.8-httt (= ${source:Version}),
-  wesnoth-1.8-tsg (= ${source:Version}),
-  wesnoth-1.8-trow (= ${source:Version}),
-  wesnoth-1.8-ttb (= ${source:Version}),
-  wesnoth-1.8-ei (= ${source:Version}),
-  wesnoth-1.8-utbs (= ${source:Version}),
-  wesnoth-1.8-did (= ${source:Version}),
-  wesnoth-1.8-nr (= ${source:Version}),
-  wesnoth-1.8-sof (= ${source:Version}),
-  wesnoth-1.8-sotbe (= ${source:Version}),
-  wesnoth-1.8-l (= ${source:Version}),
-  wesnoth-1.8-aoi (= ${source:Version}),
-  wesnoth-1.8-thot (= ${source:Version}),
-  wesnoth-1.8-low (= ${source:Version}),
-  wesnoth-1.8-dm (= ${source:Version})
-Recommends: wesnoth-1.8-music (= ${source:Version})
-Description: fantasy turn-based strategy game - complete suite (branch 1.8)
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${binary:Version}),
+  wesnoth-1.10-core (<< ${binary:Version}.~),
+  wesnoth-1.10-data (= ${source:Version}),
+  wesnoth-1.10-httt (= ${source:Version}),
+  wesnoth-1.10-tsg (= ${source:Version}),
+  wesnoth-1.10-trow (= ${source:Version}),
+  wesnoth-1.10-ttb (= ${source:Version}),
+  wesnoth-1.10-ei (= ${source:Version}),
+  wesnoth-1.10-utbs (= ${source:Version}),
+  wesnoth-1.10-did (= ${source:Version}),
+  wesnoth-1.10-nr (= ${source:Version}),
+  wesnoth-1.10-sof (= ${source:Version}),
+  wesnoth-1.10-sotbe (= ${source:Version}),
+  wesnoth-1.10-l (= ${source:Version}),
+  wesnoth-1.10-aoi (= ${source:Version}),
+  wesnoth-1.10-thot (= ${source:Version}),
+  wesnoth-1.10-low (= ${source:Version}),
+  wesnoth-1.10-dm (= ${source:Version}),
+  wesnoth-1.10-dw (= ${source:Version})
+Recommends: wesnoth-1.10-music (= ${source:Version})
+Description: fantasy turn-based strategy game - complete suite (branch 1.10)
  This package depends on the complete set of packages built from the wesnoth
  source package but the server (which can be found in the
- wesnoth-1.8-server package), most helpful if you always
+ wesnoth-1.10-server package), most helpful if you always
  want to have all the official campaigns installed.  If you only want to play
  over the network with other players or want to play only a few campaigns you
- just need to install the wesnoth-1.8-core package and
+ just need to install the wesnoth-1.10-core package and
  the wanted campaign packages.
  .
  Battle for control of villages, using variety of units which have advantages
@@ -109,8 +113,8 @@ Description: fantasy turn-based strategy game - complete suite (branch 1.8)
 
 Package: wesnoth
 Architecture: all
-Depends: ${misc:Depends}, wesnoth-1.8 (>= ${binary:Version}),
-  wesnoth-1.8-data (= ${source:Version})
+Depends: ${misc:Depends}, wesnoth-1.10 (>= ${binary:Version}),
+  wesnoth-1.10-data (= ${source:Version})
 Description: fantasy turn-based strategy game - complete suite (metapackage)
  This metapackage pulls in the complete set of the latest stable version, most
  helpful if you always want to have all the official campaigns installed. If
@@ -123,11 +127,11 @@ Description: fantasy turn-based strategy game - complete suite (metapackage)
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-music
+Package: wesnoth-1.10-music
 Architecture: all
 Depends: ${misc:Depends}
-Description: music files for Wesnoth (branch 1.8)
- This package contains the music files for Wesnoth.  It is not required but
+Description: music files for Wesnoth (branch 1.10)
+ This package contains the music files for Wesnoth. It is not required but
  gives nice background music and encouraged.
  .
  Battle for control of villages, using variety of units which have advantages
@@ -135,10 +139,23 @@ Description: music files for Wesnoth (branch 1.8)
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-server
+Package: wesnoth-music
+Architecture: all
+Depends: ${misc:Depends}, wesnoth-1.10-music (= ${source:Version}),
+  wesnoth-1.10-data (= ${source:Version})
+Description: music files for Wesnoth (metapackage)
+ This metapackage pulls in the music package for use with the latest stable
+ version of wesnoth.
+ .
+ Battle for control of villages, using variety of units which have advantages
+ and disadvantages in different types of terrains and against different types
+ of attacks.  Units gain experience and advance levels, and are carried over
+ from one scenario to the next in a campaign.
+
+Package: wesnoth-1.10-server
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, lsb-base
-Description: multiplayer network server for Wesnoth (branch 1.8)
+Description: multiplayer network server for Wesnoth (branch 1.10)
  This package contains the multiplayer network server for Wesnoth.  You need it
  if you want to host multiplayer games on your computer and don't want to use
  the official servers.
@@ -148,16 +165,16 @@ Description: multiplayer network server for Wesnoth (branch 1.8)
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-tools
+Package: wesnoth-1.10-tools
 Architecture: all
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends},
-  wesnoth-1.8-data (= ${source:Version})
-Enhances: wesnoth-1.8-core
-Description: tools for campaign developers for Wesnoth (branch 1.8)
+  wesnoth-1.10-data (= ${source:Version})
+Enhances: wesnoth-1.10-core
+Description: tools for campaign developers for Wesnoth (branch 1.10)
  This package contains various tools for Wesnoth that are especially useful for
  campaign developers, including but not limited to scripts supporting the
  generation and checking of WML (Wesnoth Markup Language).  You can find them
- in the directory /usr/share/games/wesnoth/1.8/data/tools
+ in the directory /usr/share/games/wesnoth/1.10/data/tools
  after installation of the package.
  .
  Battle for control of villages, using variety of units which have advantages
@@ -165,140 +182,139 @@ Description: tools for campaign developers for Wesnoth (branch 1.8)
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-httt
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${wesnoth:Min-Version}),
-  wesnoth-1.8-core (<< ${wesnoth:Max-Version})
+Package: wesnoth-1.10-httt
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
 Architecture: all
-Description: "Heir to the Throne" official campaign for Wesnoth (branch 1.8)
+Description: "Heir to the Throne" official campaign for Wesnoth (branch 1.10)
  This package contains the "Heir to the Throne" campaign for Wesnoth:
  "Fight to regain the throne of Wesnoth, of which you are the legitimate
  heir."
- (Novice level, 25 scenarios.)
+ (Novice level, 23 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-tsg
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${wesnoth:Min-Version}),
-  wesnoth-1.8-core (<< ${wesnoth:Max-Version})
+Package: wesnoth-1.10-tsg
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
 Architecture: all
-Description: "The South Guard" official campaign for Wesnoth (branch 1.8)
+Description: "The South Guard" official campaign for Wesnoth (branch 1.10)
  This package contains the "The South Guard" campaign for Wesnoth:
  "A young Knight, Deoran, is dispatched to take command of the South Guard...
  Note: This campaign is designed as an introduction to Wesnoth. The 'Civilian'
  difficulty level is aimed at first-time players."
- (Novice level, 9 or 10 scenarios depending on the branch you take.)
+ (Novice level, 9 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-trow
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${wesnoth:Min-Version}),
-  wesnoth-1.8-core (<< ${wesnoth:Max-Version})
+Package: wesnoth-1.10-trow
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
 Architecture: all
-Description: "The Rise of Wesnoth" official campaign for Wesnoth (branch 1.8)
+Description: "The Rise of Wesnoth" official campaign for Wesnoth (branch 1.10)
  This package contains the "The Rise of Wesnoth" campaign for Wesnoth:
  "Lead Prince Haldric through the destruction of the Green Isle and across the
  Ocean to establish the very kingdom of Wesnoth itself. The confrontation with
  Lich-Lord Jevyan awaits..."
- (Intermediate level, 25 scenarios.)
+ (Intermediate level, 24 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-ttb
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${wesnoth:Min-Version}),
-  wesnoth-1.8-core (<< ${wesnoth:Max-Version})
+Package: wesnoth-1.10-ttb
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
 Architecture: all
-Description: "A Tale of Two Brothers" official campaign for Wesnoth (branch 1.8)
+Description: "A Tale of Two Brothers" official campaign for Wesnoth (branch 1.10)
  This package contains the "A Tale of Two Brothers" campaign for Wesnoth:
- "An evil mage is threatening the local village and its inhabitants. When their
- leader Bjarn sends for aid from his brother Arne, he is victorious, but Bjarn
- himself is kidnapped. Can you rescue him?"
- (Novice level, 4 scenarios; the 'Hard' version may challenge more experienced
- players.)
+ "An evil mage is threatening the small village of Maghre and its inhabitants.
+ The village’s mage sends to his warrior brother for help, but not all goes as
+ planned. Can you help?"
+ (Novice level, 4 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-ei
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${wesnoth:Min-Version}),
-  wesnoth-1.8-core (<< ${wesnoth:Max-Version})
+Package: wesnoth-1.10-ei
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
 Architecture: all
-Description: "The Eastern Invasion" official campaign for Wesnoth (branch 1.8)
+Description: "The Eastern Invasion" official campaign for Wesnoth (branch 1.10)
  This package contains the "The Eastern Invasion" campaign for Wesnoth:
  "There are rumors of undead attacks on the eastern border of Wesnoth. You, an
  officer in the Royal Army, have been sent to the eastern front to protect the
  villagers and find out what is happening."
- (Intermediate level, 18 scenarios.)"
+ (Intermediate level, 16 scenarios.)"
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-utbs
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${wesnoth:Min-Version}),
-  wesnoth-1.8-core (<< ${wesnoth:Max-Version})
+Package: wesnoth-1.10-utbs
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
 Architecture: all
-Description: "Under the Burning Suns" official campaign for Wesnoth (branch 1.8)
+Description: "Under the Burning Suns" official campaign for Wesnoth (branch 1.10)
  This package contains the "Under the Burning Suns" campaign for Wesnoth:
  "In the distant future a small band of elves struggles to survive amidst the
  ruins of fallen empires. Lead your people out of the desert on an epic journey
  to find a new home."
- (Expert level, 11 scenarios, some under reconstruction)
+ (Expert level, 10 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-did
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${wesnoth:Min-Version}),
-  wesnoth-1.8-core (<< ${wesnoth:Max-Version})
+Package: wesnoth-1.10-did
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
 Architecture: all
-Description: "Descent Into Darkness" official campaign for Wesnoth (branch 1.8)
+Description: "Descent Into Darkness" official campaign for Wesnoth (branch 1.10)
  This package contains the "Descent Into Darkness" campaign for Wesnoth:
  "Learn the dark arts of necromancy in order to save your people from an orcish
  incursion."
- (Expert level, 11 scenarios.)
+ (Intermediate level, 12 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-nr
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${wesnoth:Min-Version}),
-  wesnoth-1.8-core (<< ${wesnoth:Max-Version})
+Package: wesnoth-1.10-nr
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
 Architecture: all
-Description: "Northern Rebirth" official campaign for Wesnoth (branch 1.8)
+Description: "Northern Rebirth" official campaign for Wesnoth (branch 1.10)
  This package contains the "Northern Rebirth" campaign for Wesnoth:
  "For the people of Dwarven Doors the choice was stark: either drudge as
  downtrodden slaves for the orcs until the end of their brief and miserable
  lives, or risk all for freedom and rise up against their cruel overlords.
  Little did they suspect that their struggle would be the hinge of great events
  that might restore the Northlands to the glory they had once known."
- (Expert level, 14 scenarios.)
+ (Expert level, 13 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-sof
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${wesnoth:Min-Version}),
-  wesnoth-1.8-core (<< ${wesnoth:Max-Version})
+Package: wesnoth-1.10-sof
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
 Architecture: all
-Description: "The Sceptre of Fire" official campaign for Wesnoth (branch 1.8)
+Description: "The Sceptre of Fire" official campaign for Wesnoth (branch 1.10)
  This package contains the "The Sceptre of Fire" campaign for Wesnoth:
   "The land of Wesnoth's banner bold
   Comes not from its own land;
@@ -315,18 +331,18 @@ Description: "The Sceptre of Fire" official campaign for Wesnoth (branch 1.8)
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-sotbe
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${wesnoth:Min-Version}),
-  wesnoth-1.8-core (<< ${wesnoth:Max-Version})
+Package: wesnoth-1.10-sotbe
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
 Architecture: all
-Description: "Son of the Black-Eye" official campaign for Wesnoth (branch 1.8)
+Description: "Son of the Black-Eye" official campaign for Wesnoth (branch 1.10)
  This package contains the "Son of the Black-Eye" campaign for Wesnoth:
  "Your father Karun Black-Eye was the greatest orcish leader that ever lived.
  Now, as his son, it's up to you to thwart the selfish designs of the humans
  who have broken the old agreements with the orcs and are bent upon taking your
  lands. Unite the warring orcish tribes, bring together the Orcish Council and
- call up the Great Horde to send the human-worms and their tree-shagger allies
- to the land of the dead!"
+ call up the Great Horde to send the human-worms and their wose-born allies to
+ the land of the dead!"
  (Expert level, 18 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
@@ -334,28 +350,28 @@ Description: "Son of the Black-Eye" official campaign for Wesnoth (branch 1.8)
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-l
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${wesnoth:Min-Version}),
-  wesnoth-1.8-core (<< ${wesnoth:Max-Version})
+Package: wesnoth-1.10-l
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
 Architecture: all
-Description: "Liberty" official campaign for Wesnoth (branch 1.8)
+Description: "Liberty" official campaign for Wesnoth (branch 1.10)
  This package contains the "Liberty" campaign for Wesnoth:
  "As the shadow of civil war lengthens across Wesnoth, a band of hardy
  marchlanders revolts against the tyranny of Queen Asheviere. To win their way
  to freedom, they must defeat not just the trained blades of Wesnothian troops
  but darker foes including orcs and undead."
- (Intermediate level, 9 scenarios)
+ (Intermediate level, 8 scenarios)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-aoi
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${wesnoth:Min-Version}),
-  wesnoth-1.8-core (<< ${wesnoth:Max-Version})
+Package: wesnoth-1.10-aoi
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
 Architecture: all
-Description: "An Orcish Incursion" official campaign for Wesnoth (branch 1.8)
+Description: "An Orcish Incursion" official campaign for Wesnoth (branch 1.10)
  This package contains the "An Orcish Incursion" campaign for Wesnoth:
  "Defend the forests of the elves against the first orcs to reach the Great
  Continent, learning valuable tactics as you do so."
@@ -366,50 +382,68 @@ Description: "An Orcish Incursion" official campaign for Wesnoth (branch 1.8)
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-thot
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${wesnoth:Min-Version}),
-  wesnoth-1.8-core (<< ${wesnoth:Max-Version})
+Package: wesnoth-1.10-thot
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
 Architecture: all
-Description: "The Hammer of Thursagan" official campaign for Wesnoth (branch 1.8)
+Description: "The Hammer of Thursagan" official campaign for Wesnoth (branch 1.10)
  This package contains the "The Hammer of Thursagan" campaign for Wesnoth:
  "In the first years of the Northern Alliance, an expedition from Knalga seeks
  out their kin at Kal Kartha and to learn the fate of the legendary Hammer of
  Thursagan. The perils of their journey through the wild Northern Lands, though
  great, pale beside the evil they will face at its end."
- (Intermediate level, 13 scenarios.)
+ (Intermediate level, 11 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-low
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${wesnoth:Min-Version}),
-  wesnoth-1.8-core (<< ${wesnoth:Max-Version})
+Package: wesnoth-1.10-low
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
 Architecture: all
-Description: "Legend of Wesmere" official campaign for Wesnoth (branch 1.8)
+Description: "Legend of Wesmere" official campaign for Wesnoth (branch 1.10)
  This package contains the "Legend of Wesmere" campaign for Wesnoth:
  "The tale of Kalenz, the High Lord who rallied his people after the second
  orcish invasion of the Great Continent and became the most renowned hero in
  the recorded history of the Elves."
- (Intermediate level, 17 playable scenarios.)
+ (Intermediate level, 18 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth-1.8-dm
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${wesnoth:Min-Version}),
-  wesnoth-1.8-core (<< ${wesnoth:Max-Version})
+Package: wesnoth-1.10-dm
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
 Architecture: all
-Description: "Delfador's Memoirs" official campaign for Wesnoth (branch 1.8)
+Description: "Delfador's Memoirs" official campaign for Wesnoth (branch 1.10)
  This package contains the "Delfador's Memoirs" campaign for Wesnoth:
  "Wesnoth seems to be slipping inexorably into chaos, as marauding orcs pour
  south across the Great River, and mysterious and deadly creatures roam the
  night. Who is the shadowy Iliah-Malal? Can you defeat him before he destroys
  all life in Wesnoth?"
- (Intermediate level, 23 scenarios)
+ (Intermediate level, 19 scenarios)
+ .
+ Battle for control of villages, using variety of units which have advantages
+ and disadvantages in different types of terrains and against different types
+ of attacks.  Units gain experience and advance levels, and are carried over
+ from one scenario to the next in a campaign.
+
+Package: wesnoth-1.10-dw
+Depends: ${misc:Depends}, wesnoth-1.10-core (>= ${wesnoth:Min-Version}),
+  wesnoth-1.10-core (<< ${wesnoth:Max-Version})
+Architecture: all
+Description: "Dead Water" official campaign for Wesnoth (branch 1.10)
+ This package contains the "Dead Water" campaign for Wesnoth:
+ "You are Kai Krellis, son and heir of the last merman king but only a child. A
+ necromancer is turning your subjects into undead slaves! Lead your people on a
+ mission to convince a powerful mer-sorceress to help you repel the invasion.
+ The oceans near the Northern Lands are perilous, so you will need cunning and
+ bravery to survive. But first you need to gain the respect of your troops!"
+ (Intermediate level, 10 scenarios)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
index 1f9c9f8..3b9b0b8 100644 (file)
@@ -2,21 +2,24 @@ Source: wesnoth-BRANCH
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7), quilt, libsdl-image1.2-dev, libfreetype6-dev,
+Build-Depends: debhelper (>= 7), libsdl-image1.2-dev, libfreetype6-dev,
   libsdl-mixer1.2-dev, libsdl-net1.2-dev, libfribidi-dev, libsdl1.2-dev,
   libsdl-ttf2.0-dev (>= 2.0.8), python-support, libdbus-1-dev,
   libboost-iostreams-dev, libboost-test-dev, libboost-regex-dev,
-  libboost-serialization-dev, libpango1.0-dev, automake, liblua5.1-0-dev
-Standards-Version: 3.9.1
-Uploaders: Gerfried Fuchs <rhonda@debian.at>
+  libboost-serialization-dev, libboost-system-dev, libboost-thread-dev,
+  libboost-program-options-dev,
+  libpango1.0-dev, cmake (>= 2.6)
+Standards-Version: 3.9.4
+Uploaders: Gerfried Fuchs <rhonda@debian.org>,
+  Vincent Cheng <vcheng@debian.org>
 Homepage: http://wesnoth.org/
-Vcs-Git: git://git.debian.org/git/pkg-games/wesnoth.git
-Vcs-Browser: http://git.debian.org/?p=pkg-games/wesnoth.git;a=summary
+Vcs-Git: git://anonscm.debian.org/pkg-games/wesnoth.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/wesnoth.git
 
 Package: wesnoth-BRANCH-data
 Architecture: all
-Depends: ${misc:Depends}, ttf-dejavu
-Recommends: ttf-wqy-zenhei (>= 0.8.38-1)
+Depends: ${misc:Depends}, fonts-dejavu-core
+Recommends: fonts-droid
 Suggests: wesnoth-BRANCH-music
 Description: data files for Wesnoth (branch BRANCH)
  This package contains the sound files and graphics for Wesnoth. It is required
@@ -91,7 +94,8 @@ Depends: ${misc:Depends}, wesnoth-BRANCH-core (>= ${binary:Version}),
   wesnoth-BRANCH-aoi (= ${source:Version}),
   wesnoth-BRANCH-thot (= ${source:Version}),
   wesnoth-BRANCH-low (= ${source:Version}),
-  wesnoth-BRANCH-dm (= ${source:Version})
+  wesnoth-BRANCH-dm (= ${source:Version}),
+  wesnoth-BRANCH-dw (= ${source:Version})
 Recommends: wesnoth-BRANCH-music (= ${source:Version})
 Description: fantasy turn-based strategy game - complete suite (branch BRANCH)
  This package depends on the complete set of packages built from the wesnoth
@@ -135,6 +139,19 @@ Description: music files for Wesnoth (branch BRANCH)
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
+Package: wesnoth-music
+Architecture: all
+Depends: ${misc:Depends}, wesnoth-BRANCH-music (= ${source:Version}),
+  wesnoth-BRANCH-data (= ${source:Version})
+Description: music files for Wesnoth (metapackage)
+ This metapackage pulls in the music package for use with the latest stable
+ version of wesnoth.
+ .
+ Battle for control of villages, using variety of units which have advantages
+ and disadvantages in different types of terrains and against different types
+ of attacks.  Units gain experience and advance levels, and are carried over
+ from one scenario to the next in a campaign.
+
 Package: wesnoth-BRANCH-server
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, lsb-base
@@ -173,7 +190,7 @@ Description: "Heir to the Throne" official campaign for Wesnoth (branch BRANCH)
  This package contains the "Heir to the Throne" campaign for Wesnoth:
  "Fight to regain the throne of Wesnoth, of which you are the legitimate
  heir."
- (Novice level, 25 scenarios.)
+ (Novice level, 23 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
@@ -189,7 +206,7 @@ Description: "The South Guard" official campaign for Wesnoth (branch BRANCH)
  "A young Knight, Deoran, is dispatched to take command of the South Guard...
  Note: This campaign is designed as an introduction to Wesnoth. The 'Civilian'
  difficulty level is aimed at first-time players."
- (Novice level, 9 or 10 scenarios depending on the branch you take.)
+ (Novice level, 9 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
@@ -205,7 +222,7 @@ Description: "The Rise of Wesnoth" official campaign for Wesnoth (branch BRANCH)
  "Lead Prince Haldric through the destruction of the Green Isle and across the
  Ocean to establish the very kingdom of Wesnoth itself. The confrontation with
  Lich-Lord Jevyan awaits..."
- (Intermediate level, 25 scenarios.)
+ (Intermediate level, 24 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
@@ -218,11 +235,10 @@ Depends: ${misc:Depends}, wesnoth-BRANCH-core (>= ${wesnoth:Min-Version}),
 Architecture: all
 Description: "A Tale of Two Brothers" official campaign for Wesnoth (branch BRANCH)
  This package contains the "A Tale of Two Brothers" campaign for Wesnoth:
- "An evil mage is threatening the local village and its inhabitants. When their
- leader Bjarn sends for aid from his brother Arne, he is victorious, but Bjarn
- himself is kidnapped. Can you rescue him?"
- (Novice level, 4 scenarios; the 'Hard' version may challenge more experienced
- players.)
+ "An evil mage is threatening the small village of Maghre and its inhabitants.
+ The village’s mage sends to his warrior brother for help, but not all goes as
+ planned. Can you help?"
+ (Novice level, 4 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
@@ -238,7 +254,7 @@ Description: "The Eastern Invasion" official campaign for Wesnoth (branch BRANCH
  "There are rumors of undead attacks on the eastern border of Wesnoth. You, an
  officer in the Royal Army, have been sent to the eastern front to protect the
  villagers and find out what is happening."
- (Intermediate level, 18 scenarios.)"
+ (Intermediate level, 16 scenarios.)"
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
@@ -254,7 +270,7 @@ Description: "Under the Burning Suns" official campaign for Wesnoth (branch BRAN
  "In the distant future a small band of elves struggles to survive amidst the
  ruins of fallen empires. Lead your people out of the desert on an epic journey
  to find a new home."
- (Expert level, 11 scenarios, some under reconstruction)
+ (Expert level, 10 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
@@ -269,7 +285,7 @@ Description: "Descent Into Darkness" official campaign for Wesnoth (branch BRANC
  This package contains the "Descent Into Darkness" campaign for Wesnoth:
  "Learn the dark arts of necromancy in order to save your people from an orcish
  incursion."
- (Expert level, 11 scenarios.)
+ (Intermediate level, 12 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
@@ -287,7 +303,7 @@ Description: "Northern Rebirth" official campaign for Wesnoth (branch BRANCH)
  lives, or risk all for freedom and rise up against their cruel overlords.
  Little did they suspect that their struggle would be the hinge of great events
  that might restore the Northlands to the glory they had once known."
- (Expert level, 14 scenarios.)
+ (Expert level, 13 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
@@ -325,8 +341,8 @@ Description: "Son of the Black-Eye" official campaign for Wesnoth (branch BRANCH
  Now, as his son, it's up to you to thwart the selfish designs of the humans
  who have broken the old agreements with the orcs and are bent upon taking your
  lands. Unite the warring orcish tribes, bring together the Orcish Council and
- call up the Great Horde to send the human-worms and their tree-shagger allies
- to the land of the dead!"
+ call up the Great Horde to send the human-worms and their wose-born allies to
+ the land of the dead!"
  (Expert level, 18 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
@@ -344,7 +360,7 @@ Description: "Liberty" official campaign for Wesnoth (branch BRANCH)
  marchlanders revolts against the tyranny of Queen Asheviere. To win their way
  to freedom, they must defeat not just the trained blades of Wesnothian troops
  but darker foes including orcs and undead."
- (Intermediate level, 9 scenarios)
+ (Intermediate level, 8 scenarios)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
@@ -376,7 +392,7 @@ Description: "The Hammer of Thursagan" official campaign for Wesnoth (branch BRA
  out their kin at Kal Kartha and to learn the fate of the legendary Hammer of
  Thursagan. The perils of their journey through the wild Northern Lands, though
  great, pale beside the evil they will face at its end."
- (Intermediate level, 13 scenarios.)
+ (Intermediate level, 11 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
@@ -392,7 +408,7 @@ Description: "Legend of Wesmere" official campaign for Wesnoth (branch BRANCH)
  "The tale of Kalenz, the High Lord who rallied his people after the second
  orcish invasion of the Great Continent and became the most renowned hero in
  the recorded history of the Elves."
- (Intermediate level, 17 playable scenarios.)
+ (Intermediate level, 18 scenarios.)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
@@ -409,7 +425,25 @@ Description: "Delfador's Memoirs" official campaign for Wesnoth (branch BRANCH)
  south across the Great River, and mysterious and deadly creatures roam the
  night. Who is the shadowy Iliah-Malal? Can you defeat him before he destroys
  all life in Wesnoth?"
- (Intermediate level, 23 scenarios)
+ (Intermediate level, 19 scenarios)
+ .
+ Battle for control of villages, using variety of units which have advantages
+ and disadvantages in different types of terrains and against different types
+ of attacks.  Units gain experience and advance levels, and are carried over
+ from one scenario to the next in a campaign.
+
+Package: wesnoth-BRANCH-dw
+Depends: ${misc:Depends}, wesnoth-BRANCH-core (>= ${wesnoth:Min-Version}),
+  wesnoth-BRANCH-core (<< ${wesnoth:Max-Version})
+Architecture: all
+Description: "Dead Water" official campaign for Wesnoth (branch BRANCH)
+ This package contains the "Dead Water" campaign for Wesnoth:
+ "You are Kai Krellis, son and heir of the last merman king but only a child. A
+ necromancer is turning your subjects into undead slaves! Lead your people on a
+ mission to convince a powerful mer-sorceress to help you repel the invasion.
+ The oceans near the Northern Lands are perilous, so you will need cunning and
+ bravery to survive. But first you need to gain the respect of your troops!"
+ (Intermediate level, 10 scenarios)
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
index d5f78d3..5032522 100644 (file)
@@ -1,7 +1,7 @@
 This package was originally debianized by Cyril Bouthors <cyril@bouthors.org>
 on Tue, 14 Oct 2003 14:10:24 +0200.  It got maintained in the meantime also by
 Isaac Clerencia <isaac@sindominio.net> and is now looked after by
-Gerfried Fuchs <rhonda@debian.at>.
+Gerfried Fuchs <rhonda@debian.org>.
 
 
 It was downloaded from http://www.wesnoth.org/
@@ -178,6 +178,28 @@ On Debian systems, the complete text of the GNU General Public
 License can be found in /usr/share/common-licenses/GPL-2 file,
 later versions can be found in the same directory.
 
+       -----
+
+        fonts/Andagii.ttf
+        
+        Original by Mark Williamson <node.ue@gmail.com>
+        Modified by Arc Riley <arcriley@ubuntu.com>
+        
+        Available under the GNU GPLv2 with the font exception:
+        As a special exception, if you create a document which uses this font,
+        and embed this font or unaltered portions of this font into the
+        document, this font does not by itself cause the resulting document to
+        be covered by the GNU General Public License. This exception does not
+        however invalidate any other reasons why the document might be covered
+        by the GNU General Public License.  If you modify this font, you may
+        extend this exception to your version of the font, but you are not
+        obligated to do so. If you do not wish to do so, delete this exception
+        statement from your version.
+        
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL-2 file,
+later versions can be found in the same directory.
+
         -----
 
         The debianization of the package is licensed under the WTFPLv2:
@@ -185,7 +207,7 @@ later versions can be found in the same directory.
                DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
                        Version 2, December 2004
 
-    Copyright (C) 2007-2010 Gerfried Fuchs
+    Copyright (C) 2007-2011 Gerfried Fuchs
 
     Everyone is permitted to copy and distribute verbatim or modified
     copies of this license document, and changing it is allowed as long
index ab8953f..e9fb22f 100644 (file)
@@ -3,25 +3,25 @@ Description: call wesnoth-nolog from desktop file, too
 
 --- a/icons/wesnoth.desktop
 +++ b/icons/wesnoth.desktop
-@@ -55,7 +55,7 @@
- Comment[sr]=Фантазијска стратешка игра на потезе
+@@ -69,7 +69,7 @@
  Comment[sr@latin]=Fantazijska strateška igra na poteze
  Comment[tr]=Fantastik, sırayla oynanan bir strateji oyunu
+ Comment[vi]=Một trò chơi chiến lược dựa trên lượt đi theo phong cách thần thoại
 -Icon=wesnoth-icon
 -Exec=wesnoth
-+Icon=wesnoth-1.8-icon
-+Exec=wesnoth-1.8-nolog
++Icon=wesnoth-1.10-icon
++Exec=wesnoth-1.10-nolog
  Categories=Game;StrategyGame;
  
 --- a/icons/wesnoth_editor.desktop
 +++ b/icons/wesnoth_editor.desktop
-@@ -33,7 +33,7 @@
- Comment[sr]=Уређивач за мапе намењене Боју за Веснот
+@@ -48,7 +48,7 @@
  Comment[sr@latin]=Uređivač za mape namenjene Boju za Vesnot
  Comment[tr]=Wesnoth savaşı haritaları için harita düzenleyici
+ Comment[vi]=Một chương trình chỉnh sửa bản đồ cho Trận chiến vì Wesnoth
 -Icon=wesnoth_editor-icon
 -Exec=wesnoth -e
-+Icon=wesnoth-1.8_editor-icon
-+Exec=wesnoth-1.8-nolog -e
++Icon=wesnoth-1.10_editor-icon
++Exec=wesnoth-1.10-nolog -e
  Categories=Game;StrategyGame;
  
index 4d4452e..51451e4 100644 (file)
@@ -3,10 +3,10 @@ Description: call wesnoth-nolog from desktop file, too
 
 --- a/icons/wesnoth.desktop
 +++ b/icons/wesnoth.desktop
-@@ -55,7 +55,7 @@
- Comment[sr]=Фантазијска стратешка игра на потезе
+@@ -69,7 +69,7 @@
  Comment[sr@latin]=Fantazijska strateška igra na poteze
  Comment[tr]=Fantastik, sırayla oynanan bir strateji oyunu
+ Comment[vi]=Một trò chơi chiến lược dựa trên lượt đi theo phong cách thần thoại
 -Icon=wesnoth-icon
 -Exec=wesnoth
 +Icon=wesnoth-BRANCH-icon
@@ -15,10 +15,10 @@ Description: call wesnoth-nolog from desktop file, too
  
 --- a/icons/wesnoth_editor.desktop
 +++ b/icons/wesnoth_editor.desktop
-@@ -33,7 +33,7 @@
- Comment[sr]=Уређивач за мапе намењене Боју за Веснот
+@@ -48,7 +48,7 @@
  Comment[sr@latin]=Uređivač za mape namenjene Boju za Vesnot
  Comment[tr]=Wesnoth savaşı haritaları için harita düzenleyici
+ Comment[vi]=Một chương trình chỉnh sửa bản đồ cho Trận chiến vì Wesnoth
 -Icon=wesnoth_editor-icon
 -Exec=wesnoth -e
 +Icon=wesnoth-BRANCH_editor-icon
index ed19884..a0edc95 100644 (file)
@@ -1,14 +1,25 @@
-Author: Gerfried Fuchs <rhonda@debian.at>      vim:ft=diff:
-Description: Search for wesnothd-1.8 instead of plain wesnothd
+Author: Gerfried Fuchs <rhonda@debian.org>     vim:ft=diff:
+Description: Search for wesnothd-1.10 instead of plain wesnothd
 
 --- a/src/game_preferences_display.cpp
 +++ b/src/game_preferences_display.cpp
-@@ -1255,7 +1255,7 @@
+@@ -1320,7 +1320,7 @@
  #ifndef WESNOTH_PREFIX
  #define WESNOTH_PREFIX "/usr"
  #endif
 -      const std::string filename = "wesnothd";
-+      const std::string filename = "wesnothd-1.8";
++      const std::string filename = "wesnothd-1.10";
        std::string path = WESNOTH_PREFIX + std::string("/bin");
        if (!is_directory(path))
                path = get_cwd();
+--- a/src/game_controller.cpp
++++ b/src/game_controller.cpp
+@@ -906,7 +906,7 @@
+ {
+       const std::string wesnothd_program =
+               preferences::get_mp_server_program_name().empty() ?
+-              get_program_invocation("wesnothd") : preferences::get_mp_server_program_name();
++              get_program_invocation("wesnothd-1.10") : preferences::get_mp_server_program_name();
+       std::string config = get_user_config_dir() + "/lan_server.cfg";
+       if (!file_exists(config)) {
index bc5681b..989f52e 100644 (file)
@@ -1,9 +1,9 @@
-Author: Gerfried Fuchs <rhonda@debian.at>      vim:ft=diff:
+Author: Gerfried Fuchs <rhonda@debian.org>     vim:ft=diff:
 Description: Search for wesnothd-BRANCH instead of plain wesnothd
 
 --- a/src/game_preferences_display.cpp
 +++ b/src/game_preferences_display.cpp
-@@ -1255,7 +1255,7 @@
+@@ -1320,7 +1320,7 @@
  #ifndef WESNOTH_PREFIX
  #define WESNOTH_PREFIX "/usr"
  #endif
@@ -12,3 +12,14 @@ Description: Search for wesnothd-BRANCH instead of plain wesnothd
        std::string path = WESNOTH_PREFIX + std::string("/bin");
        if (!is_directory(path))
                path = get_cwd();
+--- a/src/game_controller.cpp
++++ b/src/game_controller.cpp
+@@ -906,7 +906,7 @@
+ {
+       const std::string wesnothd_program =
+               preferences::get_mp_server_program_name().empty() ?
+-              get_program_invocation("wesnothd") : preferences::get_mp_server_program_name();
++              get_program_invocation("wesnothd-BRANCH") : preferences::get_mp_server_program_name();
+       std::string config = get_user_config_dir() + "/lan_server.cfg";
+       if (!file_exists(config)) {
index 8ce8337..0eddc1f 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # debian/rules for wesnoth
-# copyright 2007-2010 by Gerfried Fuchs <rhonda@debian.at>
+# copyright 2007-2011 by Gerfried Fuchs <rhonda@debian.org>
 # Licenced under WTFPLv2
 
 # Uncomment this to turn on verbose mode.
@@ -13,8 +13,16 @@ export DH_OPTIONS
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-CFLAGS = -g
+export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+export CFLAGS   := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
+export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
+export LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
+
+ifneq (,$(filter $(DEB_BUILD_ARCH),alpha))
+  LDFLAGS += -Wl,--no-relax
+endif
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -O0
 else
@@ -47,55 +55,52 @@ BRANCH_VERSION = $(STRIP_MAJOR).$(MINOR_VERSION)
 
 CONFIGURE_SWITCHES = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --disable-strict-compilation --disable-maintainer-mode --disable-rpath --prefix=/usr --mandir=\$${prefix}/share/man --bindir=\$${prefix}/games --with-datadir-name=wesnoth/$(BRANCH_VERSION) --with-localedir=\$${prefix}/share/games/wesnoth/$(BRANCH_VERSION)/locale --with-fifodir=/var/run/wesnothd --datadir=\$${prefix}/share/games --enable-server --with-fribidi --enable-python-install
 
+CMAKE_SWITCHES = -DBINARY_SUFFIX="-$(BRANCH_VERSION)" -DCMAKE_INSTALL_PREFIX="/usr/" -DBINDIR="/usr/games" -DDATAROOTDIR="/usr/share/games" -DDATADIRNAME="wesnoth/$(BRANCH_VERSION)" -DDESKTOPDIR="/usr/share/applications" -DDOCDIR="/usr/share/doc/wesnoth-$(BRANCH_VERSION)-data" -DLOCALEDIR="locale" -DMANDIR="/usr/share/man" -DUSE_ANA_NETWORK=OFF -DCMAKE_VERBOSE_MAKEFILE=on -DENABLE_OMP=ON
+
 
 clean:
        dh_testdir
        dh_testroot
-       rm -f build-stamp
+       rm -f debian/stamp-*
        # Add here commands to clean up after the build process.
-       [ ! -f Makefile ] || $(MAKE) distclean
-       rm -f aclocal.m4 config.h.in Makefile.in configure m4/Makefile.in \
-               po/Makefile.in doc/Makefile.in doc/man/Makefile.in \
-               doc/manual/Makefile.in src/Makefile.in icons/Makefile.in \
-               config/compile config/config.guess config/config.sub \
-               config/install-sh config/missing config/depcomp \
-               config/py-compile config.log
-       find po -name "*.gmo" -exec rm -f {} \;
-       find po -name "stamp-po" -exec rm -f {} \;
-       rm -f config.sub config.guess
-       $(MAKE) -f /usr/share/quilt/quilt.make unpatch
+       rm -rf build locale # locale doesn't get generated inside build ...
        dh_clean
 
 
-configure: configure-stamp
-configure-stamp:
-       $(MAKE) -f /usr/share/quilt/quilt.make patch
-        CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./autogen.sh $(CONFIGURE_SWITCHES)
+configure: debian/stamp-configure
+debian/stamp-configure:
+       mkdir -p build
+       cd build && \
+               cmake .. $(CMAKE_SWITCHES)
+       # CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./configure $(CONFIGURE_SWITCHES)
        touch $@
 
 
-build: build-stamp
-build-stamp: configure-stamp
-       $(MAKE)
+build: build-arch build-indep
+build-arch: debian/stamp-build
+build-indep: debian/stamp-build
+
+debian/stamp-build: debian/stamp-configure
+       $(MAKE) -C build
        touch $@
 
 
-install: install-stamp
-install-stamp: build
+install: debian/stamp-install
+debian/stamp-install: build
        dh_testdir
        dh_testroot
        dh_prep
        dh_installdirs
 
-       $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+       $(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install
 
        cd $(CURDIR)/debian/tmp/usr/share/games/wesnoth/$(BRANCH_VERSION)/data/tools \
                && chmod +x extractbindings unit_tree/TeamColorizer \
                wesnoth/wescamp.py wesnoth/wmldata.py wesnoth/wmlparser.py \
                wmlindent wmlflip wmllint wmlscope wesnoth_addon_manager \
-               wmlvalidator hexometer/hexometer wmlxgettext
+               wmlvalidator hexometer/hexometer wmlxgettext imgcheck
 
-       dh_install
+       dh_install -Xgitignore
 
        touch $@
 
@@ -132,21 +137,20 @@ binary-common:
 # Build architecture independant packages using the common target.
 binary-indep: install
        # workaround for dh_link (mis)behavior, see BTS#445550
-       for i in ttf-dejavu/DejaVuSans.ttf; \
+       for i in dejavu/DejaVuSans.ttf droid/DroidSansJapanese.ttf droid/DroidSansFallbackFull.ttf; \
                do ln -s /usr/share/fonts/truetype/$$i \
                debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/games/wesnoth/$(BRANCH_VERSION)/fonts/`basename $$i`; \
                done
-       ln -s /usr/share/fonts/truetype/wqy/wqy-zenhei.ttc \
-               debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/games/wesnoth/$(BRANCH_VERSION)/fonts/wqy-zenhei.ttc
 
        # rename icons versioned
-       mv debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/wesnoth-icon.png \
-               debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/wesnoth-$(BRANCH_VERSION)-icon.png
-       mv debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/wesnoth_editor-icon.png \
-               debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/wesnoth-$(BRANCH_VERSION)_editor-icon.png
+
+       mv debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/hicolor/64x64/apps/wesnoth-icon.png \
+               debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/hicolor/64x64/apps/wesnoth-$(BRANCH_VERSION)-icon.png
+       mv debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/hicolor/64x64/apps/wesnoth_editor-icon.png \
+               debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/hicolor/64x64/apps/wesnoth-$(BRANCH_VERSION)_editor-icon.png
 
        # /usr/share/doc symlinks
-       for i in wesnoth-$(BRANCH_VERSION) wesnoth wesnoth-core; do \
+       for i in wesnoth wesnoth-core wesnoth-music wesnoth-$(BRANCH_VERSION); do \
                install -p -d -m755 debian/$$i/usr/share/doc; \
                ln -s wesnoth-$(BRANCH_VERSION)-data debian/$$i/usr/share/doc/$$i; \
                done
@@ -181,12 +185,6 @@ binary-arch: install
                mv $$i $$(echo $$i | sed -e 's/wesnothd\.6/wesnothd-$(BRANCH_VERSION).6/'); \
                done
 
-       # move binaries to their proper name
-       mv debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth \
-               debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth-$(BRANCH_VERSION)
-       mv debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd \
-               debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd-$(BRANCH_VERSION)
-
        # move the desktop files to their proper name
        mv debian/wesnoth-$(BRANCH_VERSION)-core/usr/share/applications/wesnoth.desktop \
                debian/wesnoth-$(BRANCH_VERSION)-core/usr/share/applications/wesnoth-$(BRANCH_VERSION).desktop
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/wesnoth-1.10-aoi.install b/debian/wesnoth-1.10-aoi.install
new file mode 100644 (file)
index 0000000..c369adc
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/An_Orcish_Incursion
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-aoi.mo
diff --git a/debian/wesnoth-1.10-core.install b/debian/wesnoth-1.10-core.install
new file mode 100644 (file)
index 0000000..827efe9
--- /dev/null
@@ -0,0 +1,10 @@
+debian/tmp/usr/games/wesnoth-1.10
+debian/wesnoth-1.10-smallgui /usr/games
+debian/wesnoth-1.10-nolog /usr/games
+debian/wesnoth-1.10_editor /usr/games
+debian/tmp/usr/share/man/man6/wesnoth.6
+debian/tmp/usr/share/man/*/man6/wesnoth.6
+icons/wesnoth.desktop /usr/share/applications
+icons/wesnoth_editor.desktop /usr/share/applications
+debian/wesnoth-1.10-icon.xpm /usr/share/pixmaps
+debian/wesnoth-1.10_editor-icon.xpm /usr/share/pixmaps
diff --git a/debian/wesnoth-1.10-core.lintian-overrides b/debian/wesnoth-1.10-core.lintian-overrides
new file mode 100644 (file)
index 0000000..7663963
--- /dev/null
@@ -0,0 +1,4 @@
+wesnoth-1.10-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-1.10-nolog.6.gz
+wesnoth-1.10-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-1.10-smallgui.6.gz
+wesnoth-1.10-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-1.10.6.gz
+wesnoth-1.10-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-1.10_editor.6.gz
diff --git a/debian/wesnoth-1.10-core.menu b/debian/wesnoth-1.10-core.menu
new file mode 100644 (file)
index 0000000..744f028
--- /dev/null
@@ -0,0 +1,14 @@
+?package(wesnoth-1.10-core): \
+ needs="X11" \
+ section="Games/Strategy" \
+ title="Battle for Wesnoth (1.10)" \
+ longtitle="Battle for Wesnoth (1.10) is a fantasy turn-based strategy game" \
+ command="/usr/games/wesnoth-1.10-nolog" \
+ icon="/usr/share/pixmaps/wesnoth-1.10-icon.xpm"
+?package(wesnoth-1.10-core): \
+ needs="X11" \
+ section="Games/Tools" \
+ title="Battle for Wesnoth Editor (1.10)" \
+ longtitle="Map editor for Battle for Wesnoth (1.10), a fantasy turn-based strategy game" \
+ command="/usr/games/wesnoth-1.10-nolog -e" \
+ icon="/usr/share/pixmaps/wesnoth-1.10_editor-icon.xpm"
similarity index 53%
rename from debian/wesnoth-1.8-core.postinst
rename to debian/wesnoth-1.10-core.postinst
index c6909ec..695cb2d 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/sh
-# postinst script for wesnoth-1.8-core
-# Copyright 2010 by Gerfried Fuchs <rhonda@debian.at>
+# postinst script for wesnoth-1.10-core
+# Copyright 2010-2012 by Gerfried Fuchs <rhonda@debian.org>
 # Licensed under WTFPLv2
 
 set -e
@@ -9,33 +9,35 @@ divert_oldfiles()
 {
        # programs
        for i in wesnoth wesnoth-nolog wesnoth-smallgui wesnoth-editor; do
-               dpkg-divert --package wesnoth-1.8-core \
-                       --divert /usr/games/$i-old \
-                       --rename /usr/games/$i
+               if dpkg-divert --list /usr/games/$i | grep -q /usr/games/$i; then
+                       dpkg-divert --remove --package wesnoth-1.10-core \
+                               --rename /usr/games/$i 2>/dev/null || true
+               fi
        done
 
        # manpages
        for i in ca_ES@valencia cs da de en_GB es et fi fr gl hu it ja \
                lt nl pl sk sr sr@latin sv tr zh_CN zh_TW; do
-               dpkg-divert --package wesnoth-1.8-core \
-                       --divert /usr/share/man/$i/man6/wesnoth-old.6.gz \
-                       --rename /usr/share/man/$i/man6/wesnoth.6.gz
+               if dpkg-divert --list /usr/share/man/$i/man6/wesnoth.6.gz | grep -q /usr/share/man/$i/man6/wesnoth.6.gz; then
+                       dpkg-divert --remove --package wesnoth-1.10-core \
+                               --rename /usr/share/man/$i/man6/wesnoth.6.gz 2>/dev/null || true
+               fi
        done
 }
 
 setup_alternatives()
 {
        # man 6 wesnoth
-       slaves=$(for man in /usr/share/man/*/man6/wesnoth-1.8.6.gz; do \
+       slaves=$(for man in /usr/share/man/*/man6/wesnoth-1.10.6.gz; do \
                lang=$(echo $man | sed -e 's#.*/man/##;s#/man6.*##;'); \
                echo -n " --slave /usr/share/man/$lang/man6/wesnoth.6.gz wesnoth.$lang.6.gz $man"; \
        done)
-       slaves="$slaves --slave /usr/share/man/man6/wesnoth.6.gz wesnoth.6.gz /usr/share/man/man6/wesnoth-1.8.6.gz"
+       slaves="$slaves --slave /usr/share/man/man6/wesnoth.6.gz wesnoth.6.gz /usr/share/man/man6/wesnoth-1.10.6.gz"
 
-       slaves="$slaves --slave /usr/games/wesnoth-nolog wesnoth-nolog /usr/games/wesnoth-nolog-1.8"
+       slaves="$slaves --slave /usr/games/wesnoth-nolog wesnoth-nolog /usr/games/wesnoth-1.10-nolog"
 
        update-alternatives --install /usr/games/wesnoth wesnoth \
-               /usr/games/wesnoth-1.8 18 \
+               /usr/games/wesnoth-1.10 110 \
                $slaves
 }
 
similarity index 66%
rename from debian/wesnoth-1.8-core.prerm
rename to debian/wesnoth-1.10-core.prerm
index 68acd06..6b5a5e0 100644 (file)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# prerm script for wesnoth-1.8-core
+# prerm script for wesnoth-1.10-core
 # Copyright 2010 by Gerfried Fuchs <rhonda@debian.at>
 # Licensed under WTFPLv2
 
@@ -7,7 +7,7 @@ set -e
 
 setup_alternatives()
 {
-       update-alternatives --remove wesnoth /usr/games/wesnoth-1.8
+       update-alternatives --remove wesnoth /usr/games/wesnoth-1.10
 }
 
 
diff --git a/debian/wesnoth-1.10-data.dirs b/debian/wesnoth-1.10-data.dirs
new file mode 100644 (file)
index 0000000..c53475c
--- /dev/null
@@ -0,0 +1,2 @@
+/usr/share/games/wesnoth/1.10/fonts
+/usr/share/icons
diff --git a/debian/wesnoth-1.10-data.doc-base b/debian/wesnoth-1.10-data.doc-base
new file mode 100644 (file)
index 0000000..73552e6
--- /dev/null
@@ -0,0 +1,9 @@
+Document: wesnoth-1.10-user-manual
+Title: Battle for Wesnoth User's Manual (1.10)
+Abstract: This document helps you getting started with the Battle for Wesnoth,
+ a turnbased strategy game.
+Section: Games/Strategy
+
+Format: HTML
+Index: /usr/share/doc/wesnoth-1.10-data/manual.en.html
+Files: /usr/share/doc/wesnoth-1.10-data/manual.en.html
diff --git a/debian/wesnoth-1.10-data.install b/debian/wesnoth-1.10-data.install
new file mode 100644 (file)
index 0000000..3410fba
--- /dev/null
@@ -0,0 +1,33 @@
+icons/wesnoth-icon.png /usr/share/icons/hicolor/64x64/apps
+icons/wesnoth_editor-icon.png /usr/share/icons/hicolor/64x64/apps
+debian/tmp/usr/share/games/wesnoth/1.10/data/*.cfg
+debian/tmp/usr/share/games/wesnoth/1.10/data/COPYING.txt
+debian/tmp/usr/share/games/wesnoth/1.10/data/ai
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/tutorial
+debian/tmp/usr/share/games/wesnoth/1.10/data/core/*.cfg
+debian/tmp/usr/share/games/wesnoth/1.10/data/core/README
+debian/tmp/usr/share/games/wesnoth/1.10/data/core/editor
+debian/tmp/usr/share/games/wesnoth/1.10/data/core/encyclopedia
+debian/tmp/usr/share/games/wesnoth/1.10/data/core/images
+debian/tmp/usr/share/games/wesnoth/1.10/data/core/macros
+debian/tmp/usr/share/games/wesnoth/1.10/data/core/sounds
+debian/tmp/usr/share/games/wesnoth/1.10/data/core/terrain-graphics
+debian/tmp/usr/share/games/wesnoth/1.10/data/core/units
+debian/tmp/usr/share/games/wesnoth/1.10/data/gui
+debian/tmp/usr/share/games/wesnoth/1.10/data/hardwired
+debian/tmp/usr/share/games/wesnoth/1.10/data/languages
+debian/tmp/usr/share/games/wesnoth/1.10/data/lua
+debian/tmp/usr/share/games/wesnoth/1.10/data/multiplayer
+debian/tmp/usr/share/games/wesnoth/1.10/data/test
+debian/tmp/usr/share/games/wesnoth/1.10/data/themes
+debian/tmp/usr/share/games/wesnoth/1.10/fonts/Andagii.ttf
+debian/tmp/usr/share/games/wesnoth/1.10/images
+debian/tmp/usr/share/games/wesnoth/1.10/sounds
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-editor.mo
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-help.mo
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-lib.mo
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-multiplayer.mo
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-tutorial.mo
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-units.mo
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth.mo
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-anl.mo
diff --git a/debian/wesnoth-1.10-data.lintian-overrides b/debian/wesnoth-1.10-data.lintian-overrides
new file mode 100644 (file)
index 0000000..9f9dc11
--- /dev/null
@@ -0,0 +1,7 @@
+# Wesnoth refuses to run if license file cannot be found; see #697933
+wesnoth-1.10-data: extra-license-file usr/share/games/wesnoth/1.10/data/COPYING.txt
+# Manually create symlinks because dh_link has problems with forming relative
+# links; see #461392
+wesnoth-1.10-data: symlink-should-be-relative usr/share/games/wesnoth/1.10/fonts/DejaVuSans.ttf /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf
+wesnoth-1.10-data: symlink-should-be-relative usr/share/games/wesnoth/1.10/fonts/DroidSansFallbackFull.ttf /usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf
+wesnoth-1.10-data: symlink-should-be-relative usr/share/games/wesnoth/1.10/fonts/DroidSansJapanese.ttf /usr/share/fonts/truetype/droid/DroidSansJapanese.ttf
diff --git a/debian/wesnoth-1.10-did.install b/debian/wesnoth-1.10-did.install
new file mode 100644 (file)
index 0000000..56abd42
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/Descent_Into_Darkness
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-did.mo
diff --git a/debian/wesnoth-1.10-dm.install b/debian/wesnoth-1.10-dm.install
new file mode 100644 (file)
index 0000000..ff0d328
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/Delfadors_Memoirs
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-dm.mo
diff --git a/debian/wesnoth-1.10-dw.install b/debian/wesnoth-1.10-dw.install
new file mode 100644 (file)
index 0000000..1bb3b5a
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/Dead_Water
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-dw.mo
diff --git a/debian/wesnoth-1.10-ei.install b/debian/wesnoth-1.10-ei.install
new file mode 100644 (file)
index 0000000..29d8917
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/Eastern_Invasion
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-ei.mo
diff --git a/debian/wesnoth-1.10-httt.install b/debian/wesnoth-1.10-httt.install
new file mode 100644 (file)
index 0000000..5f987c1
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/Heir_To_The_Throne
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-httt.mo
diff --git a/debian/wesnoth-1.10-l.install b/debian/wesnoth-1.10-l.install
new file mode 100644 (file)
index 0000000..4d87e63
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/Liberty
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-l.mo
diff --git a/debian/wesnoth-1.10-low.install b/debian/wesnoth-1.10-low.install
new file mode 100644 (file)
index 0000000..36b9d97
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/Legend_of_Wesmere
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-low.mo
diff --git a/debian/wesnoth-1.10-music.install b/debian/wesnoth-1.10-music.install
new file mode 100644 (file)
index 0000000..e611345
--- /dev/null
@@ -0,0 +1 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/core/music
diff --git a/debian/wesnoth-1.10-nr.install b/debian/wesnoth-1.10-nr.install
new file mode 100644 (file)
index 0000000..751f330
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/Northern_Rebirth
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-nr.mo
diff --git a/debian/wesnoth-1.10-server.default b/debian/wesnoth-1.10-server.default
new file mode 100644 (file)
index 0000000..177911d
--- /dev/null
@@ -0,0 +1,13 @@
+# Defaults for wesnoth-1.10-server initscript
+# sourced by /etc/init.d/wesnoth-1.10-server
+# installed at /etc/default/wesnoth-1.10-server
+
+#
+# This is a POSIX shell fragment
+#
+
+# Additional options that are passed to the Daemon.
+# You will have to create the config file if you want to change the
+# default options that the server runs with.
+# See wesnothd-1.10(6) for the syntax of the configuration file.
+#DAEMON_OPTS="-c /etc/wesnothd-1.10.cfg"
similarity index 86%
rename from debian/wesnoth-1.8-server.init.d
rename to debian/wesnoth-1.10-server.init.d
index 36f2daa..fbc4f61 100644 (file)
@@ -1,19 +1,19 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          wesnoth-1.8-server
+# Provides:          wesnoth-1.10-server
 # Required-Start:    $remote_fs
 # Required-Stop:     $remote_fs
 # Default-Start:     
 # Default-Stop:      0 1 2 3 4 5 6
-# Short-Description: Starts Wesnoth server (1.8)
-# Description:       Starts the Wesnoth server (1.8) used for multiplayer games.
+# Short-Description: Starts Wesnoth server (1.10)
+# Description:       Starts the Wesnoth server (1.10) used for multiplayer games.
 ### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/games/wesnothd-1.8
+DAEMON=/usr/games/wesnothd-1.10
 DAEMON_OPTS=
-NAME=wesnoth-1.8-server
-DESC="Wesnoth server (1.8)"
+NAME=wesnoth-1.10-server
+DESC="Wesnoth server (1.10)"
 PIDFILE=/var/run/$NAME.pid
 
 test -x $DAEMON || exit 5
similarity index 70%
rename from debian/wesnoth-1.8-server.install
rename to debian/wesnoth-1.10-server.install
index f4bf36c..abad1af 100644 (file)
@@ -1,3 +1,3 @@
-debian/tmp/usr/games/wesnothd
+debian/tmp/usr/games/wesnothd-1.10
 debian/tmp/usr/share/man/man6/wesnothd.6
 debian/tmp/usr/share/man/*/man6/wesnothd.6
diff --git a/debian/wesnoth-1.10-server.lintian-overrides b/debian/wesnoth-1.10-server.lintian-overrides
new file mode 100644 (file)
index 0000000..ad8ddfe
--- /dev/null
@@ -0,0 +1 @@
+wesnoth-1.10-server: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnothd-1.10.6.gz
diff --git a/debian/wesnoth-1.10-sof.install b/debian/wesnoth-1.10-sof.install
new file mode 100644 (file)
index 0000000..0c681c5
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/Sceptre_of_Fire
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-sof.mo
diff --git a/debian/wesnoth-1.10-sof.lintian-overrides b/debian/wesnoth-1.10-sof.lintian-overrides
new file mode 100644 (file)
index 0000000..e63f3ac
--- /dev/null
@@ -0,0 +1,2 @@
+wesnoth-1.10-sof: using-first-person-in-description line 6: I
+wesnoth-1.10-sof: using-first-person-in-description line 9: I
diff --git a/debian/wesnoth-1.10-sotbe.install b/debian/wesnoth-1.10-sotbe.install
new file mode 100644 (file)
index 0000000..ad8c7b7
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/Son_Of_The_Black_Eye
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-sotbe.mo
diff --git a/debian/wesnoth-1.10-thot.install b/debian/wesnoth-1.10-thot.install
new file mode 100644 (file)
index 0000000..3b822b5
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/The_Hammer_of_Thursagan
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-thot.mo
diff --git a/debian/wesnoth-1.10-tools.install b/debian/wesnoth-1.10-tools.install
new file mode 100644 (file)
index 0000000..a10137e
--- /dev/null
@@ -0,0 +1,15 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/tools/addon_manager/
+debian/tmp/usr/share/games/wesnoth/1.10/data/tools/extractbindings
+debian/tmp/usr/share/games/wesnoth/1.10/data/tools/helpheader.html
+debian/tmp/usr/share/games/wesnoth/1.10/data/tools/helptrailer.html
+debian/tmp/usr/share/games/wesnoth/1.10/data/tools/hexometer/
+debian/tmp/usr/share/games/wesnoth/1.10/data/tools/README
+debian/tmp/usr/share/games/wesnoth/1.10/data/tools/unit_tree/
+debian/tmp/usr/share/games/wesnoth/1.10/data/tools/wesnoth/
+debian/tmp/usr/share/games/wesnoth/1.10/data/tools/wesnoth_addon_manager
+debian/tmp/usr/share/games/wesnoth/1.10/data/tools/wmlflip
+debian/tmp/usr/share/games/wesnoth/1.10/data/tools/wmlindent
+debian/tmp/usr/share/games/wesnoth/1.10/data/tools/wmllint
+debian/tmp/usr/share/games/wesnoth/1.10/data/tools/wmlscope
+debian/tmp/usr/share/games/wesnoth/1.10/data/tools/wmlvalidator
+debian/tmp/usr/share/games/wesnoth/1.10/data/tools/wmlxgettext
diff --git a/debian/wesnoth-1.10-tools.lintian-overrides b/debian/wesnoth-1.10-tools.lintian-overrides
new file mode 100644 (file)
index 0000000..d40446a
--- /dev/null
@@ -0,0 +1,3 @@
+# Wesnoth refuses to run if license file cannot be found; see #697933
+wesnoth-1.10-tools: extra-license-file usr/share/games/wesnoth/1.10/data/tools/addon_manager/COPYING.txt
+wesnoth-1.10-tools: executable-not-elf-or-script usr/share/games/wesnoth/1.10/data/tools/*/*.py
diff --git a/debian/wesnoth-1.10-trow.install b/debian/wesnoth-1.10-trow.install
new file mode 100644 (file)
index 0000000..efab092
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/The_Rise_Of_Wesnoth
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-trow.mo
diff --git a/debian/wesnoth-1.10-tsg.install b/debian/wesnoth-1.10-tsg.install
new file mode 100644 (file)
index 0000000..809c95c
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/The_South_Guard
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-tsg.mo
diff --git a/debian/wesnoth-1.10-ttb.install b/debian/wesnoth-1.10-ttb.install
new file mode 100644 (file)
index 0000000..a542641
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/Two_Brothers
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-tb.mo
diff --git a/debian/wesnoth-1.10-utbs.install b/debian/wesnoth-1.10-utbs.install
new file mode 100644 (file)
index 0000000..a57e8e0
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/1.10/data/campaigns/Under_the_Burning_Suns
+debian/tmp/usr/share/games/wesnoth/1.10/locale/*/LC_MESSAGES/wesnoth-utbs.mo
diff --git a/debian/wesnoth-1.10.lintian-overrides b/debian/wesnoth-1.10.lintian-overrides
new file mode 100644 (file)
index 0000000..1639213
--- /dev/null
@@ -0,0 +1 @@
+wesnoth-1.10: empty-binary-package
diff --git a/debian/wesnoth-1.8-aoi.install b/debian/wesnoth-1.8-aoi.install
deleted file mode 100644 (file)
index 9ab6684..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/An_Orcish_Incursion
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-aoi.mo
diff --git a/debian/wesnoth-1.8-core.install b/debian/wesnoth-1.8-core.install
deleted file mode 100644 (file)
index ef021fe..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-debian/tmp/usr/games/wesnoth
-debian/wesnoth-1.8-smallgui /usr/games
-debian/wesnoth-1.8-nolog /usr/games
-debian/wesnoth-1.8_editor /usr/games
-debian/tmp/usr/share/man/man6/wesnoth.6
-debian/tmp/usr/share/man/*/man6/wesnoth.6
-icons/wesnoth.desktop /usr/share/applications
-icons/wesnoth_editor.desktop /usr/share/applications
-debian/wesnoth-1.8-icon.xpm /usr/share/pixmaps
-debian/wesnoth-1.8_editor-icon.xpm /usr/share/pixmaps
diff --git a/debian/wesnoth-1.8-core.lintian-overrides b/debian/wesnoth-1.8-core.lintian-overrides
deleted file mode 100644 (file)
index 25e61cf..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-wesnoth-1.8-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-1.8-nolog.6.gz
-wesnoth-1.8-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-1.8-smallgui.6.gz
-wesnoth-1.8-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-1.8.6.gz
-wesnoth-1.8-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-1.8_editor.6.gz
-wesnoth-1.8-core: diversion-for-unknown-file usr/share/man/*/man6/wesnoth.6.gz postinst:22
diff --git a/debian/wesnoth-1.8-core.menu b/debian/wesnoth-1.8-core.menu
deleted file mode 100644 (file)
index 813a615..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-?package(wesnoth-1.8-core): \
- needs="X11" \
- section="Games/Strategy" \
- title="Battle for Wesnoth (1.8)" \
- longtitle="Battle for Wesnoth (1.8) is a fantasy turn-based strategy game" \
- command="/usr/games/wesnoth-1.8-nolog" \
- icon="/usr/share/pixmaps/wesnoth-1.8-icon.xpm"
-?package(wesnoth-1.8-core): \
- needs="X11" \
- section="Games/Tools" \
- title="Battle for Wesnoth Editor (1.8)" \
- longtitle="Map editor for Battle for Wesnoth (1.8), a fantasy turn-based strategy game" \
- command="/usr/games/wesnoth-1.8-nolog -e" \
- icon="/usr/share/pixmaps/wesnoth-1.8_editor-icon.xpm"
diff --git a/debian/wesnoth-1.8-core.postrm b/debian/wesnoth-1.8-core.postrm
deleted file mode 100644 (file)
index 4f02733..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# postrm script for wesnoth-1.8-core
-# Copyright 2010 by Gerfried Fuchs <rhonda@debian.at>
-# Licensed under WTFPLv2
-
-set -e
-
-divert_oldfiles()
-{
-       # programs
-       for i in wesnoth wesnoth-nolog wesnoth-smallgui wesnoth-editor; do 
-               dpkg-divert --remove --package wesnoth-1.8-core \
-                       --rename /usr/games/$i
-       done
-
-       # manpages
-       for i in ca_ES@valencia cs da de en_GB es et fi fr gl hu it ja \
-               lt nl pl sk sr sr@latin sv tr zh_CN zh_TW; do
-               dpkg-divert --remove --package wesnoth-1.8-core \
-                       --rename /usr/share/man/$i/man6/wesnoth.6.gz
-       done
-}
-
-
-case "$1" in
-       purge|remove)
-               divert_oldfiles
-       ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/wesnoth-1.8-data.dirs b/debian/wesnoth-1.8-data.dirs
deleted file mode 100644 (file)
index 56515b2..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/games/wesnoth/1.8/fonts
-/usr/share/icons
diff --git a/debian/wesnoth-1.8-data.doc-base b/debian/wesnoth-1.8-data.doc-base
deleted file mode 100644 (file)
index 74def49..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: wesnoth-1.8-user-manual
-Title: Battle for Wesnoth User's Manual (1.8)
-Abstract: This document helps you getting started with the Battle for Wesnoth,
- a turnbased strategy game.
-Section: Games/Strategy
-
-Format: HTML
-Index: /usr/share/doc/wesnoth-1.8-data/manual.en.html
-Files: /usr/share/doc/wesnoth-1.8-data/manual.en.html
diff --git a/debian/wesnoth-1.8-data.install b/debian/wesnoth-1.8-data.install
deleted file mode 100644 (file)
index c040957..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-icons/wesnoth-icon.png /usr/share/icons
-icons/wesnoth_editor-icon.png /usr/share/icons
-debian/tmp/usr/share/games/wesnoth/1.8/data/*.cfg
-debian/tmp/usr/share/games/wesnoth/1.8/data/COPYING.txt
-debian/tmp/usr/share/games/wesnoth/1.8/data/ai
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/tutorial
-debian/tmp/usr/share/games/wesnoth/1.8/data/core/*.cfg
-debian/tmp/usr/share/games/wesnoth/1.8/data/core/README
-debian/tmp/usr/share/games/wesnoth/1.8/data/core/editor
-debian/tmp/usr/share/games/wesnoth/1.8/data/core/images
-debian/tmp/usr/share/games/wesnoth/1.8/data/core/macros
-debian/tmp/usr/share/games/wesnoth/1.8/data/core/sounds
-debian/tmp/usr/share/games/wesnoth/1.8/data/core/terrain-graphics
-debian/tmp/usr/share/games/wesnoth/1.8/data/core/units
-debian/tmp/usr/share/games/wesnoth/1.8/data/gui
-debian/tmp/usr/share/games/wesnoth/1.8/data/hardwired
-debian/tmp/usr/share/games/wesnoth/1.8/data/languages
-debian/tmp/usr/share/games/wesnoth/1.8/data/lua
-debian/tmp/usr/share/games/wesnoth/1.8/data/multiplayer
-debian/tmp/usr/share/games/wesnoth/1.8/data/test
-debian/tmp/usr/share/games/wesnoth/1.8/data/themes
-debian/tmp/usr/share/games/wesnoth/1.8/fonts/Andagii.ttf
-debian/tmp/usr/share/games/wesnoth/1.8/images
-debian/tmp/usr/share/games/wesnoth/1.8/sounds
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-editor.mo
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-lib.mo
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-multiplayer.mo
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-tutorial.mo
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-units.mo
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth.mo
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-anl.mo
diff --git a/debian/wesnoth-1.8-data.lintian-overrides b/debian/wesnoth-1.8-data.lintian-overrides
deleted file mode 100644 (file)
index 580acd2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-wesnoth-1.8-data: extra-license-file usr/share/games/wesnoth/1.8/data/COPYING.txt
-wesnoth-1.8-data: symlink-should-be-relative usr/share/games/wesnoth/1.8/fonts/DejaVuSans.ttf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
-wesnoth-1.8-data: symlink-should-be-relative usr/share/games/wesnoth/1.8/fonts/wqy-zenhei.ttc /usr/share/fonts/truetype/wqy/wqy-zenhei.ttc
diff --git a/debian/wesnoth-1.8-did.install b/debian/wesnoth-1.8-did.install
deleted file mode 100644 (file)
index 45b0032..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/Descent_Into_Darkness
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-did.mo
diff --git a/debian/wesnoth-1.8-dm.install b/debian/wesnoth-1.8-dm.install
deleted file mode 100644 (file)
index a56229e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/Delfadors_Memoirs
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-dm.mo
diff --git a/debian/wesnoth-1.8-ei.install b/debian/wesnoth-1.8-ei.install
deleted file mode 100644 (file)
index 66bfd9d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/Eastern_Invasion
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-ei.mo
diff --git a/debian/wesnoth-1.8-httt.install b/debian/wesnoth-1.8-httt.install
deleted file mode 100644 (file)
index 1d37789..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/Heir_To_The_Throne
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-httt.mo
diff --git a/debian/wesnoth-1.8-l.install b/debian/wesnoth-1.8-l.install
deleted file mode 100644 (file)
index e7ea88b..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/Liberty
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-l.mo
diff --git a/debian/wesnoth-1.8-low.install b/debian/wesnoth-1.8-low.install
deleted file mode 100644 (file)
index ca5f2b0..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/Legend_of_Wesmere
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-low.mo
diff --git a/debian/wesnoth-1.8-music.install b/debian/wesnoth-1.8-music.install
deleted file mode 100644 (file)
index 42e49f2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/core/music
diff --git a/debian/wesnoth-1.8-nr.install b/debian/wesnoth-1.8-nr.install
deleted file mode 100644 (file)
index 1f8ff54..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/Northern_Rebirth
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-nr.mo
diff --git a/debian/wesnoth-1.8-server.default b/debian/wesnoth-1.8-server.default
deleted file mode 100644 (file)
index fa19270..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Defaults for wesnoth-1.8-server initscript
-# sourced by /etc/init.d/wesnoth-1.8-server
-# installed at /etc/default/wesnoth-1.8-server
-
-#
-# This is a POSIX shell fragment
-#
-
-# Additional options that are passed to the Daemon.
-# You will have to create the config file if you want to change the
-# default options that the server runs with.
-# See wesnothd-1.8(6) for the syntax of the configuration file.
-#DAEMON_OPTS="-c /etc/wesnothd-1.8.cfg"
diff --git a/debian/wesnoth-1.8-server.lintian-overrides b/debian/wesnoth-1.8-server.lintian-overrides
deleted file mode 100644 (file)
index b954e61..0000000
+++ /dev/null
@@ -1 +0,0 @@
-wesnoth-1.8-server: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnothd-1.8.6.gz
diff --git a/debian/wesnoth-1.8-sof.install b/debian/wesnoth-1.8-sof.install
deleted file mode 100644 (file)
index f0adaf6..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/Sceptre_of_Fire
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-sof.mo
diff --git a/debian/wesnoth-1.8-sof.lintian-overrides b/debian/wesnoth-1.8-sof.lintian-overrides
deleted file mode 100644 (file)
index a608fce..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-wesnoth-1.8-sof: using-first-person-in-description line 6: I
-wesnoth-1.8-sof: using-first-person-in-description line 9: I
diff --git a/debian/wesnoth-1.8-sotbe.install b/debian/wesnoth-1.8-sotbe.install
deleted file mode 100644 (file)
index e02bde2..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/Son_Of_The_Black_Eye
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-sotbe.mo
diff --git a/debian/wesnoth-1.8-thot.install b/debian/wesnoth-1.8-thot.install
deleted file mode 100644 (file)
index a40a944..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/The_Hammer_of_Thursagan
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-thot.mo
diff --git a/debian/wesnoth-1.8-tools.install b/debian/wesnoth-1.8-tools.install
deleted file mode 100644 (file)
index e7f1ab6..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/tools/addon_manager/
-debian/tmp/usr/share/games/wesnoth/1.8/data/tools/extractbindings
-debian/tmp/usr/share/games/wesnoth/1.8/data/tools/helpheader.html
-debian/tmp/usr/share/games/wesnoth/1.8/data/tools/helptrailer.html
-debian/tmp/usr/share/games/wesnoth/1.8/data/tools/hexometer/
-debian/tmp/usr/share/games/wesnoth/1.8/data/tools/README
-debian/tmp/usr/share/games/wesnoth/1.8/data/tools/unit_tree/
-debian/tmp/usr/share/games/wesnoth/1.8/data/tools/wesnoth/
-debian/tmp/usr/share/games/wesnoth/1.8/data/tools/wesnoth_addon_manager
-debian/tmp/usr/share/games/wesnoth/1.8/data/tools/wmlflip
-debian/tmp/usr/share/games/wesnoth/1.8/data/tools/wmlindent
-debian/tmp/usr/share/games/wesnoth/1.8/data/tools/wmllint
-debian/tmp/usr/share/games/wesnoth/1.8/data/tools/wmlscope
-debian/tmp/usr/share/games/wesnoth/1.8/data/tools/wmlvalidator
-debian/tmp/usr/share/games/wesnoth/1.8/data/tools/wmlxgettext
diff --git a/debian/wesnoth-1.8-trow.install b/debian/wesnoth-1.8-trow.install
deleted file mode 100644 (file)
index ded4b43..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/The_Rise_Of_Wesnoth
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-trow.mo
diff --git a/debian/wesnoth-1.8-tsg.install b/debian/wesnoth-1.8-tsg.install
deleted file mode 100644 (file)
index 8530694..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/The_South_Guard
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-tsg.mo
diff --git a/debian/wesnoth-1.8-ttb.install b/debian/wesnoth-1.8-ttb.install
deleted file mode 100644 (file)
index eb0cdd5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/Two_Brothers
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-tb.mo
diff --git a/debian/wesnoth-1.8-utbs.install b/debian/wesnoth-1.8-utbs.install
deleted file mode 100644 (file)
index 00afa2b..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/games/wesnoth/1.8/data/campaigns/Under_the_Burning_Suns
-debian/tmp/usr/share/games/wesnoth/1.8/locale/*/LC_MESSAGES/wesnoth-utbs.mo
index 0516187..4660ec2 100644 (file)
@@ -1,4 +1,4 @@
-debian/tmp/usr/games/wesnoth
+debian/tmp/usr/games/wesnoth-BRANCH
 debian/wesnoth-BRANCH-smallgui /usr/games
 debian/wesnoth-BRANCH-nolog /usr/games
 debian/wesnoth-BRANCH_editor /usr/games
index b18a988..f3866ff 100644 (file)
@@ -2,4 +2,3 @@ wesnoth-BRANCH-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man
 wesnoth-BRANCH-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-BRANCH-smallgui.6.gz
 wesnoth-BRANCH-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-BRANCH.6.gz
 wesnoth-BRANCH-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-BRANCH_editor.6.gz
-wesnoth-BRANCH-core: diversion-for-unknown-file usr/share/man/*/man6/wesnoth.6.gz postinst:22
index 11d977a..e7b8017 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/sh
 # postinst script for wesnoth-BRANCH-core
-# Copyright 2010 by Gerfried Fuchs <rhonda@debian.at>
+# Copyright 2010-2012 by Gerfried Fuchs <rhonda@debian.org>
 # Licensed under WTFPLv2
 
 set -e
@@ -9,17 +9,19 @@ divert_oldfiles()
 {
        # programs
        for i in wesnoth wesnoth-nolog wesnoth-smallgui wesnoth-editor; do
-               dpkg-divert --package wesnoth-BRANCH-core \
-                       --divert /usr/games/$i-old \
-                       --rename /usr/games/$i
+               if dpkg-divert --list /usr/games/$i | grep -q /usr/games/$i; then
+                       dpkg-divert --remove --package wesnoth-BRANCH-core \
+                               --rename /usr/games/$i 2>/dev/null || true
+               fi
        done
 
        # manpages
        for i in ca_ES@valencia cs da de en_GB es et fi fr gl hu it ja \
                lt nl pl sk sr sr@latin sv tr zh_CN zh_TW; do
-               dpkg-divert --package wesnoth-BRANCH-core \
-                       --divert /usr/share/man/$i/man6/wesnoth-old.6.gz \
-                       --rename /usr/share/man/$i/man6/wesnoth.6.gz
+               if dpkg-divert --list /usr/share/man/$i/man6/wesnoth.6.gz | grep -q /usr/share/man/$i/man6/wesnoth.6.gz; then
+                       dpkg-divert --remove --package wesnoth-BRANCH-core \
+                               --rename /usr/share/man/$i/man6/wesnoth.6.gz 2>/dev/null || true
+               fi
        done
 }
 
@@ -32,7 +34,7 @@ setup_alternatives()
        done)
        slaves="$slaves --slave /usr/share/man/man6/wesnoth.6.gz wesnoth.6.gz /usr/share/man/man6/wesnoth-BRANCH.6.gz"
 
-       slaves="$slaves --slave /usr/games/wesnoth-nolog wesnoth-nolog /usr/games/wesnoth-nolog-BRANCH"
+       slaves="$slaves --slave /usr/games/wesnoth-nolog wesnoth-nolog /usr/games/wesnoth-BRANCH-nolog"
 
        update-alternatives --install /usr/games/wesnoth wesnoth \
                /usr/games/wesnoth-BRANCH BRANODOT \
diff --git a/debian/wesnoth-BRANCH-core.postrm.in b/debian/wesnoth-BRANCH-core.postrm.in
deleted file mode 100644 (file)
index 9afdef4..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# postrm script for wesnoth-BRANCH-core
-# Copyright 2010 by Gerfried Fuchs <rhonda@debian.at>
-# Licensed under WTFPLv2
-
-set -e
-
-divert_oldfiles()
-{
-       # programs
-       for i in wesnoth wesnoth-nolog wesnoth-smallgui wesnoth-editor; do 
-               dpkg-divert --remove --package wesnoth-BRANCH-core \
-                       --rename /usr/games/$i
-       done
-
-       # manpages
-       for i in ca_ES@valencia cs da de en_GB es et fi fr gl hu it ja \
-               lt nl pl sk sr sr@latin sv tr zh_CN zh_TW; do
-               dpkg-divert --remove --package wesnoth-BRANCH-core \
-                       --rename /usr/share/man/$i/man6/wesnoth.6.gz
-       done
-}
-
-
-case "$1" in
-       purge|remove)
-               divert_oldfiles
-       ;;
-esac
-
-#DEBHELPER#
-
-exit 0
index 65ff3e1..bc0dfe9 100644 (file)
@@ -1,5 +1,5 @@
-icons/wesnoth-icon.png /usr/share/icons
-icons/wesnoth_editor-icon.png /usr/share/icons
+icons/wesnoth-icon.png /usr/share/icons/hicolor/64x64/apps
+icons/wesnoth_editor-icon.png /usr/share/icons/hicolor/64x64/apps
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/*.cfg
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/COPYING.txt
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/ai
@@ -7,6 +7,7 @@ debian/tmp/usr/share/games/wesnoth/BRANCH/data/campaigns/tutorial
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/core/*.cfg
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/core/README
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/core/editor
+debian/tmp/usr/share/games/wesnoth/BRANCH/data/core/encyclopedia
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/core/images
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/core/macros
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/core/sounds
@@ -23,6 +24,7 @@ debian/tmp/usr/share/games/wesnoth/BRANCH/fonts/Andagii.ttf
 debian/tmp/usr/share/games/wesnoth/BRANCH/images
 debian/tmp/usr/share/games/wesnoth/BRANCH/sounds
 debian/tmp/usr/share/games/wesnoth/BRANCH/locale/*/LC_MESSAGES/wesnoth-editor.mo
+debian/tmp/usr/share/games/wesnoth/BRANCH/locale/*/LC_MESSAGES/wesnoth-help.mo
 debian/tmp/usr/share/games/wesnoth/BRANCH/locale/*/LC_MESSAGES/wesnoth-lib.mo
 debian/tmp/usr/share/games/wesnoth/BRANCH/locale/*/LC_MESSAGES/wesnoth-multiplayer.mo
 debian/tmp/usr/share/games/wesnoth/BRANCH/locale/*/LC_MESSAGES/wesnoth-tutorial.mo
index 517b6d1..8a3fb38 100644 (file)
@@ -1,3 +1,7 @@
+# Wesnoth refuses to run if license file cannot be found; see #697933
 wesnoth-BRANCH-data: extra-license-file usr/share/games/wesnoth/BRANCH/data/COPYING.txt
-wesnoth-BRANCH-data: symlink-should-be-relative usr/share/games/wesnoth/BRANCH/fonts/DejaVuSans.ttf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
-wesnoth-BRANCH-data: symlink-should-be-relative usr/share/games/wesnoth/BRANCH/fonts/wqy-zenhei.ttc /usr/share/fonts/truetype/wqy/wqy-zenhei.ttc
+# Manually create symlinks because dh_link has problems with forming relative
+# links; see #461392
+wesnoth-BRANCH-data: symlink-should-be-relative usr/share/games/wesnoth/BRANCH/fonts/DejaVuSans.ttf /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf
+wesnoth-BRANCH-data: symlink-should-be-relative usr/share/games/wesnoth/BRANCH/fonts/DroidSansFallbackFull.ttf /usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf
+wesnoth-BRANCH-data: symlink-should-be-relative usr/share/games/wesnoth/BRANCH/fonts/DroidSansJapanese.ttf /usr/share/fonts/truetype/droid/DroidSansJapanese.ttf
diff --git a/debian/wesnoth-BRANCH-dw.install.in b/debian/wesnoth-BRANCH-dw.install.in
new file mode 100644 (file)
index 0000000..866b43a
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/BRANCH/data/campaigns/Dead_Water
+debian/tmp/usr/share/games/wesnoth/BRANCH/locale/*/LC_MESSAGES/wesnoth-dw.mo
index f4bf36c..1a6f253 100644 (file)
@@ -1,3 +1,3 @@
-debian/tmp/usr/games/wesnothd
+debian/tmp/usr/games/wesnothd-BRANCH
 debian/tmp/usr/share/man/man6/wesnothd.6
 debian/tmp/usr/share/man/*/man6/wesnothd.6
diff --git a/debian/wesnoth-BRANCH-tools.lintian-overrides.in b/debian/wesnoth-BRANCH-tools.lintian-overrides.in
new file mode 100644 (file)
index 0000000..d34ccb6
--- /dev/null
@@ -0,0 +1,3 @@
+# Wesnoth refuses to run if license file cannot be found; see #697933
+wesnoth-BRANCH-tools: extra-license-file usr/share/games/wesnoth/BRANCH/data/tools/addon_manager/COPYING.txt
+wesnoth-BRANCH-tools: executable-not-elf-or-script usr/share/games/wesnoth/BRANCH/data/tools/*/*.py
diff --git a/debian/wesnoth-BRANCH.lintian-overrides.in b/debian/wesnoth-BRANCH.lintian-overrides.in
new file mode 100644 (file)
index 0000000..1ced3c8
--- /dev/null
@@ -0,0 +1 @@
+wesnoth-BRANCH: empty-binary-package
index c0ea1b8..da2a352 100644 (file)
@@ -1,24 +1,17 @@
 #!/bin/sh
 # postinst script for wesnoth-core
-# copyright 2010 by Gerfried Fuchs <rhonda@debian.at>
-# Licenced under WTFPLv2
-
 set -e
 
-case "$1" in
-    configure|reconfigure)
-       if dpkg --compare-versions "$2" lt-nl "1:1.8.3-4"; then
-               if [ -d /usr/share/doc/wesnoth-core ]; then
-                       if rmdir /usr/share/doc/wesnoth-core; then
-                               ln -s wesnoth-1.8-data /usr/share/doc/wesnoth-core
-                       fi
-               fi
-       elif dpkg --compare-versions "$2" lt-nl "1:1.8.3-5"; then
-               if rm /usr/share/doc/wesnoth-core; then
-                       ln -s wesnoth-1.8-data /usr/share/doc/wesnoth-core
+if dpkg --compare-versions "$2" lt-nl 1:1.10.5-1; then
+       # Replace directory with symlink. See BTS #688712
+       if [ ! -L /usr/share/doc/wesnoth-core ] && \
+          [ -d /usr/share/doc/wesnoth-core ]; then
+               if rmdir /usr/share/doc/wesnoth-core 2>/dev/null; then
+                       ln -sf wesnoth-1.10-data /usr/share/doc/wesnoth-core
                fi
        fi
-    ;;
-esac
+fi
 
 #DEBHELPER#
+
+exit 0
index 06a5650..14dd800 100644 (file)
@@ -1,24 +1,17 @@
 #!/bin/sh
 # postinst script for wesnoth-core
-# copyright 2010 by Gerfried Fuchs <rhonda@debian.at>
-# Licenced under WTFPLv2
-
 set -e
 
-case "$1" in
-    configure|reconfigure)
-       if dpkg --compare-versions "$2" lt-nl "1:1.8.3-4"; then
-               if [ -d /usr/share/doc/wesnoth-core ]; then
-                       if rmdir /usr/share/doc/wesnoth-core; then
-                               ln -s wesnoth-BRANCH-data /usr/share/doc/wesnoth-core
-                       fi
-               fi
-       elif dpkg --compare-versions "$2" lt-nl "1:1.8.3-5"; then
-               if rm /usr/share/doc/wesnoth-core; then
-                       ln -s wesnoth-BRANCH-data /usr/share/doc/wesnoth-core
+if dpkg --compare-versions "$2" lt-nl 1:1.10.5-1; then
+       # Replace directory with symlink. See BTS #688712
+       if [ ! -L /usr/share/doc/wesnoth-core ] && \
+          [ -d /usr/share/doc/wesnoth-core ]; then
+               if rmdir /usr/share/doc/wesnoth-core 2>/dev/null; then
+                       ln -sf wesnoth-BRANCH-data /usr/share/doc/wesnoth-core
                fi
        fi
-    ;;
-esac
+fi
 
 #DEBHELPER#
+
+exit 0
diff --git a/debian/wesnoth-music.postinst b/debian/wesnoth-music.postinst
new file mode 100644 (file)
index 0000000..550f65d
--- /dev/null
@@ -0,0 +1,17 @@
+#!/bin/sh
+# postinst script for wesnoth-music
+set -e
+
+if dpkg --compare-versions "$2" lt-nl 1:1.10.5-1; then
+       # Replace directory with symlink. See BTS #688712
+       if [ ! -L /usr/share/doc/wesnoth-music ] && \
+          [ -d /usr/share/doc/wesnoth-music ]; then
+               if rmdir /usr/share/doc/wesnoth-music 2>/dev/null; then
+                       ln -sf wesnoth-1.10-data /usr/share/doc/wesnoth-music
+               fi
+       fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/wesnoth-music.postinst.in b/debian/wesnoth-music.postinst.in
new file mode 100644 (file)
index 0000000..1eefd3a
--- /dev/null
@@ -0,0 +1,17 @@
+#!/bin/sh
+# postinst script for wesnoth-music
+set -e
+
+if dpkg --compare-versions "$2" lt-nl 1:1.10.5-1; then
+       # Replace directory with symlink. See BTS #688712
+       if [ ! -L /usr/share/doc/wesnoth-music ] && \
+          [ -d /usr/share/doc/wesnoth-music ]; then
+               if rmdir /usr/share/doc/wesnoth-music 2>/dev/null; then
+                       ln -sf wesnoth-BRANCH-data /usr/share/doc/wesnoth-music
+               fi
+       fi
+fi
+
+#DEBHELPER#
+
+exit 0
index 68b4f35..35317de 100644 (file)
@@ -1,24 +1,17 @@
 #!/bin/sh
 # postinst script for wesnoth
-# copyright 2010 by Gerfried Fuchs <rhonda@debian.at>
-# Licenced under WTFPLv2
-
 set -e
 
-case "$1" in
-    configure|reconfigure)
-       if dpkg --compare-versions "$2" lt-nl "1:1.8.3-4"; then
-               if [ -d /usr/share/doc/wesnoth ]; then
-                       if rmdir /usr/share/doc/wesnoth; then
-                               ln -s wesnoth-1.8-data /usr/share/doc/wesnoth
-                       fi
-               fi
-       elif dpkg --compare-versions "$2" lt-nl "1:1.8.3-5"; then
-               if rm /usr/share/doc/wesnoth; then
-                       ln -s wesnoth-1.8-data /usr/share/doc/wesnoth
+if dpkg --compare-versions "$2" lt-nl 1:1.10.5-1; then
+       # Replace directory with symlink. See BTS #688712
+       if [ ! -L /usr/share/doc/wesnoth ] && \
+          [ -d /usr/share/doc/wesnoth ]; then
+               if rmdir /usr/share/doc/wesnoth 2>/dev/null; then
+                       ln -sf wesnoth-1.10-data /usr/share/doc/wesnoth
                fi
        fi
-    ;;
-esac
+fi
 
 #DEBHELPER#
+
+exit 0
index 7d98b44..232970e 100644 (file)
@@ -1,24 +1,17 @@
 #!/bin/sh
 # postinst script for wesnoth
-# copyright 2010 by Gerfried Fuchs <rhonda@debian.at>
-# Licenced under WTFPLv2
-
 set -e
 
-case "$1" in
-    configure|reconfigure)
-       if dpkg --compare-versions "$2" lt-nl "1:1.8.3-4"; then
-               if [ -d /usr/share/doc/wesnoth ]; then
-                       if rmdir /usr/share/doc/wesnoth; then
-                               ln -s wesnoth-BRANCH-data /usr/share/doc/wesnoth
-                       fi
-               fi
-       elif dpkg --compare-versions "$2" lt-nl "1:1.8.3-5"; then
-               if rm /usr/share/doc/wesnoth; then
-                       ln -s wesnoth-BRANCH-data /usr/share/doc/wesnoth
+if dpkg --compare-versions "$2" lt-nl 1:1.10.5-1; then
+       # Replace directory with symlink. See BTS #688712
+       if [ ! -L /usr/share/doc/wesnoth ] && \
+          [ -d /usr/share/doc/wesnoth ]; then
+               if rmdir /usr/share/doc/wesnoth 2>/dev/null; then
+                       ln -sf wesnoth-BRANCH-data /usr/share/doc/wesnoth
                fi
        fi
-    ;;
-esac
+fi
 
 #DEBHELPER#
+
+exit 0