Comment 10 for bug 792193

OK, with the patch to bzr-builddeb's import_dsc.py:

== modified file 'import_dsc.py'
--- import_dsc.py 2011-06-05 00:12:43 +0000
+++ import_dsc.py 2011-06-05 02:07:44 +0000
@@ -1149,7 +1149,8 @@
             # We need to import at least the diff, possibly upstream.
             # Work out if we need the upstream part first.
             imported_upstream = False
- if not self.has_upstream_version(version.upstream_version):
+ if not self.has_upstream_version(version.upstream_version,
+ md5=upstream_md5):
                 up_pull_branch = \
                     self.branch_to_pull_upstream_from(version.upstream_version,
                             upstream_md5)

and having first seeded the download-cache with the deleted .orig.tar.gz, and running with --persistent-download-cache, we get history that makes sense, and the upstream-2.6.24 gets moved to the second import of the upstream OK.

So we should get that fix into bzr-builddeb, and then get bzr-builddeb updated on jubany.

When running the manual import, it might be advantageous to use a patched import_package.py:

=== modified file 'import_package.py'
--- a/import_package.py 2011-06-05 03:40:10 +0000
+++ b/import_package.py 2011-06-05 04:04:11 +0000
@@ -233,6 +233,7 @@
     vlist = get_debian_versions(package, extra_debian=extra_debian)
     publications = icommon.lp_call(icommon.call_with_limited_size,
                 u_archive.getPublishedSources,
+ distro_series="/ubuntu/hardy", pocket="Release",
                 source_name=package, exact_match=True)
     pb = ui.ui_factory.nested_progress_bar()
     try:

such that the manual run only has to import hardy-release (which still takes 1½ hours for me). Then, the rest of the importing can hopefully be handled by a normal mass_import.py child.