Re: wesnoth-1.8 freeze exception
Hi!
* Julien Cristau <jcristau@debian.org> [2010-08-18 13:26:28 CEST]:
> On Tue, Aug 17, 2010 at 09:56:59 +0200, Gerfried Fuchs wrote:
> 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.
It is, in the debian/wesnoth-BRANCH-core.postinst.in file from which
this helper script generates debian/wesnoth-1.8-core.postinst
#v+
update-alternatives --install /usr/games/wesnoth wesnoth \
/usr/games/wesnoth-BRANCH BRANODOT \
$slaves
#v-
Given that the branches are increasing its version constantly I chose
to use that for calculating the priority for the alternative handling.
> [...]
> > 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/?
Right, thanks, will improve that in a later upload, I wouldn't though
see this as something for which I solely would want to do another upload
round.
> > # /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)?
Doh, right, this is an issue I usually forget. You are right, I'll
produce a postinst snippet like I have in other packages already. Thanks
for catching that!
> > 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)?
Yes, it is. Actually it was in there before already, I just hadn't
adjusted the header yet.
I have two or three more things pending that I'd like to push in with
the next update fixing the package description improvement and fixing
the symlink doc dir transition:
-) The wesnoth server package should ship an default file for the
init.d script with documentation. It will only contain comments so I
don't see an objection here.
-) Adding a debian/NEWS entry about the transition and how people are
able to keep their old wesnoth version side-by-side with this update to
be able to continue to play their already started campaigns.
-) And this is the thing I would like to see your comments about:
Upstream released a 1.8.4 version within the last week. The even minor
numbers are their stable releases and they are pretty strict about what
they allow into them, they are bound to be compatible with their other
stable releases from the branch - and thus they only contain bugfixes
and (mostly) translation updates. I wonder if you would be willing to
accept that update into squeezes and wether I should base above
mentioned changes on that new upstream bugfix release or wether you
would want me to base them on the 1.8.3 version and consider 1.8.4 at a
later time.
Thanks in advance,
Rhonda
--
"Lediglich 11 Prozent der Arbeitgeber sind der Meinung, dass jeder
Mensch auch ein Privatleben haben sollte."
-- http://www.karriere.at/artikel/884/
Reply to: