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

[Jelmer Vernooij]

Document the argument to --export-upstream.

[James Westby (james-w)]

Looks good.

Thanks,

James

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2012-03-10 15:21:36 +0000
+++ cmds.py	2012-03-19 10:12:18 +0000
@@ -60,9 +60,11 @@
 dont_purge_opt = Option('dont-purge',
     help="Don't purge the build directory after building.")
 result_opt = Option('result-dir',
-    help="Directory in which to place the resulting package files.", type=str)
+    help="Directory in which to place the resulting package files.", type=str,
+    argname="DIRECTORY")
 builder_opt = Option('builder',
-    help="Command to build the package.", type=str)
+    help="Command to build the package.", type=str,
+    argname="BUILDER")
 merge_opt = Option('merge',
     help='Merge the debian part of the source in to the upstream tarball.')
 split_opt = Option('split',
@@ -71,15 +73,16 @@
     help="The dir to use for building.", type=str)
 orig_dir_opt = Option('orig-dir',
     help="Directory containing the .orig.tar.gz files. For use when only "
-       +"debian/ is versioned.", type=str)
+       +"debian/ is versioned.", type=str,
+       argname="DIRECTORY")
 native_opt = Option('native',
     help="Build a native package.")
 export_upstream_opt = Option('export-upstream',
-    help="Create the .orig.tar.gz from a bzr branch before building.",
-    type=unicode)
+    help="Create the .orig.tar.gz from specified bzr branch before building.",
+    type=unicode, argname="BRANCH")
 export_upstream_revision_opt = Option('export-upstream-revision',
     help="Select the upstream revision that will be exported.",
-    type=str)
+    type=str, argname="REVISION")
 
 
 def _get_changelog_info(tree, last_version=None, package=None, distribution=None):
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-03-13 15:22:43 +0000
+++ debian/changelog	2012-03-19 10:12:18 +0000
@@ -4,8 +4,9 @@
   * Cope with missing tags when looking up upstream versions.
   * Skip quilt unapplying for trees that can not be copied (such as
     _PreviewTree). LP: #950419
+  * Document the argument for --export-upstream. LP: #959065
 
- -- Jelmer Vernooij <[e-mail]>  Tue, 13 Mar 2012 16:22:40 +0100
+ -- Jelmer Vernooij <[e-mail]>  Mon, 19 Mar 2012 11:10:21 +0100
 
 bzr-builddeb (2.8.3) unstable; urgency=low