Merge lp:~vila/bzr-builddeb/trunk into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

[Vincent Ladeuil]

[Vincent Ladeuil (vila)]

Same player shoots again, some more uses for PristineTarFeature :)

[James Westby (james-w)]

Thanks

review: Approve

=== modified file 'tests/test_import_dsc.py'
--- tests/test_import_dsc.py	2009-07-04 20:45:01 +0000
+++ tests/test_import_dsc.py	2009-07-10 17:43:12 +0000
@@ -826,6 +826,7 @@
         self.assertEqual(len(self.tree2.branch.revision_history()), 3)
 
     def test_import_package_init_upstream_from_other(self):
+        self.requireFeature(PristineTarFeature)
         version1 = Version("0.1-1")
         version2 = Version("0.1-2")
         builder = SourcePackageBuilder("package", version1)
@@ -1358,6 +1359,7 @@
         # are used in the second non-native upstream
 
     def test_merge_upstream_branches(self):
+        self.requireFeature(PristineTarFeature)
         version1 = Version("1.0-1")
         version2 = Version("1.1-1")
         version3 = Version("1.2-1")
@@ -1395,6 +1397,7 @@
 
     def test_import_symlink(self):
         version = Version("1.0-1")
+        self.requireFeature(PristineTarFeature)
         self.requireFeature(tests.SymlinkFeature)
         builder = SourcePackageBuilder("package", version)
         builder.add_default_control()