Reviewers: mp+222790_code.launchpad.net,

Message:
Please take a look.

Description:
Update HACKING doc.

Reference the two different packaging recipes for trusty and beyond and
for
the pre-trusty series.

The packaging branches are now two separate series:
lp:juju-quickstart/packaging and
lp:juju-quickstart/packaging-pre-trusty.
Referencing them in the recipes is cleaner than using bare branch names.

https://code.launchpad.net/~bac/juju-quickstart/packaging-tweaks/+merge/222790

(do not edit description out of merge proposal)


Please review this at https://codereview.appspot.com/103310043/

Affected files (+15, -6 lines):
   M HACKING.rst
   A [revision details]


Index: HACKING.rst
=== modified file 'HACKING.rst'
--- HACKING.rst	2014-06-10 17:37:55 +0000
+++ HACKING.rst	2014-06-11 12:36:39 +0000
@@ -77,7 +77,7 @@
  ~~~~~~~~~~~~~~

  The general steps for manual QA (until we get a continuous integration set  
up
-with functional tests) should be run on trusty and saucy.
+with functional tests) should be run on trusty and saucy.

  * Ensure juju-quickstart is installed from the juju-gui/quickstart-beta  
PPA.::

@@ -113,8 +113,8 @@
  series before trusty and trusty and later.  Consequently, there are two
  packaging branches and two build recipes.  The two packaging branches are:

-* lp:~juju-gui/juju-quickstart/packaging-trunk, and
-* lp:~juju-gui/juju-quickstart/packaging-pre-trusty
+* lp:juju-quickstart/packaging, and
+* lp:juju-quickstart/packaging-pre-trusty

  For the following instructions we'll use the -trunk version but the  
procedure
  is the same for the -pre-trusty branch.
@@ -122,8 +122,8 @@
  The packaging repository (including the ``debian`` directory) can be  
checked
  out from lp:~juju-gui/juju-quickstart/packaging-trunk, e.g.::

-    $ bzr branch lp:~juju-gui/juju-quickstart/packaging-trunk/  
packaging-trunk
-    $ cd packaging-trunk
+    $ bzr branch lp:juju-quickstart/packaging packaging
+    $ cd packaging

  Check that the packaging version reflects the latest Quickstart version.  
The
  packaging version can be found in the ``debian/changelog`` file present in  
the
@@ -141,8 +141,15 @@
  At this point, edit the changelog as required, commit and push the changes  
back
  to the packaging branch trunk, and follow the instructions below.

-The recipe for creating packages is in
+The procedure is analogous for pre-trusty series releases, just using the
+other packaging branch.
+
+The recipe for creating packages for trusty and beyond is in:
   
<https://code.launchpad.net/~juju-gui-charmers/+recipe/juju-quickstart-trunk-daily>.
+
+The pre-trusty recipe is at:
+<https://code.launchpad.net/~juju-gui-charmers/+recipe/juju-quickstart-pre-trusty-daily>.
+
  We currently publish beta releases on the Juju Quickstart Beta PPA: see
  <https://launchpad.net/~juju-gui/+archive/quickstart-beta/+packages>.
  When a beta release is ready to be published, we move over the packages  
from


Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>