diff -Nru bzr-builder-0.7.3/cmds.py bzr-builder-0.7.3+bzr174~ppa13~ubuntu14.04.1/cmds.py
--- bzr-builder-0.7.3/cmds.py	2012-04-08 17:36:02.000000000 +0000
+++ bzr-builder-0.7.3+bzr174~ppa13~ubuntu14.04.1/cmds.py	2014-08-25 05:41:05.000000000 +0000
@@ -412,9 +412,11 @@
                     if dput is not None:
                         dput_source_package(package_dir, dput)
             finally:
-                # package_dir -> working_directory
-                # FIXME: may fail in error unwind, masking the original exception.
-                os.rename(package_dir, working_directory)
+                if not no_build:
+                    # package_dir -> working_directory
+                    # FIXME: may fail in error unwind, masking the
+                    # original exception.
+                    os.rename(package_dir, working_directory)
             # Note that this may write a second manifest.
             if manifest is not None:
                 write_manifest_to_transport(manifest, base_branch,
diff -Nru bzr-builder-0.7.3/debian/bzr-builder.manifest bzr-builder-0.7.3+bzr174~ppa13~ubuntu14.04.1/debian/bzr-builder.manifest
--- bzr-builder-0.7.3/debian/bzr-builder.manifest	1970-01-01 00:00:00.000000000 +0000
+++ bzr-builder-0.7.3+bzr174~ppa13~ubuntu14.04.1/debian/bzr-builder.manifest	2014-08-25 05:41:06.000000000 +0000
@@ -0,0 +1,3 @@
+# bzr-builder format 0.4 deb-version 0.7.3+bzr174~ppa13
+lp:bzr-builder revid:william.grant@canonical.com-20140806120929-1leqzdwteb2yhqq1
+nest-part packaging lp:ubuntu/trusty/bzr-builder debian debian revid:package-import@ubuntu.com-20120610024503-4syoetggxq6qr1lp
diff -Nru bzr-builder-0.7.3/debian/changelog bzr-builder-0.7.3+bzr174~ppa13~ubuntu14.04.1/debian/changelog
--- bzr-builder-0.7.3/debian/changelog	2012-06-26 14:03:56.000000000 +0000
+++ bzr-builder-0.7.3+bzr174~ppa13~ubuntu14.04.1/debian/changelog	2014-08-25 05:41:06.000000000 +0000
@@ -1,3 +1,9 @@
+bzr-builder (0.7.3+bzr174~ppa13~ubuntu14.04.1) trusty; urgency=low
+
+  * Auto build.
+
+ -- William Grant <me@williamgrant.id.au>  Mon, 25 Aug 2014 05:41:06 +0000
+
 bzr-builder (0.7.3-0ubuntu1) quantal; urgency=low
 
   * New upstream release.
diff -Nru bzr-builder-0.7.3/debian/source/format bzr-builder-0.7.3+bzr174~ppa13~ubuntu14.04.1/debian/source/format
--- bzr-builder-0.7.3/debian/source/format	2012-06-26 13:54:35.000000000 +0000
+++ bzr-builder-0.7.3+bzr174~ppa13~ubuntu14.04.1/debian/source/format	2014-08-25 05:41:06.000000000 +0000
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
diff -Nru bzr-builder-0.7.3/deb_version.py bzr-builder-0.7.3+bzr174~ppa13~ubuntu14.04.1/deb_version.py
--- bzr-builder-0.7.3/deb_version.py	2012-04-08 17:36:02.000000000 +0000
+++ bzr-builder-0.7.3+bzr174~ppa13~ubuntu14.04.1/deb_version.py	2014-08-25 05:41:05.000000000 +0000
@@ -69,7 +69,7 @@
 
     basename = "debversion"
 
-    minimum_format = 0.4
+    minimum_format = 0.3
 
     def __init__(self, branch_name, version):
         super(DebVersionVariable, self).__init__(branch_name)
@@ -102,7 +102,7 @@
 class DebUpstreamBaseVariable(DebUpstreamVariable):
 
     basename = "debupstream-base"
-    minimum_format = 0.4
+    minimum_format = 0.3
 
     def get(self):
         version = super(DebUpstreamBaseVariable, self).get()
@@ -193,7 +193,7 @@
     from bzrlib.plugins.builder.deb_version import DebUpstreamVariable, DebUpstreamBaseVariable, DebVersionVariable
     debupstream_var = DebUpstreamVariable.from_changelog(branch_name, changelog)
     base_branch.deb_version = debupstream_var.replace(base_branch.deb_version)
-    if base_branch.format < 0.4:
+    if base_branch.format < 0.3:
         # The other variables were introduced in recipe format 0.4
         return
     debupstreambase_var = DebUpstreamBaseVariable.from_changelog(
diff -Nru bzr-builder-0.7.3/info.py bzr-builder-0.7.3+bzr174~ppa13~ubuntu14.04.1/info.py
--- bzr-builder-0.7.3/info.py	2012-04-08 17:36:02.000000000 +0000
+++ bzr-builder-0.7.3+bzr174~ppa13~ubuntu14.04.1/info.py	2014-08-25 05:41:05.000000000 +0000
@@ -14,4 +14,4 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-bzr_plugin_version = (0, 7, 3, 'final', 0)
+bzr_plugin_version = (0, 7, 4, 'dev', 0)
diff -Nru bzr-builder-0.7.3/tests/test_blackbox.py bzr-builder-0.7.3+bzr174~ppa13~ubuntu14.04.1/tests/test_blackbox.py
--- bzr-builder-0.7.3/tests/test_blackbox.py	2012-04-08 17:36:02.000000000 +0000
+++ bzr-builder-0.7.3+bzr174~ppa13~ubuntu14.04.1/tests/test_blackbox.py	2014-08-25 05:41:05.000000000 +0000
@@ -359,7 +359,7 @@
         new_cl_contents = ("package (1) unstable; urgency=low\n\n"
                 "  * Auto build.\n\n -- M. Maintainer <maint@maint.org>  ")
         actual_cl_contents = self._get_file_contents(
-            "working/test-1/debian/changelog")
+            "working/package-1/debian/changelog")
         self.assertStartsWith(actual_cl_contents, new_cl_contents)
         for fn in os.listdir("working"):
             self.assertFalse(fn.endswith(".changes"))
@@ -381,7 +381,7 @@
     def test_cmd_dailydeb_with_version_from_changelog(self):
         self.requireFeature(NotUnderFakeRootFeature)
         self.make_simple_package("source")
-        self.build_tree_contents([("test.recipe", "# bzr-builder format 0.4 "
+        self.build_tree_contents([("test.recipe", "# bzr-builder format 0.3 "
                     "deb-version {debversion}-2\nsource 1\n")])
         out, err = self.run_bzr(
             "dailydeb --allow-fallback-to-native -q test.recipe working")
@@ -485,8 +485,10 @@
         source = self.make_simple_package("source")
         self.build_tree(["source/debian/source/"])
         self.build_tree_contents([
-            ("source/debian/source/format", "3.0 (quilt)\n")])
-        source.add(["debian/source", "debian/source/format"])
+            ("source/debian/source/format", "3.0 (quilt)\n"),
+            ("source/debian/source/options", 'compression = "gzip"\n')])
+        source.add([
+            "debian/source", "debian/source/format", "debian/source/options"])
         source.commit("set source format")
         return source