[Konversation-devel] Konversation branch changes

[Eike Hein]

Hi everyone,

with the port to KF5 now nearing completion, we have merged
the frameworks branch to master and deleted it.

We've also branched master into a 1.6 branch for KDE i18n to
focus on, since we plan to release a KF5-based beta soon.

Here is the full overview over all active branches:

* 1.5: The KDE Platform 4-based stable branch. 1.5.x is
released from this.

* 1.6: The first release branch based on KDE Frameworks 5.
A 1.6 Beta 1 will be released from this fairly soon.

* master: The development branch, also based on KF 5.


Konversation contributors: As usual, please commit fixes to
the lowest eligible branch and then merge up. In many cases
this means 1.5 -> 1.6 -> master. The remaining KF5 porting
work should go into 1.6 and be merged up into master. Eli
can use master for his ipf2 work.


KDE sysadmin: I've adjusted kde-build-metadata to this:

   "extragear/network/konversation": {
     "stable-qt4": "1.5",
     "latest-qt4": "1.5",
     "stable-kf5-qt5": "1.6",
     "kf5-qt5": "master"
   }

Please double-check this is all KDE CI needs and in the
correct format.


I'll be mailing kde-i18n-doc separately to prepare for the
Beta as soon as projects.kde.org has synced the repo and I
can select the proper i18n branches.


Cheers,
Eike