wesnoth: merge new Debian version 1.2.7-2

[Andrea Gasparini]

Binary package hint: wesnoth

Merge wesnoth 1.2.7-2 from Debian unstable.
Ubuntu component: Universe
Debian component: Main

[Emilio Pozuelo Monfort (pochu)]

Importance High since this fixes a CVE

[Emilio Pozuelo Monfort (pochu)]

Andrea Gasparini wrote:
> Hi Emilio,
> I think I did it.
>
> Although there are a few things that bother me.
> I start from the merge from DaD, and i think I corrected all, trying to
> minimize the difference with debian, so:
>
> - i made a debdiff, attacched in this mail, that should make wesnoth
> compile and packaging. I also got it install in a hardy chroot.
>
> - there's a part that doens't appear so clear to me, in data/wesnoth/sr.po
> there's a part, that doesn't appear in debian version.
>
> 330 +#: data/abilities.cfg:445
> 331 +msgid ""
> 332 +"Slow:\n"
> 333 +"This attack slows the target until it ends a turn. Slow halves the
> damage "
> 334 +"caused by attacks and slowed units move at half the normal speed
> (rounded "
> 335 +"up)."
>
> I leaved it, but i'm not sure about this. I found this change also in other
> files, so i tought that could be a patch for something, but i didn't find
> anything related to this code.

You can safely remove those. It looks like a mistake when merging it in the past...

Also, improve your debian/changelog entry to reflect the remaining changes:

 * Merge from Debian, remaining changes:
   - debian/control:
     + Added wesnoth-all metapackage.
     + Changed Maintainer to MOTU.
 ...

Cheers,
Emilio

>
> bye!

[Andrea Gasparini (gaspa)]

done. it seems ok.

[Emilio Pozuelo Monfort (pochu)]

Andrea, can you remove the po/ changes? They shouldn't be there, and removing them will also make the diff smaller.

[Andrea Gasparini (gaspa)]

Sure, I thought there was a reason for those to be there.

Do you think that's ok, now?

thanks, and sorry for my dumb mistakes. I'm still quite new in ubuntu packaging.

[Emilio Pozuelo Monfort (pochu)]

You put twice the metapackage in debian/changelog. Other than that, it looks good. Subscribing ubuntu-universe-sponsors

[Andrea Gasparini (gaspa)]

you're right. sorry.

[Andrea Gasparini (gaspa)]

Emilio, must I provide a build log in order to upload the package? do I only have to wait for the upload?

thanks

[Emilio Pozuelo Monfort (pochu)]

No, this is Ok. The merge is listed in http://daniel.holba.ch/sponsoring/ so a sponsor should pick it up soon.

[Luke Yelavich (themuso)]

Since its early in the cycle, why don't we try and get as many changes as possible into Debian? Don't forget the discussoin that has been going on re wesnoth on the MOTu mailing list.

If we can get all changes in, a sync is required, and no more work from our end is needed.

[Emilio Pozuelo Monfort (pochu)]

Hi Luke.

You are right. It would be awesome to get our changes in Debian. I'll take care of that.

However, I believe this is important to upload. We can sync from Debian later, if our changes are applied, or remove some of them, or merge again. But this has a CVE fix which should get in.

For the stable releases, I've reported bug 156436

[Luke Yelavich (themuso)]

Uploaded. Thanks for your wokr/. Please mark the bug as fix released once the package has built onn all architectures. Please also specify the bug number in the changelog, to close the sponsor request bug, with the format (LP: #nnnnnn) to ensure that the sponsor request bug automatically get closed on package upload, saving you, and the sponsor some time.

Again, I also encourage getting all Ubuntu changes into Debian where possible.

[Andrea Gasparini (gaspa)]

I don't understand: do you want another debdiff? i haven't permission to change the changelog once you uploaded it.

[Luke Yelavich (themuso)]

You don't need to do anything. As I said, the package has been uploaded. I am however suggesting that you put the bug number in the changelog as I explained in my previous comment. This means that you or I for example, won't have to close any future bugs you file requesting sponsorship of uploads.

[Emilio Pozuelo Monfort (pochu)]

Andrea, Luke means that you do that in the future ;)

By the way, the other day I filed Debian bug 449132 [1] about the wesnoth-all metapackage. So we only have the dummy locales, which I'll discuss with Debian, since they think it's not a good idea. We should probably remove it, but let's first get some feedback.

[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=449132

[Andrea Gasparini (gaspa)]

yes, i got it.
I was confused because in another merge someone (don't remember exactly who and when) tell me to don't do it. So, next time, i'll ask to be sure ;)
thanks.