[02:59] <larka06> Hello everyone
[03:03] <larka06> I do not think anyone is home today. I see the schedule is tomorrow. bye
[16:01] <james_w> hi
[16:02] <james_w> Who is here for the packaging training session?
[16:06] <james_w> I'll wait a couple more minutes for people to join
[16:07] <james_w> right, hello everyone
[16:07] <james_w> most of the names that just joined I recognise, so I won't take it too slowly today
[16:08] <james_w> this is all a bit last-minute though, so I don't have anything prepared
[16:08] <james_w> so I'm happy to answer any questions you have
[16:08] <james_w> right, so a quick introduction
[16:09] <james_w> you can now use bzr for doing a lot of packaging work, instead of having to learn how to generate debdiffs and the like
[16:09] <james_w> debdiffs are ok, they have some disadvantages, but the main thing is that they aren't something used in other projects
[16:10] <james_w> bzr is a version control system, and so is probably more familiar to newcomers
[16:10] <james_w> so, if you want to make use of it, please install bzr and bzr-builddeb if you don't already have them installed
[16:10] <james_w> bzr-builddeb is a plugin for bzr that knows about packaging stuff
[16:11] <james_w> once you have those, then you can run
[16:11] <james_w> bzr branch lp:ubuntu/<source package name>
[16:11] <james_w> to get the current source of any package in ubuntu as a bzr branch
[16:11] <james_w> there is also lp:ubuntu/karmic/source etc. as well
[16:12] <james_w> you can run bzr log and bzr annotate and the like to see how the package evolved over time
[16:13] <james_w> that gets useful when debugging etc.
[16:13] <james_w> now, you can build a package by using "bzr builddeb" from one of these branches
[16:13] <james_w> "bzr bd" for short
[16:13] <james_w> to build a source package use "bzr bd -S"
 QUESTION: is there a specific bzr revision for each different version commited to the archives ?
[16:13] <james_w> yes
[16:14] <james_w> grab a branch of a package you know and have a look
[16:14] <james_w> or click around on launchpad
[16:14] <james_w> https://launchpad.net/ubuntu/+source/package
[16:14] <james_w> and then click on "Branches" and you can browse them online
 Question: Would it make sense to automatically handle "-v" when doing "bzr builddeb -S" (so that it auto-adds the last uploaded version with it)?
[16:14] <james_w> that would be cool
[16:14] <james_w> however, you can't do it automatically
[16:15] <james_w> without querying something remote to find out what the current version is, and I don't want building a package to require that
[16:16] <james_w> so, we currently require a human to tell us what value to use
[16:16] <james_w> what I would like to do is have a flag to say "this is a merge from Debian", so use -vlast-ubuntu-version and -sa if needed
[16:17] <james_w> the main thing stopping me is that I can't come up with a good name for that flag ;-)
[16:18] <james_w> so, once you have built the package with your changes and tested it, you can commit
[16:18] <james_w> how do you get someone to upload that for you?
[16:19] <james_w> to do that you should propose the branch for merging on launchpad
[16:19] <james_w> first, push it to your namespace on launchpad
[16:19] <james_w> bzr push lp:~LP-ID/ubuntu/lucid/package/some-descriptive-name
[16:19] <james_w> then open up the branch page on launchpad and click "Propose for merging"
[16:20] <james_w> explain what you have done and click "Propose"
[16:20] <james_w> a couple of timesavers here:
[16:20] <james_w> bzr lp-open
[16:20] <james_w> running that after you pushed will open your browser at the right page
[16:20] <james_w> bzr lp-propose
[16:21] <james_w> instead of clicking around on the webapp this will let you type your description in to your editor, like when you commit, and then make the merge proposal for you
[16:21] <james_w> someone will review your changes and vote on them
[16:22] <james_w> if they would like you to fix something then you can just make the changes locally, "bzr commit", "bzr push" and then comment on the merge proposal to say you have done it
[16:22] <james_w> once they are happy they will upload it for you
 QUESTION:  Are there branches for Debian packages (lp:debian/package) ?
