r9196 - in packages/trunk/wesnoth/debian: . overrides patches
Gerfried Fuchs
alfie at alioth.debian.org
Wed Mar 18 16:22:18 UTC 2009
Author: alfie
Date: 2009-03-18 16:22:18 +0000 (Wed, 18 Mar 2009)
New Revision: 9196
Added:
packages/trunk/wesnoth/debian/overrides/wesnoth-core
packages/trunk/wesnoth/debian/overrides/wesnoth-server
packages/trunk/wesnoth/debian/wesnoth-low.install
packages/trunk/wesnoth/debian/wesnoth-smallgui
packages/trunk/wesnoth/debian/wesnoth_editor
Removed:
packages/trunk/wesnoth/debian/overrides/wesnoth-editor
packages/trunk/wesnoth/debian/patches/03fix-server-dos
packages/trunk/wesnoth/debian/patches/04wesnoth-did-ai-fix
packages/trunk/wesnoth/debian/patches/05limit-mapsize
packages/trunk/wesnoth/debian/wesnoth-editor.dirs
packages/trunk/wesnoth/debian/wesnoth-editor.install
packages/trunk/wesnoth/debian/wesnoth-editor.menu
packages/trunk/wesnoth/debian/wesnoth-editor.postinst
Modified:
packages/trunk/wesnoth/debian/NEWS
packages/trunk/wesnoth/debian/changelog
packages/trunk/wesnoth/debian/control
packages/trunk/wesnoth/debian/copyright
packages/trunk/wesnoth/debian/overrides/wesnoth-data
packages/trunk/wesnoth/debian/patches/02wesnoth-nolog-desktop-file
packages/trunk/wesnoth/debian/patches/series
packages/trunk/wesnoth/debian/rules
packages/trunk/wesnoth/debian/watch
packages/trunk/wesnoth/debian/wesnoth-core.install
packages/trunk/wesnoth/debian/wesnoth-core.menu
packages/trunk/wesnoth/debian/wesnoth-data.install
packages/trunk/wesnoth/debian/wesnoth-tools.install
packages/trunk/wesnoth/debian/wesnoth.postinst
Log:
Merge stuff from experimental for upcoming 1.6 release
Modified: packages/trunk/wesnoth/debian/NEWS
===================================================================
--- packages/trunk/wesnoth/debian/NEWS 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/NEWS 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1,4 +1,4 @@
-wesnoth (1:1.4.6-1) unstable; urgency=low
+wesnoth (1:1.5.5-1) experimental; urgency=low
* The meaning of the wesnoth package has changed: It is now the old
wesnoth-all package that pulls in all the campaigns. If you don't want
@@ -6,7 +6,7 @@
wesnoth-core package. The switch was done to reduce the confusion of users
who wonder about where the campaigns are.
- -- Gerfried Fuchs <rhonda at debian.at> Wed, 05 Nov 2008 08:51:19 +0100
+ -- Gerfried Fuchs <rhonda at debian.at> Mon, 06 Oct 2008 00:17:43 +0200
wesnoth (1:1.4-1) unstable; urgency=low
Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/changelog 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1,95 +1,183 @@
-wesnoth (1:1.4.7-5) unstable; urgency=low
+wesnoth (1:1.5.14-2) experimental; urgency=low
+ * Adjust wesnoth-data overrides with respect to font changes.
+
+ -- Gerfried Fuchs <rhonda at debian.at> Mon, 16 Mar 2009 17:35:14 +0100
+
+wesnoth (1:1.5.14-1) experimental; urgency=low
+
+ * New upstream RC3 for 1.6 release.
+ * Font ttf-sazanami-gothic got removed, ttf-wqy-zenhei got renamed.
* Change Section of wesnoth-dbg to debug.
- -- Gerfried Fuchs <rhonda at debian.at> Sun, 15 Mar 2009 19:35:35 +0100
+ -- Gerfried Fuchs <rhonda at debian.at> Mon, 16 Mar 2009 09:45:22 +0100
-wesnoth (1:1.4.7-4) unstable; urgency=high
+wesnoth (1:1.5.13-1) experimental; urgency=low
- * Upload to fix several severe problems:
- - Compile with --disable-python because the python AI support allowed to
- break out of sandbox and allowed execution of abitrary code
- (CVE-2009-0367, Upstream Bug #13048). Don't install data/ais into
- wesnoth-data package anymore, and remove python-dev from
- Build-Dependencies.
- - Pull wesnoth-did-ai-fix patch from upstream svn r33013 to make it still
- work after above changes.
- - Pull limit-mapsize patch from upstream svn r32987 to avoid hanging of
- wesnoth/exhausting system memory (Upstream Bug #13031)
+ * New upstream RC2 for 1.6 release (closes: #519195)
+ * Fix VCS entries in control file for experimental branch.
+ * Add overrides for manpage-locale-dir-country-specific in wesnoth-core and
+ wesnoth-server, there actually _are_ en_GB translations of the manpages.
+ * Use wesnoth-nolog for editor menu entry, too.
+ * Make wmlflip executable.
+
+ -- Gerfried Fuchs <rhonda at debian.at> Wed, 11 Mar 2009 10:16:54 +0100
+
+wesnoth (1:1.5.12-1) experimental; urgency=low
+
+ * First RC for upcoming 1.6 release! Contains fix for:
+ - save game cached informations didn't update (closes: #483782)
+ - fixed reproducible pathfinder crash (closes: #510403)
+ - removed patch fix-server-dos as it is part of the release.
+ * Install new wmlflip tool into wesnoth-tools package.
+
+ -- Gerfried Fuchs <rhonda at debian.at> Mon, 02 Mar 2009 14:39:20 +0100
+
+wesnoth (1:1.5.11-1) experimental; urgency=high
+
+ * New upstream release, which addresses several severe bugs:
+ - Removed python AI support which allowed to break out of sandbox and
+ allowed execution of abitrary code (CVE-2009-0367, Upstream Bug #13048).
+ Remove python-dev from Build-Dependencies and related compile option
+ from debian/rules.
+ - Limiting map size to 200x200 to avoid hanging of wesnoth/exhausting
+ system memory (Upstream Bug #13031)
* Pulled patch fix-server-dos from upstream svn r33069 which fixes a DoS
pattern in the server, which came in a bit too late for the release
(CVE-2009-0366, Upstream Bug #13037)
+ * Don't chmod +x on wesnoth/wmlgrammar.py tools file anymore.
+
+ -- Gerfried Fuchs <rhonda at debian.at> Tue, 24 Feb 2009 16:10:36 +0100
+
+wesnoth (1:1.5.10-1) experimental; urgency=low
+
+ * Second beta for upcoming 1.6 release.
+ * Removed the --disable-strict-compilation configure switch again.
+ * Switch libboost Build-Depends from unversioned packages to 1.37.
+
+ -- Gerfried Fuchs <rhonda at debian.at> Tue, 17 Feb 2009 16:50:28 +0100
+
+wesnoth (1:1.5.9-1) experimental; urgency=low
+
+ * First beta for upcoming 1.6 release! Wooh. Fixes:
+ - Local Game offers to switch a player into a Network Player
+ (closes: #505402)
+ * configure with --disable-strict-compilation, upstream will work on it.
+
+ -- Gerfried Fuchs <rhonda at debian.at> Mon, 02 Feb 2009 15:53:44 +0100
+
+wesnoth (1:1.5.8-1) experimental; urgency=low
+
+ * New upstream development release.
* Fix typo in wesnoth-tools package description noticed by Soliton, thanks.
- -- Gerfried Fuchs <rhonda at debian.at> Tue, 24 Feb 2009 16:04:59 +0100
+ -- Gerfried Fuchs <rhonda at debian.at> Sun, 18 Jan 2009 19:10:02 +0100
-wesnoth (1:1.4.7-3) unstable; urgency=low
+wesnoth (1:1.5.7-2) experimental; urgency=low
- * Revert change in last revision - it would impose a compatibility issue.
- Will be fixed with first release candidate of 1.6.
+ * Missed the new directory data/core/editor/ for installation, making
+ starting the editor quitting the game through an assertion.
- -- Gerfried Fuchs <rhonda at debian.at> Sun, 14 Dec 2008 16:10:47 +0100
+ -- Gerfried Fuchs <rhonda at debian.at> Fri, 02 Jan 2009 13:03:05 +0100
-wesnoth (1:1.4.7-2) unstable; urgency=low
+wesnoth (1:1.5.7-1) experimental; urgency=low
- * Fetch upstream revision 28805 to allow recruit more than 99 castle tiles
- away (LP: #256345). Have fun, Toni!
+ * The "happy new year" devel release, containing:
+ - support for playlist in editor (closes: #458847)
+ * Add Legend of Wesmere campaign to depends of wesnoth.
+ * Add jQuery and tablesorter copyright to debian/copyright.
- -- Gerfried Fuchs <rhonda at debian.at> Sat, 13 Dec 2008 23:43:16 +0100
+ -- Gerfried Fuchs <rhonda at debian.at> Thu, 01 Jan 2009 18:08:14 +0100
-wesnoth (1:1.4.7-1) unstable; urgency=low
+wesnoth (1:1.5.6-1) experimental; urgency=low
- * New stable upstream release, bugfixes and translation updates, fixing:
- - gcc 4.4 FTBFS (closes: #505957)
+ * New upstream release.
+ * New campaign Legend of Wesmere.
+ * Lower wesnoth-music from Recommends to Suggests in wesnoth-data
+ (LP: #281791)
+ * "official" is not part of the campaign name, don't quote it in the package
+ descriptions.
+ * Add Replaces & Conflicts on versioned wesnoth to wesnoth-core for the
+ switch.
- -- Gerfried Fuchs <rhonda at debian.at> Sat, 13 Dec 2008 13:38:28 +0100
+ -- Gerfried Fuchs <rhonda at debian.at> Mon, 24 Nov 2008 10:41:59 +0100
-wesnoth (1:1.4.6-1) unstable; urgency=low
+wesnoth (1:1.5.5-1) experimental; urgency=low
- * New stable upstream release, bugfixes and translation updates:
- - Fixes assertion with End Turn (closes: #498154)
- * Lower wesnoth-music from Recommends to Suggests in wesnoth-data (LP: #281791)
+ * New upstream release, containing fixes for:
+ - wesnoth-editor: please add Time of Day view posibility (closes: #458305)
+ - Northern Rebirth scenario: AI problem (closes: #499895, #501136)
+ * Install data/tools/wmltest and data/tools/addon_manager into wesnoth-tools
+ package, too. Change executable chmods accordingly.
* Rename wesnoth to wesnoth-core and wesnoth-all to wesnoth. Document the
switch in the NEWS file (closes: #500935)
+
+ -- Gerfried Fuchs <rhonda at debian.at> Mon, 06 Oct 2008 14:25:32 +0200
+
+wesnoth (1:1.5.4-1) experimental; urgency=low
+
+ * New upstream release, containing fixes for:
+ - quit to desktop did just quit editor (closes: #497659)
+ - terrain images properly referenced (closes: #497795)
+ - unavailable languages are greyed out (closes: #452727)
+ * Don't build smallgui anymore, replace it with a wrapper script for calling
+ wesnoth --smallgui, and echo a message stating so.
+ * Don't build wesnoth_editor anymore, replace it with a wrapper script for
+ calling wesnoth --editor, and echo a message stating so.
+ * Remove wesnoth-editor package completely, incorporate the files installed
+ there into the appropriate packages (mostly wesnoth-data). Adding
+ appropriate Replaces and Provides entries.
* Allow to hand over arguments to wesnoth-nolog.
* Quote campaign names in package descriptions.
- -- Gerfried Fuchs <rhonda at debian.at> Thu, 06 Nov 2008 08:04:35 +0100
+ -- Gerfried Fuchs <rhonda at debian.at> Thu, 11 Sep 2008 19:23:55 +0200
-wesnoth (1:1.4.5-1) unstable; urgency=low
+wesnoth (1:1.5.3-1) experimental; urgency=low
- * New stable upstream release, bugfixes and translation updates.
+ * New upstream release containing fix for:
+ - unit/terrain graphic mistace (closes: #473377)
+ * debian/wesnoth-data.install:
+ - there is no data/*.fai anymore
+ - data/ais is now called data/ai
- -- Gerfried Fuchs <rhonda at debian.at> Wed, 03 Sep 2008 12:17:23 +0200
+ -- Gerfried Fuchs <rhonda at debian.at> Fri, 22 Aug 2008 13:19:29 +0200
-wesnoth (1:1.4.4-2) unstable; urgency=low
+wesnoth (1:1.5.2-2) experimental; urgency=low
- * Add wesnoth-dbg package as suggested by Patrick Matthäi now that the
- development release for experimental made it through NEW with it.
+ * Make wesnoth-dbg explicitly depend on wesnoth-data instead of implicitly
+ through the wesnoth dependency so that lintian is able to catch it ...
- -- Gerfried Fuchs <rhonda at debian.at> Thu, 24 Jul 2008 15:31:49 +0200
+ -- Gerfried Fuchs <rhonda at debian.at> Thu, 24 Jul 2008 09:44:53 +0200
-wesnoth (1:1.4.4-1) unstable; urgency=low
+wesnoth (1:1.5.2-1) experimental; urgency=low
- * New stable upstream release, bugfixes and translation updates. Includes
- fix for:
- - FTBFS on GNU/kFreeBSD (closes: #490638)
+ * New upstream release, new Build-Dependency: libpango1.0-dev
+ * Add following new paths/files to install files:
+ - data/*.fai, data/gui (wesnoth-data)
+ - data/themes/editor2.cfg (wesnoth-editor)
+ * Add -dbg package as suggested by Patrick Matthäi
- -- Gerfried Fuchs <rhonda at debian.at> Wed, 23 Jul 2008 19:26:40 +0200
+ -- Gerfried Fuchs <rhonda at debian.at> Mon, 14 Jul 2008 16:11:44 +0200
-wesnoth (1:1.4.3-1) unstable; urgency=low
+wesnoth (1:1.5.1-1) experimental; urgency=low
- * New upstream release, incorporating the following two patches:
- no-campaign-fix, address-align-for-sparc. Removed them from patch series.
+ * New upstream release
* Finally switched Maintainer to Games Team.
* Updated to Standards-Version 3.8.0:
- Added README.source to package.
- -- Gerfried Fuchs <rhonda at debian.at> Sun, 08 Jun 2008 21:26:24 +0200
+ -- Gerfried Fuchs <rhonda at debian.at> Sat, 21 Jun 2008 02:28:46 +0200
-wesnoth (1:1.4.2-1) unstable; urgency=low
+wesnoth (1:1.5.0a-1) experimental; urgency=low
- * New upstream release.
+ * New upstream release (closes: #478793), includes fix for:
+ - 100% evasion on some terrain acts as 50% (closes: #467253)
+ - The Court of Karrag: no TC for Karrag as Dwarf (closes: #473218)
+ - Patches not needed anymore: no-campaign-fix, address-align-for-sparc.
+ * Doesn't use included libsdl-ttf anymore, build-depend on
+ libsdl-ttf2.0-dev (>= 2.0.8) Requires libboost-regex-dev, also.
+ * Switched version information in debian/rules and debian/watch to
+ development release dependencies.
* Do postinst hooks only on upgrades from older versions than 1:1.4.1-2,
also check wether it might be a symlink already and ignore rmdir error
message.
@@ -97,8 +185,11 @@
only suggests.
* Rename debian/NEWS.Debian to debian/NEWS which dh_installchangelogs likes
to pick up and install as NEWS.Debian...
+ * New gettext domain wesnoth-anl for a muliplayer scenario, installing it
+ into wesnoth-data mainpackage.
+ * Updated wesnoth-tools install file and chmods in rules.
- -- Gerfried Fuchs <rhonda at debian.at> Mon, 05 May 2008 09:36:53 +0200
+ -- Gerfried Fuchs <rhonda at debian.at> Sat, 10 May 2008 19:42:55 +0200
wesnoth (1:1.4.1-2) unstable; urgency=low
Modified: packages/trunk/wesnoth/debian/control
===================================================================
--- packages/trunk/wesnoth/debian/control 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/control 2009-03-18 16:22:18 UTC (rev 9196)
@@ -4,18 +4,20 @@
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5), quilt, libsdl-image1.2-dev, libfreetype6-dev,
libsdl-mixer1.2-dev, libsdl-net1.2-dev, libfribidi-dev, libsdl1.2-dev,
- python-support,
- libboost-iostreams-dev, libboost-test-dev
+ libsdl-ttf2.0-dev (>= 2.0.8), python-support,
+ libboost-iostreams1.37-dev, libboost-test1.37-dev, libboost-regex1.37-dev,
+ libpango1.0-dev
Standards-Version: 3.8.0
Uploaders: Isaac Clerencia <isaac at debian.org>, Cyril Bouthors <cyril at bouthors.org>, Gerfried Fuchs <rhonda at debian.at>
Homepage: http://wesnoth.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/wesnoth/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/wesnoth/?op=log
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/branches/wesnoth/experimental/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/branches/wesnoth/experimental/?op=log
Package: wesnoth-data
Architecture: all
Depends: ttf-dejavu
-Recommends: ttf-sazanami-gothic, ttf-wqy-zenhei
+Replaces: wesnoth-editor (<< 1:1.5.4-1)
+Recommends: ttf-wqy-zenhei
Suggests: wesnoth-music
Description: data files for Wesnoth
This package contains the sound files and graphics for Wesnoth. It is required
@@ -29,8 +31,9 @@
Package: wesnoth-core
Architecture: any
Depends: ${shlibs:Depends}, wesnoth-data (= ${source:Version})
-Replaces: wesnoth-data (<< 1:1.3.9-3), wesnoth (<< 1:1.4.6-1)
-Conflicts: wesnoth (<< 1:1.4.6-1)
+Replaces: wesnoth-data (<< 1:1.3.9-3), wesnoth-editor (<< 1:1.5.4-1), wesnoth (<< 1:1.5.5-1)
+Provides: wesnoth-editor
+Conflicts: wesnoth-editor (<< 1:1.5.4-1), wesnoth (<< 1:1.5.5-1)
Recommends: wesnoth-ttb, wesnoth-httt, wesnoth-tsg
Suggests: wesnoth
Description: fantasy turn-based strategy game
@@ -45,6 +48,20 @@
for which they aren't needed. If you want to have all the official campaigns
installed you are encouraged to install wesnoth.
+Package: wesnoth-editor
+Architecture: all
+Depends: wesnoth-core (>= ${source:Version}), wesnoth-data (= ${source:Version})
+Description: map editor for Wesnoth - transitional package
+ 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.
+ .
+ This package used to contain the map editor for Wesnoth. It was incorporated
+ into the main program so this package has become useless. Please use the
+ integrated editor in the main wesnoth binary. You can savely remove this
+ package after the upgrade.
+
Package: wesnoth-dbg
Section: debug
Architecture: any
@@ -68,12 +85,11 @@
wesnoth-did (= ${source:Version}), wesnoth-nr (= ${source:Version}),
wesnoth-sof (= ${source:Version}), wesnoth-sotbe (= ${source:Version}),
wesnoth-l (= ${source:Version}), wesnoth-aoi (= ${source:Version}),
- wesnoth-thot (= ${source:Version})
-Replaces: wesnoth-all (<< 1:1.4.6-1)
+ wesnoth-thot (= ${source:Version}), wesnoth-low (= ${source:Version})
+Replaces: wesnoth-all (<< 1:1.5.5-1)
Provides: wesnoth-all
-Conflicts: wesnoth-all (<< 1:1.4.6-1)
-Recommends: wesnoth-music (= ${source:Version}),
- wesnoth-editor (>= ${binary:Version}), wesnoth-editor (<< ${binary:Version}.~)
+Conflicts: wesnoth-all (<< 1:1.5.5-1)
+Recommends: wesnoth-music (= ${source:Version})
Description: fantasy turn-based strategy game - complete suite
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-server
@@ -125,18 +141,6 @@
of attacks. Units gain experience and advance levels, and are carried over
from one scenario to the next in a campaign.
-Package: wesnoth-editor
-Architecture: any
-Depends: ${shlibs:Depends}, wesnoth-data (= ${source:Version})
-Description: map editor for Wesnoth
- This package contains the map editor for Wesnoth which can be used to create
- maps for scenarios to play in.
- .
- 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-tools
Architecture: all
Depends: ${shlibs:Depends}, ${python:Depends}, wesnoth-data (= ${source:Version})
@@ -356,3 +360,18 @@
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-low
+Depends: wesnoth-core (>= ${wesnoth:Stable-Version}), wesnoth-core (<< ${wesnoth:Next-Version})
+Architecture: all
+Description: "Legend of Wesmere" official campaign for Wesnoth
+ 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.)
+ .
+ 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.
Modified: packages/trunk/wesnoth/debian/copyright
===================================================================
--- packages/trunk/wesnoth/debian/copyright 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/copyright 2009-03-18 16:22:18 UTC (rev 9196)
@@ -56,8 +56,8 @@
-----
- fonts/ is Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.
- Bitstream Vera is a trademark of Bitstream, Inc.
+ fonts/ is Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.
+ Bitstream Vera is a trademark of Bitstream, Inc.
Permission is hereby granted, free of charge, to any person obtaining a
copy of the fonts accompanying this license ("Fonts") and associated
@@ -101,3 +101,66 @@
Software without prior written authorization from the Gnome Foundation
or Bitstream Inc., respectively. For further information, contact:
fonts at gnome dot org.
+
+ -----
+
+ data/tools/addon_manager/jquery.js
+
+ * Copyright (c) 2008 John Resig (jquery.com)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+On Debian systems, the complete text of the GNU Library General
+Public License can be found in /usr/share/common-licenses/LGPL-2 file,
+later versions can be found in the same directory.
+
+ -----
+
+ data/tools/addon_manager/tablesorter.js
+
+ * Copyright (c) 2007 Christian Bach
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+On Debian systems, the complete text of the GNU Library General
+Public License can be found in /usr/share/common-licenses/LGPL-2 file,
+later versions can be found in the same directory.
Added: packages/trunk/wesnoth/debian/overrides/wesnoth-core
===================================================================
--- packages/trunk/wesnoth/debian/overrides/wesnoth-core (rev 0)
+++ packages/trunk/wesnoth/debian/overrides/wesnoth-core 2009-03-18 16:22:18 UTC (rev 9196)
@@ -0,0 +1,4 @@
+wesnoth-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-nolog.6.gz
+wesnoth-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth-smallgui.6.gz
+wesnoth-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth.6.gz
+wesnoth-core: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnoth_editor.6.gz
Modified: packages/trunk/wesnoth/debian/overrides/wesnoth-data
===================================================================
--- packages/trunk/wesnoth/debian/overrides/wesnoth-data 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/overrides/wesnoth-data 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1,5 +1,6 @@
wesnoth-data: extra-license-file usr/share/games/wesnoth/data/COPYING.txt
wesnoth-data: symlink-should-be-relative usr/share/games/wesnoth/fonts/DejaVuSans.ttf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
-wesnoth-data: symlink-should-be-relative usr/share/games/wesnoth/fonts/sazanami-gothic.ttf /usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
+wesnoth-data: symlink-should-be-relative usr/share/games/wesnoth/fonts/wqy-zenhei.ttc /usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
wesnoth-data: symlink-should-be-relative usr/share/games/wesnoth/fonts/wqy-zenhei-gb2312.ttf /usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
wesnoth-data: symlink-should-be-relative usr/share/icons/wesnoth-icon.png /usr/share/games/wesnoth/images/wesnoth-icon.png
+wesnoth-data: symlink-should-be-relative usr/share/icons/wesnoth_editor-icon.png /usr/share/games/wesnoth/images/wesnoth_editor-icon.png
Deleted: packages/trunk/wesnoth/debian/overrides/wesnoth-editor
===================================================================
--- packages/trunk/wesnoth/debian/overrides/wesnoth-editor 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/overrides/wesnoth-editor 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1 +0,0 @@
-wesnoth-editor: symlink-should-be-relative usr/share/icons/wesnoth_editor-icon.png /usr/share/games/wesnoth/images/wesnoth_editor-icon.png
Added: packages/trunk/wesnoth/debian/overrides/wesnoth-server
===================================================================
--- packages/trunk/wesnoth/debian/overrides/wesnoth-server (rev 0)
+++ packages/trunk/wesnoth/debian/overrides/wesnoth-server 2009-03-18 16:22:18 UTC (rev 9196)
@@ -0,0 +1 @@
+wesnoth-server: manpage-locale-dir-country-specific usr/share/man/en_GB/man6/wesnothd.6.gz
Modified: packages/trunk/wesnoth/debian/patches/02wesnoth-nolog-desktop-file
===================================================================
--- packages/trunk/wesnoth/debian/patches/02wesnoth-nolog-desktop-file 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/patches/02wesnoth-nolog-desktop-file 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1,10 +1,10 @@
Author: Gerfried Fuchs <rhonda at debian.at> vim:ft=diff:
Description: call wesnoth-nolog from desktop file, too
-Index: wesnoth-1.4.7/icons/wesnoth.desktop
+Index: wesnoth-1.5.11/icons/wesnoth.desktop
===================================================================
---- wesnoth-1.4.7.orig/icons/wesnoth.desktop
-+++ wesnoth-1.4.7/icons/wesnoth.desktop
+--- wesnoth-1.5.11.orig/icons/wesnoth.desktop
++++ wesnoth-1.5.11/icons/wesnoth.desktop
@@ -44,6 +44,6 @@ Comment[sk]=Ťahová strategická hra z
Comment[sr]=Фантазијска стратешка игра на потезе
Comment[sr at latin]=Fantazijska strateška igra na poteze
Deleted: packages/trunk/wesnoth/debian/patches/03fix-server-dos
===================================================================
--- packages/trunk/wesnoth/debian/patches/03fix-server-dos 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/patches/03fix-server-dos 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1,19 +0,0 @@
-Author: dave vim:ft=diff:
-Description: fixed DoS attack using z compressed WML on server
- (upstream svn r33069)
-
-Index: wesnoth-1.4.7/src/server/simple_wml.cpp
-===================================================================
---- wesnoth-1.4.7.orig/src/server/simple_wml.cpp
-+++ wesnoth-1.4.7/src/server/simple_wml.cpp
-@@ -27,6 +27,10 @@ char* uncompress_buffer(const string_spa
- int len = 0;
- int pos = 0;
- while(filter.good() && (len = filter.read(&buf[pos], chunk_size).gcount()) == chunk_size) {
-+ if(pos + chunk_size > 40000000) {
-+ throw error("WML document exceeds 40MB limit");
-+ }
-+
- pos += len;
- buf.resize(pos + chunk_size);
- len = 0;
Deleted: packages/trunk/wesnoth/debian/patches/04wesnoth-did-ai-fix
===================================================================
--- packages/trunk/wesnoth/debian/patches/04wesnoth-did-ai-fix 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/patches/04wesnoth-did-ai-fix 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1,28 +0,0 @@
-Author: zookeeper vim:ft=diff:
-Description: Removed kamikaze.py and replaced it with a crude WML workaround
- for now. (upstream svn r33013)
-
-Index: wesnoth-1.4.7/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
-===================================================================
---- wesnoth-1.4.7.orig/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
-+++ wesnoth-1.4.7/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
-@@ -77,10 +77,16 @@
- no_leader=yes
- fog=no
- shroud=no
-- # kamikaze.py heads straight for the leader of side 1 and attacks
- [ai]
-- ai_algorithm=python_ai
-- python_script="../campaigns/Descent_Into_Darkness/ais/kamikaze.py"
-+ aggression=4.0
-+ caution=0.0
-+ grouping=no
-+ simple_targetting=yes
-+ village_value=0
-+ [target]
-+ id=Malin Keshar
-+ value=100
-+ [/target]
- [/ai]
- [/side]
-
Deleted: packages/trunk/wesnoth/debian/patches/05limit-mapsize
===================================================================
--- packages/trunk/wesnoth/debian/patches/05limit-mapsize 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/patches/05limit-mapsize 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1,59 +0,0 @@
-Author: ilor vim:ft=diff:
-Description: fix bug #13031 by implementing a hard limit on map size. The cap
- is set to 200 tiles (so 200*200 is the max map area), and as of now is
- a hardcoded constant in terrain_translation.cpp. (upstream svn r32987)
-
-Index: wesnoth-1.4.7/src/terrain_translation.cpp
-===================================================================
---- wesnoth-1.4.7.orig/src/terrain_translation.cpp
-+++ wesnoth-1.4.7/src/terrain_translation.cpp
-@@ -29,6 +29,10 @@
-
- namespace t_translation {
-
-+ size_t max_map_size() {
-+ return 200; //TODO make this overridable by the user without having to rebuild
-+ }
-+
- /***************************************************************************************/
- // forward declaration of internal functions
-
-@@ -312,6 +316,10 @@ t_map read_game_map(const std::string& s
- ERR_G << "Map not a rectangle error occured at line offset " << y << " position offset " << x << "\n";
- throw error("Map not a rectangle.");
- }
-+ if (y > max_map_size()) {
-+ ERR_G << "Map size exceeds limit (y > " << max_map_size() << ")\n";
-+ throw error("Map height limit exceeded.");
-+ }
- }
-
- // Prepare next iteration
-@@ -334,6 +342,10 @@ t_map read_game_map(const std::string& s
- } else {
- ++x;
- offset = pos_separator + 1;
-+ if (x > max_map_size()) {
-+ ERR_G << "Map size exceeds limit (x > " << max_map_size() << ")\n";
-+ throw error("Map width limit exceeded.");
-+ }
- }
-
- }
-Index: wesnoth-1.4.7/src/terrain_translation.hpp
-===================================================================
---- wesnoth-1.4.7.orig/src/terrain_translation.hpp
-+++ wesnoth-1.4.7/src/terrain_translation.hpp
-@@ -25,6 +25,12 @@
-
- namespace t_translation {
-
-+ /**
-+ * Return the maximum allowed map size (in either dimension),
-+ * the maximum map area is, therefore, this value squared.
-+ */
-+ size_t max_map_size();
-+
- typedef Uint32 t_layer;
- const t_layer WILDCARD = 0x2A000000;
- const t_layer NO_LAYER = 0xFFFFFFFF;
Modified: packages/trunk/wesnoth/debian/patches/series
===================================================================
--- packages/trunk/wesnoth/debian/patches/series 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/patches/series 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1,4 +1 @@
02wesnoth-nolog-desktop-file
-03fix-server-dos
-04wesnoth-did-ai-fix
-05limit-mapsize
Modified: packages/trunk/wesnoth/debian/rules
===================================================================
--- packages/trunk/wesnoth/debian/rules 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/rules 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# debian/rules for wesnoth
-# copyright 2007-2008 by Gerfried Fuchs <rhonda at debian.at>
+# copyright 2007++ by Gerfried Fuchs <rhonda at debian.at>
# Licenced the same way as wesnoth itself
# Uncomment this to turn on verbose mode.
@@ -21,7 +21,7 @@
CFLAGS += -O2
endif
-CONFIGURE_SWITCHES = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --disable-rpath --prefix=/usr --mandir=\$${prefix}/share/man --bindir=\$${prefix}/games --with-datadir-name=wesnoth --with-localedir=\$${prefix}/share/locale --with-fifodir=/var/run/wesnothd --datadir=\$${prefix}/share/games --enable-editor --enable-server --disable-python --with-fribidi --enable-python-install CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+CONFIGURE_SWITCHES = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --disable-rpath --prefix=/usr --mandir=\$${prefix}/share/man --bindir=\$${prefix}/games --with-datadir-name=wesnoth --with-localedir=\$${prefix}/share/locale --with-fifodir=/var/run/wesnothd --datadir=\$${prefix}/share/games --enable-server --with-fribidi --enable-python-install CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
# calculate the version strings
@@ -30,13 +30,13 @@
UPSTREAM_VERSION = $(shell dpkg-parsechangelog | grep "^Version:" | cut -d" " -f2 | rev | cut -d- -f2 | rev)
## if we are in a stable release we use this
-STABLE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION)
-NEXT_VERSION = $(MAJOR_VERSION).$(shell echo $$(( $(MINOR_VERSION) + 1 )) )
+#STABLE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION)
+#NEXT_VERSION = $(MAJOR_VERSION).$(shell echo $$(( $(MINOR_VERSION) + 1 )) )
## for development releases, we use this so we won't have to change the
## control file
-#STABLE_VERSION = $(UPSTREAM_VERSION)
-#NEXT_VERSION = $(UPSTREAM_VERSION).~
+STABLE_VERSION = $(UPSTREAM_VERSION)
+NEXT_VERSION = $(UPSTREAM_VERSION).~
include /usr/share/quilt/quilt.make
@@ -49,7 +49,7 @@
[ ! -f Makefile ] || $(MAKE) distclean
find po -name "*.gmo" -exec rm -f {} \;
find po -name "stamp-po" -exec rm -f {} \;
- rm -f config.sub config.guess src/wesnoth-smallgui
+ rm -f config.sub config.guess
dh_clean
@@ -59,11 +59,8 @@
build-arch: build-arch-stamp
build-arch-stamp: patch
- ./configure $(CONFIGURE_SWITCHES) --enable-smallgui
+ ./configure $(CONFIGURE_SWITCHES)
$(MAKE)
- mv src/wesnoth src/wesnoth-smallgui
- ./configure $(CONFIGURE_SWITCHES) --disable-smallgui
- $(MAKE)
touch $@
@@ -89,9 +86,9 @@
pkgdatadir=/usr/share/games/wesnoth
cd $(CURDIR)/debian/tmp/usr/share/games/wesnoth/data/tools && chmod +x \
- extractbindings unit_tree/TeamColorizer.pl unit_tree/units.pl \
+ extractbindings unit_tree/TeamColorizer \
wesnoth/wescamp.py wesnoth/wmldata.py wesnoth/wmlparser.py \
- wmlindent wmllint wmlscope
+ wmlindent wmlflip wmllint wmlscope wesnoth_addon_manager wmltest
DESTDIR=$(CURDIR)/debian/tmp/ \
$(MAKE) -C po install \
@@ -144,16 +141,18 @@
# Build architecture independant packages using the common target.
binary-indep: build-indep install-indep
# workaround for dh_link (mis)behavior, see BTS#445550
- for i in ttf-dejavu/DejaVuSans.ttf sazanami/sazanami-gothic.ttf; \
+ for i in ttf-dejavu/DejaVuSans.ttf; \
do ln -s /usr/share/fonts/truetype/$$i \
debian/wesnoth-data/usr/share/games/wesnoth/fonts/`basename $$i`; \
done
ln -s /usr/share/fonts/truetype/wqy/wqy-zenhei.ttf \
- debian/wesnoth-data/usr/share/games/wesnoth/fonts/wqy-zenhei-gb2312.ttf
+ debian/wesnoth-data/usr/share/games/wesnoth/fonts/wqy-zenhei.ttc
ln -s /usr/share/games/wesnoth/images/wesnoth-icon.png \
debian/wesnoth-data/usr/share/icons/wesnoth-icon.png
+ ln -s /usr/share/games/wesnoth/images/wesnoth_editor-icon.png \
+ debian/wesnoth-data/usr/share/icons/wesnoth_editor-icon.png
- for i in wesnoth wesnoth-all; do \
+ for i in wesnoth wesnoth-all wesnoth-editor; do \
install -p -d -m755 debian/$$i/usr/share/doc; \
ln -s wesnoth-data debian/$$i/usr/share/doc/$$i; \
done
@@ -162,18 +161,16 @@
# Build architecture dependant packages using the common target.
binary-arch: build-arch install-arch
- # workaround for dh_link (mis)behavior, see BTS#445550
- ln -s /usr/share/games/wesnoth/images/wesnoth_editor-icon.png \
- debian/wesnoth-editor/usr/share/icons/wesnoth_editor-icon.png
-
for i in debian/wesnoth-core/usr/share/man/*/man6/wesnoth.6; do \
ln -s wesnoth.6.gz `dirname $$i`/wesnoth-nolog.6.gz; \
ln -s wesnoth.6.gz `dirname $$i`/wesnoth-smallgui.6.gz; \
+ ln -s wesnoth.6.gz `dirname $$i`/wesnoth_editor.6.gz; \
done
ln -s wesnoth.6.gz debian/wesnoth-core/usr/share/man/man6/wesnoth-nolog.6.gz
ln -s wesnoth.6.gz debian/wesnoth-core/usr/share/man/man6/wesnoth-smallgui.6.gz
+ ln -s wesnoth.6.gz debian/wesnoth-core/usr/share/man/man6/wesnoth_editor.6.gz
- for i in wesnoth-core wesnoth-editor wesnoth-dbg; do \
+ for i in wesnoth-core wesnoth-dbg; do \
install -p -d -m755 debian/$$i/usr/share/doc; \
ln -s wesnoth-data debian/$$i/usr/share/doc/$$i; \
done
Modified: packages/trunk/wesnoth/debian/watch
===================================================================
--- packages/trunk/wesnoth/debian/watch 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/watch 2009-03-18 16:22:18 UTC (rev 9196)
@@ -2,7 +2,7 @@
# Site/Directory Pattern Version Script
## stable branch
-http://sf.net/wesnoth/ wesnoth-([\d]+\.[\d]*[02468](?:\.[\d\.]*)?)\.tar\.(?:bz2|gz) debian uupdate
+#http://sf.net/wesnoth/ wesnoth-([\d]+\.[\d]*[02468](?:\.[\d\.]*)?)\.tar\.(?:bz2|gz) debian uupdate
## everything (like, useful for development branch :))
-#http://sf.net/wesnoth/ wesnoth-([\d.]+)\.tar\.(?:bz2|gz) debian uupdate
+http://sf.net/wesnoth/ wesnoth-([\d.a]+)\.tar\.(?:bz2|gz) debian uupdate
Modified: packages/trunk/wesnoth/debian/wesnoth-core.install
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-core.install 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/wesnoth-core.install 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1,7 +1,10 @@
debian/tmp/usr/games/wesnoth
-src/wesnoth-smallgui /usr/games
+debian/wesnoth-smallgui /usr/games
debian/wesnoth-nolog /usr/games
+debian/wesnoth_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-icon.xpm /usr/share/pixmaps
+debian/wesnoth_editor-icon.xpm /usr/share/pixmaps
Modified: packages/trunk/wesnoth/debian/wesnoth-core.menu
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-core.menu 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/wesnoth-core.menu 2009-03-18 16:22:18 UTC (rev 9196)
@@ -5,3 +5,10 @@
longtitle="Battle for Wesnoth is a fantasy turn-based strategy game" \
command="/usr/games/wesnoth-nolog" \
icon="/usr/share/pixmaps/wesnoth-icon.xpm"
+?package(wesnoth-core): \
+ needs="X11" \
+ section="Games/Tools" \
+ title="Battle for Wesnoth Editor" \
+ longtitle="Map editor for Battle for Wesnoth, a fantasy turn-based strategy game" \
+ command="/usr/games/wesnoth-nolog --editor" \
+ icon="/usr/share/pixmaps/wesnoth_editor-icon.xpm"
Modified: packages/trunk/wesnoth/debian/wesnoth-data.install
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-data.install 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/wesnoth-data.install 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1,32 +1,22 @@
debian/overrides/wesnoth-data /usr/share/lintian/overrides
debian/tmp/usr/share/games/wesnoth/data/*.cfg
debian/tmp/usr/share/games/wesnoth/data/COPYING.txt
+debian/tmp/usr/share/games/wesnoth/data/ai
debian/tmp/usr/share/games/wesnoth/data/campaigns/tutorial
debian/tmp/usr/share/games/wesnoth/data/core/*.cfg
debian/tmp/usr/share/games/wesnoth/data/core/README
+debian/tmp/usr/share/games/wesnoth/data/core/editor
debian/tmp/usr/share/games/wesnoth/data/core/images
debian/tmp/usr/share/games/wesnoth/data/core/macros
debian/tmp/usr/share/games/wesnoth/data/core/sounds
debian/tmp/usr/share/games/wesnoth/data/core/terrain-graphics
debian/tmp/usr/share/games/wesnoth/data/core/units
+debian/tmp/usr/share/games/wesnoth/data/gui
debian/tmp/usr/share/games/wesnoth/data/hardwired
debian/tmp/usr/share/games/wesnoth/data/languages
debian/tmp/usr/share/games/wesnoth/data/multiplayer
-debian/tmp/usr/share/games/wesnoth/data/themes/default.cfg
-debian/tmp/usr/share/games/wesnoth/data/themes/dfool.cfg
-debian/tmp/usr/share/games/wesnoth/data/themes/experimental.cfg
-debian/tmp/usr/share/games/wesnoth/data/themes/macros.cfg
-debian/tmp/usr/share/games/wesnoth/images/README
-debian/tmp/usr/share/games/wesnoth/images/buttons
-debian/tmp/usr/share/games/wesnoth/images/cursors
-debian/tmp/usr/share/games/wesnoth/images/cursors-bw
-debian/tmp/usr/share/games/wesnoth/images/dialogs
-debian/tmp/usr/share/games/wesnoth/images/flags
-debian/tmp/usr/share/games/wesnoth/images/footsteps
-debian/tmp/usr/share/games/wesnoth/images/icons
-debian/tmp/usr/share/games/wesnoth/images/misc
-debian/tmp/usr/share/games/wesnoth/images/tools
-debian/tmp/usr/share/games/wesnoth/images/wesnoth-icon.png
+debian/tmp/usr/share/games/wesnoth/data/themes
+debian/tmp/usr/share/games/wesnoth/images
debian/tmp/usr/share/games/wesnoth/sounds
debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth-editor.mo
debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth-lib.mo
@@ -34,3 +24,4 @@
debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth-tutorial.mo
debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth-units.mo
debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth.mo
+debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth-anl.mo
Deleted: packages/trunk/wesnoth/debian/wesnoth-editor.dirs
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-editor.dirs 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/wesnoth-editor.dirs 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1 +0,0 @@
-/usr/share/icons
Deleted: packages/trunk/wesnoth/debian/wesnoth-editor.install
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-editor.install 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/wesnoth-editor.install 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1,9 +0,0 @@
-debian/overrides/wesnoth-editor /usr/share/lintian/overrides
-debian/tmp/usr/games/wesnoth_editor
-debian/tmp/usr/share/man/man6/wesnoth_editor.6
-debian/tmp/usr/share/man/*/man6/wesnoth_editor.6
-debian/tmp/usr/share/games/wesnoth/data/themes/editor.cfg
-debian/tmp/usr/share/games/wesnoth/images/editor
-debian/wesnoth_editor-icon.xpm /usr/share/pixmaps
-icons/wesnoth_editor.desktop /usr/share/applications
-icons/wesnoth_editor-icon.png /usr/share/games/wesnoth/images
Deleted: packages/trunk/wesnoth/debian/wesnoth-editor.menu
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-editor.menu 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/wesnoth-editor.menu 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1,7 +0,0 @@
-?package(wesnoth-editor): \
- needs="X11" \
- section="Games/Tools" \
- title="Battle for Wesnoth Editor" \
- longtitle="Map editor for the Battle for Wesnoth" \
- command="/usr/games/wesnoth_editor" \
- icon="/usr/share/pixmaps/wesnoth_editor-icon.xpm"
Deleted: packages/trunk/wesnoth/debian/wesnoth-editor.postinst
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-editor.postinst 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/wesnoth-editor.postinst 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-# postinst script for wesnoth-editor
-# copyright 2008 by Gerfried Fuchs <rhonda at debian.at>
-# Licenced the same way as wesnoth itself
-
-if dpkg --compare-versions "$version" lt-nl 1:1.4.1-2 \
- && [ "$1" = configure ] \
- && [ ! -L /usr/share/doc/wesnoth-editor ] \
- && [ -d /usr/share/doc/wesnoth-editor ] \
- && rmdir /usr/share/doc/wesnoth-editor 2>/dev/null ; then
-
- ln -s wesnoth-data /usr/share/doc/wesnoth-editor
-fi
-
-#DEBHELPER#
Added: packages/trunk/wesnoth/debian/wesnoth-low.install
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-low.install (rev 0)
+++ packages/trunk/wesnoth/debian/wesnoth-low.install 2009-03-18 16:22:18 UTC (rev 9196)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/games/wesnoth/data/campaigns/Legend_of_Wesmere
+debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth-low.mo
Added: packages/trunk/wesnoth/debian/wesnoth-smallgui
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-smallgui (rev 0)
+++ packages/trunk/wesnoth/debian/wesnoth-smallgui 2009-03-18 16:22:18 UTC (rev 9196)
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "wesnoth-smallgui is deprecated -- please use wesnoth --smallgui directly!"
+wesnoth --smallgui $*
Modified: packages/trunk/wesnoth/debian/wesnoth-tools.install
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-tools.install 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/wesnoth-tools.install 2009-03-18 16:22:18 UTC (rev 9196)
@@ -1,10 +1,13 @@
debian/tmp/usr/share/games/wesnoth/data/tools/extractbindings
debian/tmp/usr/share/games/wesnoth/data/tools/helpheader.xhtml
debian/tmp/usr/share/games/wesnoth/data/tools/helptrailer.xhtml
-debian/tmp/usr/share/games/wesnoth/data/tools/Makefile
debian/tmp/usr/share/games/wesnoth/data/tools/unit_tree/
+debian/tmp/usr/share/games/wesnoth/data/tools/wmlflip
debian/tmp/usr/share/games/wesnoth/data/tools/wmlindent
debian/tmp/usr/share/games/wesnoth/data/tools/wmllint
debian/tmp/usr/share/games/wesnoth/data/tools/wmlscope
+debian/tmp/usr/share/games/wesnoth/data/tools/wmltest
+debian/tmp/usr/share/games/wesnoth/data/tools/wesnoth_addon_manager
+debian/tmp/usr/share/games/wesnoth/data/tools/addon_manager/
debian/tmp/usr/share/games/wesnoth/data/tools/README
debian/tmp/usr/share/games/wesnoth/data/tools/wesnoth/
Modified: packages/trunk/wesnoth/debian/wesnoth.postinst
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth.postinst 2009-03-18 14:21:47 UTC (rev 9195)
+++ packages/trunk/wesnoth/debian/wesnoth.postinst 2009-03-18 16:22:18 UTC (rev 9196)
@@ -3,16 +3,13 @@
# copyright 2008 by Gerfried Fuchs <rhonda at debian.at>
# Licenced the same way as wesnoth itself
-action=$1
-version=$2
-
if dpkg --compare-versions "$version" lt-nl 1:1.4.1-2 \
&& [ "$1" = configure ] \
- && [ ! -L /usr/share/doc/wesnoth-all ] \
- && [ -d /usr/share/doc/wesnoth-all ] \
- && rmdir /usr/share/doc/wesnoth-all 2>/dev/null ; then
+ && [ ! -L /usr/share/doc/wesnoth ] \
+ && [ -d /usr/share/doc/wesnoth ] \
+ && rmdir /usr/share/doc/wesnoth 2>/dev/null ; then
- ln -s wesnoth-data /usr/share/doc/wesnoth-all
+ ln -s wesnoth-data /usr/share/doc/wesnoth
fi
#DEBHELPER#
Added: packages/trunk/wesnoth/debian/wesnoth_editor
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth_editor (rev 0)
+++ packages/trunk/wesnoth/debian/wesnoth_editor 2009-03-18 16:22:18 UTC (rev 9196)
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "wesnoth_editor is deprecated -- please use wesnoth --editor directly!"
+wesnoth --editor $*
More information about the Pkg-games-commits
mailing list