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