[00:12] <clivejo> I really need to learn how to merge!
[00:13] <valorie> I need to learn how to package
[00:13] <valorie> btw: upgrade went awesomely
[00:14] <valorie> hmmm, it seems to have purged yakuake from auto-starting though
[00:14] <clivejo> well git merge is part of packaging :)
[00:14] <valorie> and I've not done that either
[00:15]  * valorie removed landing ppa
[00:15] <clivejo> I should go to bed
[00:16] <valorie> sweet dreams, clivejo
[00:16] <valorie> thanks for your work
[00:16] <clivejo> but this wind is sooo noisy
[07:15] <soee> good morning
[08:46] <sitter> clivejo: bot became self-aware
[08:47] <lordievader> Good morning.
[09:42] <yossarianuk> hi - since upgrading to plasma 5.5.3 apt-check seems to break my machine every morning.
[09:42] <yossarianuk> Came in this morning - desktop load was @ 100 
[09:43] <soee> there is a bug report about it i think
[09:43] <soee> and a pending patch upstream
[09:44] <yossarianuk> there were hundreds  of apt-check ...
[09:44] <yossarianuk> (processes_
[09:44] <yossarianuk> soee: cheers 
[09:45] <yossarianuk> (if that was aimed at me..)
[09:45] <yossarianuk> what you you guys think about project Neon ?
[10:15] <yossarianuk> to avoid the apt-check issue I have added a cron job..
[10:15] <yossarianuk> 2 9 * * * /usr/bin/killall -9 apt-check
[10:16] <yossarianuk> so my desktop works in the morning... - also done a bug report https://bugs.launchpad.net/ubuntu/+source/update-notifier/+bug/1540830
[10:16] <valorie> thanks, yossarianuk
[10:17] <valorie> I didn't experience that
[10:17] <valorie> but you aren't the only one
[10:21] <yossarianuk> I only notice when I come in in the morning to the office...
[10:21] <yossarianuk> I don;t notice on my home PC, but I don't leave that on over night , etc
[10:34]  * sitter not sure why muon uses apt-check anyway
[10:38] <yossarianuk> sitter: hasn't muon been replaced by plasma-discover ?
[10:39] <bshah> muon and plasma-discover are different thing
[10:39] <bshah> one is package manager other is software center
[10:42] <yossarianuk> hmm - dpkg -l | grep muon -> shows -> 'ii  muon-updater                                    4:5.5.3a-0ubuntu1~ubuntu15.10~ppa5              all          Transitional package (muon-updater -> plasma-discover-updater)'
[10:53] <clivejo> yossarianuk: have you tested 5.5.4 yet?
[11:10] <clivejo> 146 Broken Senile packages
[11:10] <yossarianuk> clivejo: no, I have this repo enabled -> https://launchpad.net/~kubuntu-ppa/+archive/ubuntu/backports?field.series_filter=wily
[11:11] <clivejo> its in backports landing
[11:11] <clivejo> https://launchpad.net/~kubuntu-ppa/+archive/ubuntu/backports-landing
[11:11] <clivejo> you had a multiple monitor setup that 5.5.4 is supposed to fix?
[11:11] <yossarianuk> I do
[11:12] <yossarianuk> although the only real issue i'm having is with the apt-check bug on 5.5.3
[11:12] <clivejo> will you try it?
[11:12] <clivejo> I see that from my back log
[11:12] <clivejo> give 5.5.4 a try
[11:21] <yossarianuk> clivejo: I shall do @ home.
[11:23] <yossarianuk> if I add the backports-landing repo, when 5.5.4 is in kubuntu-backports ppa will that superseed it ?
[11:36] <clivejo> 5.5.4 shouldnt be in kubuntu-backports yet
[11:36] <clivejo> still being tested at the moment
[12:27] <BluesKaj> Hiyas all
[12:28] <clivejo> hi BluesKaj
[12:28] <BluesKaj> Hi clivejo
[12:40] <apol_> Riddell, sitter, anyone: can you help soee test a patch? he needs to repackage discover with it *please...*
[12:41] <soee> clivejo: ping
[12:47] <sitter> soee: apt-cache policy plasma-discover-updater
[12:49] <soee> sitter: http://paste.ubuntu.com/14856903/
[12:52] <yofel> fun, I was trying to figure out some docker slowness and ran into https://github.com/plasma-mobile/xbuilder/issues/2 XD
[12:52] <sitter> soee: where do you have 5.5.4 from?
[12:52] <sitter> yofel: ulimit all the way :)
[12:52] <yofel> yossarianuk: you won't get any updates when it's moved then, as it'll be the same packages just from a different location
[12:52] <sitter> https://github.com/blue-systems/pangea-tooling/blob/master/lib/ci/container.rb#L73
[12:53] <yofel> thx
[12:54] <soee> sitter: we have it in bacports-landing/staging
[12:55] <sitter> soee, apol_: what's the patch?
[12:55] <apol_> sitter: https://git.reviewboard.kde.org/r/126923/
[13:05] <soee> brb, food time
[13:07] <sitter> apol_: soee: https://launchpad.net/~apachelogger/+archive/ubuntu/axios building now
[13:15] <apol_> <3
[13:48]  * soee high fifes sitter
[13:49]  * mamarley plays the drum along with soee's fife.
[13:50] <sitter> yofel, clivejo, sgclark: FYI there's repos without unstable branch http://anonscm.debian.org/cgit/pkg-kde/frameworks/oxygen-icons5.git/
[13:52] <soee> !testers discover-notifier patch tests needed (https://launchpad.net/~apachelogger/+archive/ubuntu/axios)
[13:52] <soee> !testers
[13:52] <soee> discover-notifier patch tests needed (https://launchpad.net/~apachelogger/+archive/ubuntu/axios)
[13:53] <soee> yossarianuk: ping
[14:00] <yossarianuk> hey soee:
[14:01] <soee> yossarianuk: are you on Wily ?
[14:01] <yossarianuk> yes i am
[14:02] <soee> yossarianuk: can you test this https://launchpad.net/~apachelogger/+archive/ubuntu/axios ? it should fix apt processes bug and the notifier icon in systray staying after updates
[14:02] <clivejo> soee: is this bug only on wily?
[14:02] <soee> clivejo: no, but sitter created updated package for WIly
[14:02] <sitter> clivejo: because you have not created one
[14:02] <yossarianuk> soee: i'm still currently on plasma 5.5.3 - am I ok to use that package ?
[14:03] <soee> sitter: ^
[14:03] <BluesKaj> soee, sorry, no Wily install here
[14:03] <clivejo> sitter: this is my first time with a backport, have I done something wrong?
[14:03] <soee> BluesKaj: np. i will test it now here at work
[14:04] <soee> clivejo: it is not related to your packaging
[14:04] <soee> just to test patch for upstream bug
[14:04] <sitter> no, clivejo is just speaking out of context :P
[14:05] <sitter> clivejo: also that is unrelated to backports
[14:05] <soee> reboot, brb
[14:25] <soee> apol: i'v added ppa:libreoffice/ppa to get some packages to update. Run apt update, and update snotification icon showed up in systray. Than run apt full-upgrade but after installing updates icon is still in systray (when clicking on it is saysthat my system is up to date)
[14:26] <soee> apol: so thi spatch does not fix the problem with this icon - it is visible in systray after updates
[14:26] <apol> soee: so the updates count changes but it doesn't disappear?
[14:26] <apol> soee: do you get the apt-check eating up your resources?
[14:27] <soee> apol: i didn't test apt-check, give me few more minutes
[14:29] <apol> soee: also did you restart plasma?
[14:30] <soee> apol: i have rebooted after updating to test version
[14:30] <apol> soee: ok
[14:31] <apol> you didn't answer, by the way: [15:20] <apol> soee: so the updates count changes but it doesn't disappear?
[14:32] <soee> apol: checking step by step, running apt update, shows 1 apt-check process that taks ~ 25% cpu at teh end than is gone
[14:32] <soee> after this notifier shows 24 packages to update
[14:33] <apol> ok
[14:33] <apol> then I'll commit
[14:35] <apol> soee: pushed http://commits.kde.org/discover/7ded9bf1de57f7954be552a48aa9abdb3e4db400
[14:35] <soee> apol: also i reru updates again but had notifier extende dview pined and it shows 24 updates while there are none
[14:36] <soee> abd if i click on teh update button it pens discover with messag ethat there are not updates
[14:36] <apol> I'll reopen this bug then
[14:37] <soee> apol: thank you
[15:27]  * lordievader goes to boot his Wily box
[15:51] <lordievader> How can I effectively test the apt patch?
[15:59] <lordievader> Hmm, no million apt-check processes after installing the package. I guess that is a good sign.
[16:00] <clivejo> :)
[19:49] <clivejo> Riddell or sitter: would any of you be around to teach me how to do a debian git merge?
[19:54] <yofel> clivejo: not sure if they're around, at least jr said that he'll take some time off
[19:54] <yofel> so what do you want to know?
[19:54] <clivejo> how to merge
[19:55] <yofel> (If you expect me to write a guide with complete commands and explenation - that's not going to happen)
[19:55] <clivejo> properly, without causing craziness and madiness and have KCI shout at me
[19:56] <clivejo> I need a walk through, watch or instruct me whilst doing an actual merge
[19:56] <yofel> let me explain the merging, The kci part you'll have to figure out yourself.
[19:56] <yofel> let me pick something simple
[19:57] <clivejo> PIM?
[19:57]  * yofel pretends he didn't read that
[19:57] <clivejo> spoil sport
[19:57] <yofel> XD
[19:57] <clivejo> step?
[19:57] <yofel> hm, maybe
[19:58] <yofel> clivejo: yeah, we can do that
[19:58] <yofel> so, I made a fresh clone
[19:59] <clivejo> Maxy seems to be doing a huge amount of work 
[19:59] <yofel> the first thing you will want to do is check the diff between debian and ubuntu, to check if there's diff that you don't need anymore
[20:00] <yofel> git diff origin/master origin/kubuntu_xenial_archive
[20:00] <yofel> will show you the diff
[20:01] <yofel> the changelog diff is junk, just skip that part. dpkg-mergechangelogs will take care of that
[20:04] <yofel> in the diff you will see a couple things that we don't need, like XS-Testsuite in control, and that debian interestingly doesn't have the autopkgtest stuff
[20:04] <yofel> I do this step mostly just so I know what the diff is, and to look for things that might go wrong in the merge, in case debian removed something that we want to keep
[20:04] <clivejo> and the qt5.5 patch
[20:05] <yofel> the 2 patches are in master, but not in kubuntu_xenial_archive, hence the red
[20:05] <yofel> come to think of it, is your diff output colored?
[20:05] <clivejo> that would fix our problems
[20:05] <clivejo> thats why I added .PHONY
[20:06] <clivejo> so do I cherry pick the best solution from both branches
 come to think of it, is your diff output colored?
[20:07] <clivejo> yes it is coloured
[20:07] <yofel> ok
[20:07] <clivejo> white, green, red and blue
[20:07] <yofel> you have [merge "dpkg-mergechangelogs"] in your .gitconfig?
[20:08] <clivejo> nope
[20:08] <yofel> add this:
[20:08] <yofel> [merge "dpkg-mergechangelogs"]
[20:08] <yofel>     name = debian/changelog merge driver
[20:08] <yofel>     driver = dpkg-mergechangelogs -m %O %A %B %A
[20:08] <clivejo> K
[20:09] <yofel> next, you switch to kubuntu_xenial_archive, and merge origin/master
[20:10] <yofel> that will apply all debian changes onto our branch
[20:10] <clivejo> git checkout kubuntu_xenial_archive
[20:11] <clivejo> ok
[20:11] <yofel> yes
[20:11] <clivejo> git merge origin/master
[20:11] <clivejo> sorry, Im going to copy/paste this conversation 
[20:11] <yofel> np, that's a good idea
[20:11] <clivejo> need the commands I actually use
[20:12] <clivejo> so what happens with the two different solutions?
[20:13] <yofel> so, if you had a package where the merge went wrong, you would now have to resolve conflicts in files, and individually git add each of them and 'git commit' everything at the end
[20:13] <yofel> the commit message will already be filled out by git
[20:13] <clivejo> ie we chose to disbale the autotests and debian seem to have patched the problem
[20:14] <yofel> we take their solution, unless there's a good argument for not using it (doesn't work in ubuntu, would need patching again, ...)
[20:14] <clivejo>  8 files changed, 167 insertions(+), 26 deletions(-) and 5 new files
[20:14] <yofel> once the commit is done, you will want to review the merge
[20:15] <yofel> you can do that with git diff HEAD^
[20:15] <yofel> the ^ means: one commit backwards (^^ 2 commits, etc.)
[20:15] <yofel> you need to do that even if you don't get conflicts, to find cases where we and debian did the same change - in different positions in a file
[20:16] <yofel> can esp. cause a mess if it happens in control or rules
[20:17] <yofel> in the case of step, all technical changes are fine
[20:17] <yofel> the changelog should be fixed though
[20:18] <yofel> we have an UNRELEASED 4:15.12.0-0ubuntu1 that comes *after* a released 4:15.12.0-1
[20:18] <yofel> that shouldn't be the case
[20:18] <yofel> if we would have the same upstream version, the way to go would be to move our changelog to the top, and change the version to 4:15.12.0-1ubuntu1
[20:19] <yofel> in this case, we move it to the top and change the version to 4:15.12.1-0ubuntu1
[20:19] <yofel> as we were working on .1
[20:20] <yofel> also add a changelog entry saying "Merge with debian git master"
[20:21] <clivejo> do I leave my changelog for 15.12.0?
[20:22] <yofel> no, you move it to the top
[20:22] <clivejo> I have
[20:22] <yofel> UNRELEASED should never appear anywere but the topmost changelog entry
[20:22] <clivejo> but surely there is no need to have  * Disbaling autotests due to fix needed upstream
[20:23] <sgclark> yofel: clivejo please update trello with merges I am working on them and seem to be running into conflicts as things are being done as same time as me
[20:23] <clivejo> as that version was unrelease?
[20:23]  * yofel hasn't touched merges in days
[20:23] <yofel> kdelibs I forgot to mark as done though, sorry
[20:23] <clivejo> I think that was me, I was fixing KCI failures
[20:24] <yofel> clivejo: yes, that's fine to remove then
[20:24] <yofel> clivejo: you'll also want to remove the test override in rules then
[20:25] <clivejo> done
[20:26] <yofel> ok, that should finish step and you can check it off on the trello board - after you've uploaded the new package to staging
[20:26] <yofel> and don't forget to push ^^
[20:26] <clivejo> and it gets commited to xenial_archive?
[20:26] <yofel> yes
[20:27] <clivejo> sorry pushed
[20:27] <sgclark> please mark the project before hand with your name and WIP please.
[20:27] <yofel> merges always go into _archive
[20:28] <yofel> git pull still doesn't see anything o.O
[20:28] <clivejo> havent pushed yet
[20:28] <clivejo> you are as impatient as soee :P
[20:28] <genii> heh
 sorry pushed <-- past tense ^^
[20:29] <clivejo> I corrected my question :P
[20:29] <clivejo> and it gets commited/pushed to xenial_archive?
[20:30] <yofel> ah
[20:30] <clivejo> ok Ive updated the trello note, is that oki?
[20:31] <yofel> sgclark: sorry, I saw that step was still red on the status page and didn't check trello
[20:31] <yofel> sgclark: are you not uploading to the ppa?
[20:32] <sgclark> yofel: I seem to have been sending to invalid ppa, fixing.. sorry
[20:33] <sgclark> but I have been using trello
[20:33] <yofel> yeah, good job on trello. I was just curious why the status page didn't change
[20:34] <sgclark> because I am a dummy, staging-applications should have been staging-kdeapplications.. we need consistency haha
[20:34] <yofel> *facepalm*
[20:34] <yofel> I've stumbled over the same damn thing myself a couple times
[20:34] <clivejo> made that mistake myself
[20:36] <sgclark> oy this is many... 
[20:36]  * yofel "fixed" that by writing a dput shortcut
[20:36] <clivejo> yofel: did you see sitters post about missing branches for oxygen?
[20:36] <yofel> nope
 yofel, clivejo, sgclark: FYI there's repos without unstable branch http://anonscm.debian.org/cgit/pkg-kde/frameworks/oxygen-icons5.git/
[20:37] <yofel> ah
[20:37] <yofel> I guess I didn't bother as adding stuff to CI needs manual doing
[20:37] <yofel> so I left it to the person doing that
[20:37] <clivejo> can they be added 
[20:38] <sgclark> who is that person?
[20:38] <yofel> sitter or shadeslayer I guess?
[20:38] <yofel> dunno
[20:39] <sgclark> mmm my bouncer does not seem to log anything anymore, I see that message nowhere
[20:42] <clivejo> !info libgsl-dev xenial
[20:43] <clivejo> !info libgsl-dev wily
[20:43] <clivejo> need to backport libgsl-dev to wily?
[20:44] <yofel> that would be the first thing to try
[20:44] <yofel> if that's not possible you'll need to make the dep optional
[20:45] <yofel> dpkg doesn't support that, but there's ways around that
[20:45] <clivejo> I guess get apps 15.12.1 working in xenial first and cross that backporting bridge when we come to it
[20:48] <clivejo> how often should we be merging with debian?
[20:50] <sgclark> after every release, the problem is it takes an entire release to finish haha. Went much faster when there was 6+ of us working on them
[20:50] <sgclark> there has to be a better way...
[20:50] <clivejo> KDE release or Kubuntu release?
[20:51] <sgclark> Ubuntu
[20:51] <lordievader> Is Kubuntu obliged to follow Ubuntu releases?
[20:51] <sgclark> if we want to remain a flavor, yes
[20:52] <lordievader> Ah.. Else Kubuntu could consider to skip releases.
[20:52] <sgclark> We reap no benifit removing flavor status, we would lose everything. 
[20:53] <sgclark> we are struggling as it is
[21:08] <clivejo> yofel: help please
[21:09] <yofel> yes?
[21:09] <clivejo> Ive done a debian merge on syndication
[21:10] <clivejo> but I made some changes in unstable
[21:10] <clivejo> few days ago
[21:10] <clivejo> when I merge unstable into archive the changelog is conflicting
[21:11] <yofel> why are you merging unstable into archive?
[21:11] <clivejo> Im trying to get those changes 
[21:11] <yofel> unstable tracks 16.04-dev
[21:11] <yofel> you don't want to merge that
[21:12] <yofel> cherry pick the changes instead
[21:12] <clivejo> could I merge debian into unstable?
[21:12] <sgclark> yes never merge unstable into archive!!
[21:13] <yofel> you could... if you don't want debian in _archive
[21:13] <yofel> which is again: why?
[21:14] <clivejo> ok so how do I fix the merger?
[21:14] <yofel> you merge archive into unstable
[21:14] <clivejo> Im not explaining myself
[21:16] <sgclark> what you want to do will break many things. You need to cherry-pick that change into archive
[21:17] <lordievader> clivejo: Perhaps you should cleary explain what problem you have and how you are trying to fix it.
[21:17] <yofel> clivejo: do you know 'git cherry-pick'? If yes, please properly explain what you're trying to achieve
[21:17] <clivejo> Im no good at explaining myself :(
[21:17] <clivejo> it makes sense in my head
[21:18] <sgclark> I understand he made changes in unstable and wats to merge that into archive.But it cannot be done that way. google cherry-pick git and grab that change and apply it to archive branch.
[21:18] <yofel> what I read so far is "I'm trying to fix the merger by doing something that the merger never does"
[21:49] <tsdgeos> hi guys, topic says FW 5.18 landing in xenial
[21:49] <tsdgeos> any hint of "when"?
[21:56] <clivejo> in the landing PPA?
[21:57] <clivejo> tsdgeos: https://launchpad.net/~kubuntu-ppa/+archive/ubuntu/ppa-landing
[21:57] <tsdgeos> clivejo: why is there a ppa for xenial? 
[21:57] <tsdgeos> i mean xenial is a development release anyway
[21:58] <tsdgeos> is it like development-development ppa?
[22:00] <clivejo> there is certain QA needs to be achieved before it goes to the archive
[22:00] <tsdgeos> i see
[22:00] <tsdgeos> ok, will keep waiting
[22:01] <clivejo> there have been a few issues need resolving
[22:02] <clivejo> tsdgeos: you can help test if you are interested :)
[22:03] <tsdgeos> i wish i had time for it, life claims me elsewhere unfortunately
[22:04] <clivejo> Its being worked on
[22:04] <tsdgeos> appreciate that :)
[22:28] <clivejo> yofel sgclark: whats going on with sweeper?
[22:29] <clivejo> http://anonscm.debian.org/cgit/pkg-kde/applications/sweeper.git/
[22:34] <sgclark> clivejo: could you be a bit more specific, I have no context to your question :(