--- bzr-svn-0.4.10.orig/workingtree.py
+++ bzr-svn-0.4.10/workingtree.py
@@ -32,20 +32,20 @@
 from bzrlib.transport.local import LocalTransport
 from bzrlib.workingtree import WorkingTree, WorkingTreeFormat
 
-from branch import SvnBranch
-from commit import _revision_id_to_svk_feature
-from convert import SvnConverter
-from errors import LocalCommitsUnsupported, NoSvnRepositoryPresent
+from bzrlib.plugins.svn.branch import SvnBranch
+from bzrlib.plugins.svn.commit import _revision_id_to_svk_feature
+from bzrlib.plugins.svn.convert import SvnConverter
+from bzrlib.plugins.svn.errors import LocalCommitsUnsupported, NoSvnRepositoryPresent
 from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_ANCESTRY, SVN_PROP_BZR_FILEIDS, 
                      SVN_PROP_BZR_REVISION_ID, SVN_PROP_BZR_REVISION_INFO,
                      generate_revision_metadata)
-from remote import SvnRemoteAccess
-from repository import SvnRepository
-from svk import SVN_PROP_SVK_MERGE, parse_svk_features, serialize_svk_features
+from bzrlib.plugins.svn.remote import SvnRemoteAccess
+from bzrlib.plugins.svn.repository import SvnRepository
+from bzrlib.plugins.svn.svk import SVN_PROP_SVK_MERGE, parse_svk_features, serialize_svk_features
 from bzrlib.plugins.svn.mapping import escape_svn_path
-from transport import (SvnRaTransport, bzr_to_svn_url, create_svn_client,
+from bzrlib.plugins.svn.transport import (SvnRaTransport, bzr_to_svn_url, create_svn_client,
                        svn_config) 
-from tree import SvnBasisTree
+from bzrlib.plugins.svn.tree import SvnBasisTree
 
 import os
 import urllib
@@ -53,8 +53,8 @@
 import svn.core, svn.wc
 from svn.core import SubversionException
 
-from errors import NoCheckoutSupport
-from format import get_rich_root_format
+from bzrlib.plugins.svn.errors import NoCheckoutSupport
+from bzrlib.plugins.svn.format import get_rich_root_format
 
 def generate_ignore_list(ignore_map):
     """Create a list of ignores, ordered by directory.
--- bzr-svn-0.4.10.orig/branch.py
+++ bzr-svn-0.4.10/branch.py
@@ -27,12 +27,12 @@
 import svn.client, svn.core
 from svn.core import SubversionException
 
-from commit import push
-from config import BranchConfig
-from errors import NotSvnBranchPath
-from format import get_rich_root_format
-from repository import SvnRepository
-from transport import bzr_to_svn_url, create_svn_client
+from bzrlib.plugins.svn.commit import push
+from bzrlib.plugins.svn.config import BranchConfig
+from bzrlib.plugins.svn.errors import NotSvnBranchPath
+from bzrlib.plugins.svn.format import get_rich_root_format
+from bzrlib.plugins.svn.repository import SvnRepository
+from bzrlib.plugins.svn.transport import bzr_to_svn_url, create_svn_client
 
 
 class FakeControlFiles(object):
--- bzr-svn-0.4.10.orig/tree.py
+++ bzr-svn-0.4.10/tree.py
@@ -31,7 +31,7 @@
 import svn.core, svn.wc, svn.delta
 from svn.core import Pool
 
-import errors
+from bzrlib.plugins.svn import errors
 
 def parse_externals_description(base_url, val):
     """Parse an svn:externals property value.
--- bzr-svn-0.4.10.orig/upgrade.py
+++ bzr-svn-0.4.10/upgrade.py
@@ -19,7 +19,7 @@
 from bzrlib.trace import info, mutter
 import bzrlib.ui as ui
 
-from errors import RebaseNotPresent
+from bzrlib.plugins.svn.errors import RebaseNotPresent
 import itertools
 from bzrlib.plugins.svn.mapping import parse_revision_id
 
--- bzr-svn-0.4.10.orig/revids.py
+++ bzr-svn-0.4.10/revids.py
@@ -22,12 +22,12 @@
 
 import svn.core
 
-from cache import CacheTable
-from errors import InvalidPropertyValue
+from bzrlib.plugins.svn.cache import CacheTable
+from bzrlib.plugins.svn.errors import InvalidPropertyValue
 from bzrlib.plugins.svn.mapping import (parse_revision_id, BzrSvnMapping, 
                      SVN_PROP_BZR_REVISION_ID, parse_revid_property)
 from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
-from mapping3.scheme import BranchingScheme
+from bzrlib.plugins.svn.mapping3.scheme import BranchingScheme
 
 class RevidMap(object):
     def __init__(self, repos):
@@ -148,7 +148,7 @@
             pass
 
         def get_scheme(name):
-            from mapping3.scheme import BranchingScheme
+            from bzrlib.plugins.svn.mapping3.scheme import BranchingScheme
             assert isinstance(name, str)
             return BranchingScheme.find_scheme(name)
 
--- bzr-svn-0.4.10.orig/transport.py
+++ bzr-svn-0.4.10/transport.py
@@ -26,7 +26,7 @@
 import svn.core
 import svn.client
 
-from errors import convert_svn_error, NoSvnRepositoryPresent
+from bzrlib.plugins.svn.errors import convert_svn_error, NoSvnRepositoryPresent
 import urlparse
 import urllib
 
@@ -411,7 +411,7 @@
                 discover_changed_paths, strict_node_history, revprops, rcvr, 
                 pool=None):
         if paths is None:
