unifying libdiff2

[Jeremy Whiting]

Hello Release team, a quick question.  I've split kompare/libdiff2 into
it's own git repository libkomparediff2 which builds on its own has all
branches/tags, etc. but need it to not be split for KDE SC 4.11 since
that's frozen anyway, so I guess I need to only merge my changes to kompare
to the master branch, and KDE/4.11 branch can be used to release KDE SC
4.11.x releases, right?

Kevin,
I've pushed my libkomparediff2 to the new official git repo, if you could
check it and kompare on my branch builds ok for you I'd appreciate it. then
I'll enable the hooks and do the other items on my list (make kdevplatform
use it, check the differences between the two copies, etc.

thanks,
Jeremy


On Sat, Jul 20, 2013 at 4:25 PM, Kevin Kofler <kevin.kofler at chello.at>wrote:

> Hi Jeremy,
>
> On Friday 19 July 2013 at 17:59:33, Jeremy Whiting wrote:
> > Thanks for the guidance.  I did decide the actions and such do belong
> > inside KompareModelList afterall, and found a way to make KomparePart get
> > the actions from the KompareModelList and add them to it's own
> > actionCollection.  I've pushed a branch to kompare called movelibdiff2 if
> > you want to take a look.  It works ok here, but I'll let you guys see
> what
> > you think of my solution.
> >
> > My libdiff2 is at scratch/whiting/libdiff2 and builds by itself and
> > installs a LibKompareDiff2Config.cmake file that libdialogpages on my
> > branch uses to find LibKompareDiff2 variables to build against.
>
> I looked at your changes, everything looks fine to me, so:
>
> Ship it!
>
>         Kevin Kofler
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kompare-devel/attachments/20130724/4a6d4429/attachment.html>