Author: alfie
Date: 2008-09-10 08:55:00 +0000 (Wed, 10 Sep 2008)
New Revision: 8100
Added:
packages/branches/wesnoth/experimental/debian/wesnoth_editor
Removed:
packages/branches/wesnoth/experimental/debian/overrides/wesnoth-editor
packages/branches/wesnoth/experimental/debian/wesnoth-editor.dirs
packages/branches/wesnoth/experimental/debian/wesnoth-editor.install
packages/branches/wesnoth/experimental/debian/wesnoth-editor.menu
packages/branches/wesnoth/experimental/debian/wesnoth-editor.postinst
Modified:
packages/branches/wesnoth/experimental/debian/changelog
packages/branches/wesnoth/experimental/debian/control
packages/branches/wesnoth/experimental/debian/overrides/wesnoth-data
packages/branches/wesnoth/experimental/debian/rules
packages/branches/wesnoth/experimental/debian/wesnoth-data.install
packages/branches/wesnoth/experimental/debian/wesnoth.install
packages/branches/wesnoth/experimental/debian/wesnoth.menu
Log:
* 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.
Modified: packages/branches/wesnoth/experimental/debian/changelog
===================================================================
--- packages/branches/wesnoth/experimental/debian/changelog 2008-09-10
08:50:57 UTC (rev 8099)
+++ packages/branches/wesnoth/experimental/debian/changelog 2008-09-10
08:55:00 UTC (rev 8100)
@@ -6,9 +6,14 @@
- 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.
- -- Gerfried Fuchs <[EMAIL PROTECTED]> Wed, 10 Sep 2008 09:47:46 +0200
+ -- Gerfried Fuchs <[EMAIL PROTECTED]> Wed, 10 Sep 2008 10:20:31 +0200
wesnoth (1:1.5.3-1) experimental; urgency=low
Modified: packages/branches/wesnoth/experimental/debian/control
===================================================================
--- packages/branches/wesnoth/experimental/debian/control 2008-09-10
08:50:57 UTC (rev 8099)
+++ packages/branches/wesnoth/experimental/debian/control 2008-09-10
08:55:00 UTC (rev 8100)
@@ -16,6 +16,7 @@
Package: wesnoth-data
Architecture: all
Depends: ttf-dejavu
+Replaces: wesnoth-editor (<< 1:1.5.4-1)
Recommends: wesnoth-music, ttf-sazanami-gothic, ttf-wqy-zenhei
Description: data files for Wesnoth
This package contains the sound files and graphics for Wesnoth. It is required
@@ -29,7 +30,8 @@
Package: wesnoth
Architecture: any
Depends: ${shlibs:Depends}, wesnoth-data (= ${source:Version})
-Replaces: wesnoth-data (<< 1:1.3.9-3)
+Replaces: wesnoth-data (<< 1:1.3.9-3), wesnoth-editor (<< 1:1.5.4-1)
+Provides: wesnoth-editor
Recommends: wesnoth-ttb, wesnoth-httt, wesnoth-tsg
Suggests: wesnoth-all
Description: fantasy turn-based strategy game
@@ -67,8 +69,7 @@
wesnoth-sof (= ${source:Version}), wesnoth-sotbe (= ${source:Version}),
wesnoth-l (= ${source:Version}), wesnoth-aoi (= ${source:Version}),
wesnoth-thot (= ${source:Version})
-Recommends: wesnoth-music (= ${source:Version}),
- wesnoth-editor (>= ${binary:Version}), wesnoth-editor (<<
${binary:Version}.~)
+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
@@ -104,18 +105,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})
Modified: packages/branches/wesnoth/experimental/debian/overrides/wesnoth-data
===================================================================
--- packages/branches/wesnoth/experimental/debian/overrides/wesnoth-data
2008-09-10 08:50:57 UTC (rev 8099)
+++ packages/branches/wesnoth/experimental/debian/overrides/wesnoth-data
2008-09-10 08:55:00 UTC (rev 8100)
@@ -3,3 +3,4 @@
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-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/branches/wesnoth/experimental/debian/overrides/wesnoth-editor
===================================================================
--- packages/branches/wesnoth/experimental/debian/overrides/wesnoth-editor
2008-09-10 08:50:57 UTC (rev 8099)
+++ packages/branches/wesnoth/experimental/debian/overrides/wesnoth-editor
2008-09-10 08:55:00 UTC (rev 8100)
@@ -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
Modified: packages/branches/wesnoth/experimental/debian/rules
===================================================================
--- packages/branches/wesnoth/experimental/debian/rules 2008-09-10 08:50:57 UTC
(rev 8099)
+++ packages/branches/wesnoth/experimental/debian/rules 2008-09-10 08:55:00 UTC
(rev 8100)
@@ -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
--enable-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 --enable-python
--with-fribidi --enable-python-install CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
# calculate the version strings
@@ -149,6 +149,8 @@
debian/wesnoth-data/usr/share/games/wesnoth/fonts/wqy-zenhei-gb2312.ttf
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
install -p -d -m755 debian/wesnoth-all/usr/share/doc
ln -s wesnoth-data debian/wesnoth-all/usr/share/doc/wesnoth-all
@@ -158,8 +160,6 @@
# 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/usr/share/man/*/man6/wesnoth.6; do \
ln -s wesnoth.6.gz `dirname $$i`/wesnoth-nolog.6.gz; \
@@ -168,7 +168,7 @@
ln -s wesnoth.6.gz debian/wesnoth/usr/share/man/man6/wesnoth-nolog.6.gz
ln -s wesnoth.6.gz
debian/wesnoth/usr/share/man/man6/wesnoth-smallgui.6.gz
- for i in wesnoth wesnoth-editor wesnoth-dbg; do \
+ for i in wesnoth 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/branches/wesnoth/experimental/debian/wesnoth-data.install
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-data.install
2008-09-10 08:50:57 UTC (rev 8099)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-data.install
2008-09-10 08:55:00 UTC (rev 8100)
@@ -14,21 +14,8 @@
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
Deleted: packages/branches/wesnoth/experimental/debian/wesnoth-editor.dirs
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-editor.dirs
2008-09-10 08:50:57 UTC (rev 8099)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-editor.dirs
2008-09-10 08:55:00 UTC (rev 8100)
@@ -1 +0,0 @@
-/usr/share/icons
Deleted: packages/branches/wesnoth/experimental/debian/wesnoth-editor.install
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-editor.install
2008-09-10 08:50:57 UTC (rev 8099)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-editor.install
2008-09-10 08:55:00 UTC (rev 8100)
@@ -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/branches/wesnoth/experimental/debian/wesnoth-editor.menu
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-editor.menu
2008-09-10 08:50:57 UTC (rev 8099)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-editor.menu
2008-09-10 08:55:00 UTC (rev 8100)
@@ -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/branches/wesnoth/experimental/debian/wesnoth-editor.postinst
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-editor.postinst
2008-09-10 08:50:57 UTC (rev 8099)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-editor.postinst
2008-09-10 08:55:00 UTC (rev 8100)
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-# postinst script for wesnoth-editor
-# copyright 2008 by Gerfried Fuchs <[EMAIL PROTECTED]>
-# 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#
Modified: packages/branches/wesnoth/experimental/debian/wesnoth.install
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth.install
2008-09-10 08:50:57 UTC (rev 8099)
+++ packages/branches/wesnoth/experimental/debian/wesnoth.install
2008-09-10 08:55:00 UTC (rev 8100)
@@ -1,7 +1,12 @@
debian/tmp/usr/games/wesnoth
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
+debian/tmp/usr/share/man/man6/wesnoth_editor.6
+debian/tmp/usr/share/man/*/man6/wesnoth_editor.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/branches/wesnoth/experimental/debian/wesnoth.menu
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth.menu 2008-09-10
08:50:57 UTC (rev 8099)
+++ packages/branches/wesnoth/experimental/debian/wesnoth.menu 2008-09-10
08:55:00 UTC (rev 8100)
@@ -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): \
+ 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 -e" \
+ icon="/usr/share/pixmaps/wesnoth_editor-icon.xpm"
Added: packages/branches/wesnoth/experimental/debian/wesnoth_editor
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth_editor
(rev 0)
+++ packages/branches/wesnoth/experimental/debian/wesnoth_editor
2008-09-10 08:55:00 UTC (rev 8100)
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "wesnoth_editor is deprecated -- please use wesnoth --editor directly!"
+wesnoth --editor $*
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
