SeekingSponsorship
|
Size: 3368
Comment:
|
Size: 2988
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 43: | Line 43: |
| N.B. Launchpad does not yet offer personal source package branches. When it does you will be able to use branch locations associated with the source package. For now we use +junk locations. |
|
| Line 51: | Line 47: |
| $ bzr push lp:~james-w/+junk/seccure-fix-12345 | $ bzr push lp:~james-w/ubuntu/karmic/seccure/seccure-fix-12345 |
| Line 54: | Line 50: |
| where you change "james-w" for your launchpad username. | where you change "james-w" for your launchpad username, and "karmic" for the release that you are targetting. |
| Line 59: | Line 56: |
| This however does not currently generate any bug mail. What you should do is add a comment on the bug report stating that you have a fix available, and subscribe the relevant sponsor team. The comment should include a link to the branch that you pushed, using the '''lp:''' notation so that sponsors can easily grab your fix, e.g. |
However, this usually isn't enough. What you should do is propose a merge so that the developers can find the change and review it. To do this open your page in a browser, e.g. |
| Line 66: | Line 62: |
| Hi, | $ bzr lp-open }}} |
| Line 68: | Line 65: |
| I think my branch fixes this bug. I changed it to frob the wotsit so that users can twiddle the blurp. Please review it for inclusion. |
if that fails, then you can use |
| Line 71: | Line 67: |
| You can grab my branch from | {{{ $ xdg-open https://code.launchpad.net/~james-w/ubuntu/karmic/seccure/seccure-fix-12345 }}} |
| Line 73: | Line 71: |
| lp:~james-w/+junk/seccure-fix-12345 Thanks, James }}} |
where most of the URL matches what you used for "push". Then you can use the link "Propose for merging into another branch", and then type in an explanation of your change in the "Initial Comment" box and click "Propose Merge." |
| Line 97: | Line 93: |
| Now you can add another comment to the bug report, something like {{{ Hi, Thanks for the feedback, I have made all of the changes requested in my branch. You can once again retrieve it from lp:~james-w/+junk/seccure-fix-12345 Thanks, James }}} Once the sponsor has uploaded your change you can delete your local branch, and mark the branch on launchpad as merged, or delete it. |
Then you can reply to the request for changes explaining what you changed and asking for re-review, or reply on the merge proposal page in Launchpad. |
Seeking Sponsorship
If you have made a change to the package and you do not have rights to upload the package then you will need to seek a sponsor.
Note that most sponsorship is still done via debdiffs, and some sponsors will prefer that, so you may wish to attach a diff to the bug as well.
Generating a debdiff
To generate a diff against the package in the archive you can run the following command from your branch.
$ bzr diff -rbranch:../seccure
Linking to a bug
As you will need a bug report to seek sponsorship you should close it from your debian/changelog. Fill in the changelog entry and add the LP: #12345 entry and normal.
Now, you can tell bzr that this commit fixes that bug in launchpad, so when you commit use
$ bzr commit --fixes lp:12345
Alternatively, from Intrepid onwards putting the bug number in the changelog and using debcommit will do this automatically. (Make sure to use something of the form "LP: #12345, #12346"; if you leave out the space or the # then debcommit will not detect it. You can use debcommit -n to check what it's going to do.)
Now, when you push the branch to launchpad it will link the branch and the bug report.
Pushing to launchpad
Now you should push the branch to launchpad so that it can be retrieved by others. You do this by pushing it to a branch under your user.
$ bzr push lp:~james-w/ubuntu/karmic/seccure/seccure-fix-12345
where you change "james-w" for your launchpad username, and "karmic" for the release that you are targetting.
If you linked a commit to a bug number using --fixes then this will show up on the bug page as having a possible fix for the bug.
However, this usually isn't enough. What you should do is propose a merge so that the developers can find the change and review it.
To do this open your page in a browser, e.g.
$ bzr lp-open
if that fails, then you can use
$ xdg-open https://code.launchpad.net/~james-w/ubuntu/karmic/seccure/seccure-fix-12345
where most of the URL matches what you used for "push". Then you can use the link "Propose for merging into another branch", and then type in an explanation of your change in the "Initial Comment" box and click "Propose Merge."
Dealing with feedback from sponsors
If a sponsor reviews your change and asks you to change something then you can do this fairly easily. Simply go to the branch that you were working in before and make the changes requested, and then commit.
$ bzr commit
Now you can push your changes up to launchpad as before, but bzr will have remembered where you pushed to, so you can simply run
$ bzr push
Then you can reply to the request for changes explaining what you changed and asking for re-review, or reply on the merge proposal page in Launchpad.
DistributedDevelopment/Documentation/SeekingSponsorship (last edited 2013-12-03 12:24:46 by dholbach)