← Back to team overview

ubuntu-packaging-guide-team team mailing list archive

[Merge] lp:~rpadovani/ubuntu-packaging-guide/1257794 into lp:ubuntu-packaging-guide

 

Riccardo Padovani has proposed merging lp:~rpadovani/ubuntu-packaging-guide/1257794 into lp:ubuntu-packaging-guide.

Requested reviews:
  Ubuntu Packaging Guide Team (ubuntu-packaging-guide-team)
Related bugs:
  Bug #1257794 in Ubuntu Packaging Guide: "Update Ubuntu release names"
  https://bugs.launchpad.net/ubuntu-packaging-guide/+bug/1257794

For more details, see:
https://code.launchpad.net/~rpadovani/ubuntu-packaging-guide/1257794/+merge/197971

Fixed #1257794
Updated old Ubuntu release names and updated references to packages accordingly.


Not updated ubuntu-packaging-guide/patches-to-packages.rst and ubuntu-packaging-guide/libraries.rst because they refers to patches and to libraries that there aren't in newest version. 
I suggest to open a new bug to request a full review of these two guides.

-- 
https://code.launchpad.net/~rpadovani/ubuntu-packaging-guide/1257794/+merge/197971
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~rpadovani/ubuntu-packaging-guide/1257794 into lp:ubuntu-packaging-guide.
=== modified file 'ubuntu-packaging-guide/chroots.rst'
--- ubuntu-packaging-guide/chroots.rst	2012-10-19 09:44:44 +0000
+++ ubuntu-packaging-guide/chroots.rst	2013-12-05 23:08:21 +0000
@@ -15,17 +15,17 @@
 
 Use the command ``debootstrap`` to create a new chroot::
 
-    $ sudo debootstrap oneiric oneiric/
+    $ sudo debootstrap saucy saucy/
 
-This will create a directory ``oneiric`` and install a minimal oneiric system
+This will create a directory ``saucy`` and install a minimal saucy system
 into it.
 
-If your version of ``debootstrap`` does not know about oneiric you can try
+If your version of ``debootstrap`` does not know about saucy you can try
 upgrading to the version in ``backports``.
 
 You can then work inside the chroot::
 
-    $ sudo chroot oneiric
+    $ sudo chroot saucy
 
 Where you can install or remove any package you wish without affecting your
 main system.
@@ -33,8 +33,8 @@
 You might want to copy your GPG/ssh keys and Bazaar configuration into the
 chroot so you can access and sign packages directly::
 
-    $ sudo mkdir oneiric/home/<username>
-    $ sudo cp -r ~/.gnupg ~/.ssh ~/.bazaar oneiric/home/<username>
+    $ sudo mkdir saucy/home/<username>
+    $ sudo cp -r ~/.gnupg ~/.ssh ~/.bazaar saucy/home/<username>
 
 To stop apt and other programs complaining about missing locales you
 can install your relevant language pack::
@@ -44,7 +44,7 @@
 If you want to run X programs you will need to bind the /tmp directory
 into the chroot, from outside the chroot run::
 
-    $ sudo mount -t none -o bind /tmp oneiric/tmp
+    $ sudo mount -t none -o bind /tmp saucy/tmp
     $ xhost +
 
 Some programs may need you to bind /dev or /proc.

=== modified file 'ubuntu-packaging-guide/debian-dir-overview.rst'
--- ubuntu-packaging-guide/debian-dir-overview.rst	2012-10-28 14:18:03 +0000
+++ ubuntu-packaging-guide/debian-dir-overview.rst	2013-12-05 23:08:21 +0000
@@ -43,11 +43,11 @@
 Here is a sample ``changelog`` file for hello::
 
 
- hello (2.6-0ubuntu1) natty; urgency=low
+ hello (2.8-3ubuntu1) raring; urgency=low
 
    * New upstream release with lots of bug fixes and feature improvements.
 
- -- Jane Doe <packager@xxxxxxxxxxx>  Thu, 21 Apr 2011 11:12:00 -0400
+ -- Jane Doe <packager@xxxxxxxxxxx>  Thu, 21 Oct 2013 11:12:00 -0400
  
 Notice that the version has a ``-0ubuntu1`` appended to it, this is the distro 
 revision, used so that the packaging can be updated (to fix bugs for example) 

