Integrating new version of libgaim?

[Ralf Schlatterbeck]

On Sat, Apr 26, 2008 at 08:43:00PM +0200, Jerome WAGNER wrote:
> Hello,
>  From what I remembe, it was decided to not integrate libpurple in the 
> 2.x branch because it was easier to do it in the coip branch.
> 
> You can find the status of the integration in the coip branch :
> * http://trac.qutecom.org/browser/qutecom%20coip/libs/3rdparty/libpurple
> * http://trac.qutecom.org/browser/qutecom%20coip/libs/purplewrapper
> 
> I hope this will help you as a jumpstart.
> Jerome
Interesting.
Can somebody give a summary of all the branches:
e.g., which branches exist, their purpose, what is there, plans on how
they will be integrated etc?

I currently know that there is/was a head/trunk and 2.2. And on head
there is python integration (or is this a separate branch).
So now I'm at the point where
- I'd like to have python integration from head
- I'd like to have a newer libgaim/libpurple from the coip branch 
:-)

Do all the changes (bug-fixes) we do on the 2.2 branch actually go to
the other branches or is there a regular merge?

Ralf
-- 
Dr. Ralf Schlatterbeck                  Tel:   +43/2243/26465-16
Open Source Consulting                  Fax:   +43/2243/26465-23
Reichergasse 131                        www:   http://www.runtux.com
A-3411 Weidling                         email: office at runtux.com
osAlliance member                       email: rsc at osalliance.com