-            paths = ["/"]
+            paths = [""]
         self.mutter('svn log %r:%r %r (limit: %r)' % (from_revnum, to_revnum, paths, limit))
         if hasattr(svn.ra, 'get_log2'):
             return svn.ra.get_log2(self._ra, paths, 
@@ -755,8 +755,7 @@
         return self.PhonyLock() # FIXME
 
     def _is_http_transport(self):
-        return (self.svn_url.startswith("http://") or 
-                self.svn_url.startswith("https://"))
+        return False
 
     def clone_root(self):
         if self._is_http_transport():
--- bzr-svn-0.4.10.orig/convert.py
+++ bzr-svn-0.4.10/convert.py
@@ -23,7 +23,7 @@
 from bzrlib.revision import ensure_null
 from bzrlib.transport import get_transport
 
-from format import get_rich_root_format
+from bzrlib.plugins.svn.format import get_rich_root_format
 
 import svn.core, svn.repos
 
--- bzr-svn-0.4.10.orig/__init__.py
+++ bzr-svn-0.4.10/__init__.py
@@ -25,8 +25,8 @@
 from bzrlib.trace import warning, mutter
 from bzrlib.transport import register_lazy_transport, register_transport_proto
 
-import format
-import revspec
+from bzrlib.plugins.svn import format
+from bzrlib.plugins.svn import revspec
 
 # versions ending in 'exp' mean experimental mappings
 # versions ending in 'dev' mean development version
@@ -133,8 +133,8 @@
     if optimizers_registered:
         return
     from bzrlib.repository import InterRepository
-    import commit
-    import fetch
+    from bzrlib.plugins.svn import commit
+    from bzrlib.plugins.svn import fetch
     optimizers_registered = True
     InterRepository.register_optimiser(fetch.InterFromSvnRepository)
     InterRepository.register_optimiser(commit.InterToSvnRepository)
@@ -147,7 +147,7 @@
     """
     if isinstance(schemename, unicode):
         schemename = schemename.encode("ascii")
-    from mapping3.scheme import BranchingScheme
+    from bzrlib.plugins.svn.mapping3.scheme import BranchingScheme
     from bzrlib.errors import BzrCommandError
     
     ret = BranchingScheme.find_scheme(schemename)
@@ -181,8 +181,8 @@
         from bzrlib.bzrdir import BzrDir
         from bzrlib.errors import BzrCommandError, NoRepositoryPresent, NotBranchError
         from bzrlib import urlutils
-        from convert import convert_repository
-        from repository import SvnRepository
+        from bzrlib.plugins.svn.convert import convert_repository
+        from bzrlib.plugins.svn.repository import SvnRepository
         import os
 
         if to_location is None:
@@ -194,7 +194,7 @@
             standalone = False
 
         if os.path.isfile(from_location):
-            from convert import load_dumpfile
+            from bzrlib.plugins.svn.convert import load_dumpfile
             import tempfile
             tmp_repos = tempfile.mkdtemp(prefix='bzr-svn-dump-')
             load_dumpfile(from_location, tmp_repos)
@@ -251,7 +251,7 @@
 
     @display_command
     def run(self, from_repository=None, verbose=False):
-        from upgrade import upgrade_branch, upgrade_workingtree
+        from bzrlib.plugins.svn.upgrade import upgrade_branch, upgrade_workingtree
         from bzrlib.branch import Branch
         from bzrlib.errors import NoWorkingTree, BzrCommandError
         from bzrlib.repository import Repository
@@ -373,8 +373,8 @@
         from bzrlib.msgeditor import edit_commit_message
         from bzrlib.repository import Repository
         from bzrlib.trace import info
-        from repository import SvnRepository
-        from mapping3.scheme import scheme_from_branch_list
+        from bzrlib.plugins.svn.repository import SvnRepository
+        from bzrlib.plugins.svn.mapping3.scheme import scheme_from_branch_list
         def scheme_str(scheme):
             if scheme is None:
                 return ""
@@ -436,6 +436,3 @@
 elif __name__ != 'bzrlib.plugins.svn':
     raise ImportError('The Subversion plugin must be installed as'
                       ' bzrlib.plugins.svn not %s' % __name__)
-else:
-    import os, sys
-    sys.path.append(os.path.dirname(os.path.abspath(__file__)))
--- bzr-svn-0.4.10.orig/fileids.py
+++ bzr-svn-0.4.10/fileids.py
@@ -23,7 +23,7 @@
 
 import urllib
 
-import changes
+from bzrlib.plugins.svn import changes
 from bzrlib.plugins.svn.mapping import escape_svn_path
 
 def get_local_changes(paths, branch, mapping, generate_revid, 
--- bzr-svn-0.4.10.orig/Makefile
+++ bzr-svn-0.4.10/Makefile
@@ -26,6 +26,7 @@
 
 $(TMP_PLUGINS_DIR):
 	mkdir -p $@
+	touch $@/dbus.py $@/gtk.py
 
 $(TMP_PLUGINS_DIR)/svn: $(TMP_PLUGINS_DIR)
 	ln -sf .. $@
--- bzr-svn-0.4.10.orig/remote.py
+++ bzr-svn-0.4.10/remote.py
@@ -24,10 +24,10 @@
 from svn.core import SubversionException
 import svn.core, svn.repos
 
-from errors import NoSvnRepositoryPresent
-from format import get_rich_root_format, SvnRemoteFormat
-from repository import SvnRepository
-from transport import bzr_to_svn_url, get_svn_ra_transport
+from bzrlib.plugins.svn.errors import NoSvnRepositoryPresent
+from bzrlib.plugins.svn.format import get_rich_root_format, SvnRemoteFormat
+from bzrlib.plugins.svn.repository import SvnRepository
+from bzrlib.plugins.svn.transport import bzr_to_svn_url, get_svn_ra_transport
 
 
 class SvnRemoteAccess(BzrDir):
--- bzr-svn-0.4.10.orig/repository.py
+++ bzr-svn-0.4.10/repository.py
@@ -34,23 +34,23 @@
 
 import os
 
-from branchprops import PathPropertyProvider
-from cache import create_cache_dir, sqlite3
-import changes
-from changes import changes_path, find_prev_location
-from config import SvnRepositoryConfig
-from parents import SqliteCachingParentsProvider
-import errors
-import logwalker
+from bzrlib.plugins.svn.branchprops import PathPropertyProvider
+from bzrlib.plugins.svn.cache import create_cache_dir, sqlite3
+from bzrlib.plugins.svn import changes
+from bzrlib.plugins.svn.changes import changes_path, find_prev_location
+from bzrlib.plugins.svn.config import SvnRepositoryConfig
+from bzrlib.plugins.svn.parents import SqliteCachingParentsProvider
+from bzrlib.plugins.svn import errors
+from bzrlib.plugins.svn import logwalker
 from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_REVISION_ID, SVN_REVPROP_BZR_SIGNATURE,
                      parse_revision_metadata, parse_revid_property, 
                      parse_merge_property, BzrSvnMapping,
                      get_default_mapping, parse_revision_id)
 from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
-from revids import CachingRevidMap, RevidMap
-from svk import (SVN_PROP_SVK_MERGE, svk_features_merged_since, 
+from bzrlib.plugins.svn.revids import CachingRevidMap, RevidMap
+from bzrlib.plugins.svn.svk import (SVN_PROP_SVK_MERGE, svk_features_merged_since, 
                  parse_svk_feature)
-from tree import SvnRevisionTree
+from bzrlib.plugins.svn.tree import SvnRevisionTree
 import urllib
 
 def full_paths(find_children, paths, bp, from_bp, from_rev):
@@ -121,7 +121,7 @@
     rich_root_data = True
 
     def __get_matchingbzrdir(self):
-        from remote import SvnRemoteFormat
+        from bzrlib.plugins.svn.remote import SvnRemoteFormat
         return SvnRemoteFormat()
 
     _matchingbzrdir = property(__get_matchingbzrdir)
@@ -151,7 +151,7 @@
     def __init__(self, bzrdir, transport, branch_path=None):
         from bzrlib.plugins.svn import lazy_register_optimizers
         lazy_register_optimizers()
-        from fileids import CachingFileIdMap, simple_apply_changes, FileIdMap
+        from bzrlib.plugins.svn.fileids import CachingFileIdMap, simple_apply_changes, FileIdMap
         _revision_store = None
 
         assert isinstance(transport, Transport)
@@ -791,7 +791,7 @@
     def get_commit_builder(self, branch, parents, config, timestamp=None, 
                            timezone=None, committer=None, revprops=None, 
                            revision_id=None):
-        from commit import SvnCommitBuilder
+        from bzrlib.plugins.svn.commit import SvnCommitBuilder
         return SvnCommitBuilder(self, branch, parents, config, timestamp, 
                 timezone, committer, revprops, revision_id)
 
--- bzr-svn-0.4.10.orig/logwalker.py
+++ bzr-svn-0.4.10/logwalker.py
@@ -21,11 +21,11 @@
 import bzrlib.ui as ui
 
 from svn.core import SubversionException, Pool
-from transport import SvnRaTransport
+from bzrlib.plugins.svn.transport import SvnRaTransport
 import svn.core
 
 from cache import CacheTable
-import changes
+from bzrlib.plugins.svn import changes
 
 LOG_CHUNK_LIMIT = 0
 
--- bzr-svn-0.4.10.orig/fetch.py
+++ bzr-svn-0.4.10/fetch.py
@@ -29,16 +29,16 @@
 import svn.core
 
 from bzrlib.plugins.svn.errors import InvalidFileName
-from logwalker import lazy_dict
+from bzrlib.plugins.svn.logwalker import lazy_dict
 from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_MERGE, 
                      SVN_PROP_BZR_PREFIX, SVN_PROP_BZR_REVISION_INFO, 
                      SVN_PROP_BZR_REVISION_ID,
                      SVN_PROP_BZR_FILEIDS, SVN_REVPROP_BZR_SIGNATURE,
                      parse_merge_property,
                      parse_revision_metadata)
-from repository import SvnRepository, SvnRepositoryFormat
-from svk import SVN_PROP_SVK_MERGE
-from tree import (apply_txdelta_handler, parse_externals_description, 
+from bzrlib.plugins.svn.repository import SvnRepository, SvnRepositoryFormat
+from bzrlib.plugins.svn.svk import SVN_PROP_SVK_MERGE
+from bzrlib.plugins.svn.tree import (apply_txdelta_handler, parse_externals_description, 
                   inventory_add_external)
 
 
--- bzr-svn-0.4.10.orig/mapping.py
+++ bzr-svn-0.4.10/mapping.py
@@ -21,7 +21,7 @@
 
 from bzrlib.plugins.svn import version_info
 import calendar
-import errors
+from bzrlib.plugins.svn import errors
 import svn
 import time
 import urllib
--- bzr-svn-0.4.10.orig/NEWS
+++ bzr-svn-0.4.10/NEWS
@@ -495,6 +495,14 @@
 
    * Implement SvnWorkingTree.smart_add() (#79336)
 
+bzr-svn 0.3.5	2007-07-19
+ 
+  BUG FIXES
+
+  * Fix compatibility with bazaar 0.18.
+
+  * Fix broken constructor for NotDumpFile exception.
+
 bzr-svn 0.3.4    2007-06-15
 
   BUG FIXES
--- bzr-svn-0.4.10.orig/format.py
+++ bzr-svn-0.4.10/format.py
@@ -23,8 +23,7 @@
 import os
 
 lazy_import(globals(), """
-import errors
-import remote
+from bzrlib.plugins.svn import errors, remote
 
 from bzrlib import errors as bzr_errors
 """)
@@ -46,12 +45,12 @@
 
     def __init__(self):
         super(SvnRemoteFormat, self).__init__()
-        from repository import SvnRepositoryFormat
+        from bzrlib.plugins.svn.repository import SvnRepositoryFormat
         self.repository_format = SvnRepositoryFormat()
 
     @classmethod
     def probe_transport(klass, transport):
-        from transport import get_svn_ra_transport
+        from bzrlib.plugins.svn.transport import get_svn_ra_transport
         import svn.core
         format = klass()
 
@@ -82,7 +81,7 @@
 
     def initialize_on_transport(self, transport):
         """See BzrDir.initialize_on_transport()."""
-        from transport import get_svn_ra_transport
+        from bzrlib.plugins.svn.transport import get_svn_ra_transport
         from bzrlib.transport.local import LocalTransport
         import svn.repos
 
@@ -110,7 +109,7 @@
 
     def __init__(self):
         super(SvnWorkingTreeDirFormat, self).__init__()
-        from repository import SvnRepositoryFormat
+        from bzrlib.plugins.svn.repository import SvnRepositoryFormat
         self.repository_format = SvnRepositoryFormat()
 
     @classmethod
@@ -127,7 +126,7 @@
 
     def _open(self, transport):
         import svn.core
-        from workingtree import SvnCheckout
+        from bzrlib.plugins.svn.workingtree import SvnCheckout
         subr_version = svn.core.svn_subr_version()
         if subr_version.major == 1 and subr_version.minor < 4:
             raise errors.NoCheckoutSupport()
--- bzr-svn-0.4.10.orig/commit.py
+++ bzr-svn-0.4.10/commit.py
@@ -31,12 +31,12 @@
 from bzrlib.plugins.svn import util
 
 from cStringIO import StringIO
-from errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed
-from svk import (generate_svk_feature, serialize_svk_features, 
+from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed
+from bzrlib.plugins.svn.svk import (generate_svk_feature, serialize_svk_features, 
                  parse_svk_features, SVN_PROP_SVK_MERGE)
-from logwalker import lazy_dict
+from bzrlib.plugins.svn.logwalker import lazy_dict
 from bzrlib.plugins.svn.mapping import parse_revision_id
-from repository import SvnRepositoryFormat, SvnRepository
+from bzrlib.plugins.svn.repository import SvnRepositoryFormat, SvnRepository
 import urllib
 
 
--- bzr-svn-0.4.10.orig/svk.py
+++ bzr-svn-0.4.10/svk.py
@@ -15,7 +15,7 @@
 
 """Utility functions for dealing with SVK properties."""
 
-import errors
+from bzrlib.plugins.svn import errors
 
 SVN_PROP_SVK_MERGE = 'svk:merge'
 
--- bzr-svn-0.4.10.orig/parents.py
+++ bzr-svn-0.4.10/parents.py
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from cache import CacheTable
+from bzrlib.plugins.svn.cache import CacheTable
 
 class SqliteCachingParentsProvider(object):
     def __init__(self, actual, cachedb=None):
--- bzr-svn-0.4.10.orig/mapping3/__init__.py
+++ bzr-svn-0.4.10/mapping3/__init__.py
@@ -17,8 +17,8 @@
 from bzrlib.errors import InvalidRevisionId
 from bzrlib.trace import mutter
 from bzrlib.plugins.svn import mapping
-from layout import RepositoryLayout
-from mapping3.scheme import (BranchingScheme, guess_scheme_from_branch_path, 
+from bzrlib.plugins.svn.layout import RepositoryLayout
+from bzrlib.plugins.svn.mapping3.scheme import (BranchingScheme, guess_scheme_from_branch_path, 
                              guess_scheme_from_history, ListBranchingScheme, 
                              parse_list_scheme_text, NoBranchingScheme,
                              TrunkBranchingScheme, ListBranchingScheme)
--- bzr-svn-0.4.10.orig/mapping3/scheme.py
+++ bzr-svn-0.4.10/mapping3/scheme.py
@@ -22,8 +22,8 @@
 from bzrlib.errors import NotBranchError
 
 from base64 import urlsafe_b64decode, urlsafe_b64encode
-from errors import InvalidSvnBranchPath
-import util
+from bzrlib.plugins.svn.errors import InvalidSvnBranchPath
+from bzrlib.plugins.svn import util
 import bz2
 import urllib
 
--- bzr-svn-0.4.10.orig/debian/control
+++ bzr-svn-0.4.10/debian/control
@@ -0,0 +1,25 @@
+Source: bzr-svn
+Section: devel
+Priority: optional
+Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint@lists.alioth.debian.org>
+Homepage: http://bazaar-vcs.org/BzrSvn
+Uploaders: Jelmer Vernooij <jelmer@samba.org>, Reinhard Tartler <siretart@tauware.de>, Robert Collins <robertc@robertcollins.net>
+Build-Depends-Indep: python-subversion, bzr (>= 1.4~), python (>= 2.5) | python-pysqlite2
+Build-Depends: python-central (>= 0.5), cdbs (>= 0.4.43), python, debhelper (>= 5.0.37.2)
+Standards-Version: 3.7.3
+XS-Python-Version: >= 2.4
+Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-svn/unstable/
+DM-Upload-Allowed: yes
+
+Package: bzr-svn
+Architecture: all
+Depends: bzr (>= 1.4~), bzr (<< 1.6~), python-subversion (>= 1.4.1), ${python:Depends}, python (>= 2.5) | python-pysqlite2
+Enhances: bzr, subversion
+Recommends: bzr-rebase (>= 0.2~)
+XB-Python-Version: ${python:Versions}
+Description: Bazaar plugin providing Subversion integration
+ Plugin for Bazaar that adds the ability to read and commit to
+ branches stored in Subversion.
+ .
+ Also included is a bzr subcommand that allows converting
+ complete Subversion repositories to Bazaar repositories.
--- bzr-svn-0.4.10.orig/debian/pycompat
+++ bzr-svn-0.4.10/debian/pycompat
@@ -0,0 +1 @@
+2
--- bzr-svn-0.4.10.orig/debian/copyright
+++ bzr-svn-0.4.10/debian/copyright
@@ -0,0 +1,24 @@
+This package was debianized by Jelmer Vernooij
+<jelmer@samba.org> on Tue Jul  4 13:45:22 CEST 2006.
+
+It was downloaded from http://people.samba.org/bzr/jelmer/bzr-svn/.
+
+Copyright 2005-2008 Jelmer Vernooij.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License with
+the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+if not, write to the Free Software Foundation, Inc., 51 Franklin St,
+Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian systems, the full text of the GPL can be found in
+/usr/share/common-licenses/GPL
--- bzr-svn-0.4.10.orig/debian/examples
+++ bzr-svn-0.4.10/debian/examples
@@ -0,0 +1 @@
+pre-revprop-change.example
--- bzr-svn-0.4.10.orig/debian/rules
+++ bzr-svn-0.4.10/debian/rules
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+DEB_PYTHON_SYSTEM=pycentral
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+
+DEB_INSTALL_DOCS_ALL += FAQ
+
+clean::
+	-rm -rf build test*.tmp 
+	find . -name "*.pyc" -print0 | xargs -0 rm -f
+
--- bzr-svn-0.4.10.orig/debian/NEWS
+++ bzr-svn-0.4.10/debian/NEWS
@@ -0,0 +1,9 @@
+bzr-svn (0.4.0-1) unstable; urgency=low
+
+  As of this version bzr-svn creates revisions with different revision ids than 
+  previous versions. In other words, existing bzr-svn branches created with 
+  0.3.x can not be used directly with 0.4.0 but will have to be upgraded to 
+  work with 0.4.0 using the "bzr svn-upgrade" command. The bzr-rebase package 
+  has to be installed for this command to work correctly.
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Sun, 05 Aug 2007 14:14:54 +0200
--- bzr-svn-0.4.10.orig/debian/watch
+++ bzr-svn-0.4.10/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://samba.org/~jelmer/bzr/bzr-svn-(.*).tar.gz
--- bzr-svn-0.4.10.orig/debian/compat
+++ bzr-svn-0.4.10/debian/compat
@@ -0,0 +1 @@
+4
--- bzr-svn-0.4.10.orig/debian/changelog
+++ bzr-svn-0.4.10/debian/changelog
@@ -0,0 +1,173 @@
+bzr-svn (0.4.10-2) unstable; urgency=high
+
+  * Fix compatibility with Subversion 1.5.
+  * Get rid of relative imports since they conflict with some other plugins.
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Fri, 04 Jul 2008 16:56:59 +0200
+
+bzr-svn (0.4.10-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Mon, 12 May 2008 01:49:35 +0200
+
+bzr-svn (0.4.9-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #472133)
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Mon, 24 Mar 2008 05:16:59 +0100
+
+bzr-svn (0.4.8-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #468807)
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Thu, 13 Mar 2008 00:18:30 +0100
+
+bzr-svn (0.4.7-1) unstable; urgency=low
+
+  * New upstream release. 
+    + Fixes typo in assertion. (Closes: #459886)
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Wed, 09 Jan 2008 15:20:16 +0100
+
+bzr-svn (0.4.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Tue, 08 Jan 2008 20:20:38 +0100
+
+bzr-svn (0.4.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Sat, 01 Dec 2007 15:07:18 +0100
+
+bzr-svn (0.4.4-2) unstable; urgency=low
+
+  [ Jelmer Vernooij ]
+  * Install FAQ.
+  * Set homepage field in control file.
+  * Fix syntax of NEWS.Debian.
+
+  [ Arnaud Fontaine ]
+  * Update GPL path to GPL-2 as GPL-3 is now the default.
+
+  [ Adeodato Simó ]
+  * Allow Debian maintainer uploads.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Fri, 23 Nov 2007 00:54:10 +0000
+
+bzr-svn (0.4.4-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #444775)
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Fri, 02 Nov 2007 15:48:32 +0100
+
+bzr-svn (0.4.3-1) unstable; urgency=low
+
+  * New upstream version.
+  * Fix depends. (Closes: #442171)
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Sun, 16 Sep 2007 15:52:03 +0200
+
+bzr-svn (0.4.2-1) unstable; urgency=low
+
+  [ Jelmer Vernooij ]
+  * New upstream release.
+
+ -- Robert Collins <robertc@robertcollins.net>  Wed, 12 Sep 2007 07:30:01 +1000
+
+bzr-svn (0.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Sun, 26 Aug 2007 12:22:43 +0200
+
+bzr-svn (0.4.0-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #428757)
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Sat, 04 Aug 2007 21:18:15 +0200
+
+bzr-svn (0.3.5-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #428758)
+  * Let bzr-svn enhance bzr.
+
+  [Reinhard Tartler]
+  * Let bzr-svn enhance subversion. (LP: #122073)
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Thu, 19 Jul 2007 15:41:02 +0200
+
+bzr-svn (0.3.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+  [Reinhard Tartler]
+  * tighten depedency on bzr. We'll update bzr-svn on the upload of bzr
+    0.18 in any case. as discussed on pkg-bazaar-maint.
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Fri, 15 Jun 2007 17:26:58 +0200
+
+bzr-svn (0.3.3-1) unstable; urgency=low
+
+  * Merge changes from Ubuntu.
+  * Recommend python-pysqlite2 (Closes: #422452)
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Tue, 08 May 2007 19:29:49 +0200
+
+bzr-svn (0.3.3-0ubuntu1) gutsy; urgency=low
+
+  * New upstream release.
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Sun, 29 Apr 2007 18:25:15 +0200
+
+bzr-svn (0.3.2-0ubuntu1) feisty; urgency=low
+
+  [Jelmer Vernooij]
+  * New upstream release.
+  
+  [Reinhard Tartler]
+  * Disabled testsuite, since bzr-gtk broke it. Discussed via private mail
+    with Jelmer.
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Tue, 13 Mar 2007 10:44:37 +0100
+
+bzr-svn (0.3-1) experimental; urgency=low
+
+  * Merge changes from Ubuntu.
+  * Add XS-Vcs-Bzr line.
+  * Add watch file.
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Tue, 30 Jan 2007 12:20:17 +0100
+
+bzr-svn (0.3-0ubuntu2) feisty; urgency=low
+
+  * changing build dependency from 'python' to 'python-dev'. Fixes FTBFS
+
+ -- Reinhard Tartler <siretart@tauware.de>  Sat, 27 Jan 2007 12:47:38 +0100
+
+bzr-svn (0.3-0ubuntu1) feisty; urgency=low
+
+  [Jelmer Vernooij]
+  * New upstream release.
+  * Fixed Python-Version (closes: #404979).
+  * Fixed dependency on bzr version (closes: #404886).
+  
+  [Reinhard Tartler]
+  * upload to feisty as discussed with Jelmer.
+    Package taken from http://samba.org/~jelmer/debian/
+
+ -- Reinhard Tartler <siretart@tauware.de>  Sat, 27 Jan 2007 11:20:51 +0100
+
+bzr-svn (0.2-0ubuntu1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Thu, 14 Dec 2006 02:46:48 +0100
+
+bzr-svn (0.1-0ubuntu1) unstable; urgency=low
+
+  * Initial revision.
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Tue,  4 Jul 2006 13:46:33 +0200
--- bzr-svn-0.4.10.orig/tests/test_workingtree.py
+++ bzr-svn-0.4.10/tests/test_workingtree.py
@@ -30,9 +30,9 @@
 
 import os, sys
 
-from transport import svn_config
-from tests import TestCaseWithSubversionRepository
-from workingtree import generate_ignore_list
+from bzrlib.plugins.svn.transport import svn_config
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.workingtree import generate_ignore_list
 
 class TestWorkingTree(TestCaseWithSubversionRepository):
     def test_add_duplicate(self):
--- bzr-svn-0.4.10.orig/tests/test_radir.py
+++ bzr-svn-0.4.10/tests/test_radir.py
@@ -24,9 +24,9 @@
 
 import svn
 
-from format import SvnRemoteFormat
-from tests import TestCaseWithSubversionRepository
-from transport import SvnRaTransport
+from bzrlib.plugins.svn.format import SvnRemoteFormat
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.transport import SvnRaTransport
 
 class TestRemoteAccess(TestCaseWithSubversionRepository):
     def test_clone(self):
--- bzr-svn-0.4.10.orig/tests/test_commit.py
+++ bzr-svn-0.4.10/tests/test_commit.py
@@ -25,12 +25,12 @@
 from bzrlib.trace import mutter
 from bzrlib.workingtree import WorkingTree
 
-from commit import set_svn_revprops, _revision_id_to_svk_feature
+from bzrlib.plugins.svn.commit import set_svn_revprops, _revision_id_to_svk_feature
 from copy import copy
-from errors import RevpropChangeFailed
+from bzrlib.plugins.svn.errors import RevpropChangeFailed
 import os
-from transport import SvnRaTransport
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.transport import SvnRaTransport
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
 from svn.core import svn_time_to_cstring
 
--- bzr-svn-0.4.10.orig/tests/test_mapping.py
+++ bzr-svn-0.4.10/tests/test_mapping.py
@@ -17,14 +17,14 @@
 
 import sha
 
-from errors import InvalidPropertyValue
-from mapping import (generate_revision_metadata, parse_revision_metadata, 
+from bzrlib.plugins.svn.errors import InvalidPropertyValue
+from bzrlib.plugins.svn.mapping import (generate_revision_metadata, parse_revision_metadata, 
                      parse_revid_property, parse_merge_property, 
                      BzrSvnMappingv1, BzrSvnMappingv2, 
                      BzrSvnMappingv4, parse_revision_id)
-from mapping3 import (BzrSvnMappingv3FileProps, BzrSvnMappingv3RevProps, 
+from bzrlib.plugins.svn.mapping3 import (BzrSvnMappingv3FileProps, BzrSvnMappingv3RevProps, 
                       BzrSvnMappingv3Hybrid)
-from mapping3.scheme import NoBranchingScheme
+from bzrlib.plugins.svn.mapping3.scheme import NoBranchingScheme
 
 from bzrlib.errors import InvalidRevisionId
 from bzrlib.tests import (TestCase, adapt_tests, TestNotApplicable)
--- bzr-svn-0.4.10.orig/tests/test_svk.py
+++ bzr-svn-0.4.10/tests/test_svk.py
@@ -14,8 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from bzrlib.tests import TestCase
-from svk import parse_svk_feature
-from svk import parse_svk_features
+from bzrlib.plugins.svn.svk import parse_svk_feature
+from bzrlib.plugins.svn.svk import parse_svk_features
 
 class SvkTests(TestCase):
     def test_parse_svk_feature_root(self):
--- bzr-svn-0.4.10.orig/tests/test_revspec.py
+++ bzr-svn-0.4.10/tests/test_revspec.py
@@ -23,7 +23,7 @@
 from bzrlib.revisionspec import RevisionSpec, RevisionInfo
 from bzrlib.tests import TestCase
 
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
 
 class TestRevSpec(TestCase):
--- bzr-svn-0.4.10.orig/tests/test_tree.py
+++ bzr-svn-0.4.10/tests/test_tree.py
@@ -22,12 +22,12 @@
 from bzrlib.tests import TestCase
 from bzrlib.workingtree import WorkingTree
 
-import errors
+from bzrlib.plugins.svn import errors
 import os
-from tree import (SvnBasisTree, parse_externals_description, 
+from bzrlib.plugins.svn.tree import (SvnBasisTree, parse_externals_description, 
                   inventory_add_external)
 import sys
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
 class TestBasisTree(TestCaseWithSubversionRepository):
     def test_executable(self):
--- bzr-svn-0.4.10.orig/tests/test_revids.py
+++ bzr-svn-0.4.10/tests/test_revids.py
@@ -18,8 +18,8 @@
 from bzrlib.repository import Repository
 from bzrlib.tests import TestCase
 
-from revids import RevisionIdMapCache
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.revids import RevisionIdMapCache
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
 class TestRevidMapCache(TestCase):
     def test_create(self):
--- bzr-svn-0.4.10.orig/tests/test_config.py
+++ bzr-svn-0.4.10/tests/test_config.py
@@ -17,9 +17,9 @@
 """Config tests."""
 
 from bzrlib.branch import Branch
-from config import SvnRepositoryConfig, BranchConfig
-from mapping3.scheme import TrunkBranchingScheme
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.config import SvnRepositoryConfig, BranchConfig
+from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
 from bzrlib.tests import TestCaseInTempDir
 
--- bzr-svn-0.4.10.orig/tests/test_transport.py
+++ bzr-svn-0.4.10/tests/test_transport.py
@@ -16,10 +16,10 @@
 
 """Subversion transport tests."""
 
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 from bzrlib.errors import NotBranchError, NoSuchFile, FileExists, InvalidURL
 from bzrlib import urlutils
-from transport import SvnRaTransport, bzr_to_svn_url, _url_unescape_uri
+from bzrlib.plugins.svn.transport import SvnRaTransport, bzr_to_svn_url, _url_unescape_uri
 from unittest import TestCase
 
 import os
--- bzr-svn-0.4.10.orig/tests/test_upgrade.py
+++ bzr-svn-0.4.10/tests/test_upgrade.py
@@ -21,13 +21,13 @@
 from bzrlib.repository import Repository
 from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
 
-from errors import RebaseNotPresent
-from format import get_rich_root_format
-from mapping import (BzrSvnMappingv2, BzrSvnMappingv1)
-from mapping3 import BzrSvnMappingv3FileProps
-from mapping3.scheme import TrunkBranchingScheme
-from tests import TestCaseWithSubversionRepository
-from upgrade import (upgrade_repository, upgrade_branch,
+from bzrlib.plugins.svn.errors import RebaseNotPresent
+from bzrlib.plugins.svn.format import get_rich_root_format
+from bzrlib.plugins.svn.mapping import (BzrSvnMappingv2, BzrSvnMappingv1)
+from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
+from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.upgrade import (upgrade_repository, upgrade_branch,
                      upgrade_workingtree, UpgradeChangesContent, 
                      create_upgraded_revid, generate_upgrade_map)
 
--- bzr-svn-0.4.10.orig/tests/test_repos.py
+++ bzr-svn-0.4.10/tests/test_repos.py
@@ -33,16 +33,16 @@
 
 import svn.fs, svn
 
-import format
-from mapping import (escape_svn_path, unescape_svn_path, 
+from bzrlib.plugins.svn import format
+from bzrlib.plugins.svn.mapping import (escape_svn_path, unescape_svn_path, 
                      SVN_PROP_BZR_REVISION_ID)
-from mapping3 import (SVN_PROP_BZR_BRANCHING_SCHEME, set_branching_scheme,
+from bzrlib.plugins.svn.mapping3 import (SVN_PROP_BZR_BRANCHING_SCHEME, set_branching_scheme,
                       set_property_scheme)
-from mapping3.scheme import (TrunkBranchingScheme, NoBranchingScheme, 
+from bzrlib.plugins.svn.mapping3.scheme import (TrunkBranchingScheme, NoBranchingScheme, 
                     ListBranchingScheme, SingleBranchingScheme)
-from transport import SvnRaTransport
-from tests import TestCaseWithSubversionRepository
-from repository import SvnRepositoryFormat
+from bzrlib.plugins.svn.transport import SvnRaTransport
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.repository import SvnRepositoryFormat
 
 
 class TestSubversionRepositoryWorks(TestCaseWithSubversionRepository):
--- bzr-svn-0.4.10.orig/tests/test_push.py
+++ bzr-svn-0.4.10/tests/test_push.py
@@ -29,13 +29,13 @@
 from bzrlib.workingtree import WorkingTree
 
 import os
-import format
+from bzrlib.plugins.svn import format
 import svn.core
 from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix
 from time import sleep
-from commit import push
-from mapping import SVN_PROP_BZR_REVISION_ID
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.commit import push
+from bzrlib.plugins.svn.mapping import SVN_PROP_BZR_REVISION_ID
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
 class TestPush(TestCaseWithSubversionRepository):
     def setUp(self):
--- bzr-svn-0.4.10.orig/tests/test_logwalker.py
+++ bzr-svn-0.4.10/tests/test_logwalker.py
@@ -19,10 +19,10 @@
 from bzrlib.errors import NoSuchRevision
 
 import os
-import logwalker
+from bzrlib.plugins.svn import logwalker
 from bzrlib import debug
-from tests import TestCaseWithSubversionRepository
-from transport import SvnRaTransport
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.transport import SvnRaTransport
 
 class TestLogWalker(TestCaseWithSubversionRepository):
     def setUp(self):
--- bzr-svn-0.4.10.orig/tests/test_errors.py
+++ bzr-svn-0.4.10/tests/test_errors.py
@@ -19,7 +19,7 @@
                            UnexpectedEndOfContainerError)
 from bzrlib.tests import TestCase
 
-from errors import (convert_svn_error, convert_error, InvalidPropertyValue, 
+from bzrlib.plugins.svn.errors import (convert_svn_error, convert_error, InvalidPropertyValue, 
                     NotSvnBranchPath, InvalidSvnBranchPath,
                     SVN_ERR_UNKNOWN_HOSTNAME)
 
--- bzr-svn-0.4.10.orig/tests/test_scheme.py
+++ bzr-svn-0.4.10/tests/test_scheme.py
@@ -19,7 +19,7 @@
 from bzrlib.errors import NotBranchError, BzrError
 
 from bzrlib.tests import TestCase
-from mapping3.scheme import (ListBranchingScheme, NoBranchingScheme, 
+from bzrlib.plugins.svn.mapping3.scheme import (ListBranchingScheme, NoBranchingScheme, 
                     BranchingScheme, TrunkBranchingScheme, 
                     SingleBranchingSchemev0, 
                     SingleBranchingScheme, 
--- bzr-svn-0.4.10.orig/tests/test_convert.py
+++ bzr-svn-0.4.10/tests/test_convert.py
@@ -25,11 +25,11 @@
 from bzrlib.trace import mutter
 
 import os, sys
-from convert import convert_repository, NotDumpFile, load_dumpfile
-from format import get_rich_root_format
-from mapping3 import set_branching_scheme
-from mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.convert import convert_repository, NotDumpFile, load_dumpfile
+from bzrlib.plugins.svn.format import get_rich_root_format
+from bzrlib.plugins.svn.mapping3 import set_branching_scheme
+from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
 import svn.repos
 
--- bzr-svn-0.4.10.orig/tests/test_fileids.py
+++ bzr-svn-0.4.10/tests/test_fileids.py
@@ -21,10 +21,10 @@
 from bzrlib.trace import mutter
 from bzrlib.tests import TestCase
 
-from fileids import simple_apply_changes
-from mapping3 import BzrSvnMappingv3FileProps, set_branching_scheme
-from mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.fileids import simple_apply_changes
+from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps, set_branching_scheme
+from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
 class MockRepo(object):
     def __init__(self, mapping, uuid="uuid"):
--- bzr-svn-0.4.10.orig/tests/test_fetch.py
+++ bzr-svn-0.4.10/tests/test_fetch.py
@@ -26,14 +26,14 @@
 from bzrlib.tests import TestSkipped, KnownFailure
 from bzrlib.trace import mutter
 
-from convert import load_dumpfile
+from bzrlib.plugins.svn.convert import load_dumpfile
 from bzrlib.plugins.svn.errors import InvalidFileName
-import format
-import remote
-from mapping3 import set_branching_scheme
-from mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
-from tests import TestCaseWithSubversionRepository
-from transport import SvnRaTransport
+from bzrlib.plugins.svn import format
+from bzrlib.plugins.svn import remote
+from bzrlib.plugins.svn.mapping3 import set_branching_scheme
+from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.transport import SvnRaTransport
 
 import os, sys
 
--- bzr-svn-0.4.10.orig/tests/test_branchprops.py
+++ bzr-svn-0.4.10/tests/test_branchprops.py
@@ -18,10 +18,10 @@
 
 from bzrlib.errors import NoSuchRevision
 
-from tests import TestCaseWithSubversionRepository
-from branchprops import PathPropertyProvider
-from logwalker import LogWalker, CachingLogWalker
-from transport import SvnRaTransport
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.branchprops import PathPropertyProvider
+from bzrlib.plugins.svn.logwalker import LogWalker, CachingLogWalker
+from bzrlib.plugins.svn.transport import SvnRaTransport
 
 class TestBranchProps(TestCaseWithSubversionRepository):
     def setUp(self):
--- bzr-svn-0.4.10.orig/tests/test_branch.py
+++ bzr-svn-0.4.10/tests/test_branch.py
@@ -26,12 +26,12 @@
 import os
 from unittest import TestCase
 
-from branch import FakeControlFiles, SvnBranchFormat
-from convert import load_dumpfile
-from mapping import SVN_PROP_BZR_REVISION_ID
-from mapping3 import BzrSvnMappingv3FileProps
-from mapping3.scheme import TrunkBranchingScheme
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.branch import FakeControlFiles, SvnBranchFormat
+from bzrlib.plugins.svn.convert import load_dumpfile
+from bzrlib.plugins.svn.mapping import SVN_PROP_BZR_REVISION_ID
+from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
+from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
 class WorkingSubversionBranch(TestCaseWithSubversionRepository):
     def test_last_rev_rev_hist(self):
--- bzr-svn-0.4.10.orig/tests/test_blackbox.py
+++ bzr-svn-0.4.10/tests/test_blackbox.py
@@ -19,9 +19,9 @@
 from bzrlib.tests.blackbox import ExternalBase
 from bzrlib.trace import mutter
 
-from mapping3 import BzrSvnMappingv3FileProps
-from mapping3.scheme import NoBranchingScheme
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
+from bzrlib.plugins.svn.mapping3.scheme import NoBranchingScheme
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
 import os
 
--- bzr-svn-0.4.10.orig/tests/test_checkout.py
+++ bzr-svn-0.4.10/tests/test_checkout.py
@@ -21,10 +21,10 @@
 from bzrlib.errors import NoRepositoryPresent, UninitializableFormat
 from bzrlib.tests import TestCase
 
-from convert import SvnConverter
+from bzrlib.plugins.svn.convert import SvnConverter
 from bzrlib.plugins.svn.workingtree import SvnWorkingTreeFormat
 from bzrlib.plugins.svn.format import SvnWorkingTreeDirFormat
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
 class TestWorkingTreeFormat(TestCase):
     def setUp(self):