|
736
by Dustin Kirkland
added instructions for merging to a debian/ README file |
1 |
# This document is intended to describe the process by which we merge
|
2 |
# Eucalyptus snapshots from source control into Ubuntu's development
|
|
3 |
# branch.
|
|
4 |
#
|
|
5 |
# The instructions below are written in shell format, and are suitable
|
|
6 |
# for copy-and-paste, but this README is not intended for arbitrary
|
|
7 |
# execution.
|
|
8 |
#
|
|
9 |
# Please update as necessary.
|
|
10 |
#
|
|
11 |
# -- Dustin Kirkland <kirkland@canonical.com>, 12 Dec 2009
|
|
12 |
||
13 |
# Current Eucalyptus Major.Minor version
|
|
|
1065
by Dave Walker (Daviey)
Releasing 2.0~bzr1224-0ubuntu1 |
14 |
VER=2.0 |
|
736
by Dustin Kirkland
added instructions for merging to a debian/ README file |
15 |
DIR=$(mktemp -d) |
16 |
cd $DIR |
|
17 |
||
18 |
# Grab the Upstream branch
|
|
|
1102
by Dave Walker (Daviey)
debian/README.ubuntu-merging: updated merge location as 2.0 is now released upstream |
19 |
bzr branch lp:~eucalyptus-maintainers/eucalyptus/2.0.0-lp upstream |
|
736
by Dustin Kirkland
added instructions for merging to a debian/ README file |
20 |
|
21 |
# Get the current revision number
|
|
|
746
by Dustin Kirkland
add some notes regarding merging from a non-standard location |
22 |
cd upstream |
23 |
REVNO=$(bzr revno) && echo $REVNO |
|
|
736
by Dustin Kirkland
added instructions for merging to a debian/ README file |
24 |
|
25 |
# Upstream currently has it's own debian packaging, which is *not* what we want
|
|
26 |
bzr rm debian |
|
27 |
bzr commit -m "remove the upstream debian packaging directory" |
|
|
746
by Dustin Kirkland
add some notes regarding merging from a non-standard location |
28 |
bzr export --root eucalyptus-$VER~bzr$REVNO ../eucalyptus_$VER~bzr$REVNO.orig.tar.gz && ls -halF ../eucalyptus_$VER~bzr$REVNO.orig.tar.gz |
|
736
by Dustin Kirkland
added instructions for merging to a debian/ README file |
29 |
cd .. |
30 |
||
31 |
# Grab the Ubuntu branch
|
|
|
1065
by Dave Walker (Daviey)
Releasing 2.0~bzr1224-0ubuntu1 |
32 |
bzr branch lp:~ubuntu-virt/ubuntu/maverick/eucalyptus/2.0 ubuntu |
33 |
bzr branch ubuntu working.area |
|
34 |
cd working.area |
|
35 |
||
36 |
# Unapply the Ubuntu patches
|
|
37 |
quilt pop -a |
|
38 |
bzr commit -m "Ubuntu Patches Unapplied" |
|
|
736
by Dustin Kirkland
added instructions for merging to a debian/ README file |
39 |
|
40 |
# Do the Merge
|
|
|
746
by Dustin Kirkland
add some notes regarding merging from a non-standard location |
41 |
bzr merge ../upstream |
|
1065
by Dave Walker (Daviey)
Releasing 2.0~bzr1224-0ubuntu1 |
42 |
|
43 |
# Commit the merge
|
|
44 |
bzr commit -m "New upstream merge, r$REVNO" |
|
45 |
||
46 |
# Apply ubuntu patches, and look for issues.
|
|
47 |
quilt push -a |
|
48 |
||
49 |
#If successful, commit it back
|
|
50 |
bzr add |
|
51 |
dch -i "New upstream snapshot, -r$REVNO" |
|
|
1084
by Dustin Kirkland
update the commit message after merge |
52 |
debcommit
|
|
1065
by Dave Walker (Daviey)
Releasing 2.0~bzr1224-0ubuntu1 |
53 |
|
54 |
# Merge it into your main tree
|
|
55 |
cd ../ubuntu |
|
56 |
bzr merge ../working.area |
|
|
736
by Dustin Kirkland
added instructions for merging to a debian/ README file |
57 |
|
58 |
##################################
|
|
59 |
# MANUAL STEP: Resolve Conflicts #
|
|
60 |
##################################
|
|
61 |
||
62 |
# Do an intermediate commit, to separate the upstream merge changes
|
|
63 |
# from our packaging changes
|
|
64 |
debcommit
|
|
65 |
||
66 |
# Test the source build
|
|
67 |
bzr bd -S |
|
68 |
||
69 |
# Test the binary build
|
|
70 |
bzr bd |
|
71 |
||
72 |
##############################
|
|
73 |
# MANUAL STEP: Test Packages #
|
|
74 |
##############################
|
|
75 |
||
76 |
# Update the changelog for release
|
|
|
1082
by Dustin Kirkland
debian/README.ubuntu-merging: updated for maverick merge procedures |
77 |
dch --release maverick |
|
736
by Dustin Kirkland
added instructions for merging to a debian/ README file |
78 |
# Commit and tag the release
|
79 |
debcommit --release |
|
|
1087
by Dustin Kirkland
fix up merge, drop the non-working bugs-fixed code |
80 |
# Build your source package
|
81 |
bzr bd -S |
|
82 |
# And upload!
|
|
|
1082
by Dustin Kirkland
debian/README.ubuntu-merging: updated for maverick merge procedures |
83 |
bzr push lp:~ubuntu-virt/ubuntu/maverick/eucalyptus/2.0 |
|
736
by Dustin Kirkland
added instructions for merging to a debian/ README file |
84 |
dput ../eucalyptus*_source.changes |