ubuntu-packaging-guide-team team mailing list archive

[Dmitrijs Ledkovs <launchpad@xxxxxxxxxxxx>]

Dmitrijs Ledkovs has proposed merging lp:~xnox/ubuntu-packaging-guide/merge-from-sid into lp:ubuntu-packaging-guide.

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

For more details, see:
https://code.launchpad.net/~xnox/ubuntu-packaging-guide/merge-from-sid/+merge/168068
-- 
https://code.launchpad.net/~xnox/ubuntu-packaging-guide/merge-from-sid/+merge/168068
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~xnox/ubuntu-packaging-guide/merge-from-sid into lp:ubuntu-packaging-guide.

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-05 07:21:58 +0000
+++ debian/changelog	2013-06-07 14:11:48 +0000
@@ -22,6 +22,10 @@
   * getting-set-up: Launchpad finds developer gpg keys quicker if they
     are uploaded directly to the Ubuntu keyserver (LP: #1172810).
 
+  [ Dmitrijs Ledkovs ]
+  * Always recommend merging from lp:debian/package, instead of a
+    particular debian release.
+
  -- Andrew Starr-Bochicchio <asb@xxxxxxxxxx>  Fri, 08 Mar 2013 20:20:29 -0500
 
 ubuntu-packaging-guide (0.3.1) experimental; urgency=low

=== modified file 'ubuntu-packaging-guide/udd-merging.rst'
--- ubuntu-packaging-guide/udd-merging.rst	2013-02-16 12:46:08 +0000
+++ ubuntu-packaging-guide/udd-merging.rst	2013-06-07 14:11:48 +0000
@@ -20,9 +20,10 @@
 ===================
 
 Next run ``bzr merge`` passing the URL of the branch to merge from.  For
-example, to merge from the version of the package in Debian Squeeze_ run::
+example, to merge from the version of the package in Debian Unstable
+run [#]_::
 
-    $ bzr merge debianlp:squeeze/tomboy
+    $ bzr merge lp:debian/tomboy
 
 This will merge the changes since the last merge point and leave you with
 changes to review.  This may cause some conflicts.  You can see everything
@@ -116,11 +117,12 @@
 want to use as the tip of the upstream branch.
 
 
-.. _Squeeze: http://wiki.debian.org/DebianSqueeze
-
 .. [#] You will need newer versions of ``bzr`` and the ``bzr-builddeb`` for
    the ``merge`` command to work.  Use the versions from Ubuntu 12.04
    (Precise) or the development versions from the ``bzr`` PPA.  Specifically,
    you need ``bzr`` version 2.5 beta 5 or newer, and ``bzr-builddeb`` version
    2.8.1 or newer.  For older versions, use the ``bzr merge-package`` command
    instead.
+
+.. [#] To check other available branches of a package in Debian, see
+       package code page. E.g. https://code.launchpad.net/debian/+source/tomboy