~spiv/bzr-builddeb/use-dpkg-mergechangelogs

« back to all changes in this revision

Viewing changes to dh_make.py

  • Committer: Jelmer Vernooij
  • Date: 2011-06-28 08:41:44 UTC
  • mfrom: (578.2.9 multi-tarball)
  • Revision ID: jelmer@samba.org-20110628084144-1xbothpqtc1eptlo
Merge part 5 of support for multiple upstream tarballs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
64
64
            format = "bz2"
65
65
        elif tarball.endswith(".tar.lzma"):
66
66
            format = "lzma"
67
 
    dest_name = util.tarball_name(package_name, version, format=format)
 
67
    dest_name = util.tarball_name(package_name, version, None, format=format)
68
68
    trace.note("Fetching tarball")
69
69
    repack_tarball(tarball, dest_name, target_dir=orig_dir,
70
70
            force_gz=not use_v3)