[00:35] knome, well the merge has been proposed :) [11:54] micahg, would you like to approve this? haven't seen mr_pouit in a little while [11:54] https://code.launchpad.net/~smd-seandavis/xubuntu-default-settings/lightdm-gtk-greeter-updates/+merge/177959 [19:40] lderan, seriously, what?! [19:40] lderan, diff is 256809 lines... [19:40] lderan, any possibility you could do bzr merge lp:ubiquity-slideshow-ubuntu with your branch and repropose? ;) [19:41] that's insane... [19:45] sure [19:45] bluesabre, you around? [19:45] not sure what happened there [19:45] lderan, thanks :) [19:45] yeah, me neither [19:47] knome: o/ [19:47] bluesabre, what's the real package/name for our lightdm greeter [19:47] it isn't really "xubuntu greeter", right? [19:47] lightdm-gtk-greeter [19:48] is there a non-technical name? [19:48] "LightDM GTK Greeter" ? :) [19:48] LightDM GTK+ Greeter [19:48] thansk [19:48] https://launchpad.net/lightdm-gtk-greeter [19:48] thanks too [19:49] i was thinking that's it, but wanted to make sure [19:49] sure thing [19:50] one more question - who else is using the greeter? [19:50] lubuntu [19:51] okay [19:51] do you know if they have several sessions, or just lubuntu? [19:51] I think they just have one session [19:51] I can check later though [19:51] okay [19:51] i'll try to make the greeter testcase flavor-agnostic [19:52] personally, I would love to get rid of our "Xfce Session" since it breaks things [19:52] i wouldn't mind that, but i can see why some people appreciate it [19:54] what the... [19:54] bananas [19:56] some weirdo stuff going on in here. [20:11] knome, mmm my commit number is 69 yet yours is 571, is that why that happened? [20:12] lderan, heh, that sounds like a fair reason [20:12] lol [20:12] how did you manage to pull revision that old? [20:12] yeah, it does make sense because it looked like a lot of the code had been moved around... [20:12] i ran bzr branch lp:ubiquity-slideshow-ubuntu to get it [20:13] weird [20:29] ah think i wasn't in trunk [20:50] ah ha now a sane version number 569 [20:51] hehe [20:53] bah "bzr: ERROR: These branches have diverged. See "bzr help diverged-branches" for more information." [20:54] easier to make a new branch on ~lderan/ or is there an easy way to force it? [20:54] lp merge lp:ubiquity-slideshow-ubuntu [20:57] Nothing to do. [20:58] weird [20:58] ehh, bzr merge sure heh [20:58] but [20:58] aye :P [20:59] maybe you need to chagne the subbranch of whatever that's called in bzr.. [20:59] bzr switch trunk ? [21:00] bzr: ERROR: Not a branch: "/home/lderan/trunk/". [21:01] heh [21:01] weirdo [21:02] that's really weird [21:03] are you on an ancient revision if you do a re-pull? [21:04] nah, thats how i got the newer version number. [21:04] can't push to my /test branch now tho [21:04] of course, because *they* are diverged ;) [21:04] :P [21:05] Go to LP, delete. [21:06] will that mess with the linked bug? [21:07] lderan, yes, but we can re-link. [21:07] okay :) [21:08] okay done and repushed to /test [21:08] did you repropose too? [21:09] shall do so now [21:10] ta [21:13] done [21:14] will check the branch now [21:14] cool :) [21:16] and does that work without extra libs installed? [21:16] i think we need a reviewer that can do python ;) [21:18] no extra libs :) [21:18] think the only extra python include is os, as far as I know that is a default one. [21:18] and csv [21:22] lderan, one more request: [21:23] request away [21:23] lderan, can you modify the xubuntu welcome slide to only have the version id (as is in the main branch), and add a "usage" in the description [21:23] sure [21:24] if this gets approved, we should get in touch with other flavor teams and possibly dylan to make sure we update every slideshow to use these [21:27] added the usage to the MP description :P [21:27] ta [21:32] hopefully next time will go more smoothly, will double check version numbers :P [21:33] hehe [21:33] no problem ;) [21:34] i just had to seek for the way to link the bug to the branch some time [21:34] had to go to the bug and link to the branch from there, couldn't link a bug to a branch... [21:39] lderan, see your merge proposal, it has comments ;) [21:39] ooo [21:40] that is a quick thing to change :P [21:40] not the fallback though [21:41] ah, right [21:53] mmm a fallback [22:22] shall implement Dylans suggest tomorrow :P [22:22] suggestion* [22:22] nice, thanks :)