Rev 3573: (mbp) more ppa process documentation in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Jul 23 10:40:15 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3573
revision-id:pqm at pqm.ubuntu.com-20080723094000-gxsppck6d857txr1
parent: pqm at pqm.ubuntu.com-20080722202646-5kwh910svyyumzre
parent: mbp at sourcefrog.net-20080723043509-o7mrsuls2j08kizx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-07-23 10:40:00 +0100
message:
(mbp) more ppa process documentation
added:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
modified:
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3549.3.1
revision-id:mbp at sourcefrog.net-20080723043509-o7mrsuls2j08kizx
parent: pqm at pqm.ubuntu.com-20080717023455-idnyms69oiauf7fh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Wed 2008-07-23 14:35:09 +1000
message:
Updated instructions in packaging into the PPA
added:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
modified:
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
=== added file 'doc/developers/ppa.txt'
--- a/doc/developers/ppa.txt 1970-01-01 00:00:00 +0000
+++ b/doc/developers/ppa.txt 2008-07-23 04:35:09 +0000
@@ -0,0 +1,190 @@
+Managing the Bazaar PPA
+=======================
+
+See also: `Bazaar Developer Document Catalog <index.html>`_.
+
+
+Background
+----------
+
+We build Ubuntu ``.deb`` packages for Bazaar as an important part of the release
+process. These packages are hosted in a few `Personal Package Archives (PPA)`__ on
+Launchpad.
+
+ __ https://help.launchpad.net/PPAQuickStart
+
+As of June 2008, there are two PPAs:
+
+<https://launchpad.net/~bzr/+archive>
+ Final released versions.
+
+<https://launchpad.net/~bzr-beta-ppa/+archive>
+ Releases and release candidates.
+
+We build packages for every supported Ubuntu release
+<https://wiki.ubuntu.com/Releases>. Packages need no longer be updated
+when the release passes end-of-life because all users should
+have upgraded by then. (As of May 2008, Edgy Eft is no longer supported.)
+
+We build a distinct package for each distrorelease that has
+different packaging requirements. As of bzr 1.5, Dapper uses
+``python-support`` and later distributions use ``python-central``, so we
+build one version for dapper and one version for everything else. If you
+upload a release-specific version, you should add a suffix to the
+package version, e.g. ``bzr.1.3-1~bazaar1~dapper1``.
+
+Every package is first uploaded into one distroversion of the beta ppa.
+It can then be copied to other compatible distroversions. For final
+release versions it is also copied to the main PPA.
+
+The ``debian/`` directory containing the packaging information is kept in
+branches on Launchpad, named like
+<https://code.launchpad.net/~bzr/bzr/packaging-hardy>.
+
+Preconditions
+-------------
+
+* You must have a Launchpad account and be a member of the teams
+ that own these PPAs (``~bzr``, ``~bzr-beta-ppa``).
+
+* You must have a GPG key registered to your Launchpad account.
+
+* Configure ``dput`` to upload to our PPA with this section in your
+ ``~/.dput.cf``::
+
+ [bzr-beta-ppa]
+ fqdn = ppa.launchpad.net
+ method = ftp
+ incoming = ~bzr-beta-ppa/ubuntu
+ login = anonymous
+ allow_unsigned_uploads = 0
+
+ [bzr-ppa]
+ fqdn = ppa.launchpad.net
+ method = ftp
+ incoming = ~bzr/ubuntu
+ login = anonymous
+ allow_unsigned_uploads = 0
+
+ You may also want to add these lines to prevent inadvertently attempting
+ to upload into Ubuntu or Debian, which will give a somewhat unclear
+ error::
+
+ [DEFAULT]
+ default_host_main = notspecified
+
+ [notspecified]
+ fqdn = SPECIFY.A.PPA.NAME
+
+* You need a Ubuntu (or probably Debian) machine, and ::
+
+ sudo apt-get install build-essential devscripts dput quilt patch
+
+Packaging Bazaar
+----------------
+
+#. You will need a working directory for each supported release, such as
+ ``~/bzr/Packaging/hardy``
+
+#. Download the official tarball of the release to e.g. ``~/bzr/Releases``
+ if you don't already have it.
+
+#. Decide on the final version number. It should be of this form::
+
+ bzr-1.6~beta3-1~bazaar1
+
+ There are three hyphen-separated parts: the *package name*, the *upstream
+ version*, and the *packaging version*.
+
+ **Caution:** Upstream betas or release candidates must insert a tilde
+ to make them sort before the final release, like this:
+ ``bzr-1.4~rc2-1~bazaar1``.
+
+#. Copy or hardlink the original tarball into your per-disto directory, under an
+ appropriate name ending in ``.orig.tar.gz``. Untar it. The extracted
+ source directory and ``.orig`` file must match the version number you
+ calculated above. For example::
+
+ cp -l ~/bzr/Releases/bzr-1.6b3.tar.gz bzr_1.6~beta3.orig.tar.gz
+ tar xfvz bzr_1.6~beta3.orig.tar.gz
+ mv bzr-1.6b3 bzr-1.6~beta3
+
+#. Change into that directory and check out the packaging branch::
+
+ cd bzr-1.6~beta3
+ bzr checkout \
+ bzr+ssh://bazaar.launchpad.net/~bzr/bzr/packaging-hardy \
+ debian
+
+#. For Bazaar plugins, change the ``debian/control`` file to express a
+ dependency on the correct version of ``bzr``.
+
+ For bzrtools this is typically::
+
+ Build-Depends-Indep: bzr (>= 1.3~), rsync
+ Depends: ${python:Depends}, bzr (>= 1.3~), bzr (<< 1.4~), patch
+
+#. Make a new ``debian/changelog`` entry for the new release,
+ either by using ``dch`` or just editing the file::
+
+ dch -v '1.3-1~bazaar1' -D hardy
+
+ dch will default to the distro you're working in and this isn't checked
+ against the version number (which is just our conversion), so make sure
+ to specify it.
+
+ Make sure you have the correct email address for yourself, version
+ number, and distribution. It should look something like this::
+
+ bzr (1.3-1~bazaar1) hardy; urgency=low
+
+ * New upstream release.
+
+ -- John Sample <sample at example.com> Mon, 31 Mar 2008 12:36:27 +1100
+
+ If you need to upload the package again to fix a problem, normally you
+ should increment the last number in the version number, following the
+ distro name. Make sure not to omit the initial ``-1``, and make sure
+ that the distro name in the version is consistent with the target name
+ outside the parenthesis.
+
+#. Commit these changes into the packaging branch::
+
+ bzr ci -m '1.3-1~bazaar1: New upstream release.' debian
+
+#. Build a source package::
+
+ debuild -S -sa -i -D
+
+ This will create a ``.changes`` file in the per-distro directory,
+ and should invoke gpg to sign it with your key.
+ Check that file is reasonable: it should be uploading to the intended
+ distribution, have a .orig file included, and the right version number.
+
+#. Upload into the beta PPA::
+
+ dput bzr-beta-ppa ../bzr__1.3-1\~bazaar1\_source.changes
+
+#. Copy the uploaded package over to other Ubuntu releases, taking advantage
+ of Launchpad's Copy Package feature
+ <https://launchpad.net/~bzr-beta-ppa/+archive/+copy-packages>
+
+#. For final release versions, also copy it into the ``~bzr`` PPA.
+
+#. You should soon get an "upload accepted" mail from Launchpad, which
+ means that your package is waiting to be built. You can then track its
+ progress in <https://launchpad.net/~bzr-beta-ppa/+archive> and
+ <https://launchpad.net/~bzr-beta-ppa/+archive/+builds>.
+
+
+Monitoring the contents of PPAs
+-------------------------------
+
+If you add all the bzr PPAs to your ``sources.list`` then you can see a
+summary of current package versions with::
+
+ apt-cache madison bzr
+
+
+..
+ vim: filetype=rst textwidth=74 ai shiftwidth=4
=== modified file 'doc/developers/index.txt'
--- a/doc/developers/index.txt 2008-06-11 02:25:06 +0000
+++ b/doc/developers/index.txt 2008-07-23 04:35:09 +0000
@@ -26,6 +26,8 @@
* `Releasing Bazaar <releasing.html>`_ |--| How to make a release of Bazaar,
and how to coordinate the monthly development cycle.
+* `Managing the Bazaar PPA <ppa.html>`_ |--| Packaging Bazaar for Ubuntu.
+
* `Giving back <http://bazaar-vcs.org/BzrGivingBack>`_ (wiki) |--| How to get
your changes to Bazaar integrated into a release.
=== modified file 'doc/developers/releasing.txt'
--- a/doc/developers/releasing.txt 2008-06-17 00:18:39 +0000
+++ b/doc/developers/releasing.txt 2008-07-23 04:35:09 +0000
@@ -262,168 +262,11 @@
back into pqm for bzr.dev.
-Updating the PPA for a new release
-----------------------------------
-
-We build Ubuntu ``.deb`` packages for Bazaar as an important part of the release
-process. These packages are hosted in a few `Personal Package Archives (PPA)`__ on
-Launchpad.
-
- __ https://help.launchpad.net/PPAQuickStart
-
-As of June 2008, there are actually two PPAs:
-
-<https://launchpad.net/~bzr/+archive>
- Final released versions.
-
-<https://launchpad.net/~bzr-beta-ppa/+archive>
- Releases and release candidates.
-
-We build packages for every supported Ubuntu release
-<https://wiki.ubuntu.com/Releases>. Packages need no longer be updated
-when the release passes end-of-life because all users should
-updated by then. (As of May 2009, Edgy Eft is no longer supported.)
-
-The ``debian/`` directory containing the packaging information is kept in
-branches on Launchpad, named like
-<https://code.launchpad.net/~bzr/bzr/packaging-hardy>.
-
-Preconditions for building these packages:
-
-* You must have a Launchpad account and be a member of the `~bzr`__ team
-
-__ https://edge.launchpad.net/~bzr/+members>
-
-* You must have a GPG key registered to your Launchpad account.
-
-* Configure ``dput`` to upload to our PPA with this section in your
- ``~/.dput.cf``::
-
- [bzr-beta-ppa]
- fqdn = ppa.launchpad.net
- method = ftp
- incoming = ~bzr-beta-ppa/ubuntu
- login = anonymous
- allow_unsigned_uploads = 0
-
- [bzr-ppa]
- fqdn = ppa.launchpad.net
- method = ftp
- incoming = ~bzr/ubuntu
- login = anonymous
- allow_unsigned_uploads = 0
-
- You may also want to add these lines to prevent inadvertently attempting
- to upload into Ubuntu or Debian, which will give a somewhat unclear
- error::
-
- [DEFAULT]
- default_host_main = notspecified
-
- [notspecified]
- fqdn = SPECIFY.A.PPA.NAME
-
-* You need a Ubuntu (or probably Debian) machine, and ::
-
- sudo apt-get install build-essential devscripts dput quilt patch
-
-Here is the process; there are some steps which should be automated in
-future:
-
-#. You will need a working directory for each supported release, such as
- ``~/bzr/Packaging/hardy``
-
-#. Download the official tarball of the release to e.g. ``~/bzr/Releases``
-
-#. Copy the original tarball into your per-disto directory, then untar
- it::
-
- cp -l ~/bzr/Releases/bzr-1.3.tar.gz bzr_1.3.orig.tar.gz
- tar xfvz bzr_1.3.orig.tar.gz
-
- The bzrtools extracted directory does not contain a version number
- and must be renamed::
-
- mv bzrtools bzrtools-1.3.0
-
-#. Change into that directory and check out the packaging branch::
-
- cd bzr
- bzr checkout \
- bzr+ssh://bazaar.launchpad.net/~bzr/bzr/packaging-hardy \
- debian
-
-#. For Bazaar plugins, change the ``debian/control`` file to express a
- dependency on the correct version of ``bzr``.
-
- For bzrtools this is typically::
-
- Build-Depends-Indep: bzr (>= 1.3~), rsync
- Depends: ${python:Depends}, bzr (>= 1.3~), bzr (<< 1.4~), patch
-
-#. Make a new ``debian/changelog`` entry for the new release,
- either by using ``dch`` or just editing the file::
-
- dch -v '1.3-1~bazaar1' -D hardy
-
- dch will default to the distro you're working in and this isn't checked
- against the version number (which is just our conversion), so make sure
- to specify it.
-
- **Caution:** Release candidates must insert a tilde to make them sort
- before the final release, like this: ``bzr-1.4~rc2-1~bazaar1``.
-
- Make sure you have the correct email address for yourself, version
- number, and distribution. It should look something like this::
-
- bzr (1.3-1~bazaar1) hardy; urgency=low
-
- * New upstream release.
-
- -- John Sample <sample at example.com> Mon, 31 Mar 2008 12:36:27 +1100
-
- If you need to upload the package again to fix a problem, normally you
- should increment the last number in the version number, following the
- distro name. Make sure not to omit the initial ``-1``, and make sure
- that the distro name in the version is consistent with the target name
- outside the parenthesis.
-
-#. Commit these changes into the packaging branch::
-
- bzr ci -m '1.3-1~bazaar1: New upstream release.' debian
-
-#. Build a source package::
-
- debuild -S -sa -i -D
-
- This will create a ``.changes`` file in the per-distro directory,
- and should invoke gpg to sign it with your key.
- Check that file is reasonable: it should be uploading to the intended
- distribution, have a .orig file included, and the right version number.
-
-#. Upload into the appropriate PPA, either ``bzr-ppa`` or
- ``bzr-beta-ppa``::
-
- dput bzr-ppa ../bzr__1.3-1\~bazaar1\_source.changes
-
-#. Copy the uploaded package over to other Ubuntu releases, taking advantage
- of Launchpad's Copy Package feature <https://launchpad.net/~bzr/+archive/+copy-packages>
-
- **Note:** The packaging dependencies may vary between different distro series.
- As of bzr 1.5, Dapper uses ``python-support`` and later distributions use
- ``python-central``.
- If you upload a release-specific version, you should add a ~release1 to
- the package version, for example:: bzr.1.3-1~bazaar1~dapper1
-
-#. You should soon get an "upload accepted" mail from Launchpad, which
- means that your package is waiting to be built. You can then track its
- progress in <https://launchpad.net/~bzr/+archive> and
- <https://launchpad.net/~bzr/+archive/+builds>.
-
-If you add all the bzr PPAs to your ``sources.list`` then you can see a
-summary of current package versions with::
-
- apt-cache madison bzr
+See also
+--------
+
+ * `Packaging into the bzr PPA <ppa.html>`_ to make and publish Ubuntu
+ packages.
..
vim: filetype=rst textwidth=74 ai shiftwidth=4
More information about the bazaar-commits
mailing list