On Tue, Aug 17, 2010 at 09:56:59 +0200, Gerfried Fuchs wrote:
> Hi!
>
> Please allow wesnoth-1.8 (1:1.8.3-3) to move over to squeeze. The
> update now finally contains the unversioned wesnoth and wesnoth-core
> packages for transitional purpose (#586291) and to ease upgrades to
> later upstream versions. It also addresses the broken .desktop files
> (#588712).
>
> The diff[1] is not the tinies but it contains the development that I
> was doing over the last few months and was only recently able to
> finalize it.
>
Few questions:
> diff -u wesnoth-1.8-1.8.3/debian/branchcheck wesnoth-1.8-1.8.3/debian/branchcheck
> --- wesnoth-1.8-1.8.3/debian/branchcheck
> +++ wesnoth-1.8-1.8.3/debian/branchcheck
> @@ -1,16 +1,18 @@
> #!/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
$BRANODOT isn't used anywhere.
[...]
> diff -u wesnoth-1.8-1.8.3/debian/control wesnoth-1.8-1.8.3/debian/control
> --- wesnoth-1.8-1.8.3/debian/control
> +++ wesnoth-1.8-1.8.3/debian/control
> [...]
> @@ -33,16 +33,30 @@
> 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.
s/does contain/contains/?
[...]
> diff -u wesnoth-1.8-1.8.3/debian/rules wesnoth-1.8-1.8.3/debian/rules
> --- wesnoth-1.8-1.8.3/debian/rules
> +++ wesnoth-1.8-1.8.3/debian/rules
> @@ -147,7 +146,7 @@
> 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
[...]
is the directory->symlink transition for wesnoth handled somewhere
(assuming stable had it as a directory)?
> diff -u wesnoth-1.8-1.8.3/debian/wesnoth-1.8-server.init.d wesnoth-1.8-1.8.3/debian/wesnoth-1.8-server.init.d
> --- wesnoth-1.8-1.8.3/debian/wesnoth-1.8-server.init.d
> +++ wesnoth-1.8-1.8.3/debian/wesnoth-1.8-server.init.d
> @@ -3,8 +3,8 @@
> # 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
is this reflected in the dh_installinit invocation (if any)?
Cheers,
Julien
Attachment:
signature.asc
Description: Digital signature