Rev 5391: (jameinel) Document moving packaging branches to the standand ~bzr/ubuntu/* in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5391 [merge]
revision-id: pqm at pqm.ubuntu.com-20100827192648-asy9uzwe4w25v6mq
parent: pqm at pqm.ubuntu.com-20100824232014-nu9owzel2zym2jk2
parent: maxb at f2s.com-20100827003307-4je4yd2vw6wncjuz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-08-27 20:26:48 +0100
message:
  (jameinel) Document moving packaging branches to the standand ~bzr/ubuntu/*
   layouts" (Max Bowsher)
modified:
  doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
  tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
=== modified file 'doc/developers/ppa.txt'
--- a/doc/developers/ppa.txt	2010-08-20 05:20:56 +0000
+++ b/doc/developers/ppa.txt	2010-08-27 00:33:07 +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'
--- a/tools/packaging/update-packaging-branches.sh	2009-06-03 10:20:19 +0000
+++ b/tools/packaging/update-packaging-branches.sh	2010-08-27 00:33:07 +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