← Back to team overview

ubuntu-packaging-guide-team team mailing list archive

[Merge] lp:~mitya57/ubuntu-packaging-guide/anonymous-links into lp:ubuntu-packaging-guide

 

Dmitry Shachnev has proposed merging lp:~mitya57/ubuntu-packaging-guide/anonymous-links into lp:ubuntu-packaging-guide.

Requested reviews:
  Ubuntu Packaging Guide Team (ubuntu-packaging-guide-team)

For more details, see:
https://code.launchpad.net/~mitya57/ubuntu-packaging-guide/anonymous-links/+merge/218192

ReStructuredText supports three types of links:

- Inline references:

  `Link text goes here <http://example.com>`_

- Referencing by link text:

  `Link text goes here`_

  .. _`Link text goes here`: http://example.com

- Referencing by label (email-style, aka anonymous links).

  `Link text goes here <FOO_>`_

  .. _FOO: http://example.com

The second type is currently most commonly used in the packaging guide, but such links are impossible to translate.

This MP changes links of second type (and some of the first type) to the third one. Please review carefully.
-- 
https://code.launchpad.net/~mitya57/ubuntu-packaging-guide/anonymous-links/+merge/218192
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~mitya57/ubuntu-packaging-guide/anonymous-links into lp:ubuntu-packaging-guide.
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-24 15:25:01 +0000
+++ debian/changelog	2014-05-03 17:25:36 +0000
@@ -1,7 +1,8 @@
-ubuntu-packaging-guide (0.3.6) trusty; urgency=medium
+ubuntu-packaging-guide (0.3.6) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Fix a typo and regenerate the .pot file (LP: #1309861).
+  * Use anonymous links where possible to make translation easier.
 
   [ Daniel Holbach ]
   * Changed "phone and table" to "phone and tablet".

=== modified file 'ubuntu-packaging-guide/auto-pkg-test.rst'
--- ubuntu-packaging-guide/auto-pkg-test.rst	2014-02-23 09:56:45 +0000
+++ ubuntu-packaging-guide/auto-pkg-test.rst	2014-05-03 17:25:36 +0000
@@ -2,7 +2,7 @@
 autopkgtest: Automatic testing for packages
 ===========================================
 
-The `DEP 8 specification`_ defines how automatic testing can very easily be 
+The `DEP 8 specification <DEP8_>`_ defines how automatic testing can very easily be 
 integrated into packages. To integrate a test into a package, all you need to 
 do is:
 
@@ -21,7 +21,7 @@
 In ``debian/tests/control`` you specify what to expect from the testbed. So 
 for example you list all the required packages for the tests, if the testbed
 gets broken during the build or if ``root`` permissions are required. The 
-`DEP 8 specification`_ lists all available options.
+`DEP 8 specification <DEP8_>`_ lists all available options.
 
 Below we are having a look at the ``glib2.0`` source package. In a very 
 simple case the file would look like this::
@@ -93,7 +93,7 @@
 The downside of this approach is that you test it locally, but can't ensure
 that this will work in a minimal environment. For example will it be hard to
 ensure that all the required packages are installed for the tests. With 
-`lp:auto-package-testing`_ we have a more comprehensive testing tool. It 
+`lp:auto-package-testing <autotesting_>`_ we have a more comprehensive testing tool. It 
 uses a pristine virtual machine to run the tests. To set it up, firstly
 install the needed dependencies::
 
@@ -124,7 +124,7 @@
 log into the virtual machine after the tests were run. This makes it very easy
 to debug issues.
 
-The `auto-package-testing documentation`_ has a lot more valuable information
+The `auto-package-testing documentation <autotesting-doc_>`_ has a lot more valuable information
 on other testing options.
 
 
@@ -135,13 +135,13 @@
 This list is not comprehensive, but might help you get a better idea of how
 automated tests are implemented and used in Ubuntu.
 
-* The `libxml2 tests`_ are very similar. They also run a test-build of a 
+* The `libxml2 tests <libxml2_>`_ are very similar. They also run a test-build of a 
   simple piece of C code and execute it.
-* The `gtk+3.0 tests`_ also do a compile/link/run check in the "build" test. 
+* The `gtk+3.0 tests <gtk3_>`_ also do a compile/link/run check in the "build" test. 
   There is an additional "python3-gi" test which verifies that the GTK 
   library can also be used through introspection.
-* In the `ubiquity tests`_ the upstream test-suite is executed.
-* The `gvfs tests`_ have comprehensive testing of their functionality and
+* In the `ubiquity tests <ubiquity_>`_ the upstream test-suite is executed.
+* The `gvfs tests <gvfs_>`_ have comprehensive testing of their functionality and
   are very interesting because they emulate usage of CDs, Samba, DAV and
   other bits.
 
@@ -150,7 +150,7 @@
 
 Packages which have ``autopkgtest`` enabled will have their tests run whenever
 they get uploaded or any of their dependencies change. The output of
-`automatically run autopkgtest tests`_ can be viewed on the web and is 
+`automatically run autopkgtest tests <jenkins_>`_ can be viewed on the web and is 
 regularly updated.
 
 While Debian does not have an automatic testing infrastructure set up yet, 
@@ -169,7 +169,7 @@
 * run ``bzr branch ubuntu:<packagename>``,
 * edit ``debian/control`` to enable the tests,
 * add the ``debian/tests`` directory,
-* write the ``debian/tests/control`` based on the `DEP 8 Specification`_,
+* write the ``debian/tests/control`` based on the `DEP 8 Specification <dep8_>`_,
 * add your test case(s) to ``debian/tests``,
 * commit your changes, push them to Launchpad, propose a merge and get it 
   reviewed just like any other improvement in a source package.
@@ -178,20 +178,20 @@
 What you can do
 ===============
 
-The Ubuntu Engineering team put together a `list of required test-cases`_,
+The Ubuntu Engineering team put together a `list of required test-cases <requiredtests_>`_,
 where packages which need tests are put into different categories. Here you
 can find examples of these tests and easily assign them to yourself.
 
 If you should run into any problems, you can join the `#ubuntu-quality IRC
-channel`_ to get in touch with developers who can help you.
+channel <qualityirc_>`_ to get in touch with developers who can help you.
 
-.. _`DEP 8 Specification`: http://anonscm.debian.org/gitweb/?p=autopkgtest/autopkgtest.git;a=blob_plain;f=doc/README.package-tests;hb=HEAD
-.. _`libxml2 tests`: https://bazaar.launchpad.net/+branch/ubuntu/libxml2/files/head:/debian/tests/
-.. _`gvfs tests`: https://bazaar.launchpad.net/+branch/ubuntu/gvfs/files/head:/debian/tests/
-.. _`gtk+3.0 tests`: https://bazaar.launchpad.net/+branch/ubuntu/gtk+3.0/files/head:/debian/tests/
-.. _`ubiquity tests`: https://bazaar.launchpad.net/+branch/ubiquity/files/head:/debian/tests/
-.. _`automatically run autopkgtest tests`: https://jenkins.qa.ubuntu.com/view/Trusty/view/AutoPkgTest/
-.. _`lp:auto-package-testing`: https://code.launchpad.net/auto-package-testing
-.. _`auto-package-testing documentation`: http://bazaar.launchpad.net/~auto-package-testing-dev/auto-package-testing/trunk/view/head:/doc/USAGE.md
-.. _`list of required test-cases`: https://wiki.ubuntu.com/QATeam/RequiredTests
-.. _`#ubuntu-quality IRC channel`: http://webchat.freenode.net/?channels=ubuntu-quality
+.. _DEP8: http://anonscm.debian.org/gitweb/?p=autopkgtest/autopkgtest.git;a=blob_plain;f=doc/README.package-tests;hb=HEAD
+.. _libxml2: https://bazaar.launchpad.net/+branch/ubuntu/libxml2/files/head:/debian/tests/
+.. _gvfs: https://bazaar.launchpad.net/+branch/ubuntu/gvfs/files/head:/debian/tests/
+.. _gtk3: https://bazaar.launchpad.net/+branch/ubuntu/gtk+3.0/files/head:/debian/tests/
+.. _ubiquity: https://bazaar.launchpad.net/+branch/ubiquity/files/head:/debian/tests/
+.. _jenkins: https://jenkins.qa.ubuntu.com/view/Saucy/view/AutoPkgTest/
+.. _autotesting: https://code.launchpad.net/auto-package-testing
+.. _autotestingdoc: http://bazaar.launchpad.net/~auto-package-testing-dev/auto-package-testing/trunk/view/head:/doc/USAGE.md
+.. _requiredtests: https://wiki.ubuntu.com/QATeam/RequiredTests
+.. _qualityirc: http://webchat.freenode.net/?channels=ubuntu-quality

=== modified file 'ubuntu-packaging-guide/backports.rst'
--- ubuntu-packaging-guide/backports.rst	2012-06-26 16:02:09 +0000
+++ ubuntu-packaging-guide/backports.rst	2014-05-03 17:25:36 +0000
@@ -4,8 +4,8 @@
 
 Sometimes you might want to make new functionality available in a stable
 release which is not connected to a critical bug fix. For these scenarios
-you have two options: either you `upload to a PPA 
-<https://help.launchpad.net/Packaging/PPA>`_ or prepare a backport.
+you have two options: either you `upload to a PPA <ppadoc_>`_
+or prepare a backport.
 
 
 Personal Package Archive (PPA)
@@ -15,10 +15,10 @@
 don't need approval of anyone, but the downside of it is that your users will
 have to manually enable it. It is a non-standard software source.
 
-The `PPA documentation on Launchpad`_ is fairly comprehensive and should get
+The `PPA documentation on Launchpad <ppadoc_>`_ is fairly comprehensive and should get
 you up and running in no time.
 
-.. _PPA documentation on Launchpad: https://help.launchpad.net/Packaging/PPA
+.. _ppadoc: https://help.launchpad.net/Packaging/PPA
 
 
 Official Ubuntu Backports

=== modified file 'ubuntu-packaging-guide/chroots.rst'
--- ubuntu-packaging-guide/chroots.rst	2014-02-23 09:56:45 +0000
+++ ubuntu-packaging-guide/chroots.rst	2014-05-03 17:25:36 +0000
@@ -49,27 +49,30 @@
 
 Some programs may need you to bind /dev or /proc.
 
-For more information on chroots see our `Debootstrap Chroot wiki page`_.
+For more information on chroots see our `Debootstrap Chroot wiki page <DebootstrapChroot_>`_.
 
 Alternatives
 ------------
 
-SBuild is a system similar to PBuilder for creating an environment to run test package builds in.  It closer matches that used by Launchpad for building packages but takes some more setup compared to PBuilder.  See `the Security Team Build Environment wiki page`_ for a full explanation.
+SBuild is a system similar to PBuilder for creating an environment to run
+test package builds in.  It closer matches that used by Launchpad for building
+packages but takes some more setup compared to PBuilder.  See
+`the Security Team Build Environment wiki page <SecurityEnv_>`_ for a full explanation.
 
 Full virtual machines can be useful for packaging and testing
 programs.  TestDrive is a program to automate syncing and running
-daily ISO images, see `the TestDrive wiki page`_ for more information.
+daily ISO images, see `the TestDrive wiki page <TestDrive_>`_ for more information.
 
 You can also set up pbuilder to pause when it comes across a build
 failure.  Copy C10shell from /usr/share/doc/pbuilder/examples into a
 directory and use the ``--hookdir=`` argument to point to it.
 
-Amazon's `EC2 cloud computers`_ allow you to hire a computer paying a
+Amazon's `EC2 cloud computers <EC2_>`_ allow you to hire a computer paying a
 few US cents per hour, you can set up Ubuntu machines of any supported
 version and package on those.  This is useful when you want to compile
 many packages at the same time or to overcome bandwidth restraints.
 
-.. _`Debootstrap Chroot wiki page`: https://wiki.ubuntu.com/DebootstrapChroot
-.. _`EC2 cloud computers`: https://help.ubuntu.com/community/EC2StartersGuide
-.. _`the TestDrive wiki page`: https://wiki.ubuntu.com/QATeam/Testdrive 
-.. _`the Security Team Build Environment wiki page`: https://wiki.ubuntu.com/SecurityTeam/BuildEnvironment
+.. _DebootstrapChroot: https://wiki.ubuntu.com/DebootstrapChroot
+.. _EC2: https://help.ubuntu.com/community/EC2StartersGuide
+.. _TestDrive: https://wiki.ubuntu.com/QATeam/Testdrive 
+.. _SecurityEnv: https://wiki.ubuntu.com/SecurityTeam/BuildEnvironment

=== modified file 'ubuntu-packaging-guide/debian-dir-overview.rst'
--- ubuntu-packaging-guide/debian-dir-overview.rst	2014-02-23 09:56:45 +0000
+++ ubuntu-packaging-guide/debian-dir-overview.rst	2014-05-03 17:25:36 +0000
@@ -61,9 +61,8 @@
 ``2.6-1ubuntu1``. If a package for the application does not exist in Debian, 
 then the Debian revision is ``0`` (e.g. ``2.6-0ubuntu1``).
 
-For further information, see the `changelog section (Section 4.4) 
-<http://www.debian.org/doc/debian-policy/ch-source.html#s-dpkgchangelog>`_ of 
-the Debian Policy Manual.
+For further information, see the `changelog section (Section 4.4) <policy-changelog_>`_
+of the Debian Policy Manual.
 
 
 The control file
@@ -114,22 +113,19 @@
 the old value should be saved in the ``XSBC-Original-Maintainer`` field. This 
 can be done automatically with the  ``update-maintainer`` script available in 
 the ``ubuntu-dev-tools`` package. For further information, see the `Debian 
-Maintainer Field spec <https://wiki.ubuntu.com/DebianMaintainerField>`_ on the 
-Ubuntu wiki.
+Maintainer Field spec <MaintField_>`_ on the Ubuntu wiki.
 
 Each additional paragraph describes a binary package to be built.
 
-For further information, see the `control file section (Chapter 5) 
-<http://www.debian.org/doc/debian-policy/ch-controlfields.html>`_ of the Debian 
-Policy Manual.
+For further information, see the `control file section (Chapter 5) <policy-control_>`_
+of the Debian Policy Manual.
 
 
 The copyright file
 -------------------------------
 
 This file gives the copyright information for both the upstream source and the 
-packaging. Ubuntu and `Debian Policy (Section 12.5) 
-<http://www.debian.org/doc/debian-policy/ch-docs.html#s-copyrightfile>`_ 
+packaging. Ubuntu and `Debian Policy (Section 12.5) <policy-copyright_>`_ 
 require that each package installs a verbatim copy of its copyright and license 
 information to ``/usr/share/doc/$(package_name)/copyright``.
 
@@ -175,8 +171,7 @@
   License version 2 can be found in the file
   `/usr/share/common-licenses/GPL-2'.
  
-This example follows the `Machine-readable debian/copyright 
-<http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/>`_ format.
+This example follows the `Machine-readable debian/copyright <DEP5_>`_ format.
 You are encouraged to use this format as well.
 
 
@@ -324,8 +319,8 @@
      and symlinked hello_2.7.orig.tar.gz to it
 
 If your tarballs live on Launchpad, the ``debian/watch`` file is a little more
-complicated (see `Question 21146`_ and `Bug 231797`_ for why this is).  In
-that case, use something like::
+complicated (see `Question 21146 <Q21146_>`_ and `Bug 231797 <Bug231797_>`_
+for why this is).  In that case, use something like::
 
     version=3
     https://launchpad.net/flufl.enum/+download http://launchpad.net/flufl.enum/.*/flufl.enum-(.+).tar.gz
@@ -364,25 +359,32 @@
 
 * Not necessary to repack the upstream tarball to strip the debian directory
 
-* Debian-specific changes are no longer stored in a single .diff.gz but in multiple patches compatible with quilt under ``debian/patches/``
+* Debian-specific changes are no longer stored in a single .diff.gz but in
+  multiple patches compatible with quilt under ``debian/patches/``
 
-http://wiki.debian.org/Projects/DebSrc3.0 summarizes additional information 
+https://wiki.debian.org/Projects/DebSrc3.0 summarizes additional information 
 concerning the switch to the 3.0 source package formats.
 
 See ``man dpkg-source`` and the `source/format section (Section 5.21) 
-<http://www.debian.org/doc/manuals/maint-guide/dother.en.html#sourcef>`_  of 
-the Debian New Maintainers' Guide for additional details.
+<policy-format_>`_  of  the Debian New Maintainers' Guide for additional details.
 
 Additional Resources
 -------------------------------
 
 In addition to the links to the Debian Policy Manual in each section above, the 
 Debian New Maintainers' Guide has more detailed descriptions of each file. 
-`Chapter 4, "Required files under the debian directory" 
-<http://www.debian.org/doc/maint-guide/dreq.en.html>`_ further discusses the 
-control, changelog, copyright and rules files. `Chapter 5, "Other files under 
-the debian directory" <http://www.debian.org/doc/maint-guide/dother.en.html>`_ 
+`Chapter 4, "Required files under the debian directory" <RequiredFiles_>`_
+further discusses the  control, changelog, copyright and rules files.
+`Chapter 5, "Other files under the debian directory" <OtherFiles_>`_
 discusses additional files that may be used.
 
-.. _`Question 21146`: https://answers.launchpad.net/launchpad/+question/21146
-.. _`Bug 231797`: https://launchpad.net/bugs/231797
+.. _policy-control: http://www.debian.org/doc/debian-policy/ch-controlfields.html
+.. _policy-changelog: http://www.debian.org/doc/debian-policy/ch-source.html#s-dpkgchangelog
+.. _policy-copyright: http://www.debian.org/doc/debian-policy/ch-docs.html#s-copyrightfile
+.. _policy-format: http://www.debian.org/doc/manuals/maint-guide/dother.en.html#sourcef
+.. _DEP5: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+.. _MaintField: https://wiki.ubuntu.com/DebianMaintainerField
+.. _Q21146: https://answers.launchpad.net/launchpad/+question/21146
+.. _Bug231797: https://launchpad.net/launchpad/+bug/231797
+.. _RequiredFiles: http://www.debian.org/doc/manuals/maint-guide/dreq.en.html
+.. _OtherFiles: http://www.debian.org/doc/manuals/maint-guide/dother.en.html

=== modified file 'ubuntu-packaging-guide/getting-set-up.rst'
--- ubuntu-packaging-guide/getting-set-up.rst	2014-02-23 09:56:45 +0000
+++ ubuntu-packaging-guide/getting-set-up.rst	2014-05-03 17:25:36 +0000
@@ -23,9 +23,10 @@
   Ubuntu. Doing so will allow you to test changes in the same environment where 
   those changes will actually be applied and used. 
 
-  Don't worry though, you can use `Testdrive <https://wiki.ubuntu.com/QATeam/Testdrive>`_
+  Don't worry though, you can use `Testdrive`_
   or :doc:`chroots <./chroots>` to safely use the development release.
 
+  .. _Testdrive: https://wiki.ubuntu.com/QATeam/Testdrive
 
 Install basic packaging software
 ================================
@@ -47,7 +48,7 @@
 
 This command will install the following software:
 
-* ``gnupg`` -- `GNU Privacy Guard`_ contains tools you will need to create a
+* ``gnupg`` -- `GNU Privacy Guard <GPG_>`_ contains tools you will need to create a
   cryptographic key with which you will sign files you want to upload to
   Launchpad.
 * ``pbuilder`` -- a tool to do reproducible builds of a package in a
@@ -65,7 +66,7 @@
 Create your GPG key
 -------------------
 
-GPG stands for `GNU Privacy Guard`_ and it implements the OpenPGP standard
+GPG stands for `GNU Privacy Guard <GPG_>`_ and it implements the OpenPGP standard
 which allows you to sign and encrypt messages and files. This is useful for a
 number of purposes. In our case it is important that you can sign files with
 your key so they can be identified as something that you worked on. If you
@@ -182,7 +183,7 @@
 Get a Launchpad account
 --------------------------
 
-If you don't already have a Launchpad account, you can easily `create one`_.
+If you don't already have a Launchpad account, you can easily `create one <LP-AccountCreate_>`_.
 If you have a Launchpad account but cannot remember your Launchpad id, you can
 find this out by going to https://launchpad.net/~ and looking for the
 part after the `~` in the URL.
@@ -195,10 +196,11 @@
 you need to open in your browser in order to verify your email address. If
 you don't receive it, check in your spam folder.
 
-`The new account help page <https://help.launchpad.net/YourAccount/NewAccount>`_ 
-on Launchpad has more information about the process and additional settings you 
-can change.
- 
+`The new account help page <LP-AccountHelp_>`_ on Launchpad has more information
+about the process and additional settings you can change.
+
+.. _LP-AccountHelp: https://help.launchpad.net/YourAccount/NewAccount
+
 
 Upload your GPG key to Launchpad
 ----------------------------------
@@ -238,13 +240,14 @@
 
 Launchpad encrypts the email, using your public key, so that it can be sure
 that the key is yours. If you are using Thunderbird, the default Ubuntu email
-client, you can install the
-`Enigmail plugin <https://apps.ubuntu.com/cat/applications/enigmail/>`_
+client, you can install the `Enigmail plugin <Enigmail_>`_
 to easily decrypt the message.
 If your email software does not support OpenPGP
 encryption, copy the encrypted email's contents, type ``gpg`` in your
 terminal, then paste the email contents into your terminal window.
 
+.. _Enigmail: https://apps.ubuntu.com/cat/applications/enigmail/
+
 Back on the Launchpad website, use the Confirm button and Launchpad will
 complete the import of your OpenPGP key.
 
@@ -260,10 +263,10 @@
 paste them into the text box on the web page that says "Add an SSH key". Now
 click "Import Public Key".
 
-For more information on this process, visit the `creating an SSH keypair 
-<https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair>`_ page on 
-Launchpad.
+For more information on this process, visit the `creating an SSH keypair <genssh_>`_
+page on Launchpad.
 
+.. _genssh: https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair
 
 Configure Bazaar
 ----------------
@@ -304,7 +307,7 @@
 the configuration file for that shell accordingly.)
 
 
