On Wed, Aug 18, 2010 at 13:48:50 +0200, Gerfried Fuchs wrote: > 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. > But this script replaces BRANODOT with $BRANCH, not $BRANODOT. [...] > 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. > Sounds ok. > -) 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. > Can we first get 1.8.3 in testing, and then look at 1.8.4? Cheers, Julien
Attachment:
signature.asc
Description: Digital signature