summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: debian/1.8.3-1)
raw | patch | inline | side by side (from: debian/1.8.3-1)
| author | Gerfried Fuchs <rhonda@debian.at> | |
| Mon, 16 Aug 2010 19:47:42 +0000 (21:47 +0200) | ||
| committer | Gerfried Fuchs <rhonda@debian.at> | |
| Mon, 16 Aug 2010 19:47:42 +0000 (21:47 +0200) |
30 files changed:
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
/attic
/autogen.sh
/autom4te.cache
-/build-arch-stamp
-/build-indep-stamp
+/*-stamp
/changelog
/cmake
/CMakeLists.txt
/utils
/wesnoth.kdevelop
/debian/files
-/debian/stamp*
/debian/*.debhelper.log
/debian/*.debhelper
/debian/*.substvars
diff --git a/debian/branchcheck b/debian/branchcheck
--- a/debian/branchcheck
+++ b/debian/branchcheck
#!/bin/sh
# Copyright (C) 2009-2010 Gerfried Fuchs <rhonda@debian.at>
-# Licenced under BSD style
+# Licenced under WTFPLv2
set -ex
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/BRANCH/$BRANCH/g" $dir/$new
+ sed -i -e "s/BRANODOT/$BRANCH/g" $dir/$new
done
fi
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
+wesnoth-1.8 (1:1.8.3-3) unstable; urgency=low
+
+ * Make wesnoth and wesnoth-core packages directly depend on
+ wesnoth-1.8-core.
+ * Change debianization licensing to WTFPLv2.
+ * Use same commandline in the menu file like in the application file for the
+ editor.
+ * Bump Standards-Version to 3.9.1.
+ * Fix spelling errors in control file.
+ * Add lintian override for diversion-for-unknown-file.
+ * Move update-alternatives --remove to prerm.
+
+ -- Gerfried Fuchs <rhonda@debian.at> Sun, 15 Aug 2010 22:57:20 +0200
+
+wesnoth-1.8 (1:1.8.3-2) unstable; urgency=low
+
+ * Adjust LSB init.d headers to match runlinks.
+ * Update wesnoth-1.8-core package description, synchronize spacing and
+ ordering in other package descriptions.
+ * Bump to Standards-Version 3.9.0.
+ * Use BRANODOT as placeholder in branchcheck script (for alternative
+ priority)
+ * Use alternative handling and dpkg-divert for wesnoth binaries and
+ manpages.
+ * Add wesnoth and wesnoth-core meta packages depending on the corresponding
+ branch package (closes: #586291)
+ * Call patch and unpatch explicitly instead of having them as dependency.
+ This applies the patches again (closes: #588712, LP: #610056)
+ * New patch wesnothd-name to make the client search for wesnothd-1.8 instead
+ of only wesnothd.
+
+ -- Gerfried Fuchs <rhonda@debian.at> Fri, 13 Aug 2010 21:29:26 +0200
+
wesnoth-1.8 (1:1.8.3-1) unstable; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
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.8.4
+Standards-Version: 3.9.1
Uploaders: Gerfried Fuchs <rhonda@debian.at>
Homepage: http://wesnoth.org/
Vcs-Git: git://git.debian.org/git/pkg-games/wesnoth.git
wesnoth-1.8-data (= ${source:Version})
Suggests: wesnoth
Description: fantasy turn-based strategy game (branch 1.8)
+ This package does contain 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
+ on all of them.
+ .
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-core
+Architecture: all
+Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${binary:Version}),
+ wesnoth-1.8-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
+ using the latest stable version.
.
- Please note that this package recommends only three of the official campaigns,
- those that are considered to be an introduction to the game. They are just
- recommended but not depended on - quite some people enjoy the multiplayer mode
- for which they aren't needed. If you want to have all the official campaigns
- installed you are encouraged to install 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.8-dbg
Section: debug
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)
+ This package contains the debugging symbols for the wesnoth binaries.
+ .
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 contains the debugging symbols for the wesnoth binaries.
Package: wesnoth-1.8
Architecture: all
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
- want to have all the official campaigns installed. If you only want to play
+ 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
- the corresponding campaign packages.
+ the wanted campaign packages.
+ .
+ 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
+Architecture: all
+Depends: ${misc:Depends}, wesnoth-1.8 (>= ${binary:Version}),
+ wesnoth-1.8-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
+ 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-core package and the
+ wanted campaign packages.
.
Battle for control of villages, using variety of units which have advantages
and disadvantages in different types of terrains and against different types
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
+ 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
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, lsb-base
Description: multiplayer network server for Wesnoth (branch 1.8)
- This package contains the multiplayer network server for Wesnoth. You need it
+ 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.
.
Description: tools for campaign developers for Wesnoth (branch 1.8)
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
+ generation and checking of WML (Wesnoth Markup Language). You can find them
+ in the directory /usr/share/games/wesnoth/1.8/data/tools
after installation of the package.
.
Battle for control of villages, using variety of units which have advantages
diff --git a/debian/control.in b/debian/control.in
--- a/debian/control.in
+++ b/debian/control.in
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.8.4
+Standards-Version: 3.9.0
Uploaders: Gerfried Fuchs <rhonda@debian.at>
Homepage: http://wesnoth.org/
Vcs-Git: git://git.debian.org/git/pkg-games/wesnoth.git
wesnoth-BRANCH-data (= ${source:Version})
Suggests: wesnoth
Description: fantasy turn-based strategy game (branch BRANCH)
+ This package does contain 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
+ on all of them.
+ .
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-core
+Architecture: all
+Depends: ${misc:Depends}, wesnoth-BRANCH-core (>= ${binary:Version}),
+ wesnoth-BRANCH-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
+ using the latest stable version.
.
- Please note that this package recommends only three of the official campaigns,
- those that are considered to be an introduction to the game. They are just
- recommended but not depended on - quite some people enjoy the multiplayer mode
- for which they aren't needed. If you want to have all the official campaigns
- installed you are encouraged to install 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-dbg
Section: debug
Depends: ${misc:Depends}, wesnoth-BRANCH-core (= ${binary:Version}),
wesnoth-BRANCH-data (= ${source:Version})
Description: fantasy turn-based strategy game (debugging symbols for branch BRANCH)
+ This package contains the debugging symbols for the wesnoth binaries.
+ .
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 contains the debugging symbols for the wesnoth binaries.
Package: wesnoth-BRANCH
Architecture: all
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-BRANCH-server package), most helpful if you always
- want to have all the official campaigns installed. If you only want to play
+ 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-BRANCH-core package and
- the corresponding campaign packages.
+ the wanted campaign packages.
+ .
+ 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
+Architecture: all
+Depends: ${misc:Depends}, wesnoth-BRANCH (>= ${binary:Version}),
+ wesnoth-1.8-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
+ 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-core package and the
+ wanted campaign packages.
.
Battle for control of villages, using variety of units which have advantages
and disadvantages in different types of terrains and against different types
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, lsb-base
Description: multiplayer network server for Wesnoth (branch BRANCH)
- This package contains the multiplayer network server for Wesnoth. You need it
+ 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.
.
Description: tools for campaign developers for Wesnoth (branch BRANCH)
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/BRANCH/data/tools
+ generation and checking of WML (Wesnoth Markup Language). You can find them
+ in the directory /usr/share/games/wesnoth/BRANCH/data/tools
after installation of the package.
.
Battle for control of villages, using variety of units which have advantages
diff --git a/debian/copyright b/debian/copyright
--- a/debian/copyright
+++ b/debian/copyright
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>. The debianization is licensed under
-BSD style, see /usr/share/common-licenses/BSD.
+Gerfried Fuchs <rhonda@debian.at>.
+
It was downloaded from http://www.wesnoth.org/
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:
+
+ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ Version 2, December 2004
+
+ Copyright (C) 2007-2010 Gerfried Fuchs
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. You just DO WHAT THE FUCK YOU WANT TO.
diff --git a/debian/patches/02wesnoth-nolog-desktop-file b/debian/patches/02wesnoth-nolog-desktop-file
Author: Gerfried Fuchs <rhonda@debian.at> vim:ft=diff:
Description: call wesnoth-nolog from desktop file, too
-Index: wesnoth-1.8-1.8/icons/wesnoth.desktop
-===================================================================
---- wesnoth-1.8-1.8.orig/icons/wesnoth.desktop
-+++ wesnoth-1.8-1.8/icons/wesnoth.desktop
-@@ -55,7 +55,7 @@ Comment[sk]=Ťahová strategická hra z
+--- a/icons/wesnoth.desktop
++++ b/icons/wesnoth.desktop
+@@ -55,7 +55,7 @@
Comment[sr]=Фантазијска стратешка игра на потезе
Comment[sr@latin]=Fantazijska strateška igra na poteze
Comment[tr]=Fantastik, sırayla oynanan bir strateji oyunu
+Exec=wesnoth-1.8-nolog
Categories=Game;StrategyGame;
-Index: wesnoth-1.8-1.8/icons/wesnoth_editor.desktop
-===================================================================
---- wesnoth-1.8-1.8.orig/icons/wesnoth_editor.desktop
-+++ wesnoth-1.8-1.8/icons/wesnoth_editor.desktop
-@@ -33,7 +33,7 @@ Comment[lt]=Žemėlapių redaktorius Mū
+--- a/icons/wesnoth_editor.desktop
++++ b/icons/wesnoth_editor.desktop
+@@ -33,7 +33,7 @@
Comment[sr]=Уређивач за мапе намењене Боју за Веснот
Comment[sr@latin]=Uređivač za mape namenjene Boju za Vesnot
Comment[tr]=Wesnoth savaşı haritaları için harita düzenleyici
diff --git a/debian/patches/02wesnoth-nolog-desktop-file.in b/debian/patches/02wesnoth-nolog-desktop-file.in
Author: Gerfried Fuchs <rhonda@debian.at> vim:ft=diff:
Description: call wesnoth-nolog from desktop file, too
-Index: wesnoth-1.8-1.8/icons/wesnoth.desktop
-===================================================================
---- wesnoth-1.8-1.8.orig/icons/wesnoth.desktop
-+++ wesnoth-1.8-1.8/icons/wesnoth.desktop
-@@ -55,7 +55,7 @@ Comment[sk]=Ťahová strategická hra z
+--- a/icons/wesnoth.desktop
++++ b/icons/wesnoth.desktop
+@@ -55,7 +55,7 @@
Comment[sr]=Фантазијска стратешка игра на потезе
Comment[sr@latin]=Fantazijska strateška igra na poteze
Comment[tr]=Fantastik, sırayla oynanan bir strateji oyunu
+Exec=wesnoth-BRANCH-nolog
Categories=Game;StrategyGame;
-Index: wesnoth-1.8-1.8/icons/wesnoth_editor.desktop
-===================================================================
---- wesnoth-1.8-1.8.orig/icons/wesnoth_editor.desktop
-+++ wesnoth-1.8-1.8/icons/wesnoth_editor.desktop
-@@ -33,7 +33,7 @@ Comment[lt]=Žemėlapių redaktorius Mū
+--- a/icons/wesnoth_editor.desktop
++++ b/icons/wesnoth_editor.desktop
+@@ -33,7 +33,7 @@
Comment[sr]=Уређивач за мапе намењене Боју за Веснот
Comment[sr@latin]=Uređivač za mape namenjene Boju za Vesnot
Comment[tr]=Wesnoth savaşı haritaları için harita düzenleyici
diff --git a/debian/patches/03wesnothd-name b/debian/patches/03wesnothd-name
--- /dev/null
@@ -0,0 +1,14 @@
+Author: Gerfried Fuchs <rhonda@debian.at> vim:ft=diff:
+Description: Search for wesnothd-1.8 instead of plain wesnothd
+
+--- a/src/game_preferences_display.cpp
++++ b/src/game_preferences_display.cpp
+@@ -1255,7 +1255,7 @@
+ #ifndef WESNOTH_PREFIX
+ #define WESNOTH_PREFIX "/usr"
+ #endif
+- const std::string filename = "wesnothd";
++ const std::string filename = "wesnothd-1.8";
+ std::string path = WESNOTH_PREFIX + std::string("/bin");
+ if (!is_directory(path))
+ path = get_cwd();
diff --git a/debian/patches/03wesnothd-name.in b/debian/patches/03wesnothd-name.in
--- /dev/null
@@ -0,0 +1,14 @@
+Author: Gerfried Fuchs <rhonda@debian.at> 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 @@
+ #ifndef WESNOTH_PREFIX
+ #define WESNOTH_PREFIX "/usr"
+ #endif
+- const std::string filename = "wesnothd";
++ const std::string filename = "wesnothd-BRANCH";
+ std::string path = WESNOTH_PREFIX + std::string("/bin");
+ if (!is_directory(path))
+ path = get_cwd();
diff --git a/debian/patches/series b/debian/patches/series
--- a/debian/patches/series
+++ b/debian/patches/series
02wesnoth-nolog-desktop-file
+03wesnothd-name
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
#!/usr/bin/make -f
# debian/rules for wesnoth
# copyright 2007-2010 by Gerfried Fuchs <rhonda@debian.at>
-# Licenced under BSD style
+# Licenced under WTFPLv2
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
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
-include /usr/share/quilt/quilt.make
-
clean:
dh_testdir
dh_testroot
find po -name "*.gmo" -exec rm -f {} \;
find po -name "stamp-po" -exec rm -f {} \;
rm -f config.sub config.guess
- $(MAKE) -f debian/rules unpatch
+ $(MAKE) -f /usr/share/quilt/quilt.make unpatch
dh_clean
-configure: configure-stamp patch
+configure: configure-stamp
configure-stamp:
+ $(MAKE) -f /usr/share/quilt/quilt.make patch
CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./autogen.sh $(CONFIGURE_SWITCHES)
touch $@
debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/wesnoth-$(BRANCH_VERSION)_editor-icon.png
# /usr/share/doc symlinks
- for i in wesnoth-$(BRANCH_VERSION); do \
+ for i in wesnoth-$(BRANCH_VERSION) wesnoth wesnoth-core; do \
install -p -d -m755 debian/$$i/usr/share/doc; \
ln -s wesnoth-$(BRANCH_VERSION)-data debian/$$i/usr/share/doc/$$i; \
done
binary: binary-arch binary-indep
-.PHONY: clean configure build binary-indep binary-arch binary install
+.PHONY: clean configure build binary-indep binary-arch binary install patch unpatch
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
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 --editor" \
+ 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.postinst b/debian/wesnoth-1.8-core.postinst
--- /dev/null
@@ -0,0 +1,51 @@
+#!/bin/sh
+# postinst 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 --package wesnoth-1.8-core \
+ --divert /usr/games/$i-old \
+ --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 --package wesnoth-1.8-core \
+ --divert /usr/share/man/$i/man6/wesnoth-old.6.gz \
+ --rename /usr/share/man/$i/man6/wesnoth.6.gz
+ done
+}
+
+setup_alternatives()
+{
+ # man 6 wesnoth
+ slaves=$(for man in /usr/share/man/*/man6/wesnoth-1.8.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/games/wesnoth-nolog wesnoth-nolog /usr/games/wesnoth-nolog-1.8"
+
+ update-alternatives --install /usr/games/wesnoth wesnoth \
+ /usr/games/wesnoth-1.8 18 \
+ $slaves
+}
+
+case "$1" in
+ configure|reconfigure)
+ divert_oldfiles
+ setup_alternatives
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/wesnoth-1.8-core.postrm b/debian/wesnoth-1.8-core.postrm
--- /dev/null
@@ -0,0 +1,33 @@
+#!/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-core.prerm b/debian/wesnoth-1.8-core.prerm
--- /dev/null
@@ -0,0 +1,22 @@
+#!/bin/sh
+# prerm script for wesnoth-1.8-core
+# Copyright 2010 by Gerfried Fuchs <rhonda@debian.at>
+# Licensed under WTFPLv2
+
+set -e
+
+setup_alternatives()
+{
+ update-alternatives --remove wesnoth /usr/games/wesnoth-1.8
+}
+
+
+case "$1" in
+ remove)
+ setup_alternatives
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- a/debian/wesnoth-1.8-nolog
+++ b/debian/wesnoth-1.8-nolog
#!/bin/sh
# generic wesnoth-nolog script
# copyright 2009 by Gerfried Fuchs <rhonda@debian.at>
-# Licenced under BSD style
+# Licenced under WTFPLv2
$(echo $0 | sed -e s/-nolog$//) $* > /dev/null 2> /dev/null
# Provides: wesnoth-1.8-server
# Required-Start: $remote_fs
# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
+# 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.
### END INIT INFO
#!/bin/sh
# generic wesnoth-smallgui script
# copyright 2009 by Gerfried Fuchs <rhonda@debian.at>
-# Licenced under BSD style
+# Licenced under WTFPLv2
cmd=$(basename $0)
nosmall=$(echo $0 | sed -e s/-smallgui$//)
#!/bin/sh
# generic wesnoth_editor script
# copyright 2009 by Gerfried Fuchs <rhonda@debian.at>
-# Licenced under BSD style
+# Licenced under WTFPLv2
cmd=$(basename $0)
noedit=$(echo $0 | sed -e s/_editor$//)
diff --git a/debian/wesnoth-BRANCH-core.lintian-overrides.in b/debian/wesnoth-BRANCH-core.lintian-overrides.in
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
section="Games/Tools" \
title="Battle for Wesnoth Editor (BRANCH)" \
longtitle="Map editor for Battle for Wesnoth (BRANCH), a fantasy turn-based strategy game" \
- command="/usr/games/wesnoth-BRANCH-nolog --editor" \
+ command="/usr/games/wesnoth-BRANCH-nolog -e" \
icon="/usr/share/pixmaps/wesnoth-BRANCH_editor-icon.xpm"
diff --git a/debian/wesnoth-BRANCH-core.postinst.in b/debian/wesnoth-BRANCH-core.postinst.in
--- /dev/null
@@ -0,0 +1,51 @@
+#!/bin/sh
+# postinst 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 --package wesnoth-BRANCH-core \
+ --divert /usr/games/$i-old \
+ --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 --package wesnoth-BRANCH-core \
+ --divert /usr/share/man/$i/man6/wesnoth-old.6.gz \
+ --rename /usr/share/man/$i/man6/wesnoth.6.gz
+ done
+}
+
+setup_alternatives()
+{
+ # man 6 wesnoth
+ slaves=$(for man in /usr/share/man/*/man6/wesnoth-BRANCH.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-BRANCH.6.gz"
+
+ slaves="$slaves --slave /usr/games/wesnoth-nolog wesnoth-nolog /usr/games/wesnoth-nolog-BRANCH"
+
+ update-alternatives --install /usr/games/wesnoth wesnoth \
+ /usr/games/wesnoth-BRANCH BRANODOT \
+ $slaves
+}
+
+case "$1" in
+ configure|reconfigure)
+ divert_oldfiles
+ setup_alternatives
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/wesnoth-BRANCH-core.postrm.in b/debian/wesnoth-BRANCH-core.postrm.in
--- /dev/null
@@ -0,0 +1,33 @@
+#!/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
diff --git a/debian/wesnoth-BRANCH-core.prerm.in b/debian/wesnoth-BRANCH-core.prerm.in
--- /dev/null
@@ -0,0 +1,22 @@
+#!/bin/sh
+# prerm script for wesnoth-BRANCH-core
+# Copyright 2010 by Gerfried Fuchs <rhonda@debian.at>
+# Licensed under WTFPLv2
+
+set -e
+
+setup_alternatives()
+{
+ update-alternatives --remove wesnoth /usr/games/wesnoth-BRANCH
+}
+
+
+case "$1" in
+ remove)
+ setup_alternatives
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
#!/bin/sh
# generic wesnoth-nolog script
# copyright 2009 by Gerfried Fuchs <rhonda@debian.at>
-# Licenced under BSD style
+# Licenced under WTFPLv2
$(echo $0 | sed -e s/-nolog$//) $* > /dev/null 2> /dev/null
# Provides: wesnoth-BRANCH-server
# Required-Start: $remote_fs
# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
+# Default-Start:
+# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: Starts Wesnoth server (BRANCH)
# Description: Starts the Wesnoth server (BRANCH) used for multiplayer games.
### END INIT INFO
#!/bin/sh
# generic wesnoth-smallgui script
# copyright 2009 by Gerfried Fuchs <rhonda@debian.at>
-# Licenced under BSD style
+# Licenced under WTFPLv2
cmd=$(basename $0)
nosmall=$(echo $0 | sed -e s/-smallgui$//)
#!/bin/sh
# generic wesnoth_editor script
# copyright 2009 by Gerfried Fuchs <rhonda@debian.at>
-# Licenced under BSD style
+# Licenced under WTFPLv2
cmd=$(basename $0)
noedit=$(echo $0 | sed -e s/_editor$//)