Merge to 7f6b72e039efa5e2c3517b9336f9b29b4cb65c71

diff --cc gbp/scripts/buildpackage.py
index da53fe9,8d79e8b..95ecefe
--- 1/gbp/scripts/buildpackage.py
--- 2/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@@ -38,10 -37,10 +38,11 @@@ from gbp.scripts.common.buildpackage im
                                               git_archive_submodules,
                                               git_archive_single, dump_tree,
                                               write_wc, drop_index)
- from gbp.pkg import compressor_opts, compressor_aliases, parse_archive_filename
+ from gbp.pkg import (UpstreamSource, compressor_opts, compressor_aliases,
+                      parse_archive_filename)
  
 -def git_archive(repo, cp, output_dir, treeish, comp_type, comp_level, with_submodules):
 +def git_archive(repo, cp, output_dir, tmpdir_base, treeish, comp_type,
 +                comp_level, with_submodules):
      "create a compressed orig tarball in output_dir using git_archive"
      try:
          comp_opts = compressor_opts[comp_type][0]