ubuntu-packaging-guide-team team mailing list archive

[Dmitry Shachnev <mitya57@xxxxxxxxx>]

Dmitry Shachnev has proposed merging lp:~mitya57/ubuntu-packaging-guide/patches-to-packages 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/patches-to-packages/+merge/170750

patches-to-packages.rst:
- Add information about Bug-* headers;
- Remove notice about bug 815854, it has been fixed an year ago;
- Slightly simplify the text about upgrading to a new version.
-- 
https://code.launchpad.net/~mitya57/ubuntu-packaging-guide/patches-to-packages/+merge/170750
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~mitya57/ubuntu-packaging-guide/patches-to-packages into lp:ubuntu-packaging-guide.

=== modified file 'po/ubuntu-packaging-guide.pot'
--- po/ubuntu-packaging-guide.pot	2013-06-18 12:31:13 +0000
+++ po/ubuntu-packaging-guide.pot	2013-06-21 07:30:37 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-packaging-guide 0.3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-18 16:31\n"
+"POT-Creation-Date: 2013-06-21 11:22\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -1943,82 +1943,78 @@
 msgstr ""
 
 #: ../ubuntu-packaging-guide/patches-to-packages.rst:114
+msgid "A link to Launchpad bug, a short form is preferred (like *https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers."
+msgstr ""
+
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:118
 msgid "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-needed\"."
 msgstr ""
 
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:116
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:120
 msgid "Date of the last revision (in form \"YYYY-MM-DD\")."
 msgstr ""
 
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:120
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:124
 msgid "Upgrading to New Upstream Versions"
 msgstr ""
 
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:122
-msgid "When you upgrade to a new upstream version, patches will often become out of date.  They might need to be refreshed to match the new upstream source or they might need to be removed altogether."
-msgstr ""
-
 #: ../ubuntu-packaging-guide/patches-to-packages.rst:126
-msgid "You should start by ensuring no patches are applied.  Unfortunately a commit is needed before you can merge in the new upstream (this is `bug 815854`_)::"
-msgstr ""
-
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:132
-msgid "Then upgrade to the new version::"
-msgstr ""
-
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:136
-msgid "Then apply the patches one at a time to check for problems::"
-msgstr ""
-
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:145
+msgid "To upgrade to the new version, you can use ``bzr merge-upstream`` command::"
+msgstr ""
+
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:130
+msgid "When you run this command, all patches will be unapplied, because they can become out of date. They might need to be refreshed to match the new upstream source or they might need to be removed altogether. To check for problems, apply the patches one at a time::"
+msgstr ""
+
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:142
 msgid "If it can be reverse-applied this means the patch has been applied already by upstream, so we can delete the patch::"
 msgstr ""
 
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:151
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:148
 msgid "Then carry on::"
 msgstr ""
 
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:156
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:153
 msgid "It is a good idea to run refresh, this will update the patch relative to the changed upstream source::"
 msgstr ""
 
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:162
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:159
 msgid "Then commit as usual::"
 msgstr ""
 
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:168
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:165
 msgid "Making A Package Use Quilt"
 msgstr ""
 
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:170
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:167
 msgid "Modern packages use Quilt by default, it is built into the packaging format.  Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``."
 msgstr ""
 
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:174
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:171
 msgid "Older packages using source format 1.0 will need to explicitly use Quilt, usually by including a makefile into ``debian/rules``."
 msgstr ""
 
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:179
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:176
 msgid "Configuring Quilt"
 msgstr ""
 
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:181
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:178
 msgid "You can use ``~/.quiltrc`` file to configure quilt. Here are some options that can be useful for using quilt with debian/packages:"
 msgstr ""
 
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:195
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:192
 msgid "Other Patch Systems"
 msgstr ""
 
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:197
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:194
 msgid "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-patchsys``, these work similarly to Quilt by keeping patches in ``debian/patches`` but have different commands to apply, un-apply or create patches. You can find out which patch system is used by a package by using the ``what-patch`` command (from the ``ubuntu-dev-tools`` package). You can use ``edit-patch``, shown in :ref:`previous chapters <working-on-a-fix>`, as a reliable way to work with all systems."
 msgstr ""
 
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:205
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:202
 msgid "In even older packages changes will be included directly to sources and kept in the ``diff.gz`` source file.  This makes it hard to upgrade to new upstream versions or differentiate between patches and is best avoided."
 msgstr ""
 
-#: ../ubuntu-packaging-guide/patches-to-packages.rst:209
+#: ../ubuntu-packaging-guide/patches-to-packages.rst:206
 msgid "Do not change a package's patch system without discussing it with the Debian maintainer or relevant Ubuntu team.  If there is no existing patch system then feel free to add Quilt."
 msgstr ""
 

=== modified file 'ubuntu-packaging-guide/patches-to-packages.rst'
--- ubuntu-packaging-guide/patches-to-packages.rst	2013-06-05 07:11:11 +0000
+++ ubuntu-packaging-guide/patches-to-packages.rst	2013-06-21 07:30:37 +0000
@@ -111,6 +111,10 @@
 :Author:      Who wrote the patch (i.e. "Jane Doe <packager@xxxxxxxxxxx>").
 :Origin:      Where this patch comes from (i.e. "upstream"), when *Author* is
               not present.
+:Bug-Ubuntu:  A link to Launchpad bug, a short form is preferred (like
+              *https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also
+              bugs in upstream or Debian bugtrackers, add *Bug* or *Bug-Debian*
+              headers.
 :Forwarded:   Whether the patch was forwarded upstream. Either "yes", "no" or
               "not-needed".
 :Last-Update: Date of the last revision (in form "YYYY-MM-DD").
@@ -119,21 +123,14 @@
 Upgrading to New Upstream Versions
 -----------------------------------
 
-When you upgrade to a new upstream version, patches will often become out of
-date.  They might need to be refreshed to match the new upstream source or they
-might need to be removed altogether.
-
-You should start by ensuring no patches are applied.  Unfortunately a commit is
-needed before you can merge in the new upstream (this is `bug 815854`_)::
-
-    $ quilt pop -a
-    $ bzr commit -m "remove patches"
-
-Then upgrade to the new version::
+To upgrade to the new version, you can use ``bzr merge-upstream`` command::
 
     $ bzr merge-upstream --version 2.0.2 https://launchpad.net/ubuntu/+archive/primary/+files/kamoso_2.0.2.orig.tar.bz2
 
-Then apply the patches one at a time to check for problems::
+When you run this command, all patches will be unapplied, because they can
+become out of date. They might need to be refreshed to match the new upstream
+source or they might need to be removed altogether. To check for problems,
+apply the patches one at a time::
 
     $ quilt push
     Applying patch kubuntu_01_fix_qmax_on_armel.diff
@@ -211,5 +208,4 @@
 feel free to add Quilt.
 
 .. _`Quilt`: http://wiki.debian.org/UsingQuilt
-.. _`bug 815854`: https://bugs.launchpad.net/bzr-builddeb/+bug/815854
 .. _DEP-3: http://dep.debian.net/deps/dep3/