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