[16:22] <james_w> indeed
[16:22] <james_w> you can find any debian package that way as well
[16:23] <james_w> the history isn't nearly as complete for Debian packages, but it will improve from here on out
[16:23] <james_w> so, what can you do with the Debian branches?
[16:23] <james_w> diff between Ubuntu and Debian when investigating something
[16:23] <james_w> merge from Debian to pull in their changes
[16:23] <james_w> cherry-pick from them when near release time and you just want part of their changes
[16:24] <james_w> use the branches to generate a diff to send back to them
[16:24] <james_w> let's look at merging
[16:24] <james_w> from a copy of an ubuntu branch you can run
[16:24] <james_w> bzr merge-package lp:debian/sid/package
[16:24] <james_w> to merge from the sid version of the package
[16:26] <james_w> this may give you conflicts, which you can resolve
[16:26] <james_w> run "bzr diff" if you want to check the changes that are being pulled in
[16:26] <james_w> then commit when you are happy
[16:26] <james_w> running
[16:26] <james_w> bzr diff --old lp:debian/sid/package
[16:26] <james_w> will tell you the current diff from Debian, so you can see if there is anything that should be submitted back
[16:26] <james_w> again you can push this up and request the merge
 QUESTION: re auto-using "-v" with "bzr bd", couldn't you use the last tag from mark-uploaded? Does mark-uploaded do anything besides creating a tag only?
[16:27] <james_w> first, no, mark-uploaded is just creating a tag
[16:27] <james_w> in maverick you will just be able to run "bzr tag" thanks to jelmer
[16:28] <james_w> as for using the last tag from mark-uploaded that's an interesting idea, but I'm not sure if it would be reliable enough
[16:28] <james_w> might be worth a go
[16:28] <james_w> I'd be happy to help you implement it if you like
 QUESTION: so no more debdiffs ?
[16:28] <james_w> you don't have to use debdiffs to get sponsored any more
[16:28] <james_w> they may have their use from time to time
[16:29] <james_w> any more questions before I move on?
 QUESTION: are there branchs for PPAs  ?
[16:31] <james_w> only if you make them
[16:31] <james_w> you can branch from Ubuntu, make your changes, and then push it
[16:31] <james_w> uploading the source package to your PPA
[16:31] <james_w> they aren't created automatically or anything though
 QUESTION: more bzr related. Is it possible to get the "diff" after a merge annotated? When diffing, you see what's added, but not from what particular merged revision.
[16:36] <james_w> I don't think that's possible
[16:36] <james_w> ask in #bzr
 QUESTION: branches for PPA: is there planned anything to get them created automatically?
[16:36] <james_w> no
[16:37] <james_w> there's not a lot of payoff there
[16:37] <james_w> and you can just use bzr to manage the PPAs
[16:38] <james_w> right, we've looked at merging from Debian
[16:38] <james_w> let's look briefly at merging from upstream
[16:38] <james_w> this is based around the inventively named "bzr merge-upstream" command
[16:39] <james_w> from one of the branches we got earlier we can merge a new upstream release by passing it the URL of the tarball of the new upstream release (or a local path if you have already downloaded it)
[16:39] <james_w> and the version number that is assigned to this release
[16:39] <james_w> bzr merge-upstream --version 1.2 http://example.org/foo-1.2.tar.gz
[16:40] <james_w> works with tar.gz tar.bz2 .zip and a couple more
[16:40] <james_w> again it will leave you with a diff to review and any conflicts to fix up
[16:40] <james_w> I plan to make it use uscan, so that you don't even have to tell it that stuff if you have a watch file
[16:41] <james_w> "bzr merge-upstream" would just find everything out and do the obvious thing for you
[16:41] <james_w> I think this is one of the coolest things
[16:42] <james_w> and I plan to add more things as cool as that and build on top of it
[16:42] <james_w> so, what else do we have planned?
[16:42] <james_w> work is currently underway to add support in Launchpad for building from branches
[16:43] <james_w> that means you will be able to go from the branch you just pushed up to a package in your PPA without building and uploading it
[16:43] <james_w> we will probably extend that to Ubuntu itself once we are happy with it
[16:44] <james_w> this will allow us to do lots of great things
[16:44] <james_w> daily builds will be just a few clicks
[16:44] <james_w> it will be easy for people to find a patch upsteam, stick it in to bzr, and put it in their PPA for people on the bug to test
[16:44] <james_w> like, one command easy if someone wants to automate that
[16:45] <james_w> and building on top of bzr makes it easier for an Ubuntu developer to hoover up such patches after testing and merge them all together
 QUESTION: are you doing anything with ground control to get these features in that?
