gajim: merge new debian version

[Yann Rouillard]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

MOM: http://people.ubuntu.com/~scott/ongoing-merge/gajim
MOTU: yann
Status: to be merged

I'm currently working on a merged package. Please expect an
updated package to be uploaded to the archive in the near future.

   affects /distros/ubuntu/gajim
   assignee motumergers
   subscribe <email address hidden>

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQFDvFqPQLyqFC/lGi4RAk5PAKCpkZDJdDZRNXZbP9h2Z4oG0qpo1QCdEr7A
L8I0N+2t9DG1BVzgBCd1QTU=
=CDtl
-----END PGP SIGNATURE-----

[Yann Rouillard (yann-pleiades)]

It seems gajim is maintained in Ubuntu independantly from Debian, so I reassign this bug to Gajim Maintainers.

There is a debian/patches/00_debian-group_bugfix.patch in last debian package which might be interseting to merge.

[Stephan Rügamer (sruegamer)]

Why?

The merge has to be done by MOTU...please leave the bug where it came from, because only like this we can keep track of our merges.

There is right now a merge ongoing which merges the changes from debian to ubuntu and applies the ubuntu patches.

Please reassign. thx

[Yann Rouillard (yann-pleiades)]

Well, I thought this package was not really synced with debian since there was not changelog entry about sync with debian.
It seems this package is maintained independantly by the Gajim Maintainers team, hence it was not really clear to me if I had to sync it with debian.

I will reassign to Motu merges but how do I handle this merge or how to I step back on this package ?

[Stephan Rügamer (sruegamer)]

The ubuntu package of gajim came to ubuntu with version 0.8 which wasn't in debian and we (MOTU IM Team) pushed it into Ubuntu. Since then all patches, adds and changes are handled directly by the MOTU IM Team (Nafallo, Slomo and me).
THe merge itself is not handled as normal, but with looking on the changes from debian and we are incorporating them.
The debian/ dir itself goes normally directly in sync with debian, because I handle the merge manually.

The sourcecode and patches itself are in my local bzr archive and in there I'm doing all my changes and I retrieve all patches from there.

The gajim maintainers team has nothing to do with the ubuntu gajim package, because they are only doing the translations there (as far as I know and nkour was telling me).

The ubuntu gajim package itself has some ubuntu specific patches applied, so we have to make sure that those patches are not lost, please leave it to us or work with me together on this so you know what to do and join the MOTU IM Team :)

[Stephan Rügamer (sruegamer)]

Fixed with next upload

[Stephan Rügamer (sruegamer)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

The merge/sync compiled on all arches.

   affects /distros/ubuntu/gajim status fixed

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFDvV3lwYnnM8CY76gRAlH6AJ9/qNvhWdAtp3Dj0X0L7pCB7b+ibwCffcDH
IcftLjZoPhV31kpE40EET7M=
=CvMp
-----END PGP SIGNATURE-----

[Nikos Kouremenos (kourem-deactivatedaccount)]

yea, Stephan is right apart from the fact that we do some translation on rossetta (For those that liked Rosetta)

FWIW this Yann is not Yann Le Boulanger (just same name)