bzr-builddeb

Merge lp:~jelmer/bzr-builddeb/document-export-upstream into lp:bzr-builddeb

  1. document-export-upstream
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: James Westby
Approved revision: 728
Merged at revision: 728
Proposed branch: lp:~jelmer/bzr-builddeb/document-export-upstream
Merge into: lp:bzr-builddeb
Diff against target: 52 lines (+11/-7)
2 files modified
cmds.py (+9/-6)
debian/changelog (+2/-1)
To merge this branch: bzr merge lp:~jelmer/bzr-builddeb/document-export-upstream
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+98177@code.launchpad.net

Description of the change

Document the argument to --export-upstream.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

Looks good.

Thanks,

James

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmds.py'
2--- cmds.py 2012-03-10 15:21:36 +0000
3+++ cmds.py 2012-03-19 10:12:18 +0000
4@@ -60,9 +60,11 @@
5 dont_purge_opt = Option('dont-purge',
6 help="Don't purge the build directory after building.")
7 result_opt = Option('result-dir',
8- help="Directory in which to place the resulting package files.", type=str)
9+ help="Directory in which to place the resulting package files.", type=str,
10+ argname="DIRECTORY")
11 builder_opt = Option('builder',
12- help="Command to build the package.", type=str)
13+ help="Command to build the package.", type=str,
14+ argname="BUILDER")
15 merge_opt = Option('merge',
16 help='Merge the debian part of the source in to the upstream tarball.')
17 split_opt = Option('split',
18@@ -71,15 +73,16 @@
19 help="The dir to use for building.", type=str)
20 orig_dir_opt = Option('orig-dir',
21 help="Directory containing the .orig.tar.gz files. For use when only "
22- +"debian/ is versioned.", type=str)
23+ +"debian/ is versioned.", type=str,
24+ argname="DIRECTORY")
25 native_opt = Option('native',
26 help="Build a native package.")
27 export_upstream_opt = Option('export-upstream',
28- help="Create the .orig.tar.gz from a bzr branch before building.",
29- type=unicode)
30+ help="Create the .orig.tar.gz from specified bzr branch before building.",
31+ type=unicode, argname="BRANCH")
32 export_upstream_revision_opt = Option('export-upstream-revision',
33 help="Select the upstream revision that will be exported.",
34- type=str)
35+ type=str, argname="REVISION")
36
37
38 def _get_changelog_info(tree, last_version=None, package=None, distribution=None):
39
40=== modified file 'debian/changelog'
41--- debian/changelog 2012-03-13 15:22:43 +0000
42+++ debian/changelog 2012-03-19 10:12:18 +0000
43@@ -4,8 +4,9 @@
44 * Cope with missing tags when looking up upstream versions.
45 * Skip quilt unapplying for trees that can not be copied (such as
46 _PreviewTree). LP: #950419
47+ * Document the argument for --export-upstream. LP: #959065
48
49- -- Jelmer Vernooij <jelmer@debian.org> Tue, 13 Mar 2012 16:22:40 +0100
50+ -- Jelmer Vernooij <jelmer@debian.org> Mon, 19 Mar 2012 11:10:21 +0100
51
52 bzr-builddeb (2.8.3) unstable; urgency=low
53

Subscribers

People subscribed via source and target branches