Merge lp:~mbp/bzr-builddeb/620288-debian-deprecation into lp:bzr-builddeb

[Martin Pool]

Fix up one more unguarded 'import debian_bundle' and fix one guard that was backwards

Fix up one more unguarded 'import debian_bundle' and fix one guard that was backwards (copy & paste ftl)

=== modified file 'tests/blackbox/test_mark_uploaded.py'
--- tests/blackbox/test_mark_uploaded.py	2009-11-23 22:02:25 +0000
+++ tests/blackbox/test_mark_uploaded.py	2010-08-19 07:23:39 +0000
@@ -18,7 +18,11 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-from debian_bundle.changelog import Changelog, Version
+try:
+    from debian.changelog import Changelog, Version
+except ImportError:
+    # Prior to 0.1.15 the debian module was called debian_bundle
+    from debian_bundle.changelog import Changelog, Version
 
 from bzrlib.plugins.builddeb.tests import BuilddebTestCase
 

=== modified file 'tests/test_merge_package.py'
--- tests/test_merge_package.py	2010-05-23 15:29:38 +0000
+++ tests/test_merge_package.py	2010-08-19 07:23:39 +0000
@@ -23,10 +23,10 @@
 import unittest
 
 try:
-    from debian_bundle.changelog import Version
+    from debian.changelog import Version
 except ImportError:
     # Prior to 0.1.15 the debian module was called debian_bundle
-    from debian.changelog import Version
+    from debian_bundle.changelog import Version
 
 from bzrlib.tests import TestCaseWithTransport