StableReleaseUpdates

Differences between revisions 7 and 8
Revision 7 as of 2013-03-18 15:39:40
Size: 2013
Editor: zequence
Comment:
Revision 8 as of 2013-03-18 15:49:11
Size: 3261
Editor: zequence
Comment:
Deletions are marked like this. Additions are marked like this.
Line 19: Line 19:
Get the source for the development version. You'll always start by fixing the development version first. Get the source for the development version. You'll always start by fixing the development version first. Using jackd2 as example.
Line 22: Line 22:
bzr branch ubuntu:<package> bzr branch ubuntu:jackd2
Line 28: Line 28:
bzr branch ubuntu:<release>/<package> bzr branch ubuntu:quantal/jackd2 jackd2-quantal
bzr branch ubuntu:precise/jackd2 jackd2-precise
Line 34: Line 35:
edit-patch <yourpatch>.patch edit-patch jackdbus-stop-fix.patch
Line 40: Line 41:
patch -p1 < /path/to/<upstream-fix>.patch patch -p1 < /path/to/jackd2-upstream-fix.patch
Line 42: Line 43:

Hopefully your patch was well applied. If not, you may need to add changes manually, which will require for you to know a bit about the code used for that package.
Line 62: Line 65:
nano debian/patches/<yourpatch> nano debian/patches/<yourpatch>.patch
}}}

At the top, you see a header, looking something like this:

{{{
## Description: add some description
## Origin/Author: add some origin or author
## Bug: bug URL
}}}

Follow the [[http://dep.debian.net/deps/dep3/|Debian Patch Tagging Guidelines]] on what to add. For example:

{{{
## Description: This patch, consisting of two upstream git commits, fixes an issue where jackdbus is left unresponsively, running in the background, when attempting to stop it.
## Origin/Author: upstream https://github.com/jackaudio/jack2/commit/aa02feeacfa533a07f04e916334637b57eaac5a2, https://github.com/jackaudio/jack2/commit/700489b429b0edb7046b169278e3e6751e3$
## Bug: https://bugs.launchpad.net/ubuntu/+source/jackd2/+bug/956438
## Applied-Upstream: 1.9.9
}}}

We're all done with changes. Let's commit now, so that the changes stay permanent, using ''debcommit''

{{{
debcommit
}}}

That will have created a bzr commit based on your additions to debian/changelog.

  • When to do stable release update
  • How to do stable release update

https://wiki.ubuntu.com/StableReleaseUpdates

Fix Bug and do a SRU

Find Bug Fix

Add full description here

Find the upstream fix. Then, create a patch of it.

Create bzr branch with the new fix

Get the source for the development version. You'll always start by fixing the development version first. Using jackd2 as example.

bzr branch ubuntu:jackd2

You'll also want to get the source for all releases where you want to add the fix, going back one release at the time (if the development release includes the fix, just skip it).

bzr branch ubuntu:quantal/jackd2 jackd2-quantal
bzr branch ubuntu:precise/jackd2 jackd2-precise

We'll start by creating a debian patch using edit-patch. Decide the name for the patch (some packages have a convention for how to name patches). Use a name that describes what the patch fixes.

edit-patch jackdbus-stop-fix.patch

edit-patch will create a temporary folder in /tmp/. While in there, apply your upstream patch doing:

patch -p1 < /path/to/jackd2-upstream-fix.patch

Hopefully your patch was well applied. If not, you may need to add changes manually, which will require for you to know a bit about the code used for that package.

Once changes were applied, use Ctrl+D to exit edit-patch. This will create the debian/patches/patch, and opens debian/changelog. Adjust it to contain the correct info. Rename RELEASE to the release in question (precise, in this case), and describe what the patch does (here I just add which bug it fixes).

jackd2 (1.9.8~dfsg.1-1ubuntu2) precise; urgency=low

  * debian/patches/jackdbus-stop-fix.patch: [fixes LP: #956438]

 -- Kaj Ailomaa <zequence@mousike.me>  Mon, 18 Mar 2013 16:25:32 +0100

When ready, close down the editor. You'll be asked if to commit. Answer No. We still need to update the patch description.

OK to commit? [Y/n/e]

To edit the patch description, open your patch with your text editor of choice:

nano debian/patches/<yourpatch>.patch

At the top, you see a header, looking something like this:

## Description: add some description
## Origin/Author: add some origin or author
## Bug: bug URL

Follow the Debian Patch Tagging Guidelines on what to add. For example:

## Description: This patch, consisting of two upstream git commits, fixes an issue where jackdbus is left unresponsively, running in the background, when attempting to stop it.
## Origin/Author: upstream https://github.com/jackaudio/jack2/commit/aa02feeacfa533a07f04e916334637b57eaac5a2, https://github.com/jackaudio/jack2/commit/700489b429b0edb7046b169278e3e6751e3$
## Bug: https://bugs.launchpad.net/ubuntu/+source/jackd2/+bug/956438
## Applied-Upstream: 1.9.9

We're all done with changes. Let's commit now, so that the changes stay permanent, using debcommit

debcommit

That will have created a bzr commit based on your additions to debian/changelog.

UbuntuStudio/StableReleaseUpdates (last edited 2013-05-17 01:34:08 by zequence)