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! -- wesnoth: merge new Debian version 1.2.7-2 https://bugs.launchpad.net/bugs/156436 You received this bug notification because you are a member of Ubuntu Bugs, which is the bug contact for Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs