Rev 4693: (mbp) small doc fixes in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Sep 16 09:23:46 BST 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4693 [merge]
revision-id: pqm at pqm.ubuntu.com-20090916082340-tr0a0rqnswrlx7c1
parent: pqm at pqm.ubuntu.com-20090916074747-bd25xjyualxo1zei
parent: mbp at sourcefrog.net-20090916073508-vs32oo716nmwzs4a
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-09-16 09:23:40 +0100
message:
(mbp) small doc fixes
added:
tools/packaging/update-control.sh updatecontrol.sh-20090525105938-f6wej3ydmflfuijk-1
modified:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/en/user-guide/getting_help.txt getting_help.txt-20071128000722-ncxiua259xwbdbg7-2
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
=== modified file 'doc/developers/ppa.txt'
--- a/doc/developers/ppa.txt 2009-02-16 10:13:56 +0000
+++ b/doc/developers/ppa.txt 2009-09-02 10:41:30 +0000
@@ -19,7 +19,7 @@
Final released versions.
<https://launchpad.net/~bzr-beta-ppa/+archive>
- Releases and release candidates.
+ Releases and release candidates.
<https://launchpad.net/~bzr-nightly-ppa/+archive>
Automatic nightly builds from trunk.
@@ -107,12 +107,16 @@
release packages is as simple as::
cd ~/dev/bzr/releases/packaging
- ln ~/dev/bzr/releases/bzr-1.6.tar.gz ./bzr_1.6.orig.tar.gz
- export UBUNTU_RELEASES="dapper feisty gutsy hardy intrepid"
+ export VERSION="1.17~rc1-1~bazaar1"
+ export PACKAGE="bzr"
+ export UBUNTU_RELEASES="dapper hardy intrepid jaunty karmic"
~/dev/bzr/bzr.dev/tools/packaging/update-packaging-branches.sh
- ~/dev/bzr/bzr.dev/tools/packaging/update-changelogs.sh 1.6~beta3-1~bazaar1
- ~/dev/bzr/bzr.dev/tools/packaging/build-packages
- dput bzr-beta-ppa bzr_1.6~beta3-1~bazaar1*.changes
+ ~/dev/bzr/bzr.dev/tools/packaging/update-changelogs.sh
+ ~/dev/bzr/bzr.dev/tools/packaging/update-control.sh 1.16 1.17 1.18
+ ~/dev/bzr/bzr.dev/tools/packaging/build-packages.sh
+ dput bzr-beta-ppa ${PACKAGE}_$VERSION*.changes
+
+Rinse and repeat for all the plugins by changing VERSION and PACKAGE.
Long Form
~~~~~~~~~
@@ -121,23 +125,34 @@
release. Such as ``~/dev/bzr/releases/packaging/hardy``. In each of these
branches, you will produce the package for the release.
+ The scripts will also create the branches and produce packages for
+ bzrtools and bzr-svn.
+
#. Decide on the final version number. It should be of this form::
- bzr-1.6~beta3-1~bazaar1~hardy1
+ bzr-1.17~rc1-1~bazaar1~hardy1
**Note:** 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.6~beta3-1~bazaar1~hardy1``.
+ ``bzr-1.17~rc1-1~bazaar1~hardy1``.
Final releases will use a release string of the form:
- ``bzr-1.6-1~bazaar1~hardy1``
+ ``bzr-1.17-1~bazaar1~hardy1``
+
+ Set this base of this up as a usable environment variable::
+
+ export VERSION="1.17~rc1-1~bazaar1"
#. Export the distroreleases that you will be packaging for::
- export UBUNTU_RELEASES="dapper feisty gutsy hardy intrepid jaunty"
+ export UBUNTU_RELEASES="dapper hardy intrepid jaunty karmic"
+
+#. Export the program you are packaging::
+
+ export PACKAGE="bzr"
#. Checkout (or update) the packaging branch for each supported release::
@@ -155,13 +170,23 @@
For bzrtools this is typically::
- Build-Depends-Indep: bzr (>= 1.6~), rsync
- Depends: ${python:Depends}, bzr (>= 1.6~), bzr (<< 1.7~), patch
+ Build-Depends-Indep: bzr (>= 1.17~), rsync
+ Depends: ${python:Depends}, bzr (>= 1.17~), bzr (<< 1.18~), patch
+
+ There is a helper script which will update the control file and commit it
+ for all of your ``$UBUNTU_RELEASES``. It is available as::
+
+ tools/packaging/update-control.sh
+
+ You must supply the versions as arguments as follows
+ OLD_VERSION CURRENT_VERSION NEXT_VERSION, such as::
+
+ tools/packaging/update-control.sh 1.16 1.17 1.18
#. Make a new ``debian/changelog`` entry for the new release,
either by using ``dch`` or just editing the file::
- dch -v '1.6~beta3-1~bazaar1~hardy1' -D hardy
+ dch -v '1.17~rc1-1~bazaar1~hardy1' -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 convention), so make sure
@@ -171,7 +196,7 @@
export DEBEMAIL=`bzr whoami` if it isn't already set), version number, and
distribution. It should look something like this::
- bzr (1.6~beta3-1~bazaar1~hardy1) hardy; urgency=low
+ bzr (1.17~rc1-1~bazaar1~hardy1) hardy; urgency=low
* New upstream release.
@@ -185,17 +210,11 @@
You will also want to commit these changes into the packaging branch.
- There is a helper script which will update the changelog and commit it
+ There is a helper script which will build all the packages
for all of your ``$UBUNTU_RELEASES``. It is available as::
tools/packaging/update-changelogs.sh
- You must supply the release string, such as::
-
- tools/packaging/update-changelogs.sh 1.6~beta3-1~bazaar1
-
- It will automatically append the distro numbering on the end.
-
#. Build the source packages::
cd packaging-$DISTRO; bzr builddeb -S
@@ -207,13 +226,18 @@
where ``$UID`` is the gpg key you want to use to sign the changes.
+ There is a helper script which will build the package
+ for all of your ``$UBUNTU_RELEASES``. It is available as::
+
+ tools/packaging/build-packages.sh
+
#. Upload into the beta PPA for each release::
- dput bzr-beta-ppa bzr_1.6-1*.changes
+ dput bzr-beta-ppa bzr*1.17-1*.changes
#. For final release versions, also copy it into the ``~bzr`` PPA::
- dput bzr-ppa ../bzr_1.6-1\~bazaar1\~hardy1\_source.changes
+ dput bzr-ppa ../bzr_1.17-1\~bazaar1\~hardy1\_source.changes
Alternatively, you can use Launchpad's "copy" feature to copy the
packages between repositories.
@@ -234,11 +258,13 @@
#. Get a checkout of ``lp:~bzr/bzr-svn/hardy-ppa/``
-#. Merge from ``http://bzr.debian.org/pkg-bazaar/bzr-svn/experimental/``
-
+#. Merge from ``http://bzr.debian.org/pkg-bazaar/bzr-svn/unstable/``
+
This should bring in both upstream and packaging changes for the new
release, and it's updated as part of the bzr-svn release process.
+ It's quite possible you will need to resolve some conflicts.
+
#. Run ``dch -v 0.4.15-1~bazaar1-hardy1 -D hardy`` or similar
#. Run ``bzr builddeb --source``
=== modified file 'doc/developers/releasing.txt'
--- a/doc/developers/releasing.txt 2009-09-15 06:07:11 +0000
+++ b/doc/developers/releasing.txt 2009-09-16 08:23:40 +0000
@@ -188,18 +188,33 @@
failures.
-Publishing the release
-----------------------
-
-Now you have the beta or releasable product. The next step is making it
-available to the world.
-
-go to the release
+Publishing the source tarball
+-----------------------------
+
+#. Go to the relevant milestone page in Launchpad.
#. Within that release, upload the source tarball and zipfile and the GPG
signature. Or, if you prefer, use the
``tools/packaging/lp-upload-release`` script to do this.
+
+Announcing the source freeze
+----------------------------
+
+#. Post to the ``bazaar`` list, saying that the source has been frozen.
+ This is the cue for platform maintainers and plugin authors to update
+ their code. This is done before the general public announcement of the
+ release.
+
+
+Publishing the release
+----------------------
+
+There is normally a delay of a few days after the source freeze to allow
+for binaries to be built on various platforms. Once they have been built,
+we have a releasable product. The next step is to make it generally
+available to the world.
+
#. Link from http://bazaar-vcs.org/Download to the tarball and signature.
#. Announce on the `Bazaar home page <http://bazaar-vcs.org/>`_.
=== modified file 'doc/en/user-guide/getting_help.txt'
--- a/doc/en/user-guide/getting_help.txt 2007-11-28 00:07:56 +0000
+++ b/doc/en/user-guide/getting_help.txt 2009-09-14 02:30:23 +0000
@@ -1,18 +1,20 @@
Getting help
============
-Bazaar comes with a built-in on-line help system. To see the list of topics,
-the command is::
+Bazaar comes with a built-in on-line help system, accessed through::
bzr help
-To see the list of commands, the command is::
+You can ask for help on a command, or on non-command topics. To see a
+list of available help of each kind, use either::
bzr help commands
-
-To get help on topic xxx or command xxx, the command is::
-
- bzr help xxx
+ bzr help topics
+
+For help on a particular command, use either of these forms::
+
+ bzr help status
+ bzr status --help
If you wish to search the help or read it as a larger document, the
information is also available in the Bazaar User Reference.
=== modified file 'tools/packaging/build-packages.sh'
--- a/tools/packaging/build-packages.sh 2009-02-16 10:13:56 +0000
+++ b/tools/packaging/build-packages.sh 2009-05-25 10:59:42 +0000
@@ -9,5 +9,5 @@
fi
for DISTRO in $UBUNTU_RELEASES; do
- (cd "packaging-$DISTRO" && bzr builddeb -S)
+ (cd "$PACKAGE-$DISTRO" && bzr builddeb -S)
done
=== modified file 'tools/packaging/update-changelogs.sh'
--- a/tools/packaging/update-changelogs.sh 2009-02-16 10:13:56 +0000
+++ b/tools/packaging/update-changelogs.sh 2009-06-03 10:26:06 +0000
@@ -7,22 +7,27 @@
exit 1
fi
-if [ "x$1" = "x" ]; then
+if [ "x$VERSION" = "x" ]; then
echo "Missing version"
echo "You want something like:"
- echo " update-changelogs.sh 1.6~rc1-1~bazaar1"
+ echo " VERSION=1.6~rc1-1~bazaar1 update-changelogs.sh"
echo "or"
- echo " update-changelogs.sh 1.6-1~bazaar1"
+ echo " VERSION=1.6-1~bazaar1 update-changelogs.sh"
exit
fi
-VERSION=$1
+
+if [ -z "$1" ]; then
+ MSG="New upstream release"
+else
+ MSG=$1
+fi
for DISTRO in $UBUNTU_RELEASES; do
PPAVERSION="$VERSION~${DISTRO}1"
(
echo "Updating changelog for $DISTRO"
- cd "packaging-$DISTRO" &&
- dch -v $PPAVERSION -D $DISTRO -c changelog 'New upstream release.' &&
- bzr commit -m "New upstream release: $PPAVERSION"
+ cd "$PACKAGE-$DISTRO" &&
+ dch -v $PPAVERSION -D $DISTRO -c changelog "$MSG." &&
+ bzr commit -m "$MSG: $PPAVERSION"
)
done
=== added file 'tools/packaging/update-control.sh'
--- a/tools/packaging/update-control.sh 1970-01-01 00:00:00 +0000
+++ b/tools/packaging/update-control.sh 2009-09-02 04:08:08 +0000
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+if [ -z "$UBUNTU_RELEASES" ]; then
+ echo "Configure the distro platforms that you want to"
+ echo "build with a line like:"
+ echo ' export UBUNTU_RELEASES="dapper feisty gutsy hardy intrepid jaunty"'
+ exit 1
+fi
+
+OLD_VERSION=$1
+NEW_VERSION=$2
+NEXT_VERSION=$3
+if [ -z "$OLD_VERSION" -o -z "$NEW_VERSION" -o -z "$NEXT_VERSION" ]; then
+ echo "Missing version"
+ echo "You want something like:"
+ echo " update-control.sh 1.5 1.6 1.7"
+ exit
+fi
+
+if [ "$PACKAGE" = "bzr" ]; then
+ continue
+fi
+for DISTRO in $UBUNTU_RELEASES; do
+ PPAVERSION="$VERSION~${DISTRO}1"
+ (
+ echo "Updating control for $DISTRO"
+ cd "$PACKAGE-$DISTRO" &&
+ sed -i -e "s/$NEW_VERSION~/$NEXT_VERSION~/;s/$OLD_VERSION~/$NEW_VERSION~/" control &&
+ bzr commit -m "New upstream release: $PPAVERSION, update control"
+ )
+done
=== modified file 'tools/packaging/update-packaging-branches.sh'
--- a/tools/packaging/update-packaging-branches.sh 2009-02-16 10:13:56 +0000
+++ b/tools/packaging/update-packaging-branches.sh 2009-06-03 10:20:19 +0000
@@ -9,12 +9,20 @@
fi
for DISTRO in $UBUNTU_RELEASES; do
- if [ -d "packaging-$DISTRO" ] ; then
- echo "Updating packaging-$DISTRO"
- bzr update packaging-$DISTRO
+ if [ -d "$PACKAGE-$DISTRO" ] ; then
+ echo "Updating $PACKAGE-$DISTRO"
+ bzr update $PACKAGE-$DISTRO
+ if [ "$PACKAGE" = "bzr-svn" ] ; then
+ cd $PACKAGE-$DISTRO
+ bzr merge http://bzr.debian.org/pkg-bazaar/bzr-svn/unstable/
+ cd ..
+ fi
else
- echo "Checking out lp:~bzr/bzr/packaging-$DISTRO"
- bzr co lp:~bzr/bzr/packaging-$DISTRO
+ SRC="lp:~bzr/$PACKAGE/packaging-$DISTRO"
+ if [ "$PACKAGE" = "bzr-svn" ] ; then
+ SRC="lp:~bzr/$PACKAGE/beta-ppa-$DISTRO"
+ fi
+ echo "Checking out $SRC"
+ bzr co $SRC $PACKAGE-$DISTRO
fi
done
-
More information about the bazaar-commits
mailing list