-.. _`GNU Privacy Guard`: http://gnupg.org/
+.. _GPG: https://www.gnupg.org/
 .. _SSH: http://www.openssh.com/
 .. _Launchpad: https://launchpad.net/
-.. _`create one`: https://launchpad.net/+login
+.. _LP-AccountCreate: https://launchpad.net/+login

=== modified file 'ubuntu-packaging-guide/index.rst'
--- ubuntu-packaging-guide/index.rst	2013-12-07 14:11:10 +0000
+++ ubuntu-packaging-guide/index.rst	2014-05-03 17:25:36 +0000
@@ -92,21 +92,25 @@
 ---------------
 
 You can read this guide offline in different formats, if you install one of
-the `binary packages <https://launchpad.net/ubuntu/+source/ubuntu-packaging-guide>`_.
+the `binary packages <BinPkgs_>`_.
 
 If you want to learn more about building Debian packages, here are some Debian
 resources you may find useful:
 
-* `How to package for Debian <https://wiki.debian.org/HowToPackageForDebian>`_;
-* `Debian Policy Manual <http://www.debian.org/doc/debian-policy/>`_;
-* `Debian New Maintainers' Guide <http://www.debian.org/doc/manuals/maint-guide/>`_
-  — available in many languages;
-* `Packaging tutorial <http://www.debian.org/doc/manuals/packaging-tutorial/>`_ (also
-  available as a `package <https://launchpad.net/ubuntu/+source/packaging-tutorial>`_).
+* `How to package for Debian <HowToPackage_>`_;
+* `Debian Policy Manual <Policy_>`_;
+* `Debian New Maintainers' Guide <NewMaintGuide_>`_ — available in many languages;
+* `Packaging tutorial <PkgTutorial_>`_ (also available as a `package <PkgTutorialPkg_>`_).
 
 We are always looking to improve this guide. If you find any problems or have
-some suggestions, please `report a bug on Launchpad 
-<https://bugs.launchpad.net/ubuntu-packaging-guide>`_. If you'd like to help
-work on the guide, `grab the source
-<https://code.launchpad.net/~ubuntu-packaging-guide-team/ubuntu-packaging-guide/trunk>`_
-there as well.
+some suggestions, please `report a bug on Launchpad <Bugs_>`_.
+If you'd like to help work on the guide, `grab the source <Source_>`_ there as well.
+
+.. _BinPkgs: https://launchpad.net/ubuntu/+source/ubuntu-packaging-guide
+.. _HowToPackage: https://wiki.debian.org/HowToPackageForDebian
+.. _Policy: http://www.debian.org/doc/debian-policy/
+.. _NewMaintGuide: http://www.debian.org/doc/manuals/maint-guide/
+.. _PkgTutorial: http://www.debian.org/doc/manuals/packaging-tutorial/
+.. _PkgTutorialPkg: https://launchpad.net/ubuntu/+source/packaging-tutorial
+.. _Bugs: https://bugs.launchpad.net/ubuntu-packaging-guide
+.. _Source: https://code.launchpad.net/~ubuntu-packaging-guide-team/ubuntu-packaging-guide/trunk

=== modified file 'ubuntu-packaging-guide/kde.rst'
--- ubuntu-packaging-guide/kde.rst	2012-11-26 12:22:03 +0000
+++ ubuntu-packaging-guide/kde.rst	2014-05-03 17:25:36 +0000
@@ -4,11 +4,11 @@
 
 Packaging of KDE programs in Ubuntu is managed by the Kubuntu and
 MOTU teams.  You can contact the Kubuntu team on the `Kubuntu mailing
-list`_ and ``#kubuntu-devel`` Freenode IRC channel.  More information
-about Kubuntu development is on the `Kubuntu wiki page`_.
+list <ML_>`_ and ``#kubuntu-devel`` Freenode IRC channel.  More information
+about Kubuntu development is on the `Kubuntu wiki page <Wiki_>`_.
 
-Our packaging follows the practices of the `Debian Qt/KDE Team`_ and
-Debian KDE Extras Team.  Most of our packages are derived from the
+Our packaging follows the practices of the `Debian Qt/KDE Team <QtKDETeam_>`_
+and Debian KDE Extras Team.  Most of our packages are derived from the
 packaging of these Debian teams.
 
 Patching Policy
@@ -64,7 +64,7 @@
 the ``po/`` directory.  If they do not, check if they are in separate
 upstream language packs such as the KDE SC language packs.  If they
 are in separate language packs Launchpad will need to associate
-these together manually, contact `dpm`_ to do this.
+these together manually, contact `David Planella <dpm_>`_ to do this.
 
 If a package is moved from universe to main it will need to be
 re-uploaded before the translations get imported into Launchpad.
@@ -84,11 +84,11 @@
 Library symbols are tracked in ``.symbols`` files to ensure none go
 missing for new releases.  KDE uses C++ libraries which act a little
 differently compared to C libraries.  Debian's Qt/KDE Team have
-scripts to handle this. See `Working with symbols files`_ for how to
+scripts to handle this. See `Working with symbols files <SymbolsFiles_>`_ for how to
 create and keep these files up to date.
 
-.. _`Kubuntu mailing list`: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
-.. _`Debian Qt/KDE Team`: http://pkg-kde.alioth.debian.org/
-.. _`dpm`: https://launchpad.net/~dpm
-.. _`Working with symbols files`: http://pkg-kde.alioth.debian.org/symbolfiles.html
-.. _`Kubuntu wiki page`: https://wiki.kubuntu.org/Kubuntu
+.. _KubuntuML: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
+.. _QtKDETeam: http://pkg-kde.alioth.debian.org/
+.. _dpm: https://launchpad.net/~dpm
+.. _SymbolsFiles: http://pkg-kde.alioth.debian.org/symbolfiles.html
+.. _Wiki: https://wiki.kubuntu.org/Kubuntu

=== modified file 'ubuntu-packaging-guide/libraries.rst'
--- ubuntu-packaging-guide/libraries.rst	2014-02-23 09:56:45 +0000
+++ ubuntu-packaging-guide/libraries.rst	2014-05-03 17:25:36 +0000
@@ -75,7 +75,7 @@
 
 ``.la`` libtool files are needed on some non-Linux systems with poor library
 support but usually cause more problems than they solve on Debian systems.  It
-is a current `Debian goal to remove .la files`_ and we should help with this.
+is a current `Debian goal to remove .la files <LAFileRemoval_>`_ and we should help with this.
 
 
 Static Libraries
@@ -144,14 +144,14 @@
 
 C++ has even more exacting standards of binary compatibility than C.  The
 Debian Qt/KDE Team maintain some scripts to handle this, see their `Working with
-symbols files`_ page for how to use them.
+symbols files <SymbolsFiles_>`_ page for how to use them.
 
 Further Reading
 ---------------
 
-Junichi Uekawa's `Debian Library Packaging Guide`_ goes into this topic in more
+Junichi Uekawa's `Debian Library Packaging Guide <LibraryGuide_>`_ goes into this topic in more
 detail.
 
-.. _`Working with symbols files`: http://pkg-kde.alioth.debian.org/symbolfiles.html
-.. _`Debian goal to remove .la files`: http://wiki.debian.org/ReleaseGoals/LAFileRemoval
-.. _`Debian Library Packaging Guide`: http://www.netfort.gr.jp/~dancer/column/libpkg-guide/libpkg-guide.html
+.. _SymbolsFiles: http://pkg-kde.alioth.debian.org/symbolfiles.html
+.. _LAFileRemoval: https://wiki.debian.org/ReleaseGoals/LAFileRemoval
+.. _LibraryGuide: http://www.netfort.gr.jp/~dancer/column/libpkg-guide/libpkg-guide.html

=== modified file 'ubuntu-packaging-guide/packaging-new-software.rst'
--- ubuntu-packaging-guide/packaging-new-software.rst	2014-04-24 15:33:13 +0000
+++ ubuntu-packaging-guide/packaging-new-software.rst	2014-05-03 17:25:36 +0000
@@ -163,7 +163,7 @@
     $ lintian hello_2.7-0ubuntu1_amd64.deb
 
 A description of each of the problems it reports can be found on the
-`lintian website`_.
+`lintian website <Lintian_>`_.
 
 After making a fix to the packaging you can rebuild using ``-nc`` "no clean"
 without having to build from scratch::
@@ -197,8 +197,8 @@
 See :doc:`uploading<./udd-uploading>` for more information.
 
 You can ask for reviews in ``#ubuntu-motu`` IRC channel, or on the
-`MOTU mailing list`_.  There might also be a more specific team you
-could ask such as the GNU team for more specific questions.
+`MOTU mailing list <ubuntu-motu_>`_.  There might also be a more specific
+team you could ask such as the GNU team for more specific questions.
 
 Submitting for inclusion
 ------------------------
@@ -210,22 +210,22 @@
 derivatives as well. Here are some useful links for submitting new
 packages to Debian:
 
-  - `Debian Mentors FAQ`_ - debian-mentors is for the mentoring of new and
+  - `Debian Mentors FAQ <MentorsFAQ_>`_ - debian-mentors is for the mentoring of new and
     prospective Debian Developers. It is where you can find a sponsor
     to upload your package to the archive.
 
-  - `Work-Needing and Prospective Packages`_ - Information on how to file
+  - `Work-Needing and Prospective Packages <WNPP_>`_ - Information on how to file
     "Intent to Package" and "Request for Package" bugs as well as list
     of open ITPs and RFPs.
 
