[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice-devel
Subject:    Re: KOffice 1.1 Release
From:       Thomas Zander <zander () planescape ! com>
Date:       2001-08-10 17:36:42
[Download RAW message or body]

On Fri, Aug 10, 2001 at 06:25:26PM +0200, Werner Trobin wrote:
> Hi!
> 
> As KDE 2.2 already has been branched it looks like the whole KDE CVS got
> unfrozen and e.g Michael Matz fixed KOffice to compile with the recent
> HEAD kdelibs. To prevent stuff like that from happening I decided that it
> might be a good idea to create a KOFFICE_1_1_BRANCH and open HEAD for
> commits.
> 
> This means that as of now KOffice HEAD is unfrozen and we can e.g. put
> KWORD_WYSIWYG back in the HEAD branch.
> 
> Thinking about binary comatibility issues I think it's safe to break
> BC if neccesary as the next KOffice version (1.2?) will be released
> after the switch to Qt 3. If we decide to release 1.1.1 we will work
> with the KOFFICE_1_1_BRANCH anyway, so this also isn't a problem.
> However, it would be nice if we could keep source compatibility :)
> 
> I'll now revert the patch reversion of Michael Matz (hehe :) and
> merge the KWord stuff to HEAD (let's hope that cvs book covers that
> topic ;).

Easy:
- cvs up -A
  cvs tag -b KOFFICE_1_1_BRANCH

- cvs up -A
  (cd lib &&  cvs upd -j libkotext_after_1_1 configure.in.in kotext)
  (cd kword && cvs upd -j KWORD_WYSIWYG)
Fix all merge errors ;)
  cvs commit -m "bla"

-- 
Thomas Zander                                            zander@earthling.net
The only thing worse than failure is the fear of trying something new

[Attachment #3 (application/pgp-signature)]
_______________________________________________
Koffice-devel mailing list
Koffice-devel@master.kde.org
http://master.kde.org/mailman/listinfo/koffice-devel


[prev in list] [next in list] [prev in thread] [next in thread]