Merge lp:~maxb/bzr/ppa-packaging-move-to-package-branch-namespace into lp:bzr

[Max Bowsher]

Document moving packaging branches to the standand ~bzr/ubuntu/* layouts"

Relating to https://lists.ubuntu.com/archives/bazaar/2010q3/069806.html and subsequent messages.

I have moved all the packaging branches for the ~bzr PPAs to the Launchpad package branch namespace. This merge updates the bzr in-tree documentation and scripts.

[John A Meinel (jameinel)]

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

On 8/26/2010 7:39 PM, Max Bowsher wrote:
> Max Bowsher has proposed merging lp:~maxb/bzr/ppa-packaging-move-to-package-branch-namespace into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
>
> Relating to https://lists.ubuntu.com/archives/bazaar/2010q3/069806.html and subsequent messages.
>
> I have moved all the packaging branches for the ~bzr PPAs to the Launchpad package branch namespace. This merge updates the bzr in-tree documentation and scripts.

 merge: approve

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

iEYEARECAAYFAkx3GR0ACgkQJdeBCYSNAANvZwCcDJsRJElLGrqgpdcAFQehlg7C
F3kAnjZA1FtUPVXuo2khRIHUxmgC5Fvj
=+8UM
-----END PGP SIGNATURE-----

review: Approve

[John A Meinel (jameinel)]

sent to pqm by email

=== modified file 'doc/developers/ppa.txt'
--- doc/developers/ppa.txt	2010-08-20 05:20:56 +0000
+++ doc/developers/ppa.txt	2010-08-27 00:39:56 +0000
@@ -40,9 +40,9 @@
 
 The packaging information is kept in branches of bzr on Launchpad, named
 like
-<https://code.launchpad.net/~bzr/bzr/packaging-hardy>.
+<https://code.launchpad.net/~bzr/ubuntu/hardy/bzr/bzr-ppa>.
 or
-<lp:~bzr/bzr/packaging-hardy>.  These branches are intended to be used
+<lp:~bzr/ubuntu/hardy/bzr/bzr-ppa>.  These branches are intended to be used
 with the ``bzr-builddeb`` plugin.
 
 **You should almost always upload to the beta ppa first** and then either 
@@ -203,7 +203,7 @@
 
 #. Checkout (or update) the packaging branch for each supported release::
 
-      bzr co lp:~bzr/bzr/packaging-hardy
+      bzr co lp:~bzr/ubuntu/hardy/bzr/bzr-ppa
 
    There is a script available to help::
 
@@ -268,7 +268,7 @@
 
 #. Build the source packages::
 
-      cd packaging-$DISTRO; bzr builddeb -S
+      cd bzr-$DISTRO; bzr builddeb -S
 
    This will create a ``.changes`` file.  If you didn't configure builddeb
    to automatically sign them, you can use ::

=== modified file 'tools/packaging/update-packaging-branches.sh'
--- tools/packaging/update-packaging-branches.sh	2009-06-03 10:20:19 +0000
+++ tools/packaging/update-packaging-branches.sh	2010-08-27 00:39:56 +0000
@@ -18,10 +18,7 @@
             cd ..
         fi
     else
-        SRC="lp:~bzr/$PACKAGE/packaging-$DISTRO"
-        if [ "$PACKAGE" = "bzr-svn" ] ; then
-            SRC="lp:~bzr/$PACKAGE/beta-ppa-$DISTRO"
-        fi
+        SRC="lp:~bzr/ubuntu/$DISTRO/$PACKAGE/bzr-ppa"
         echo "Checking out $SRC"
         bzr co $SRC $PACKAGE-$DISTRO
     fi