[00:37] So I'm bazaar branching the documentation of natty and precise; I'm going to be asking a few questions but I'll look through these documents first [00:38] Natty? [00:39] shawnb, don't be fooled by the command saying natty. it's called that because the precise docs are essentially natty docs with s/11.04/12.04/ [00:39] (11.10 actually, so we failed even that) [00:40] yeah oneiric; I was going through the mailing list information today; so was 12.04's documentation updated at all? or is it just missing a few items? [00:40] got it knome [00:41] the branch we're working with now is copied from 13.10 [00:41] the -old branch is basically what was the documentation for 11.04 [00:42] that's purely for reference [00:42] so we're trying to do 12.04.2's right? we're not working on 13.10s [00:43] yes, we're trying to get the "precise" branch to match the situation in 12.04.2 [00:44] but we've taken the 13.10 docs branch, because that's much better than the old docs [00:44] makes sense [01:08] I'm reading through the new documentation (I compiled it to read through it easier); and I was wondering if we could do apt links for software we reference to automatically install things for the user like omgubuntu does [01:09] that would be something for the development (13.10) branch, and we'd have to see how we can handle apt:-links automatically [01:09] i don't think we're doing that currently by default [01:09] apt://minitube-ubuntu - that's how omgubuntu does it off their site [01:10] shawnb, that opens a "choose an application" window, and there isn't any applications that are handling those links [01:10] odd I use chrome and it prompts me to run xdg-open [01:11] right, that works [01:11] Do you have apturl-gtk? [01:11] firefox didn't propose that, but running 'xdg-open apt://appname' worked [01:11] mine prompted to open ubuntu software centre - uh.. not sure lemme check [01:12] Task: ubuntu-desktop, ubuntu-usb, edubuntu-desktop, edubuntu-usb, lubuntu-desktop, ubuntu-gnome-desktop [01:12] no apturl isn't [01:13] Unit193, i've a pretty default installation, and i've definitely installed anything that would open apt://-links, so there needs to be some magic [01:14] apturl-common is installed, but doesn't help me, maybe USC is required? [01:15] probably USC [01:15] I'm torrenting a xubuntu 12.04.2 iso I can check and see if it works in that [01:29] I can confirm in a default install of Xubuntu 12.04.2 it does prompt to launch Ubuntu Software Center when clicking on apt links [01:30] Well alright. [01:30] i mean, gweh [01:30] sure, we could do that [01:31] but rather than using our limited time on that, let's focus on other things which need reworking [01:31] if we end up having time, sure, we can do that as well [01:31] i would say we would need to test the apt://-links though. [01:31] and that's the reason why i'm not sure about that [01:33] shawnb, you missed at least two of my messages, let me repaste: [01:33] 04:31 knome: i would say we would need to test the apt://-links though. [01:33] 04:31 knome: and that's the reason why i'm not sure about that [01:33] (yes, the timestamp is to indicate that it is 4:30am here) [01:33] dang need to do my updates; my audio crashed my system - oh wow 4:30am [01:33] yeah like I said in the default install it does open USC; that's a new fresh install of xubuntu 12.04.2 [01:34] *prompt for install via USC [01:35] yup, but we still should smoketest that change [01:35] true [01:35] and we might be a bit too tight on time for that for the SRU [01:35] depends so much how the rest of the stuff comes along [01:37] absolutely; it'd be an idea to keep for future releases though [01:37] yup, we can work on that for the 13.10 docs [01:37] for those, we have a looser schedule [01:41] woo! [01:41] http://status.ubuntu.com/ubuntu-s/group/topic-s-flavor-xubuntu.html [01:44] You renamed it. [01:45] yeah, i was told it wasn't showing up because of that [01:45] the topic blueprints used to be topic-raring-* though, so... [01:48] knome - how would you like me to go about the documentation changes - put them in a document and mail it to the mailing list or discuss them on here? [01:49] shawnb, the optimal way would be merge proposals [01:49] shawnb, want me to go through that now? :) [01:50] yes that would be great [01:50] okay [01:50] so how familiar were you with bzr? [01:50] I've used it in the past to download packages like you do with git for compilation [01:51] I haven't committed any changes or anything like that [01:51] ok [01:51] so let's assume you have branched the docs and done some changes [01:52] then you would want to commit and push it. commit happens locally, pushing... pushes the code online [01:52] so first, the commit: [01:52] bzr commit [01:52] that will open you a text editor where you should write the commit message [01:53] anything specific e.g. chapter 6 where it says xyz changed line ____ to ____ [01:53] no, you don't need to be that specific [01:53] more in the lines of: [01:54] quick question, are we using the old documentation interface (natty/oneric) to update or the new one (precise) [01:54] "Reviewed chapter 6, updated application names and removed a mention of XYZ, which doesn't exist in 12.04" [01:54] the new one [01:55] ok, thank you [01:55] so basically, a commit message is a descriptive but brief comment about the changes you've made [01:55] if you write a good one, we can repurpose that in the changelog, which is awesome [01:55] do you commit per change or do all the changes then commit? [01:56] You may want to bzr whoami first. [01:56] use common sense: try to group meaningful subgroups into commits [01:57] eg. committing every spelling error fix is bad [01:57] otoh, totally rewriting a few sections and doing one commit is bad as well [01:58] bzr whoami - Shawn Barnes [01:58] yup, that looks good [01:58] (let's see if you also need to do other things...) [01:58] sections meaning chapters or sections meaning pieces of the chapter [01:58] anyway, once you've committed, you want to push [01:58] sections meaning chapters :) [01:59] as i said, just use common sense [01:59] it's humans who review it anyway, so anything that you think is sensible bunch of changes is probably fine [02:00] so once you've committed once or twice or how many times you need to, type: [02:00] bzr push [02:00] ...and forget that. [02:00] you will need to specify a different push location, so: [02:00] bzr push lp:~yourlpnick/xubuntu-docs/precise-branchname [02:01] you can do a test commit/push now so we can go through it [02:01] it can be anything, even just something silly. [02:01] so bzr push lp:~slooksterpsv/xubuntu-docs/precise-???? [02:01] yup [02:02] nothing where the ??? is right? [02:02] or branch [02:02] and the complete branchname could be for example precise-chapter6 [02:02] or something descriptive [02:03] it doesn't really matter what it is - you will need to enter something [02:03] ok so it'll create a branch via my name for that [02:03] yes [02:04] so go ahead and change something, then bzr commit and bzr push [02:04] then we'll go through what that does and how you'd do the actual merge proposal [02:05] ok I compiled the docs is that going to be a problem when I try the push? [02:05] no, the built docs are ignored [02:05] (there's a line in .bzrignore for that) [02:06] bzr: ERROR: Not a branch: "/home/shawn/Xubuntu Community/Documentation/". [02:07] right. you need to be in the xubuntu-docs-precise directory [02:07] oh ok [02:07] or whatever your branch directory is [02:07] same with bzr commit and push [02:08] ok so it's finding revisions and uploading [02:08] great! [02:08] oops I did push not commit [02:08] commit first then push right? [02:09] yep [02:10] can I delete this branch? [02:10] let's do the fake merge request first [02:11] as you probably noticed, it appeared in https://code.launchpad.net/~slooksterpsv [02:11] on https://code.launchpad.net/~slooksterpsv/xubuntu-docs/precise-testpush, you have a link that says "propose for merging" [02:11] click that [02:11] ok [02:11] the target branch for the precise docs is: lp:xubuntu-docs/precise [02:11] you'll have to enter that manually [02:12] ok [02:12] (or click choose, but you'll end up writing almost as much) [02:12] haha yeah [02:12] then in the description field you can write a description of *all* the commits you did [02:12] i would be fine if that spot mentioned which chapters you touched. [02:13] you can leave the reviewer empty [02:14] okay [02:14] i'll catch the xubuntu merge proposals anyway, and that leaves it open for others if they have time [02:14] then just click propose merge [02:14] you want me to click propose merge now? [02:14] (this time, add knome as the reviewer, and click propose merge now) [02:14] *do you - wow I can't type today; [02:14] (so we won't email other people) [02:15] any extra commit messages or that [02:15] nope, you can always leave the advanced stuff as they are [02:16] alrighty; now can I delete the merge and branch lol [02:16] great, so now https://code.launchpad.net/~ubuntu-core-doc/xubuntu-docs/precise tells me there are 2 branches proposed [02:16] and your merge proposal is at: https://code.launchpad.net/~slooksterpsv/xubuntu-docs/precise-testpush/+merge/174595 [02:16] that page will show everybody the diff [02:17] (nothing in this case, since you didn't change anything [02:17] oh ok [02:17] and the fantastic thing [02:17] after we've reviewed that, it's super easy to merge into the actual documentation [02:17] so by doing the merge request, you help us merging things in the docs [02:18] rather than sending documents where we need to see what's changed etc [02:18] awesome; that makes it a lot easier than I thought it would be [02:18] with MP's, everything is in the docbook format so we don't need to copypaste anything [02:18] (and you can *now* delete the branch :)) [02:18] that's awesome [02:18] (i just deleted the MP) [02:19] awesome I delete the branch [02:19] great [02:19] so now you know how to do a merge proposal [02:19] before you start working on anything, [02:19] yay I'm excited that's awesome [02:20] you might want to email the mailing list telling you're working on X [02:20] to cooperate and make sure nobody else is doing the same [02:20] ok I'll start small for now till I get the hang of things [02:20] but other than that, there's no limits [02:20] the documentation should have pretty good examples of all docbook markup you might need [02:20] so just look at the other files [02:21] yeah I was looking through a lot of it earlier today and its just like you said xml [02:21] if you think you need something that's not done yet - think again - and if you still insist - ask other first :) [02:21] *others [02:21] i pretty much used docbook to its limits [02:21] so it's possible there just isn't a better way to do something [02:22] if you end up needing to add chapters [02:23] you can just follow the example in the index file and before committing, run 'bzr add .' (which adds all new files into your branch) [02:23] ...or you can ask me to lay the groundwork for you [02:31] does that all make sense to you or would you like to ask something? [04:02] huhu, Unit193 reconnecting [04:03] Figured I'd do so since things are slow, and it was bugging me. :P I've been checking the blueprints, and only thing I can see that I could technically do is review of docs (again.) :/ [04:04] is there something else you could do if somebody helped you with it? [04:04] also, there are testcases, which are not exactly documentation... [04:05] and what about helping out with the flyer content? (i know, that's boring writing too...) [04:06] and i don't think it's mentioned on the blueprints [04:07] tbh, we don't have too many things in there [04:07] if you filed those bugs i've said "file and let's get them sorted", please link them to -development blueprint [04:20] I had thought they were wiki'd, but can't find it. Some are already looked at, and jockey was part of it. I'm supposed to be tracking libdvdcss-{pgk,installer}, and nothing new there for a while now. [04:20] mhm [04:20] (Also did some grepping.) [04:20] what about the popup menu thingy? [04:20] Oh, wasn't thinking that one, was more a RFC. :P [04:23] start thinking [04:23] As in, if at least one other person thinks it's a good idea I could try a merge proposal. [04:23] you've done well with speaking up (and in correct channels too), now time to start using more of the brain ;) [04:24] Hah, well just need to make sure it's not a hair brain idea. Checking about pulling an older jockey.desktop file too. [04:25] ah, yes, that one too [04:30] Natty didn't do translations, so it'd seem? http://paste.openstack.org/show/Atyf2PvRuhHTd1wSRNc8/ [04:30] hmm. [04:31] apparently not [04:31] http://pastebin.com/hqRBUCK7 from updated natty. [04:32] xubuntu-icon-theme still carries the icon, BTW. [04:32] right [04:33] And on another note: https://bugs.launchpad.net/mir/+bugs?field.tag=entering-saucy we need to prep anything for that? [04:33] umpf [04:33] no idea [06:08] thank you knome - I'll start working on this asap; I had a family thing come up due to having a viewing and funeral in the next 2 days so that's why I disappeared [06:11] shawnb, no problem [06:11] all the best with those [06:12] knome: saturday is my day off :) (I was out all day, will be back in my AM) [06:12] pleia2, no problemo [06:12] pleia2, didn't remember you had such things, you used to work all days like a mad one :P [06:13] pleia2, good night! [06:13] * pleia2 has been trying to take 1 per week ;) [06:14] gian1: btw, the only invite I have on deviantart is from 2 days ago and it has expired [06:15] tabfail [06:15] haha, oops [06:15] and yeah, i fully support people taking days off and other breaks [06:15] I am too tired [06:15] gridcube isn't here [06:15] YOU? [06:15] gian1: sorry :) [06:15] it's 9am+ [06:15] and i haven't slept for a minute [06:15] crazy person [06:16] i just had breakfast and now there's some coffee [06:16] hehe [06:16] i usually do a few allnighters per year [06:16] planned or unplanned.. [06:17] my brain turns to mush when I don't sleep [06:17] i've been filling crosswords and stuff like that :P [06:17] :) [06:17] so apparently mine behaves the other way [06:17] alright, sleepies time for me [06:17] good luck ;) [06:17] nighty night! [06:59] Can someone have a look at the new xfce4-indicator-plugin's patches? i think the patch is unnecessary [07:00] which patch [07:08] debian/patches/migrate-xfcerc-xfconf.patch: Handle the blacklist migration to Xfconf. [07:08] either unnecessary or broken [07:11] morning elfy [07:12] hi knome [07:13] no good tellin Unit193 to talk to forestpiskie - he has Unit193 on /ignore or did I mean /what? [07:14] heh [07:16] http://www.bbc.co.uk/news/uk-england-lincolnshire-23296285 [07:16] about 40 seconds in - that'd be noisy ... [07:18] huhu [07:20] d'oh thought this was the offtopic channel ... [07:23] knome, the conflict (and the area the patch affects) is at http://paste.ubuntu.com/5873350/ and t [07:32] elfy, i can't help but feel the first two tests in XFCEDisplay are slightly redundant [07:33] open and close ones? I feel the same - but we need to test it works I guess [07:33] we're supposed to be testing it - not testing what we think we should be testing [07:34] I feel that the parole one shouldn't rely on someone having an active internet connection [07:35] Not the open/close per-se, more the fact that after that, you explicitly tests opening it [07:35] And near the very bottom, you seem to have repeated part [07:36] just comment on it - I'm not looking at it or pretty much anything at all today :) [07:36] I agree that parole should need a connection, but we have no sample media [07:36] I'll fix it and merge, it's mostly just removing a few redundant/repeated parts [07:37] don't do that - just comment - I'll fix it tomorrow [07:37] Noskcaj: don't merge it either - I need to practise that - comment and I'll fix when it's approved I'll do the merge [07:38] oh, you have merge rights now? [07:38] have had for ages - just never done it - I'm wanting to keep on top of our tests so I know where we are [07:43] I've reviewed it, back to pretending i understand package merging [07:44] k [07:44] I'll sort it out tomorrow [17:15] hm, still no gridcube [17:23] interwebs aren't fun sometimes :( [19:55] knome: No idea if I did the translations thing right, and guessing not: https://code.launchpad.net/~unit193/+junk/xubuntu-default-settings [19:56] (http://paste.openstack.org/show/1JO21NRVd2QISpbuWSrW/) [19:57] http://bazaar.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk/revision/408 using that as a base. [23:18] Is anyone willing to help merge the latest xfce4-indicator-plugin?