-  - `Debian Developer's Reference, 5.1. New packages`_ - The entire 
+  - `Debian Developer's Reference, 5.1. New packages <DevRef_>`_ - The entire 
     document is invaluable for both Ubuntu and Debian packagers. This
     section documents processes for submitting new packages.
 
 In some cases, it might make sense to go directly into Ubuntu first. For
 instance, Debian might be in a freeze making it unlikely that your
 package will make it into Ubuntu in time for the next release. This
-process is documented on the `"New Packages"`_ section of the Ubuntu wiki.
+process is documented on the `"New Packages" <NewPackages_>`_ section of the Ubuntu wiki.
 
 Screenshots
 -----------
@@ -237,9 +237,9 @@
 .. _PPA: https://help.launchpad.net/Packaging/PPA
 .. _GNU.org: http://www.gnu.org/software/hello/
 .. _`packages.ubuntu.com`:  http://packages.ubuntu.com/
-.. _`lintian website`: http://lintian.debian.org/tags.html
-.. _`MOTU mailing list`: https://lists.ubuntu.com/mailman/listinfo/ubuntu-motu
-.. _`Debian Mentors FAQ`: http://wiki.debian.org/DebianMentorsFaq
-.. _`Work-Needing and Prospective Packages`: http://www.debian.org/devel/wnpp/
-.. _`Debian Developer's Reference, 5.1. New packages`: http://www.debian.org/doc/developers-reference/pkgs.html#newpackage
-.. _`"New Packages"`: https://wiki.ubuntu.com/UbuntuDevelopment/NewPackages
+.. _Lintian: http://lintian.debian.org/tags.html
+.. _ubuntu-motu: https://lists.ubuntu.com/mailman/listinfo/ubuntu-motu
+.. _MentorsFAQ: https://wiki.debian.org/DebianMentorsFaq
+.. _WNPP: http://www.debian.org/devel/wnpp/
+.. _DevRef: http://www.debian.org/doc/manuals/developers-reference/pkgs.html#newpackage
+.. _NewPackages: https://wiki.ubuntu.com/UbuntuDevelopment/NewPackages

