Bazaar

Merge lp:~johnf-inodes/bzr/ppa-doc into lp:~bzr/bzr/trunk-old

  1. ppa-doc
  2. Merge into trunk-old
Proposed by John Ferlito
Status: Merged
Approved by: Martin Pool
Approved revision: no longer in the source branch.
Merge reported by: Martin Pool
Merged at revision: not available
Proposed branch: lp:~johnf-inodes/bzr/ppa-doc
Merge into: lp:~bzr/bzr/trunk-old
Diff against target: None lines
To merge this branch: bzr merge lp:~johnf-inodes/bzr/ppa-doc
Reviewer Review Type Date Requested Status
Martin Pool Approve
John A Meinel Approve
Review via email: mp+11045@code.launchpad.net
To post a comment you must log in.
Revision history for this message
John Ferlito (johnf-inodes) wrote :

Updates to the ppa docs I've been using to build the packages every release

Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

johnf wrote:
> johnf has proposed merging lp:~johnf-inodes/bzr/ppa-doc into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> Updates to the ppa docs I've been using to build the packages every release
>

 review: approve

This looks fine to me, but mostly I'm relying on the idea that *you* are
doing the packaging using these instructions, and it is currently
working for you. (I didn't do any testing or step-by-step following of
the instructions to make sure they all worked as expected.)

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkqeuD4ACgkQJdeBCYSNAAM3EQCffOyjaSA9xaZCPDs8qowoODe4
XWcAoLzZ+d6p3gRm4uFAJqNAz4DCGbkR
=Rxxj
-----END PGP SIGNATURE-----

review: Approve
Revision history for this message
Martin Pool (mbp) wrote :

Looks good to me.

review: Approve
Revision history for this message
John Ferlito (johnf-inodes) wrote :

> This looks fine to me, but mostly I'm relying on the idea that *you* are
> doing the packaging using these instructions, and it is currently
> working for you.

Yes I am and it is :)

Revision history for this message
Martin Pool (mbp) wrote :

I'm trying to merge this but am hitting https://bugs.edge.launchpad.net/bzr/+bug/427736 - it may be caused by John uploading with a buggy 2.0rc.

Revision history for this message
Martin Pool (mbp) wrote :

> I'm trying to merge this but am hitting
> https://bugs.edge.launchpad.net/bzr/+bug/427736 - it may be caused by John
> uploading with a buggy 2.0rc.

