Rebase of kopete branch and push it to master

Ben Cooksley bcooksley at kde.org
Thu Jan 25 03:47:20 UTC 2018


On Thu, Jan 25, 2018 at 11:26 AM, Pali Rohár <pali.rohar at gmail.com> wrote:
> On Friday 19 January 2018 21:56:10 Ben Cooksley wrote:
>> On Fri, Jan 19, 2018 at 12:06 PM, Pali Rohár <pali.rohar at gmail.com> wrote:
>> > On Thursday 18 January 2018 20:50:35 Ben Cooksley wrote:
>> >> Hi all,
>> >>
>> >> I have now completed the merge from Pali's clone repository into the
>> >> 'master' branch of the main Kopete repository.
>> >> Phabricator processing of all the commits has been completed without incident.
>> >
>> > Hi! Thank you very very much!
>> >
>> >> Pali, please revise the metadata accordingly in sysadmin/repo-metadata
>> >
>> > See quoted comments/questions below
>> >
>> > https://phabricator.kde.org/source/sysadmin-repo-metadata/browse/master/projects/kde/kdenetwork/kopete/metadata.yaml
>> >
>> >> description: 'h1. Kopete - The KDE Instant Messenger
>> >
>> > What does "h1." means? Looks like some wiki(?) syntax for heading. No
>> > idea if it should be there or not.
>>
>> That is a leftover from when this data was generated from the
>> descriptions used by projects.kde.org, which ran Redmine/Chiliproject.
>> It means nothing to anything we run these days and should be cleaned up.
>>
>> >
>> >> - displayname: "Pali Roh\xE1r"
>> >
>> > What is encoding of that YAML file? Is not UTF-8 supported?
>>
>> The conversion tool we used was conservative in regards to handling
>> information and encoded everything that couldn't be represented in
>> Latin-1 I believe.
>> I've entered UTF-8 characters into other files, and they certainly
>> should be encoded in and support, UTF-8.
>
> Ok. Is some step from my side needed now?

Please feel free to update that file to use the UTF-8 version of your
name should you wish to do so.

>
>> >
>> > Otherwise looks correct.
>> >
>> > https://phabricator.kde.org/source/sysadmin-repo-metadata/browse/master/projects/kde/kdenetwork/kopete/i18n.json
>> >
>> >> {"trunk": "master", "stable": "Applications/17.08", "stable_kf5": "none", "trunk_kf5": "none"}
>> >
>> > I do not fully understand content of this JSON file, but there is no
>> > KDE4 trunk version in repository anymore. master branch now points to
>> > trunk KF5 version and there is no 17.12 (stable) version.
>>
>> Luigi has now updated this I believe.
>>
>> >
>> >> (for i18n) and kde-build-metadata (for the CI and kdesrc-build users)
>> >
>> > It is https://phabricator.kde.org/source/kde-build-metadata/ right? What
>> > should I check there?
>>
>> In that repository you need to check two things:
>>
>> 1) logical-module-structure, JSON formatted, which defines a series of
>> rules stating which branches are used by projects.
>
> Seems correct.

Excellent.

>
>> 2) the dependency-data-* files, which contain the dependency
>> definition rules between KDE projects for each branch grouping.
>> Anything not defined in here won't be made available on the CI, and
>> this data is used by kdesrc-build to sequence the order of things to
>> build.
>>
>> In regards to the dependency data, please note that there is a generic
>> wildcard rule at the very bottom which makes essentially all
>> Frameworks a dependency of anything in Applications, Extragear or
>> Playground so you don't need to declare a dependency on any Framework
>> you use.
>
> This IIRC should be enough. Anyway, if there is CI problem, is report
> send to somewhere?

Please file a task on Phabricator against the build.kde.org project
and we'll take it from there.

>
>> Hope that clears things up.
>>
>> Cheers,
>> Ben
>>
>> >
>> >> as soon as possible.
>> >>
>> >> Regards,
>> >> Ben
>> >
>> > --
>> > Pali Rohár
>> > pali.rohar at gmail.com
>
> --
> Pali Rohár
> pali.rohar at gmail.com

Cheers,
Ben


More information about the kopete-devel mailing list