Rev 5382: (garyvdm) Update ppa doc. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5382 [merge]
revision-id: pqm at pqm.ubuntu.com-20100819135853-855mfj41lxeelhs1
parent: pqm at pqm.ubuntu.com-20100819124033-giiig7w65zfjdwtf
parent: garyvdm at gmail.com-20100819112342-woalvprgzu2nysvh
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-08-19 14:58:53 +0100
message:
  (garyvdm) Update ppa doc.
modified:
  doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
=== modified file 'doc/developers/ppa.txt'
--- a/doc/developers/ppa.txt	2010-07-13 17:14:43 +0000
+++ b/doc/developers/ppa.txt	2010-08-19 11:23:42 +0000
@@ -62,7 +62,7 @@
 On reasonably recent versions of Ubuntu you no longer need special dput
 configuration, because you can just say ::
 
-  dput ppa:bzr/2.1-proposed <source.changes
+  dput ppa:bzr/proposed <source.changes
   
 
 However, you may still want to add these lines to ``~/.dput.cf`` prevent 
@@ -120,6 +120,14 @@
 use the script from <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=255165> 
 to wrap it.
 
+Update all packages in proposed before copping the main ppa
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If one updates bzr, and there are plugins that are not compatible with the
+new version of bzr, this can cause pain for users using the ppa. In order to
+avoid this, we first get all packages up to date in the proposed ppa, and then
+copy them to the main ppa.
+
 
 Short form
 ~~~~~~~~~~
@@ -132,10 +140,11 @@
   export PACKAGE="bzr"
   export UBUNTU_RELEASES="dapper hardy intrepid jaunty karmic"
   ~/dev/bzr/bzr.dev/tools/packaging/update-packaging-branches.sh
+  * Optionaly merge debian unstable. 
   ~/dev/bzr/bzr.dev/tools/packaging/update-changelogs.sh
   ~/dev/bzr/bzr.dev/tools/packaging/update-control.sh 1.16 1.17 1.18
   ~/dev/bzr/bzr.dev/tools/packaging/build-packages.sh
-  dput bzr-beta-ppa ${PACKAGE}_$VERSION*.changes
+  dput ppa:bzr/proposed ${PACKAGE}_$VERSION*.changes
 
 Rinse and repeat for all the plugins by changing VERSION and PACKAGE.
 
@@ -183,6 +192,10 @@
 
       tools/packaging/update-packaging-branches.sh
 
+#. Optionaly, merge the Debian unstable branch into each of the packaging
+   branches. You can find the Debian unstable branch here:
+   http://bzr.debian.org/pkg-bazaar/
+
 #. The ``bzr-builddeb`` step will download the original tarball if you do
    not already have it, putting it into a ``tarballs`` directory.
 
@@ -252,16 +265,9 @@
 
       tools/packaging/build-packages.sh
 
-#. Upload into the beta PPA for each release::
-
-     dput bzr-beta-ppa bzr*1.17-1*.changes
-
-#. For final release versions, also copy it into the ``~bzr`` PPA::
-
-     dput bzr-ppa ../bzr_1.17-1\~bazaar1\~hardy1\_source.changes
-
-   Alternatively, you can use Launchpad's "copy" feature to copy the
-   packages between repositories.
+#. Upload into the PPA for each release::
+
+     dput dput ppa:bzr/proposed bzr*1.17-1*.changes
 
 #. You should soon get an "upload accepted" mail from Launchpad, which
    means that your package is waiting to be built.  You can then track its