Merge lp:~laney/ubuntu-packaging-guide/new-package-no-debuild into lp:ubuntu-packaging-guide

[Iain Lane]

Don't mix debuild and bzr builddeb in the same guide.

[Iain Lane (laney)]

It should be noted that I didn't run through the guide. I'm pretty sure that these commands are right but, well, I didn't try them.

[Daniel Holbach (dholbach)]

Thanks a lot.

review: Approve

=== modified file 'ubuntu-packaging-guide/packaging-new-software.rst'
--- ubuntu-packaging-guide/packaging-new-software.rst	2012-05-11 21:42:14 +0000
+++ ubuntu-packaging-guide/packaging-new-software.rst	2012-07-07 22:09:19 +0000
@@ -131,12 +131,12 @@
 Now we need to check that our packaging successfully compiles the package and
 builds the .deb binary package::
 
-    $ debuild -us -uc
+    $ bzr builddeb -- -us -uc
     $ cd ../../
 
-``debuild`` is a command to build the package in its current location.  The
-``-us -uc`` tell it there is not need to GPG sign the compile.  The result will
-be placed in ``..``.  
+``bzr builddeb`` is a command to build the package in its current location.
+The ``-us -uc`` tell it there is not need to GPG sign the compile.  The result
+will be placed in ``..``.  
 
 You can view the contents of the package with::
 
@@ -163,7 +163,7 @@
 After making a fix to the packaging you can rebuild using ``-nc`` "no clean"
 without having to build from scratch::
 
-    $ debuild -nc
+    $ bzr builddeb -- -nc
 
 Having checked that the package builds locally you should ensure it builds on a
 clean system using ``pbuilder``. If you haven't set up ``pbuilder-dist``