=== modified file 'ubuntu-packaging-guide/fixing-a-bug.rst'
--- ubuntu-packaging-guide/fixing-a-bug.rst	2013-02-09 10:22:13 +0000
+++ ubuntu-packaging-guide/fixing-a-bug.rst	2013-12-05 23:08:21 +0000
@@ -150,7 +150,7 @@
 This will add a boilerplate changelog entry for you and launch an editor 
 where you can fill in the blanks. An example of this could be::
 
-  specialpackage (1.2-3ubuntu4) natty; urgency=low
+  specialpackage (1.2-3ubuntu4) raring; urgency=low
 
     * debian/control: updated description to include frobnicator (LP: #123456)
 
@@ -194,11 +194,11 @@
 
 This could for example be::
 
-  lp:~emmaadams/ubuntu/natty/specialpackage/fix-for-123456
+  lp:~emmaadams/ubuntu/raring/specialpackage/fix-for-123456
 
 So if you just run::
 
-  bzr push lp:~emmaadams/ubuntu/natty/specialpackage/fix-for-123456
+  bzr push lp:~emmaadams/ubuntu/raring/specialpackage/fix-for-123456
   bzr lp-propose
 
 you should be all set. The push command should push it to Launchpad and the 

=== modified file 'ubuntu-packaging-guide/getting-set-up.rst'
--- ubuntu-packaging-guide/getting-set-up.rst	2013-04-25 18:04:22 +0000
+++ ubuntu-packaging-guide/getting-set-up.rst	2013-12-05 23:08:21 +0000
@@ -145,7 +145,7 @@
 
     $ pbuilder-dist <release> create
 
-where <release> is for example `natty`, `maverick`, `lucid` or in the case of
+where <release> is for example `raring`, `quantal`, `precise` or in the case of
 Debian maybe `sid`. This will take a while as it will download all the
 necessary packages for a "minimal installation". These will be cached though.
 

=== modified file 'ubuntu-packaging-guide/security-and-stable-release-updates.rst'
--- ubuntu-packaging-guide/security-and-stable-release-updates.rst	2012-03-20 22:02:49 +0000
+++ ubuntu-packaging-guide/security-and-stable-release-updates.rst	2013-12-05 23:08:21 +0000
@@ -11,7 +11,7 @@
 Fixing security bugs in Ubuntu is not really any different than :doc:`fixing a
 regular bug in Ubuntu<./fixing-a-bug>`, and it is assumed that you are familiar
 with patching normal bugs. To demonstrate where things are different, we will
-be updating the dbus package in Ubuntu 10.04 LTS (Lucid Lynx) for a security
+be updating the dbus package in Ubuntu 12.04 LTS (Precise Pangolin) for a security
 update.
 
 
@@ -19,19 +19,19 @@
 ====================
 
 In this example, we already know we want to fix the dbus package in Ubuntu
-10.04 LTS (Lucid Lynx). So first you need to determine the version of the
+12.04 LTS (Precise Pangolin). So first you need to determine the version of the
 package you want to download. We can use the ``rmadison`` to help with this::
 
-    $ rmadison dbus | grep lucid
-    dbus | 1.2.16-2ubuntu4 |         lucid | source, amd64, i386
-    dbus | 1.2.16-2ubuntu4.1 | lucid-security | source, amd64, i386
-    dbus | 1.2.16-2ubuntu4.2 | lucid-updates | source, amd64, i386
+    $ rmadison dbus | grep precise
+    dbus | 1.4.18-1ubuntu1   | precise          | source, amd64, armel, armhf, i386, powerpc
+    dbus | 1.4.18-1ubuntu1.4 | precise-security | source, amd64, armel, armhf, i386, powerpc
+    dbus | 1.4.18-1ubuntu1.4 | precise-updates  | source, amd64, armel, armhf, i386, powerpc
 
 Typically you will want to choose the highest version for the release you want
-to patch that is not in -proposed or -backports. Since we are updating Lucid's
-dbus, you'll download 1.2.16-2ubuntu4.2 from lucid-updates::
+to patch that is not in -proposed or -backports. Since we are updating Precise's
+dbus, you'll download 1.4.18-1ubuntu1.4 from precise-updates::
 
-    $ bzr branch ubuntu:lucid-updates/dbus
+    $ bzr branch ubuntu:precise-updates/dbus
 
 
 Patching the source
@@ -65,10 +65,10 @@
 launch ``dch`` automatically after un-applying all the patches. If you are not
 using ``edit-patch``, you can launch ``dch -i`` manually. Unlike with regular
 patches, you should use the following format (note the distribution name uses
-lucid-security since this is a security update for Lucid) for security
+precise-security since this is a security update for Precise) for security
 updates::
 
