← Back to branch summary

~barry/bzr-builddeb/609186-urls

« back to all changes in this revision

Viewing changes to merge_package.py

  • Committer: Jelmer Vernooij
  • Date: 2010-05-23 15:29:38 UTC
  • mto: This revision was merged to the branch mainline in revision 452.
  • Revision ID: jelmer@samba.org-20100523152938-q1k8ihbp6kinf0d6
Attempt to import from "debian" first and try "debian_bundle" as fallback, 
prevents deprecation warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge_package.py
24
24
import shutil
25
25
import tempfile
26
26
 
27
 
from debian_bundle.changelog import Version
 
27
try:
 
28
    from debian.changelog import Version
 
29
except ImportError:
 
30
    # Prior to 0.1.15 the debian module was called debian_bundle
 
31
    from debian_bundle.changelog import Version
28
32
 
29
33
from bzrlib.plugins.builddeb.errors import (
30
34
    SharedUpstreamConflictsWithTargetPackaging)