Ubuntu Packaging Guide

Merge lp:~xnox/ubuntu-packaging-guide/merge-from-sid into lp:ubuntu-packaging-guide

  1. merge-from-sid
  2. Merge into trunk
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 379
Proposed branch: lp:~xnox/ubuntu-packaging-guide/merge-from-sid
Merge into: lp:ubuntu-packaging-guide
Diff against target: 46 lines (+10/-4)
2 files modified
debian/changelog (+4/-0)
ubuntu-packaging-guide/udd-merging.rst (+6/-4)
To merge this branch: bzr merge lp:~xnox/ubuntu-packaging-guide/merge-from-sid
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+168068@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks a bunch!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-06-05 07:21:58 +0000
3+++ debian/changelog 2013-06-07 14:27:02 +0000
4@@ -22,6 +22,10 @@
5 * getting-set-up: Launchpad finds developer gpg keys quicker if they
6 are uploaded directly to the Ubuntu keyserver (LP: #1172810).
7
8+ [ Dmitrijs Ledkovs ]
9+ * Always recommend merging from lp:debian/package, instead of a
10+ particular debian release.
11+
12 -- Andrew Starr-Bochicchio <asb@debian.org> Fri, 08 Mar 2013 20:20:29 -0500
13
14 ubuntu-packaging-guide (0.3.1) experimental; urgency=low
15
16=== modified file 'ubuntu-packaging-guide/udd-merging.rst'
17--- ubuntu-packaging-guide/udd-merging.rst 2013-02-16 12:46:08 +0000
18+++ ubuntu-packaging-guide/udd-merging.rst 2013-06-07 14:27:02 +0000
19@@ -20,9 +20,10 @@
20 ===================
21
22 Next run ``bzr merge`` passing the URL of the branch to merge from. For
23-example, to merge from the version of the package in Debian Squeeze_ run::
24+example, to merge from the version of the package in Debian Unstable
25+run [#]_::
26
27- $ bzr merge debianlp:squeeze/tomboy
28+ $ bzr merge lp:debian/tomboy
29
30 This will merge the changes since the last merge point and leave you with
31 changes to review. This may cause some conflicts. You can see everything
32@@ -116,11 +117,12 @@
33 want to use as the tip of the upstream branch.
34
35
36-.. _Squeeze: http://wiki.debian.org/DebianSqueeze
37-
38 .. [#] You will need newer versions of ``bzr`` and the ``bzr-builddeb`` for
39 the ``merge`` command to work. Use the versions from Ubuntu 12.04
40 (Precise) or the development versions from the ``bzr`` PPA. Specifically,
41 you need ``bzr`` version 2.5 beta 5 or newer, and ``bzr-builddeb`` version
42 2.8.1 or newer. For older versions, use the ``bzr merge-package`` command
43 instead.
44+
45+.. [#] To check other available branches of a package in Debian, see
46+ package code page. E.g. https://code.launchpad.net/debian/+source/tomboy

Subscribers

People subscribed via source and target branches