=== modified file 'ubuntu-packaging-guide/patches-to-packages.rst'
--- ubuntu-packaging-guide/patches-to-packages.rst	2014-02-23 09:56:45 +0000
+++ ubuntu-packaging-guide/patches-to-packages.rst	2014-05-03 17:25:36 +0000
@@ -210,5 +210,5 @@
 maintainer or relevant Ubuntu team.  If there is no existing patch system then
 feel free to add Quilt.
 
-.. _`Quilt`: http://wiki.debian.org/UsingQuilt
+.. _Quilt: https://wiki.debian.org/UsingQuilt
 .. _DEP-3: http://dep.debian.net/deps/dep3/

=== modified file 'ubuntu-packaging-guide/security-and-stable-release-updates.rst'
--- ubuntu-packaging-guide/security-and-stable-release-updates.rst	2013-12-05 22:14:33 +0000
+++ ubuntu-packaging-guide/security-and-stable-release-updates.rst	2014-05-03 17:25:36 +0000
@@ -135,6 +135,6 @@
 and does not introduce new problems.  After a week without reported problems it
 can be moved to ``updates``.
 
-See the `Stable Release Updates wiki page`_ for more information.
+See the `Stable Release Updates wiki page <SRUWiki_>`_ for more information.
 
-.. _`Stable Release Updates wiki page`: https://wiki.ubuntu.com/StableReleaseUpdates
+.. _SRUWiki: https://wiki.ubuntu.com/StableReleaseUpdates

=== modified file 'ubuntu-packaging-guide/traditional-packaging.rst'
--- ubuntu-packaging-guide/traditional-packaging.rst	2014-02-23 09:56:45 +0000
+++ ubuntu-packaging-guide/traditional-packaging.rst	2014-05-03 17:25:36 +0000
@@ -64,12 +64,13 @@
     $ cd xicc-0.2
     $ sed -i 's/colour/color/g' debian/control
 
-We also must adhere to the `Debian Maintainer Field Spec
-<https://wiki.ubuntu.com/DebianMaintainerField>`_ and edit ``debian/control``
-to replace::
+We also must adhere to the `Debian Maintainer Field Spec <MaintFieldSpec_>`_
+and edit ``debian/control`` to replace::
 
     Maintainer: Ross Burton <ross@xxxxxxxxxx>
 
