[Kroupware] Re: Partial merge of kroupware into HEAD

[Don Sanders]

I had a brief look but ran out of time, I'll leave this with Tobias.

Don.


On Thursday 28 November 2002 16:49, Don Sanders wrote:
> I'm a bit busy this morning but I will have a look at the
> KAddressBook changes later.
>
> Don Sanders / sanders@kde.org
> KMail  Adopter / kmail.kde.org
> KDE PIM  Co-founder / kdepim.org
> KAddressbook  Founder / kaddressbook.org
> KDE  Contributor / kde.org
>
> On Thursday 28 November 2002 08:33, Marc Mutz wrote:
> > Hi!
> >
> > Since HEAD CVS is open for 3.2 development again, I've comitted
> > some of the kdenetwork stuff that was developed in
> > kroupware_branch to HEAD. Specifically, this is:
> >
> > 1. RFC-compliant MDN support
> > 2. Rudimentary support for vacation through Sieve.
> > 3. A ManageSieve KIO::Slave
> > 4. KTNEF, a lib and gui to read and view MSTNEF/MAPI objects.
> >
> > Thus, the branching in the following subdirs of kdenetwork has
> > been killed:
> > - libkdenetwork
> > - kioslaves
> > - ktnef
> > Equivalently, you could say that only the kmail subdir stays
> > branched for now.
> >
> > If you worked on the kroupware_branch from CVS, you can apply
> > these commands to update:
> > cd kdenetwork/libkdenetwork
> > cvs up -A .
> > cd ../ktnef
> > cvs up -A .
> > cd ../kioslaves
> > cvs up -A .
> >
> > Tomorrow, I will port the KMAccount hierarchy refactoring I've
> > done so far to HEAD and then hope that KDAB will have
> > disconnected IMAP ready for porting ASAP. I don't want to keep
> > merging stuff against a devel version. :-(
> >
> > Also tomorrow, I will likely merge kroupware's KAddressBook into
> > HEAD. Changes are:
> > 1. new subdir resourceimap
> > 2. some apparent bugfixes in the other code.
> > I'd like to hear from kdepim people about (2) and about the merge
> > of kaddressbook in general. Specifically, I need permission from
> > someone to merge. The attached patch contains all changes made in
> > the kroupware_branch outside of the new subdir. [Please CC me]
> >
> > That means, that the stuff that's left in kroupware_branch in
> > kdenetwork is what's controversial and in kdepim what's not
> > understood yet by me or also controversial.
> >
> > We plan to port kroupware_branch to use Kaplan, but we are not
> > sure that we will get a stable version this way in time for the
> > contract to be fulfilled successfully.
> >
> > Thus, we plan to open a new branch port_kroupware_to_kaplan (or
> > so) and do the port there using the make_it_cool code, so we can
> > keep kroupware_branch for bugfixing and as possible end product
> > to be shipped to the BSI in the likely case that we don't get
> > kroupware/kaplan stable in time.
> >
> > In any case, kroupware/kaplan will be what ends up in HEAD.
> >
> > Marc