-    dbus (1.2.16-2ubuntu4.3) lucid-security; urgency=low
+    dbus (1.4.18-2ubuntu1.5) precise-security; urgency=low
 
       * SECURITY UPDATE: [DESCRIBE VULNERABILITY HERE]
         - debian/patches/99-fix-a-vulnerability.patch: [DESCRIBE CHANGES HERE]
@@ -85,7 +85,7 @@
     ## Origin/Author: [COMMIT ID, URL OR EMAIL ADDRESS OF AUTHOR]
     ## Bug: [UPSTREAM BUG URL]
     ## Bug-Ubuntu: https://launchpad.net/bugs/[BUG NUMBER]
-    Index: dbus-1.2.16/dbus/dbus-marshal-validate.c
+    Index: dbus-1.4.18/dbus/dbus-marshal-validate.c
     ...
 
 Multiple vulnerabilities can be fixed in the same security upload; just be sure
@@ -115,7 +115,7 @@
 
 The bug report should also confirm that the issue is fixed in Ubuntu versions
 newer than the one with the proposed fix (in the above example newer than
-Lucid).  If the issue is not fixed in newer Ubuntu versions you should prepare
+Precise).  If the issue is not fixed in newer Ubuntu versions you should prepare
 updates for those versions too.
 
 
@@ -131,7 +131,7 @@
 security bugs except you should subscribe ``ubuntu-sru`` to the bug.
 
 The update will go into the ``proposed`` archive (for example
-``lucid-proposed``) where it will need to be checked that it fixes the problem
+``precise-proposed``) where it will need to be checked that it fixes the problem
 and does not introduce new problems.  After a week without reported problems it
 can be moved to ``updates``.
 

=== modified file 'ubuntu-packaging-guide/udd-getting-the-source.rst'
--- ubuntu-packaging-guide/udd-getting-the-source.rst	2012-05-19 07:28:31 +0000
+++ ubuntu-packaging-guide/udd-getting-the-source.rst	2013-12-05 23:08:21 +0000
@@ -20,9 +20,9 @@
 
 To refer to the version of a source package in an older release of Ubuntu,
 just prefix the package name with the release's code name.  E.g. to refer to
-Tomboy's source package in Maverick_ use::
+Tomboy's source package in Quantal_ use::
 
-    ubuntu:maverick/tomboy
+    ubuntu:quantal/tomboy
 
 Since they are unique, you can also abbreviate the distro-series name::
 
@@ -34,14 +34,14 @@
 
     debianlp:tomboy
 
-and to access Tomboy in Debian Lenny_ use::
+and to access Tomboy in Debian Wheezy_ use::
 
-    debianlp:lenny/tomboy
+    debianlp:wheezy/tomboy
 
 
 .. _`Bazaar`: http://bazaar.canonical.com/en/
-.. _Maverick: https://wiki.ubuntu.com/MaverickMeerkat
-.. _Lenny: http://debian.org/releases/stable/
+.. _Quantal: https://wiki.ubuntu.com/QuantalQuetzal
+.. _Wheezy: http://debian.org/releases/stable/
 
 
 Getting the source
@@ -138,9 +138,9 @@
 When you want to do something like a `stable release update`_ (SRU), or you
 just want to examine the code in an old release, you'll want to grab the
 branch corresponding to a particular Ubuntu release.  For example, to get the
-Tomboy package for Maverick do::
+Tomboy package for Quantal do::
 
