|
[03:00] <valorie> welcome to the Council, Myriam / Mamarock |
|
[06:20] <soee> good morning |
|
=== vinay is now known as Guest41668 |
|
=== mgraesslin_ is now known as mgraesslin |
|
[09:11] <Riddell> shadeslayer: want some merging done? |
|
[09:11] <Riddell> valorie: alive? |
|
[09:14] <apachelogger> why would it? |
|
[09:14] <apachelogger> agh, wrong tab ^^ |
|
=== Haudegen__ is now known as Haudegen |
|
[09:52] <Riddell> "Kenny Duffus (kduffus) renewed their own membership in the Kubuntu Members" yay seaLne still loves us! |
|
[09:54] <seaLne> yep |
|
[10:34] <shadeslayer> Riddell: why are you listed as merging things for all of the things ? |
|
[10:37] <Riddell> shadeslayer: because I'm merging all the things |
|
[10:37] <shadeslayer> sure, but one at a time right ? :P |
|
[10:37] <Riddell> I am a jet engine in the wind, hear me soar |
|
[10:38] <Riddell> I batch it up as much as possible, download all the tars, clone all the debian git, merge all the changelogs, make diffs for review, then review them all |
|
[10:38] <shadeslayer> ack |
|
[10:48] <Riddell> shadeslayer: do we have a kde-games-core-declarative ? |
|
[10:48] <shadeslayer> yep |
|
[10:48] <shadeslayer> !info kde-games-core-declarative utopic |
|
[10:48] <ubottu> Package kde-games-core-declarative does not exist in utopic |
|
[10:48] <shadeslayer> eh |
|
[10:49] <Riddell> shadeslayer: it's in bzr |
|
[10:49] <shadeslayer> Riddell: it's in proposed |
|
[10:49] <Riddell> oh right |
|
[10:50] <shadeslayer> I reckon libkdegames is blocked because it would break other stuff |
|
[10:51] <shadeslayer> so once the merge is done, we need to upload 4.13.2 to the archive |
|
[10:51] <Riddell> autopkgtest for libkdegames 4:4.13.1-1ubuntu1: Always failed |
|
[10:52] <Riddell> that's the trouble with all this QA stuff, things will start to fail |
|
[10:53] <Riddell> and I've no idea why |
|
[10:54] <shadeslayer> Riddell: always failed is fine |
|
[10:54] <shadeslayer> it won't block the migration |
|
[10:55] <shadeslayer> but if things passed, and then if the autopkgtests start to fail after a upload, then it blocks migration |
|
[10:56] <Riddell> ok, maybe there's some other reason why it's blocked |
|
[10:57] <shadeslayer> I know why |
|
[10:57] <shadeslayer> libkdegames6 is now libkdegames6abi1 |
|
[10:57] <shadeslayer> so stuff needs rebuilding against the new libkdegames6abi1 , which is why once we merge, we need to upload 4.13.2 |
|
[11:00] <Riddell> gotcha |
|
[11:06] <BluesKaj> 'Morning |
|
[11:19] <Riddell> interestingly there's a bunch of packages debian has chosen not to have -dbg packages for |
|
[11:25] <Riddell> and then for some they add -dbg packages compared to yours |
|
[11:26] <shadeslayer> yep, its weird |
|
[11:26] <shadeslayer> I've kept ours where it made sense |
|
[11:26] <shadeslayer> in others, I've dropped it ( for eg. some stuff was exclusively python I think ) |
|
[11:36] <Riddell> but but how do they survive without kteatime-dbg?! |
|
[11:40] <shadeslayer> guess their tea doesn't need debugging |
|
[11:40] <shadeslayer> or worse, they don't drink tea |
|
[11:49] <BluesKaj> after reading about the amount of pesticides in tea nowadays I avoid it as much as I can |
|
[11:51] <Riddell> the return of Kross Ruby! apachelogger will be pleased |
|
[11:54] <BluesKaj> however i imagine coffee pesticide levels are probly just as high |
|
[11:57] <apachelogger> if there was a reason to use kross that is |
|
[13:40] <Riddell> shadeslayer: what's all this ${so:Depends} ? |
|
[13:41] <shadeslayer> magic |
|
[13:41] <shadeslayer> see the so plugin for debhelper |
|
[13:41] <Riddell> dh_sodeps ? |
|
[13:42] <shadeslayer> yep |
|
[13:42] <shadeslayer> quite magic |
|
[13:44] <Riddell> seems like an alternative to allLibraries |
|
[13:56] <Riddell> dantti: ping |
|
[13:56] <Riddell> dantti: should our print-manager package have a soft recommends on system-config-printer-udev (which contains /lib/udev/rules.d/70-printers.rules /lib/udev/udev-configure-printer /lib/udev/udev-add-printer) |
|
[13:59] <Riddell> dantti: also we have patch ignore_scp_dbus_failures.diff for https://bugs.launchpad.net/ubuntu/+source/system-config-printer/+bug/1048606 |
|
[13:59] <ubottu> Ubuntu bug 902762 in system-config-printer (Ubuntu Quantal) "duplicate for #1048606 scp-dbus-service.py crashed with ImportError in __main__: No module named asyncconn" [High,Fix released] |
|
[13:59] <Riddell> dantti: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/print-manager/view/head:/debian/patches/ignore_scp_dbus_failures.diff |
|
[14:00] <Riddell> I don't know if we want that or not, debian doesn't have it |
|
[14:04] <Riddell> ScottK: do you know if there's any gotcha in the pykde merge? |
|
[14:05] <Riddell> hmm looks kindae scary |
|
[14:21] <Riddell> shadeslayer: for your merges are you settings the -dev build-depends to 4.13 ? |
|
[14:21] <shadeslayer> Riddell: nope |
|
[14:21] <ScottK> I'd have imagined it'd be a sync. |
|
[14:21] <shadeslayer> ScottK: bzr still needs updating |
|
[14:21] <shadeslayer> since we use bzr |
|
[14:21] <shadeslayer> so workflow is very different |
|
[14:22] <Riddell> shadeslayer: hmm, won't that break the smooth building in future updates? |
|
[14:22] <ScottK> Right. Except that. |
|
[14:22] <shadeslayer> Riddell: nope, script will update it |
|
[14:22] <shadeslayer> when we upload 4.13.2 |
|
[14:23] <Riddell> ok if you say so |
|
[14:23] <shadeslayer> control = re.sub(r'%s\s*\(>=.*?\)' % builddep, '%s (>= %s%s)' % (builddep, epoch, upstreamVersion), control) |
|
[14:23] <shadeslayer> much magic regex there |
|
[14:23] <Riddell> aside: that kubuntu-initial-upload build-dep update needs sorted to work for kf5 and plasma 5 |
|
[14:32] <yofel> FWIW, you don't have to update them to 4.13 on merge, but you need to make sure some version is there in case debian doesn't have one |
|
[14:33] <yofel> my magic regex there doesn't *add* a version if there is none |
|
[14:38] <yofel> Riddell: well, as long as the epoch is the same you can just add kf5 and plasma to kde-sc-dev-latest-utopic.txt |
|
[14:38] <yofel> better than nothing |
|
[14:38] <sgclark> Riddell: ok I seem to be stuck on kde-baseapps requires baloowidgets which does not seem to exist in baloo kf5, ideas? |
|
[14:39] <yofel> baloowidgets is a seperate source |
|
[14:39] <Riddell> sgclark: yeah I guess there's a baloowidgets frameworks branch |
|
[14:39] <sgclark> Riddell: yofel ahh ok, then off to package that, thanks |
|
[14:54] <Riddell> yum free pizza from AWS, at last I get something back for all this money I sent them :) |
|
[15:03] <jussi> hrm, pizza... |
|
[15:03] <jussi> nom |
|
[15:04] <Riddell> sorry too late, all gone |
|
[15:06] <jussi> perhaps I need to call the pizza shop... |
|
[15:07] <Riddell> nah just launch one on AWS like I did |
|
[15:07] <Riddell> after an hour it's gone but that's fine |
|
[15:07] <shadeslayer> Riddell: free pizza? :D |
|
[15:08] <Riddell> only pepsi and 7up left now |
|
[15:48] <sgclark> Riddell: ok so there is a problem with the current Baloo-kf5-dev installing cmake files without KF5 prepended so baloo-widgets can't find it, however it looks like this is fixed in frameworks git, patch the one we have or package git version? |
|
[15:49] <Riddell> sgclark: either way, probably easier to grab a git snapshot |
|
[15:49] <sgclark> Riddell: ok off to package baloo lol |
|
[16:01] <Riddell> unless anyone can think of a reason why it should ↑ |
|
[16:21] <lordievader> Good evening. |
|
[16:53] <kubotu> feed branches had 25 updates, showing the latest 6 |
|
[17:04] <shadeslayer> Riddell: you commited .gitattributes too |
|
[17:04] <shadeslayer> useless cruft that is |
|
[17:05] <shadeslayer> http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/svgpart/revision/117/debian/changelog < looks properly screwed up |
|
[17:05] <shadeslayer> 4:4.10.4-1 after 4:4.13.0 |
|
[17:06] <shadeslayer> same with other packages too |
|
[17:06] <shadeslayer> :( |
|
[17:07] <shadeslayer> Riddell: and why 4.13.2 entries in the changelog :S |
|
[17:07] <shadeslayer> I am unsure if we can run the 4.13.2 script now |
|
[17:08] <shadeslayer> yofel: ^^ |
|
[17:08] * yofel wonders why even run it |
|
[17:09] <yofel> it's a mess already, no point in fixing :P |
|
[17:10] <shadeslayer> yofel: well, the idea was to merge, then run the 4.13.2 script to sort out package renames and what not |
|
[17:10] <yofel> how would that sort out anything |
|
[17:10] <yofel> 4.13.80 will sort that out |
|
[17:10] <yofel> or not doing SRU's |
|
[17:10] <shadeslayer> ah, I was going to remove the diffing logic |
|
[17:10] <shadeslayer> so it uploads everything |
|
[17:11] <shadeslayer> not just the diffs |
|
[17:11] <yofel> the diffing logic only applies to --sru |
|
[17:11] <yofel> devel always gets everything |
|
[17:11] <yofel> that has nothing to do with package renames though... |
|
[17:12] <shadeslayer> then it should have worked out, since some lib stuff is stuck in proposed because it breaks packages, once we uploaded 4.13.2, everything would have rebuilt against the new stuff |
|
[17:12] <shadeslayer> and would have worked out? |
|
[17:12] <yofel> ah yeah, proposed is a thing it would've solved |
|
[17:12] <yofel> hm |
|
[17:13] <yofel> the script *should* do something sensible if you run it with the same changelog message that the current 4.13.2 entry already has |
|
[17:13] <yofel> or not |
|
[17:13] <yofel> dch will not like the released changelog |
|
[17:14] <yofel> you can run with --nopush and throw the branches that already are .2 away before pushing |
|
[17:14] <soee> good evening |
|
[17:16] <yofel> shadeslayer: actually, if there is already a released entry for the version you want, the script should really ignore the branch |
|
[17:16] <yofel> maybe you could add a check for that around line 345 |
|
[17:17] <yofel> there is already some matching logic to prevent dch from running twice |
|
[17:18] <yofel> pattern = re.compile("^%s \((\d+:)?%s.*?\).*?\n --" % (package, upstreamVersion), re.DOTALL) |
|
[17:18] <yofel> someone explain to me what exactly I wrote there... -.- |
|
[17:18] <shadeslayer> heh |
|
[17:18] <shadeslayer> magic |
|
[17:19] <yofel> ah, matches the header and content of the first changelog entry |
|
[17:20] <yofel> well, you add it if you want, too magic for me :P |
|
[17:21] <shadeslayer> xD |
|
=== PaulW2U is now known as G4MBY |
|
[18:00] <kubotu> feed branches-next had 7 updates, showing the latest 6 |
|
[19:29] <Riddell> weird e-mail du jour http://paste.kde.org/p3qfv3kjv |
|
[19:30] <Riddell> shadeslayer: shrug, .gitattributes is in debian git so I'm just syncing to that |
|
[19:31] <Riddell> shadeslayer: the changelogs show the order of merges correctly |
|
[22:02] <shadeslayer> Riddell: idk merge changelog seems to be the standard tool for merging these kind of things and it does it very differently |
|
[22:14] <valorie> Riddell: alive, and here now |
|
[22:29] <valorie> ... and now off to run a bit |
|
[23:20] <Riddell> shadeslayer: which is why I don't trust it :) |
|
[23:41] <sgclark> Riddell: can you review baloo-widgets5 when you get a chance |
|
[23:45] <valorie> and back |
|
[23:45] <valorie> Riddell: did you have a question? |
|
|