[16:46] <james_w> not yet
[16:46] <james_w> but I want to have some of that stuff
[16:46] <james_w> there's a possible SoC project to lay the groundwork for that
[16:46] <james_w> we're not /quite/ at the point where we can have something as slick as groundcontrol, but very close
[16:47] <james_w> and because we are just using bzr, launchpad etc. it should be easy to modify groundcontrol to do packages as well as projects
[16:47] <james_w> right, any more questions for the last 10 minutes
[16:48] <james_w> right, some cool stuff
[16:49] <james_w> bzr gannotate or the qt equivalent when you find a bad line of code can tell you when it was changed, regardless of whether upstream debian or ubuntu changed it
[16:49] <james_w> assuming that it's v3 quilt right now
[16:50] <james_w> and you can then go from that to the diff of the revision that uploaded it, so see the rationale in the changelog
[16:50] <ClassBot> There are are 10 minutes remaining in the current session.
[16:50] <james_w> and if you want to revert it, it's one bzr command, rather than doing it by hand, or trying to generate a patch to reverse-apply
[16:51] <james_w> similar with cherry picking
[16:51] <james_w> you can grab the changes in the last debian upload and pull them in to your tree
[16:51] <james_w> bzr merge -c 1 lp:debian/sid/package
[16:52] <james_w> then use "bzr revert" and "bzr shelve --destroy" to remove the parts you don't want
[16:52] <james_w> and keep only the parts you do
[16:52] <james_w> you don't need to rely on Merge-o-Matic to have the merge ready for you to apply
[16:52] <james_w> you can merge from testing, unstable, experimental as you like
[16:52] <james_w> or the branch of anyone else in the same way
[16:53] <james_w> you have a version control system so you can just "bzr revert" if you get in to a strange situation, rather than having to blow away your workspace and unpack the source package again like you had to sometimes before
[16:53] <james_w> and plenty more as well
[16:54] <james_w> there's loads of opportunity for automating tasks and the like now, so if you have an idea for something like that I would be happy to help you implement it
[16:54] <james_w> and I'm keen that the tools are usable, so if you find something that is too hard or doesn't make sense, please file a bug
[16:55] <james_w> any last questions?
[16:55] <ClassBot> There are are 5 minutes remaining in the current session.
[16:58] <james_w> ok, let's call it a day and go make lucid even better :-)
[16:58] <james_w> thanks all
[21:02] <mhall119> james_w: are you still around?
[21:02] <james_w> yeah


[02:07] <JoseeAntonioR> Please, if there are any young contributors over here, I'll be happy if you could please fill in this survey, it's to collect data for an UDS-Q session :) http://joseeantonior.wufoo.com/forms/ubuntu-and-youth/ Thanks!
[03:47] <JoseeAntonioR> Princess, I'd like to know if I can get a link posted to UWN
[03:47] <pleia2> JoseeAntonioR: that one above?
[03:47] <JoseeAntonioR> erm yep :P
[03:48] <pleia2> sure, will just need to find a place to put it ;)
[03:48] <JoseeAntonioR> yay!
[03:48] <JoseeAntonioR> I'll be writing a blog post for the Planet later, is that better?
[03:48] <pleia2> yes :)
[03:48] <pleia2> then we can include it in the Planet section
[03:49] <JoseeAntonioR> oh, that's great
[03:49] <JoseeAntonioR> I just want to wait until my blog gets added to the Planet, because I haven't seen it in the feed list
[03:50] <pleia2> when did you add it?
[03:52] <JoseeAntonioR> almost an hour ago
[03:53] <pleia2> ah ok, it refreshes every hour
[03:54] <pleia2> lp:~planet-ubuntu/config/main		Development	52 minutes ago
[03:54] <pleia2> 1515. Added joseeantonior to Planet Ubuntu
[03:54] <JoseeAntonioR> yep
[03:54] <pleia2> :)
[03:54] <JoseeAntonioR> so, the changes are made?
[03:55] <pleia2> that was just me confirming the checkin was made
[03:55] <pleia2> if you refresh planet you'll see your name is in the feed list
[03:56] <JoseeAntonioR> YAY, my name is in the Planet :') (dreams are coming true over here)
[03:58] <pleia2> :D
[04:09] <JoseeAntonioR> post done, I hope it gets into the planet soon
[04:09] <JoseeAntonioR> yep, it's there
[08:04] <dholbach> good morning
[12:51] <akgraner> Where are we on the newsletter?
[12:51] <akgraner> sorry  - I had major deadlines yesterday
[12:52] <akgraner> oh cool it's done :-)
[12:52] <akgraner> you all rock
[12:52] <akgraner> me goes away then :-)


