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
22
  * getting-set-up: Launchpad finds developer gpg keys quicker if they
22
  * getting-set-up: Launchpad finds developer gpg keys quicker if they
6
23
    are uploaded directly to the Ubuntu keyserver (LP: #1172810).
23
    are uploaded directly to the Ubuntu keyserver (LP: #1172810).
7
24
24
8
25
  [ Dmitrijs Ledkovs ]
9
26
  * Always recommend merging from lp:debian/package, instead of a
10
27
    particular debian release.
11
28
12
25
 -- Andrew Starr-Bochicchio <asb@debian.org>  Fri, 08 Mar 2013 20:20:29 -0500
29
 -- Andrew Starr-Bochicchio <asb@debian.org>  Fri, 08 Mar 2013 20:20:29 -0500
13
26
30
14
27
ubuntu-packaging-guide (0.3.1) experimental; urgency=low
31
ubuntu-packaging-guide (0.3.1) experimental; urgency=low
15
28
32
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
20
===================
20
===================
21
21
21
22
22
Next run ``bzr merge`` passing the URL of the branch to merge from.  For
22
Next run ``bzr merge`` passing the URL of the branch to merge from.  For
24
23
example, to merge from the version of the package in Debian Squeeze_ run::
23
example, to merge from the version of the package in Debian Unstable
25
24
run [#]_::
26
24
25
28
25
    $ bzr merge debianlp:squeeze/tomboy
26
    $ bzr merge lp:debian/tomboy
29
26
27
30
27
This will merge the changes since the last merge point and leave you with
28
This will merge the changes since the last merge point and leave you with
31
28
changes to review.  This may cause some conflicts.  You can see everything
29
changes to review.  This may cause some conflicts.  You can see everything
32
@@ -116,11 +117,12 @@
33
116
want to use as the tip of the upstream branch.
117
want to use as the tip of the upstream branch.
34
117
118
35
118
119
36
119
.. _Squeeze: http://wiki.debian.org/DebianSqueeze
37
120
38
121
.. [#] You will need newer versions of ``bzr`` and the ``bzr-builddeb`` for
120
.. [#] You will need newer versions of ``bzr`` and the ``bzr-builddeb`` for
39
122
   the ``merge`` command to work.  Use the versions from Ubuntu 12.04
121
   the ``merge`` command to work.  Use the versions from Ubuntu 12.04
40
123
   (Precise) or the development versions from the ``bzr`` PPA.  Specifically,
122
   (Precise) or the development versions from the ``bzr`` PPA.  Specifically,
41
124
   you need ``bzr`` version 2.5 beta 5 or newer, and ``bzr-builddeb`` version
123
   you need ``bzr`` version 2.5 beta 5 or newer, and ``bzr-builddeb`` version
42
125
   2.8.1 or newer.  For older versions, use the ``bzr merge-package`` command
124
   2.8.1 or newer.  For older versions, use the ``bzr merge-package`` command
43
126
   instead.
125
   instead.
44
126
45
127
.. [#] To check other available branches of a package in Debian, see
46
128
       package code page. E.g. https://code.launchpad.net/debian/+source/tomboy
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Daniel Holbach (community)		2013-06-07	Approve on 2013-06-07
Review via email: mp+168068@code.launchpad.net