-    $ bzr branch ubuntu:m/tomboy maverick
+    $ bzr branch ubuntu:m/tomboy quantal
 
 
 Importing a Debian source package

=== modified file 'ubuntu-packaging-guide/udd-latest.rst'
--- ubuntu-packaging-guide/udd-latest.rst	2012-02-29 10:05:20 +0000
+++ ubuntu-packaging-guide/udd-latest.rst	2013-12-05 23:08:21 +0000
@@ -16,7 +16,7 @@
     $ bzr pull
 
 This works wherever you have a checkout of a branch, so it will work for
-things like branches of `maverick`, `hardy-proposed`, etc.
+things like branches of `quantal`, `precise-proposed`, etc.
 
 
 Getting the latest in to your working branches

=== modified file 'ubuntu-packaging-guide/udd-sponsorship.rst'
--- ubuntu-packaging-guide/udd-sponsorship.rst	2012-06-20 10:00:57 +0000
+++ ubuntu-packaging-guide/udd-sponsorship.rst	2013-12-05 23:08:21 +0000
@@ -29,10 +29,10 @@
 
     lp:~<user-id>/ubuntu/<distroseries>/<package>/<branch-name>
 
-For example, to push your fix for bug 12345 in the Tomboy package for Natty,
+For example, to push your fix for bug 12345 in the Tomboy package for Raring,
 you'd use::
 
-    $ bzr push lp:~subgenius/ubuntu/natty/tomboy/bug-12345
+    $ bzr push lp:~subgenius/ubuntu/raring/tomboy/bug-12345
 
 The last component of the path is arbitrary; it's up to you to pick
 something meaningful.
@@ -46,7 +46,7 @@
 
 If that fails, then you can use::
 
-    $ xdg-open https://code.launchpad.net/~subgenius/ubuntu/natty/tomboy/bug-12345
+    $ xdg-open https://code.launchpad.net/~subgenius/ubuntu/raring/tomboy/bug-12345
 
 where most of the URL matches what you used for `bzr push`.  On this page,
 you'll see a link that says *Propose for merging into another branch*.  Type

=== modified file 'ubuntu-packaging-guide/udd-uploading.rst'
--- ubuntu-packaging-guide/udd-uploading.rst	2012-02-29 10:05:20 +0000
+++ ubuntu-packaging-guide/udd-uploading.rst	2013-12-05 23:08:21 +0000
@@ -87,7 +87,7 @@
 of merging from a branch you created, you merge from the branch in the merge
 proposal::
 
-    $ bzr merge lp:~subgenius/ubuntu/natty/tomboy/bug-12345
+    $ bzr merge lp:~subgenius/ubuntu/raring/tomboy/bug-12345
 
 If there are lots of merge conflicts you would probably want to ask the 
 contributor to fix them up.  See the next section to learn how to cancel
@@ -128,7 +128,7 @@
 changes based on what the contributor provides then you should start by
 grabbing their branch::
 
-    $ bzr branch lp:~subgenius/ubuntu/natty/tomboy/bug-12345
+    $ bzr branch lp:~subgenius/ubuntu/raring/tomboy/bug-12345
 
 then work in this new branch, and then merge it in to the main one and upload
 as if it was your own work.  The contributor will still be mentioned in the

=== modified file 'ubuntu-packaging-guide/udd-working.rst'
--- ubuntu-packaging-guide/udd-working.rst	2012-10-19 09:44:44 +0000
+++ ubuntu-packaging-guide/udd-working.rst	2013-12-05 23:08:21 +0000
@@ -48,11 +48,11 @@
 number that you're fixing.  Your ``debian/changelog`` entry might look something
 like::
 
-    tomboy (1.5.2-1ubuntu5) natty; urgency=low
+    tomboy (1.12.0-1ubuntu3) raring urgency=low
 
         * Don't fubar the frobnicator. (LP: #12345)
 
-     -- Bob Dobbs <subgenius@xxxxxxxxxxx>  Mon, 10 Jan 2011 16:10:01 -0500
+     -- Bob Dobbs <subgenius@xxxxxxxxxxx>  Mon, 10 Sep 2013 16:10:01 -0500
 
 Commit with the normal::
 


Follow ups