[01:44] <bluesabre> I'm currently migrating Catfish (lp:catfish-search) to the Xfce infra... if I change the bug tracker to Xfce Bugzilla, what will happen to the existing bugs on Launchpad? Do they persist, disappear, or is that action blocked on their are already bugs reported?
[01:45] <bluesabre> my tired brain wrote the last part of that question :D
[02:03] <wgrant> bluesabre: Bug listings will disappear, but the bugs will still be visible if you know their URLs
[02:04] <bluesabre> wgrant: Thanks, I can work with that. :-)


[01:46] <manusheel_> neeraj: http://bugs.sugarlabs.org/ticket/1442
[01:47] <manusheel_> http://bugs.sugarlabs.org/ticket/2195
[01:56]  * dfarning is away: Away
[01:56]  * dfarning is back (gone 00:00:13)
[16:31]  * dipankar is away: Be Right Back
[16:34]  * ishan is away for dinner
[16:40] <manusheel> mukul: Hi Mukul.
[16:40] <mukul> hi sir
[16:40] <mukul> hi alsroot
[16:40] <alsroot> mukul: hi
[16:45] <manusheel> mukul: Did you get a chance to send the documentation on the analysis and implementation plan for the bug assigned to you?
[16:45] <mukul> manusheel sir: I will do that in some time.
[16:47] <manusheel> mukul: Ok.
[16:47] <mukul> alsroot, http://paste.ubuntu.com/496530/ please have a look
[16:48] <mukul> alsroot, I am trying to add a Continue button in the modal dialog which on clicking will take us to the main view
[16:50] <alsroot> mukul: and whats the problem?
[16:51] <mukul> alsroot, I have reproduced the error by making some adjustments to the variable. Also, to display the message only once, I've added this code. But it does not do the desired thing. http://paste.ubuntu.com/496532/
[16:51] <mukul> alsroot, Sorry I forgot to mention. I was looking at the sl bug #630
[16:51] <ubot2> Launchpad bug 630 in baz "default directory name contains unnecessary and outdated information" [Medium,New] https://launchpad.net/bugs/630
[16:53] <alsroot> mukul: so you plan is showing alert dialog only once?
[16:54] <alsroot> *your
[16:56] <mukul> What I plan to do is: Add a Continue button in the modal dialog box. Also, there should be a way to come back to the Main View. So now what happens is that when I return by pressing F3. it shows the dialog again. So I have modified the code. But it is not being implemented properly
[16:58] <mukul> alsroot, I will be back in 5 mins.
[17:00] <alsroot> mukul: I guess continue button might just close dialog (to return to current view)
[17:04]  * ishan is back
[17:17] <mukul> alsroot, Yes that is what I want to implement. What changes should I make in the 15-19 lines
[17:21] <alsroot> mukul: I guess you'll have to modify the code where ModalAlert appears, look like this code shows the journal not ModalAlert itself
[17:27] <mukul> alsroot, This code I found out in the file ModalAlert.py
[17:27] <mukul> Ok I'll grep it and find some other files too
[17:30] <alsroot> mukul: just grep for "ModalAlert()"
[17:44]  * dipankar is back (gone 01:12:05)
 alsroot, that is the only place where the ModalAlert() is called. Either the problem lies in the code mentioned by me or something is wrong in the function itself.
 alsroot, There has to be sthing wrong in the code itself
 manusheel, alsroot : http://paste.ubuntu.com/496532/ Here I think the value of i is always initialised to be 1 and thus no change in output. Do I have to define sthing like extern variable so that its value does not chang
