Merge lp:~jelmer/bzr-builddeb/627718-auto-v3 into lp:bzr-builddeb

[Jelmer Vernooij]

Automatically determine if "bzr merge-upstream" is being used in a v3 source package to see if .tar.bz2 orig tarballs are allowed.

Should we kill the --v3 option?

[James Westby (james-w)]

Could we perhaps lose the magic strings?

Does --v3 work to turn a package in to v3 for the first time? If so
then I would keep it, otherwise we might as well drop it.

Thanks,

James

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-02-02 13:48:00 +0000
+++ cmds.py	2011-02-02 13:48:00 +0000
@@ -105,6 +105,7 @@
         find_last_distribution,
         find_previous_upload,
         get_export_upstream_revision,
+        get_source_format,
         guess_build_type,
         lookup_distribution,
         open_file,
@@ -714,6 +715,9 @@
                 target_dir = tempfile.mkdtemp() # FIXME: Cleanup?
                 location = primary_upstream_source.fetch_tarball(
                     package, version, target_dir)
+                if v3 is None:
+                    source_format = get_source_format(tree)
+                    v3 = (source_format in ["3.0 (quilt)", "3.0 (native)"])
                 tarball_filename = self._get_tarball(config, tree, package,
                     version, upstream_branch, upstream_revision, v3,
                     location)

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-31 23:15:42 +0000
+++ debian/changelog	2011-02-02 13:48:00 +0000
@@ -41,8 +41,10 @@
     build type. LP: #655277
   * Fix finding upstream tarball when get-orig-source is not available.
     Closes: #552893
+  * merge-upstream now looks at the package source format to see what
+    kind of compression is supported on tarballs. LP: #627718
 
- -- Jelmer Vernooij <[e-mail]>  Tue, 01 Feb 2011 00:13:07 +0100
+ -- Jelmer Vernooij <[e-mail]>  Wed, 02 Feb 2011 14:40:55 +0100
 
 bzr-builddeb (2.5) unstable; urgency=low