[11:23] <CIA-33> ubiquity: cjwatson * r3363 ubiquity/ (11 files in 2 dirs):
[11:23] <CIA-33> ubiquity: Upgrade to debhelper v7. There's still some fairly significant ugliness
[11:23] <CIA-33> ubiquity: in our debian/rules, but this is a slight improvement.
[11:26] <CIA-33> ubiquity: cjwatson * r3364 ubiquity/.bzrignore: ignore debian/ubiquity-frontend-debconf
[14:02] <CIA-33> ubiquity: mterry * r3365 trunk/ (5 files in 5 dirs): kde: merge translated timezones from lp:~mterry/ubiquity/translated-timezones
[14:03] <dpm> mterry: thanks for the detailed e-mail with the info on the translated timezones!
[14:04] <mterry> dpm, np :)
[14:05] <mterry> dpm, sorry the translations are all over the place, but that's just how it ended up :)
[14:14] <CIA-33> ubiquity: mterry * r3366 trunk/ (debian/changelog gui/glade/ubiquity.glade): gtk: remove separators from dialogs
[14:30] <dpm> mterry: np :)
[15:24] <StevenK> mterry: Did you see bug 412832?
[15:24] <mterry> StevenK, hrm, no.  looking
[15:26] <mterry> StevenK, from what I can see, it never had an icon.  This bug just showed up because UNR displays like it does..  Interesting.  Easy enough to assign one
[15:33] <CIA-33> ubiquity: mterry * r3367 trunk/ (3 files in 2 dirs): add icons for oem-config-prepare menu entries
[16:22] <CIA-33> ubiquity: mterry * r3368 trunk/ (24 files in 5 dirs): gtk: convert glade to GtkBuilder
[16:40] <superm1> mterry, by making change r3367, keep in mind that the "prepare shipping to end user icon" will remain on the installed system after oem-config runs still
[16:41] <mterry> superm1, why would my change make that happen?
[16:41] <superm1> mterry, well at least in standard ubuntu now it would.  it wasn't showing up in the menus before i dont think
[16:42] <mterry> superm1, eww, you mean that oem-config-prepare is somehow sticking around?  that's a separate bug from showing an icon, but also should be fixed
[16:42] <superm1> mterry, yeah that's what i was getting at, just reminding that since oem-config and ubiquity remain installed...
[16:43] <mterry> superm1, how was this handled in the past?
[16:44] <superm1> mterry, in the past oem-config has just remained installed since it didn't have any way to clean up itself
[16:44] <mterry> superm1, but then the menu items would have also stuck around before.  that doesn't seem right
[16:44] <superm1> mterry, previously i thought the menu item was not put in the system menu, it was just on the 'oem' user's desktop
[16:45] <mterry> superm1, hmm, maybe?  I don't remember seeing that code when I merged the codebases, but I'll check how oem-config used those .desktop files
[16:46] <superm1> hmm. maybe i'm wrong though.  'Categories=GTK;System;Settings;' in the old ./desktop/oem-config-prepare-gtk.desktop.in
[16:48] <superm1> so my mistake, the behavior should be the same.  nonetheless, it cleaning itself up is the proper solution :)
[16:49] <mterry> superm1, so you're saying you think the current behavior is the same as before?  i.e. we aren't regressing?
[16:49] <superm1> mterry, i'll need to look at a fresh 9.04 install to be sure.
[16:55] <mterry> superm1, hrm, it looks like old oem-config and ubiquity do the same thing.  but it doesn't make sense to me.  oem-config installs a .desktop file to a private location, then copies it the system during postinst.  then when the oem user is created, it copies it over to the oem user's desktop.  i just don't know why it bothers copying it to the system so everyone sees it
[16:56] <superm1> mterry, i'd guess it's in a bunch of place to ensure that it's seen no matter what
[16:57] <cjwatson> the reason I never arranged for oem-config to be removed is that I was being cautious about the possibility that oem-config might need to be rerun afterwards
[16:57] <cjwatson> but it may be that that was more useful during debugging than in reality
[16:57] <cjwatson> it's probably ok not to put the .desktop file in the menus
[16:59] <mterry> cjwatson, hmm, OK.  The change to not install into the main menus is probably not disruptive.  i can do that
[18:06] <superm1> mterry, i should be able to convert most of the mythbuntu stuff over to gtkbuilder too over the weekend, i just need to make sure i dont fully break glade because we have third parties that ship mythbuntu control centre plugins in glade currently
[18:15] <mterry> superm1, there's no rush
[18:15] <mterry> superm1, but cool, thx
[23:42] <CIA-33> os-prober: cjwatson * r235 ubuntu/ (9 files in 7 dirs): merge from Debian 1.30
[23:47] <CIA-33> os-prober: cjwatson * r236 ubuntu/debian/changelog: releasing version 1.30ubuntu1