Merge lp:~m4sk1n/ubuntu-packaging-guide/ubuntu-packaging-guide into lp:ubuntu-packaging-guide

[Marcin Mikołajczak]

“latest Ubuntu version of Ubuntu” makes no sense

[Simon Quigley (tsimonq2)]

Comments added inline; once those are done I'll be happy to merge.

Nice way to get ahead and figure out the workflow before you start the GCI task, by the way. ;)

review: Needs Fixing

[lp:~m4sk1n/ubuntu-packaging-guide/ubuntu-packaging-guide]

638. By Marcin Mikołajczak <email address hidden> on 2017-12-19

Fix noticed mistakes

[Dmitry Shachnev (mitya57)]

Merged, thanks! In future, please use better commit messages: your last commit not only fixes the review comments, but also updates an unrelated file.

[Dmitry Shachnev (mitya57)]

Or in case you meant the mistakes in the guide itself, then the commit message is perfectly fine. Sorry for the noise :)

=== modified file 'ubuntu-packaging-guide/getting-set-up.rst'
--- ubuntu-packaging-guide/getting-set-up.rst	2017-09-07 22:38:12 +0000
+++ ubuntu-packaging-guide/getting-set-up.rst	2017-12-19 16:09:18 +0000
@@ -23,7 +23,7 @@
   Ubuntu. Doing so will allow you to test changes in the same environment where
   those changes will actually be applied and used.
 
-  Don't want to install the latest Ubuntu development version of Ubuntu? Spin
+  Don't want to install the latest development version of Ubuntu? Spin
   up an `LXD container <https://help.ubuntu.com/lts/serverguide/lxd.html>`_.
 
 Install basic packaging software

=== modified file 'ubuntu-packaging-guide/packaging-new-software.rst'
--- ubuntu-packaging-guide/packaging-new-software.rst	2017-09-07 22:38:12 +0000
+++ ubuntu-packaging-guide/packaging-new-software.rst	2017-12-19 16:09:18 +0000
@@ -26,8 +26,8 @@
 
 Now uncompress it::
 
-    $ tar xf hello-2.7.tar.gz
-    $ cd hello-2.7
+    $ tar xf hello-2.10.tar.gz
+    $ cd hello-2.10
 
 This application uses the autoconf build system so we want to run ``./configure``
 to prepare for compilation.
@@ -58,7 +58,7 @@
 
     $ sudo apt-get install dh-make bzr-builddeb
     $ cd ..
-    $ bzr dh-make hello 2.7 hello-2.7.tar.gz
+    $ bzr dh-make hello 2.10 hello-2.10.tar.gz
 
 When it asks what type of package type ``s`` for single binary. This will import
 the code into a branch and add the ``debian/`` packaging directory.  Have a look
@@ -72,7 +72,7 @@
 You should now customise each of the files.
 
 In ``debian/changelog`` change the
-version number to an Ubuntu version: ``2.7-0ubuntu1`` (upstream version 2.7,
+version number to an Ubuntu version: ``2.10-0ubuntu1`` (upstream version 2.10,
 Debian version 0, Ubuntu version 1).  Also change ``unstable`` to the current
 development Ubuntu release such as ``trusty``.
 
@@ -133,12 +133,12 @@
 
 You can view the contents of the package with::
 
-    $ lesspipe hello_2.7-0ubuntu1_amd64.deb
+    $ lesspipe hello_2.10-0ubuntu1_amd64.deb
 
 Install the package and check it works (later you will be able to uninstall it
 using ``sudo apt-get remove hello`` if you want)::
 
-    $ sudo dpkg --install hello_2.7-0ubuntu1_amd64.deb
+    $ sudo dpkg --install hello_2.10-0ubuntu1_amd64.deb
 
 You can also install all packages at once using::
 
@@ -152,8 +152,8 @@
 ``lintian`` which can be run on the source .dsc metadata file, .deb
 binary packages or .changes file::
 
-    $ lintian hello_2.7-0ubuntu1.dsc
-    $ lintian hello_2.7-0ubuntu1_amd64.deb
+    $ lintian hello_2.10-0ubuntu1.dsc
+    $ lintian hello_2.10-0ubuntu1_amd64.deb
 
 To see verbose description of the problems use ``--info`` lintian flag
 or ``lintian-info`` command.
@@ -177,7 +177,7 @@
 
     $ bzr builddeb -S
     $ cd ../build-area
-    $ pbuilder-dist trusty build hello_2.7-0ubuntu1.dsc
+    $ pbuilder-dist trusty build hello_2.10-0ubuntu1.dsc
 
 When you are happy with your package you will want others to review it.  You
 can upload the branch to Launchpad for review::
@@ -188,7 +188,7 @@
 others to test the binary packages.  You will need to set up a PPA in Launchpad
 and then upload with ``dput``::
 
-    $ dput ppa:<lp-username>/<ppa-name> hello_2.7-0ubuntu1.changes
+    $ dput ppa:<lp-username>/<ppa-name> hello_2.10-0ubuntu1.changes
 
 See :doc:`uploading<./udd-uploading>` for more information.