I think that bug is caused by an outdated hpss on Launchpad; I'll integrate and send this using sftp.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/developers/ppa.txt'
2--- doc/developers/ppa.txt 2009-02-16 10:13:56 +0000
3+++ doc/developers/ppa.txt 2009-09-02 10:41:30 +0000
4@@ -19,7 +19,7 @@
5 Final released versions.
6
7 <https://launchpad.net/~bzr-beta-ppa/+archive>
8- Releases and release candidates.
9+ Releases and release candidates.
10
11 <https://launchpad.net/~bzr-nightly-ppa/+archive>
12 Automatic nightly builds from trunk.
13@@ -107,12 +107,16 @@
14 release packages is as simple as::
15
16 cd ~/dev/bzr/releases/packaging
17- ln ~/dev/bzr/releases/bzr-1.6.tar.gz ./bzr_1.6.orig.tar.gz
18- export UBUNTU_RELEASES="dapper feisty gutsy hardy intrepid"
19+ export VERSION="1.17~rc1-1~bazaar1"
20+ export PACKAGE="bzr"
21+ export UBUNTU_RELEASES="dapper hardy intrepid jaunty karmic"
22 ~/dev/bzr/bzr.dev/tools/packaging/update-packaging-branches.sh
23- ~/dev/bzr/bzr.dev/tools/packaging/update-changelogs.sh 1.6~beta3-1~bazaar1
24- ~/dev/bzr/bzr.dev/tools/packaging/build-packages
25- dput bzr-beta-ppa bzr_1.6~beta3-1~bazaar1*.changes
26+ ~/dev/bzr/bzr.dev/tools/packaging/update-changelogs.sh
27+ ~/dev/bzr/bzr.dev/tools/packaging/update-control.sh 1.16 1.17 1.18
28+ ~/dev/bzr/bzr.dev/tools/packaging/build-packages.sh
29+ dput bzr-beta-ppa ${PACKAGE}_$VERSION*.changes
30+
31+Rinse and repeat for all the plugins by changing VERSION and PACKAGE.
32
33 Long Form
34 ~~~~~~~~~
35@@ -121,23 +125,34 @@
36 release. Such as ``~/dev/bzr/releases/packaging/hardy``. In each of these
37 branches, you will produce the package for the release.
38
39+ The scripts will also create the branches and produce packages for
40+ bzrtools and bzr-svn.
41+
42 #. Decide on the final version number. It should be of this form::
43
44- bzr-1.6~beta3-1~bazaar1~hardy1
45+ bzr-1.17~rc1-1~bazaar1~hardy1
46
47 **Note:** There are three hyphen-separated parts: the *package name*,
48 the *upstream version*, and the *packaging version*.
49
50 **Caution:** Upstream betas or release candidates must insert a tilde
51 to make them sort before the final release, like this:
52- ``bzr-1.6~beta3-1~bazaar1~hardy1``.
53+ ``bzr-1.17~rc1-1~bazaar1~hardy1``.
54
55 Final releases will use a release string of the form:
56- ``bzr-1.6-1~bazaar1~hardy1``
57+ ``bzr-1.17-1~bazaar1~hardy1``
58+
59+ Set this base of this up as a usable environment variable::
60+
61+ export VERSION="1.17~rc1-1~bazaar1"
62
63 #. Export the distroreleases that you will be packaging for::
64
65- export UBUNTU_RELEASES="dapper feisty gutsy hardy intrepid jaunty"
66+ export UBUNTU_RELEASES="dapper hardy intrepid jaunty karmic"
67+
68+#. Export the program you are packaging::
69+
70+ export PACKAGE="bzr"
71
72 #. Checkout (or update) the packaging branch for each supported release::
73
74@@ -155,13 +170,23 @@
75
76 For bzrtools this is typically::
77
78- Build-Depends-Indep: bzr (>= 1.6~), rsync
79- Depends: ${python:Depends}, bzr (>= 1.6~), bzr (<< 1.7~), patch
80+ Build-Depends-Indep: bzr (>= 1.17~), rsync
81+ Depends: ${python:Depends}, bzr (>= 1.17~), bzr (<< 1.18~), patch
82+
83+ There is a helper script which will update the control file and commit it
84+ for all of your ``$UBUNTU_RELEASES``. It is available as::
85+
86+ tools/packaging/update-control.sh
87+
88+ You must supply the versions as arguments as follows
89+ OLD_VERSION CURRENT_VERSION NEXT_VERSION, such as::
90+
91+ tools/packaging/update-control.sh 1.16 1.17 1.18
92
93 #. Make a new ``debian/changelog`` entry for the new release,
94 either by using ``dch`` or just editing the file::
95
96- dch -v '1.6~beta3-1~bazaar1~hardy1' -D hardy
97+ dch -v '1.17~rc1-1~bazaar1~hardy1' -D hardy
98
99 dch will default to the distro you're working in and this isn't checked
100 against the version number (which is just our convention), so make sure
101@@ -171,7 +196,7 @@
102 export DEBEMAIL=`bzr whoami` if it isn't already set), version number, and
103 distribution. It should look something like this::
104
105- bzr (1.6~beta3-1~bazaar1~hardy1) hardy; urgency=low
106+ bzr (1.17~rc1-1~bazaar1~hardy1) hardy; urgency=low
107
108 * New upstream release.
109
110@@ -185,17 +210,11 @@
111
112 You will also want to commit these changes into the packaging branch.
113
114- There is a helper script which will update the changelog and commit it
115+ There is a helper script which will build all the packages
116 for all of your ``$UBUNTU_RELEASES``. It is available as::
117
118 tools/packaging/update-changelogs.sh
119
120- You must supply the release string, such as::
121-
122- tools/packaging/update-changelogs.sh 1.6~beta3-1~bazaar1
123-
124- It will automatically append the distro numbering on the end.
125-
126 #. Build the source packages::
127
128 cd packaging-$DISTRO; bzr builddeb -S
129@@ -207,13 +226,18 @@
130
131 where ``$UID`` is the gpg key you want to use to sign the changes.
132
133+ There is a helper script which will build the package
134+ for all of your ``$UBUNTU_RELEASES``. It is available as::
135+
136+ tools/packaging/build-packages.sh
137+
138 #. Upload into the beta PPA for each release::
139
140- dput bzr-beta-ppa bzr_1.6-1*.changes
141+ dput bzr-beta-ppa bzr*1.17-1*.changes
142
143 #. For final release versions, also copy it into the ``~bzr`` PPA::
144
145- dput bzr-ppa ../bzr_1.6-1\~bazaar1\~hardy1\_source.changes
146+ dput bzr-ppa ../bzr_1.17-1\~bazaar1\~hardy1\_source.changes
147
148 Alternatively, you can use Launchpad's "copy" feature to copy the
149 packages between repositories.
150@@ -234,11 +258,13 @@
151
152 #. Get a checkout of ``lp:~bzr/bzr-svn/hardy-ppa/``
153
154-#. Merge from ``http://bzr.debian.org/pkg-bazaar/bzr-svn/experimental/``
155-
156+#. Merge from ``http://bzr.debian.org/pkg-bazaar/bzr-svn/unstable/``
157+
158 This should bring in both upstream and packaging changes for the new
159 release, and it's updated as part of the bzr-svn release process.
160
161+ It's quite possible you will need to resolve some conflicts.
162+
163 #. Run ``dch -v 0.4.15-1~bazaar1-hardy1 -D hardy`` or similar
164
165 #. Run ``bzr builddeb --source``
166
167=== modified file 'tools/packaging/build-packages.sh'
168--- tools/packaging/build-packages.sh 2009-02-16 10:13:56 +0000
169+++ tools/packaging/build-packages.sh 2009-05-25 10:59:42 +0000
170@@ -9,5 +9,5 @@
171 fi
172
173 for DISTRO in $UBUNTU_RELEASES; do
174- (cd "packaging-$DISTRO" && bzr builddeb -S)
175+ (cd "$PACKAGE-$DISTRO" && bzr builddeb -S)
176 done
177
178=== modified file 'tools/packaging/update-changelogs.sh'
179--- tools/packaging/update-changelogs.sh 2009-02-16 10:13:56 +0000
180+++ tools/packaging/update-changelogs.sh 2009-06-03 10:26:06 +0000
181@@ -7,22 +7,27 @@
182 exit 1
183 fi
184
185-if [ "x$1" = "x" ]; then
186+if [ "x$VERSION" = "x" ]; then
187 echo "Missing version"
188 echo "You want something like:"
189- echo " update-changelogs.sh 1.6~rc1-1~bazaar1"
190+ echo " VERSION=1.6~rc1-1~bazaar1 update-changelogs.sh"
191 echo "or"
192- echo " update-changelogs.sh 1.6-1~bazaar1"
193+ echo " VERSION=1.6-1~bazaar1 update-changelogs.sh"
194 exit
195 fi
196-VERSION=$1
197+
198+if [ -z "$1" ]; then
199+ MSG="New upstream release"
200+else
201+ MSG=$1
202+fi
203
204 for DISTRO in $UBUNTU_RELEASES; do
205 PPAVERSION="$VERSION~${DISTRO}1"
206 (
207 echo "Updating changelog for $DISTRO"
208- cd "packaging-$DISTRO" &&
209- dch -v $PPAVERSION -D $DISTRO -c changelog 'New upstream release.' &&
210- bzr commit -m "New upstream release: $PPAVERSION"
211+ cd "$PACKAGE-$DISTRO" &&
212+ dch -v $PPAVERSION -D $DISTRO -c changelog "$MSG." &&
213+ bzr commit -m "$MSG: $PPAVERSION"
214 )
215 done
216
217=== added file 'tools/packaging/update-control.sh'
218--- tools/packaging/update-control.sh 1970-01-01 00:00:00 +0000
219+++ tools/packaging/update-control.sh 2009-09-02 04:08:08 +0000
220@@ -0,0 +1,31 @@
221+#!/bin/bash
222+
223+if [ -z "$UBUNTU_RELEASES" ]; then
224+ echo "Configure the distro platforms that you want to"
225+ echo "build with a line like:"
226+ echo ' export UBUNTU_RELEASES="dapper feisty gutsy hardy intrepid jaunty"'
227+ exit 1
228+fi
229+
230+OLD_VERSION=$1
231+NEW_VERSION=$2
232+NEXT_VERSION=$3
233+if [ -z "$OLD_VERSION" -o -z "$NEW_VERSION" -o -z "$NEXT_VERSION" ]; then
234+ echo "Missing version"
235+ echo "You want something like:"
236+ echo " update-control.sh 1.5 1.6 1.7"
237+ exit
238+fi
239+
240+if [ "$PACKAGE" = "bzr" ]; then
241+ continue
242+fi
243+for DISTRO in $UBUNTU_RELEASES; do
244+ PPAVERSION="$VERSION~${DISTRO}1"
245+ (
246+ echo "Updating control for $DISTRO"
247+ cd "$PACKAGE-$DISTRO" &&
248+ sed -i -e "s/$NEW_VERSION~/$NEXT_VERSION~/;s/$OLD_VERSION~/$NEW_VERSION~/" control &&
249+ bzr commit -m "New upstream release: $PPAVERSION, update control"
250+ )
251+done
252
253=== modified file 'tools/packaging/update-packaging-branches.sh'
254--- tools/packaging/update-packaging-branches.sh 2009-02-16 10:13:56 +0000
255+++ tools/packaging/update-packaging-branches.sh 2009-06-03 10:20:19 +0000
256@@ -9,12 +9,20 @@
257 fi
258
259 for DISTRO in $UBUNTU_RELEASES; do
260- if [ -d "packaging-$DISTRO" ] ; then
261- echo "Updating packaging-$DISTRO"
262- bzr update packaging-$DISTRO
263+ if [ -d "$PACKAGE-$DISTRO" ] ; then
264+ echo "Updating $PACKAGE-$DISTRO"
265+ bzr update $PACKAGE-$DISTRO
266+ if [ "$PACKAGE" = "bzr-svn" ] ; then
267+ cd $PACKAGE-$DISTRO
268+ bzr merge http://bzr.debian.org/pkg-bazaar/bzr-svn/unstable/
269+ cd ..
270+ fi
271 else
272- echo "Checking out lp:~bzr/bzr/packaging-$DISTRO"
273- bzr co lp:~bzr/bzr/packaging-$DISTRO
274+ SRC="lp:~bzr/$PACKAGE/packaging-$DISTRO"
275+ if [ "$PACKAGE" = "bzr-svn" ] ; then
276+ SRC="lp:~bzr/$PACKAGE/beta-ppa-$DISTRO"
277+ fi
278+ echo "Checking out $SRC"
279+ bzr co $SRC $PACKAGE-$DISTRO
280 fi
281 done
282-