[20:45] <neeraj> #sugar
[20:46] <manusheel> neeraj: Hi Neeraj.
[20:47] <neeraj> manusheel: Hi sir
[20:47] <manusheel> neeraj: Any help needed on that gtk icon issue?
[20:48] <ishan> manusheel, sir that didnt worked as my cpsection is not opening up
[20:49] <neeraj> manusheel: Sir, I will start working from where I left last night. Will ask in case of any doubt.
[20:49] <manusheel> neeraj: Sure..
[20:49] <neeraj> I slept whole day, so will remain awake for next 4-5 hrs :)
[20:49] <manusheel> neeraj: Sure.
[20:50] <manusheel> ishan: Ok.
[20:50] <dfarning> neeraj nice work last night:)
[20:51] <manusheel> ishan: Where are you facing issues?
[20:52] <neeraj> dfarning: thanks.. Still in learning phase w.r.t to pygtk. Hopefully I will pick up things quickly. This bug has made me study python, pygtk and lots of sugar code and helped in learning new things :)
[20:52] <manusheel> neeraj: Can you help Ishan on this a bit. In a meeting right now. Ishan, I'll be back soon.
[20:52] <ishan> manusheel, after making changes and rebuilding sugar-jhbuild when i right click and click on settings it doesnt open ups
[20:52] <neeraj> ishan: what problem are u facing?
[20:52] <ishan> neeraj, ^^
[20:52] <ishan> working on http://bugs.sugarlabs.org/ticket/245
[20:53] <neeraj> hmm.. ishan what changes did u made?
[20:53] <dfarning> neeraj. yep you jumped in the deep end and survived... that is the sign of a good hacker:)
[20:55] <neeraj> ishan: where did u added the code?
[20:55] <ishan> neeraj in buddymenu.py
[20:56] <ishan> but i dont think that should be the file since if we add the code there it wil show busy worker when we click on my setting but whereas we want it to show when we click on languages under cpsection
[20:59] <neeraj> ishan: ok. that newly added line caused the problem.. That 100% sure.
[20:59] <ishan> yep
[21:00] <ishan> neeraj:i just took some points from the patch made by anurag sir on displaying busy cursor for logging and shutdown options
[21:00] <neeraj> ishan: ok.. reading the bug details on bugs.sugarlabs
[21:00] <ishan> neeraj okay
[21:03] <neeraj> ishan: Ok. Wish if u can also tell me the bug number on which anurag was working.
[21:03] <ishan> neeraj:2151
[21:04] <neeraj> ishan: As the bug description say's that we want the cursor to display when we select the language option. Do we need it any other cpsection menu ?
[21:04] <ishan> neeraj: as mentioned in the bug filed i dont think so
[21:05] <neeraj> ishan: Ok.
[21:07] <ishan> neeraj, aby pointer on above problem?
[21:07] <ishan> aby/any
[21:08] <neeraj> ishan: yes. wait a min
[21:08] <ishan> neeraj, sure
[21:10] <neeraj> ishan: are you sure that code will work? I mean anurag has mentioned that the patch failed to work.  http://bugs.sugarlabs.org/ticket/2151#comment:4
[21:10] <neeraj> Also, Ishan, I think you might need to modify the gui.py file in jarabe/controlpanel
[21:11] <ishan> neeraj, okay
[21:11] <neeraj> because, from here we choose the option and call the respective cp section menu.
[21:11] <ishan> neeraj, +1
[21:12] <neeraj> ishan: one solution which is coming to my mind is that we can add a condition that if current option ==language, then show the busy cursor
[21:15] <dfarning> neeraj, for simplicity how about switching to  busy cursor every time?  the user just wont see the change unless something is slow.
[21:17] <neeraj> dfarning: yes. that we can do. But I was not sure whether we could do this. I mean for simplicity add that in every item. :).


[18:21]  * MarkDude has some free extra A's tickets tomorrow https://lists.ubuntu.com/archives/ubuntu-us-ca/2013-April/002217.html
[18:22] <MarkDude> Lets not waste them