Merge from devel dbfc6276c4aa50b79f1cf27cfc24badc0b18da8f

diff --cc gbp/scripts/buildpackage.py
index 95ecefe,457673c..da53fe9
--- 1/gbp/scripts/buildpackage.py
--- 2/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@@ -38,11 -38,9 +38,10 @@@ from gbp.scripts.common.buildpackage im
                                               git_archive_submodules,
                                               git_archive_single, dump_tree,
                                               write_wc, drop_index)
- from gbp.pkg import (UpstreamSource, compressor_opts, compressor_aliases,
-                      parse_archive_filename)
+ from gbp.pkg import 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]

diff --cc gbp/scripts/common/import_orig.py
Simple merge

diff --cc gbp/scripts/import_orig.py
index 78bbf47,f81d249..fb6070e
--- 1/gbp/scripts/import_orig.py
--- 2/gbp/scripts/import_orig.py
+++ b/gbp/scripts/import_orig.py
@@@ -30,10 -30,48 +30,50 @@@ from gbp.deb.git import (GitRepositoryE
  from gbp.config import GbpOptionParserDebian, GbpOptionGroup, no_upstream_branch_msg
  from gbp.errors import GbpError
  import gbp.log
- from gbp.scripts.common.import_orig import (cleanup_tmp_tree, ask_package_name,
-                                             ask_package_version,
-                                             prepare_sources)
 +from gbp.pkg import compressor_opts
+ from gbp.scripts.common.import_orig import (orig_needs_repack, cleanup_tmp_tree,
+                                             ask_package_name, ask_package_version,
+                                             repack_source, is_link_target)
+ 
+ 
+ def prepare_pristine_tar(archive, pkg, version):
+     """
+     Prepare the upstream source for pristine tar import.
+ 
+     This checks if the upstream source is actually a tarball
+     and creates a symlink from I{archive}
+     to I{<pkg>_<version>.orig.tar.<ext>} so pristine-tar will
+     see the correct basename.
+ 
+     @param archive: the upstream source's name
+     @type archive: C{str}
+     @param pkg: the source package's name
+     @type pkg: C{str}
+     @param version: the upstream version number
+     @type version: C{str}
+     @rtype: C{str}
+     """
+     linked = False
+     if os.path.isdir(archive):
+         return None
+ 
+     ext = os.path.splitext(archive)[1]
+     if ext in ['.tgz', '.tbz2', '.tlz', '.txz' ]:
+         ext = ".%s" % ext[2:]
+ 
+     link = "../%s_%s.orig.tar%s" % (pkg, version, ext)
+ 
+     if os.path.basename(archive) != os.path.basename(link):
+         try:
+             if not is_link_target(archive, link):
+                 os.symlink(os.path.abspath(archive), link)
+                 linked = True
+         except OSError as err:
+                 raise GbpError("Cannot symlink '%s' to '%s': %s" % (archive, link, err[1]))
+         return (link, linked)
+     else:
+         return (archive, linked)
++>>>>>>> dbfc6276c4aa50b79f1cf27cfc24badc0b18da8f
  
  
  def upstream_import_commit_msg(options, version):
@@@ -263,12 -296,18 +303,24 @@@ def main(argv)
          if repo.bare:
              set_bare_repo_options(options)
  
 +        # Prepare sources for importing
 +        pristine_name = pristine_tarball_name(source, pkg_name, version)
 +        prepare_pristine = pristine_name if options.pristine_tar else None
 +        unpacked_orig, pristine_orig = prepare_sources(
 +                source, pkg_name, version, prepare_pristine, options.filters,
 +                options.filter_pristine_tar, None, tmpdir)
+         if not source.is_dir():
+             tmpdir = tempfile.mkdtemp(dir='../')
+             source.unpack(tmpdir, options.filters)
+             gbp.log.debug("Unpacked '%s' to '%s'" % (source.path, source.unpacked))
+ 
+         if orig_needs_repack(source, options):
+             gbp.log.debug("Filter pristine-tar: repacking '%s' from '%s'" % (source.path, source.unpacked))
+             (source, tmpdir)  = repack_source(source, sourcepackage, version, tmpdir, options.filters)
+ 
+         (pristine_orig, linked) = prepare_pristine_tar(source.path,
+                                                        sourcepackage,
+                                                        version)
  
          # Don't mess up our repo with git metadata from an upstream tarball
          try: