[Kde-pim] kdepimlibs 4.12 versioning problem
dvratil at redhat.com
Tue Dec 10 12:59:00 UTC 2013
On Tuesday 10 of December 2013 19:52:16 Ben Cooksley wrote:
> Hi everyone,
> It would appear that the CMakeLists.txt in kdepimlibs for KDE/4.12
> currently has it's version set to 4.12.43, which is totally wrong.
> More concerningly, it means master has been merged into KDE/4.12 at some
> My checks reveal the commit in question which did this is
> probably ca3a3857b5ab80497b3318659a7b07bb21560ede.
> Can someone please verify this is the case?
yes, the merge had a conflict in root CMakeLists.txt, probably due to the
> If it is the case, what action do we need to take? Should we force rewind
> it back to the last good commit - b299b86fb5e0a7f57d5828297703b9aa676ca5f9
> and cherry pick the needed patches? Or just patch up the version number and
> any other issues it has?
gitk shows some mess (commits from 2006-2013 on top of the commit list), so I
think it would be better to rewind back to the last good commit and cherry
pick the good commits from master. From my kde-commits ML folder (which I
don't guarantee is complete on my side, but should be) it looks like there
were following commits done into 4.12 after the bad merge:
> KDE PIM mailing list kde-pim at kde.org
> KDE PIM home page at http://pim.kde.org/
KDE Desktop Team
Associate Software Engineer, Red Hat, Inc.
GPG Key: 0xC59D614F6F4AE348
Fingerprint: 4EC1 86E3 C54E 0B39 5FDD B5FB C59D 614F 6F4A E348
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 490 bytes
Desc: This is a digitally signed message part.
More information about the release-team