+.. _MaintFieldSpec: https://wiki.ubuntu.com/DebianMaintainerField
+
 with::
 
     Maintainer: Ubuntu Developers <ubuntu-devel-discuss@xxxxxxxxxxxxxxxx>

=== modified file 'ubuntu-packaging-guide/udd-getting-the-source.rst'
--- ubuntu-packaging-guide/udd-getting-the-source.rst	2014-02-23 09:56:45 +0000
+++ ubuntu-packaging-guide/udd-getting-the-source.rst	2014-05-03 17:25:36 +0000
@@ -41,7 +41,7 @@
 
 .. _`Bazaar`: http://bazaar.canonical.com/en/
 .. _Saucy: https://wiki.ubuntu.com/SaucySalamander
-.. _Wheezy: http://debian.org/releases/stable/
+.. _Wheezy: http://www.debian.org/releases/stable/
 
 
 Getting the source
@@ -111,7 +111,7 @@
 
 means the importer has failed.  You can find out why on
 http://package-import.ubuntu.com/status/ and `file a bug on the UDD
-project`_ to get the issue resolved.
+project <UDD_>`_ to get the issue resolved.
 
 
 Upstream Tar
@@ -129,13 +129,13 @@
 
     bzr builddeb
 
-The `builddeb` plugin has several `configuration options`_.
+The `builddeb` plugin has several `configuration options <ConfOptions_>`_.
 
 
 Getting a branch for a particular release
 -----------------------------------------
 
-When you want to do something like a `stable release update`_ (SRU), or you
+When you want to do something like a `stable release update <SRU_>`_ (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 Quantal do::
@@ -163,8 +163,7 @@
 and Bazaar will do the rest.  You've now got a Bazaar source branch.
 
 
-.. _`status of the package importer`: http://package-import.ubuntu.com/status
-.. _`file a bug on the UDD project`: https://bugs.launchpad.net/udd
-.. _`stable release update`: https://wiki.ubuntu.com/StableReleaseUpdates
-.. _`configuration options`: http://bazaar.launchpad.net/~bzr-builddeb-hackers/bzr-builddeb/trunk/view/head:/doc/user_manual/configuration.rst
+.. _UDD: https://bugs.launchpad.net/udd
+.. _SRU: https://wiki.ubuntu.com/StableReleaseUpdates
+.. _ConfOptions: http://bazaar.launchpad.net/~bzr-builddeb-hackers/bzr-builddeb/trunk/view/head:/doc/user_manual/configuration.rst
 

=== modified file 'ubuntu-packaging-guide/udd-intro.rst'
--- ubuntu-packaging-guide/udd-intro.rst	2012-09-09 09:05:44 +0000
+++ ubuntu-packaging-guide/udd-intro.rst	2014-05-03 17:25:36 +0000
@@ -96,10 +96,10 @@
 
 To do packaging with UDD you will need to know the basics of how to use
 Bazaar to manage files.  For an introduction to Bazaar see the `Bazaar Five
-Minute Tutorial
-<http://doc.bazaar.canonical.com/bzr.dev/en/mini-tutorial/index.html>`_ and the
-`Bazaar Users Guide
-<http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/index.html>`_.
+Minute Tutorial <5MinTutorial_>`_ and the `Bazaar Users Guide <UsersGuide_>`_.
+
+.. _5MinTutorial: http://doc.bazaar.canonical.com/bzr.dev/en/mini-tutorial/index.html
+.. _UsersGuide: http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/index.html
 
 Limitations of UDD
 ------------------
@@ -120,8 +120,8 @@
 
 * Some packages have not been successfully imported into UDD branches.  Recent
   versions of Bazaar will automatically notify you when this is the case.
-  You can also check the `status of the package importer`_ manually before working 
-  on a branch.
+  You can also check the `status of the package importer <ImportStatus_>`_
+  manually before working on a branch.
 
 All of the above are being worked on and UDD is expected to become the main way
 to work on Ubuntu packages soon.  However currently most teams within Ubuntu do
@@ -129,4 +129,4 @@
 branches are the same as the packages in the  archive any team should be able to
 accept merges against them.
 
-.. _`status of the package importer`: http://package-import.ubuntu.com/status
+.. _ImportStatus: http://package-import.ubuntu.com/status

=== modified file 'ubuntu-packaging-guide/udd-uploading.rst'
--- ubuntu-packaging-guide/udd-uploading.rst	2014-02-23 09:56:45 +0000
+++ ubuntu-packaging-guide/udd-uploading.rst	2014-05-03 17:25:36 +0000
@@ -4,7 +4,7 @@
 
 Once your merge proposal is reviewed and approved, you will want to upload
 your package, either to the archive (if you have permission) or to your
-`Personal Package Archive`_ (PPA).  You might also want to do an upload if
+`Personal Package Archive <PPA_>`_ (PPA).  You might also want to do an upload if
 you are sponsoring someone else's changes.
 
 
@@ -134,4 +134,4 @@
 as if it was your own work.  The contributor will still be mentioned in the
 changelog, and Bazaar will correctly attribute the changes they made to them.
 
-.. _`Personal Package Archive`: https://help.launchpad.net/Packaging/PPA
+.. _PPA: https://help.launchpad.net/Packaging/PPA


Follow ups