diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Builder/builder_custom_init.sh pysvn-1.5.1/Builder/builder_custom_init.sh
--- pysvn-1.5.0dfsg/Builder/builder_custom_init.sh	2006-04-09 17:52:51.000000000 +0200
+++ pysvn-1.5.1/Builder/builder_custom_init.sh	2007-01-03 23:00:38.000000000 +0100
@@ -5,14 +5,9 @@
 then
     PREF_VER=$1.$2
 else
-    if [ "$(uname)" = "Darwin" ]
-    then
-        # default to 2.3 on Mac OS X
-        PREF_VER=2.3
-    else
-        PREF_VER=
-    fi
+    PREF_VER=
 fi
+
 for PY_VER in ${PREF_VER} 2.6 2.5 2.4 2.3 2.2
 do
     # used in pick python to use in Builder driver makefile
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Builder/version.info pysvn-1.5.1/Builder/version.info
--- pysvn-1.5.0dfsg/Builder/version.info	2006-08-23 12:37:04.000000000 +0200
+++ pysvn-1.5.1/Builder/version.info	2006-11-05 18:01:43.000000000 +0100
@@ -1,4 +1,4 @@
 MAJOR=1
 MINOR=5
-PATCH=0
+PATCH=1
 BUILD=0
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Docs/generate_cpp_docs_from_html_docs.py pysvn-1.5.1/Docs/generate_cpp_docs_from_html_docs.py
--- pysvn-1.5.0dfsg/Docs/generate_cpp_docs_from_html_docs.py	2006-09-09 22:03:13.000000000 +0200
+++ pysvn-1.5.1/Docs/generate_cpp_docs_from_html_docs.py	2007-01-28 17:56:34.000000000 +0100
@@ -90,7 +90,7 @@
         for node, name in all_named_nodes:
             self.docsFromNode( node, name )
 
-        copyright = ''' Copyright (c) 2003-2006 Barry A Scott.  All rights reserved.
+        copyright = ''' Copyright (c) 2003-2007 Barry A Scott.  All rights reserved.
 
  This software is licensed as described in the file LICENSE.txt,
  which you should have received as part of this distribution.
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Docs/pysvn.html pysvn-1.5.1/Docs/pysvn.html
--- pysvn-1.5.0dfsg/Docs/pysvn.html	2006-01-02 17:06:03.000000000 +0100
+++ pysvn-1.5.1/Docs/pysvn.html	2007-01-28 17:56:34.000000000 +0100
@@ -37,7 +37,7 @@
 
 <pre>
 =================================================================
-Copyright (C) 2003-2006 Barry A. Scott. All rights reserved.
+Copyright (C) 2003-2007 Barry A. Scott. All rights reserved.
 
 =================================================================
 The Apache Software License, Version 1.1
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Docs/pysvn_prog_guide.html pysvn-1.5.1/Docs/pysvn_prog_guide.html
--- pysvn-1.5.0dfsg/Docs/pysvn_prog_guide.html	2006-07-23 12:20:15.000000000 +0200
+++ pysvn-1.5.1/Docs/pysvn_prog_guide.html	2007-01-28 17:56:34.000000000 +0100
@@ -288,6 +288,6 @@
             print '%s is locked' % status.path
 </pre>
 
-<p>Copyright &copy; 2004-2006 Barry A. Scott. All rigths reserved.</p>
+<p>Copyright &copy; 2004-2007 Barry A. Scott. All rigths reserved.</p>
 </body>
 </html>
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Docs/pysvn_prog_ref.html pysvn-1.5.1/Docs/pysvn_prog_ref.html
--- pysvn-1.5.0dfsg/Docs/pysvn_prog_ref.html	2006-09-23 14:22:21.000000000 +0200
+++ pysvn-1.5.1/Docs/pysvn_prog_ref.html	2007-01-28 17:56:34.000000000 +0100
@@ -4,7 +4,7 @@
 <!--
 
  ====================================================================
- Copyright (c) 2004-2006 Barry A. Scott.  All rights reserved.
+ Copyright (c) 2004-2007 Barry A. Scott.  All rights reserved.
 
  This software is licensed as described in the file LICENSE.txt,
  which you should have received as part of this distribution.
@@ -1967,7 +1967,7 @@
 <li>unknown - something's here, but we don't know what</li>
 </ul>
 
-<p>Copyright &copy; 2004-2006 Barry A. Scott. All rigths reserved.</p>
+<p>Copyright &copy; 2004-2007 Barry A. Scott. All rigths reserved.</p>
 <script type="text/javascript">
 // expect this to fail on IE and other browsers that don't support
 changeDisplay( 1003000 );
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Examples/Client/svn_cmd.py pysvn-1.5.1/Examples/Client/svn_cmd.py
--- pysvn-1.5.0dfsg/Examples/Client/svn_cmd.py	2006-10-12 00:57:00.000000000 +0200
+++ pysvn-1.5.1/Examples/Client/svn_cmd.py	2007-01-28 17:56:34.000000000 +0100
@@ -1,6 +1,6 @@
 '''
  ====================================================================
- Copyright (c) 2003-2006 Barry A Scott.  All rights reserved.
+ Copyright (c) 2003-2007 Barry A Scott.  All rights reserved.
 
  This software is licensed as described in the file LICENSE.txt,
  which you should have received as part of this distribution.
@@ -361,7 +361,7 @@
         diff_text = self.client.diff( tmpdir, positional_args[0], recurse=recurse,
                                             revision1=revision1, revision2=revision2,
                                             diff_options=['-u'] )
-        print diff_text
+        print diff_text.encode('utf-8')
 
     def cmd_export( self, args ):
         force = args.getBooleanOption( '--force', False )
@@ -387,9 +387,9 @@
 
         print 'Path:',path
         if entry.name and entry.name != 'svn:this_dir':
-            print 'Name:',entry.name
+            print 'Name:',entry.name.encode('utf-8')
         if entry.url:
-            print 'Url:',entry.url
+            print 'Url:',entry.url.encode('utf-8')
         if entry.repos and self.pysvn_testing >= '01.03.00':
             print 'Repository:',entry.repos
         if entry.uuid:
@@ -415,11 +415,11 @@
             print "Schedule: replace"
         if entry.is_copied:
             if entry.copyfrom_url:
-                print 'Copied From URL:', entry.copyfrom_url
+                print 'Copied From URL:', entry.copyfrom_url.encode('utf-8')
             if entry.copyfrom_rev.number:
                 print 'Copied From Rev:', entry.copyfrom_rev.number
         if entry.commit_author:
-            print 'Last Changed Author:', entry.commit_author
+            print 'Last Changed Author:', entry.commit_author.encode('utf-8')
         if entry.commit_revision.number:
             print 'Last Changed Rev:', entry.commit_revision.number
         if entry.commit_time:
@@ -451,10 +451,10 @@
 
         for path, info in all_entries:
             print
-            print 'Path:',path
+            print 'Path:',path.encode('utf-8')
 
             if info.URL:
-                print 'Url:',info.URL
+                print 'Url:',info.URL.encode('utf-8')
             if info.rev:
                 print 'Revision:',info.rev.number
             if info.repos_root_URL and self.pysvn_testing >= '01.03.00':
@@ -462,7 +462,7 @@
             if info.repos_UUID:
                 print 'Repository UUID:',info.repos_UUID
             if info.last_changed_author:
-                print 'Last changed author:',info.last_changed_author
+                print 'Last changed author:',info.last_changed_author.encode('utf-8')
             if info.last_changed_date:
                 print 'Last Changed Date:', fmtDateTime( info.last_changed_date )
             if info.last_changed_rev.kind == pysvn.opt_revision_kind.number:
@@ -476,7 +476,7 @@
             else:
                 print 'Node kind: unknown'
             if info.lock:
-                print 'Lock Owner:',info.lock.owner
+                print 'Lock Owner:',info.lock.owner.encode('utf-8')
                 print 'Lock Creation Date:',fmtDateTime( info.lock.creation_date )
                 if info.lock.expiration_date is not None:
                     print 'Lock Expiration Date:',fmtDateTime( info.lock.expiration_date )
@@ -495,7 +495,7 @@
                 elif wc_info.schedule == pysvn.wc_schedule.replace:
                     print "Schedule: replace"
                 if wc_info.copyfrom_url:
-                    print 'Copied From URL:', wc_info.copyfrom_url
+                    print 'Copied From URL:', wc_info.copyfrom_url.encode('utf-8')
                     print 'Copied From Rev:', wc_info.copyfrom_rev.number
                 if wc_info.text_time:
                     print 'Text Last Updated:', fmtDateTime( wc_info.text_time )
@@ -560,6 +560,8 @@
                 for file in all_files:
                     args = {}
                     args.update( file )
+                    args['name'] = args['name'].encode('utf-8')  
+                    args['last_author'] = args['last_author'].encode('utf-8')  
                     args['time_str'] = fmtDateTime( file.time )
                     args['created_rev_num'] = file.created_rev.number
                     print '%(created_rev_num)7d %(last_author)-10s %(size)6d %(time_str)s %(name)s' % args
@@ -797,25 +799,27 @@
                     odd_status,
                     file.entry.revision.number,
                     file.entry.commit_revision.number,
-                    file.entry.commit_author,
-                    file.path)
+                    file.entry.commit_author.encode('utf-8'),
+                    file.path.encode('utf-8'))
+
             elif detailed:
                 print '%s%s %s %6s %6s %-14s %s' % (state, lock_state,
                     odd_status,
                     '',
                     '',
                     '',
-                    file.path)
+                    file.path.encode('utf-8'))
+
             elif update:
                 print '%s%s %s %s' % (state, lock_state,
                     odd_status,
-                    file.path)
+                    file.path.encode('utf-8'))
 
             else:
                 if( file.text_status != pysvn.wc_status_kind.normal
                 or file.prop_status != pysvn.wc_status_kind.normal
                 or lock_state.strip() != ''):
-                    print '%s%s %s' % (state, lock_state, file.path)
+                    print '%s%s %s' % (state, lock_state, file.path.encode('utf-8'))
 
     cmd_st = cmd_status
     cmd_stat = cmd_status
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Kit/Linux/make_rpm.py pysvn-1.5.1/Kit/Linux/make_rpm.py
--- pysvn-1.5.0dfsg/Kit/Linux/make_rpm.py	2006-01-23 11:44:17.000000000 +0100
+++ pysvn-1.5.1/Kit/Linux/make_rpm.py	2007-01-28 18:29:59.000000000 +0100
@@ -53,7 +53,7 @@
 kit_files_info = [
 	('../../Source/pysvn/__init__.py',
 		'ROOT/usr/lib/python%(pymaj)d.%(pymin)d/site-packages/pysvn', '444'),
-	('../../Source/pysvn/_pysvn.so',
+	('../../Source/pysvn/_pysvn_%(pymaj)d_%(pymin)d.so' % locals(),
 		'ROOT/usr/lib/python%(pymaj)d.%(pymin)d/site-packages/pysvn', '444'),
 	('../../LICENSE.txt',
 		'ROOT/usr/share/doc/pysvn', '444'),
@@ -83,12 +83,12 @@
 Group:		Development/Libraries
 Release:	%(pysvn_version_package_release_string)s
 Summary:	pysvn %(pysvn_version_package_string)s Python extension for Subversion %(svn_version_string)s
-License:	Apache Software License, Version 1.1 - Copyright Barry A. Scott (c) 2003-2006
+License:	Apache Software License, Version 1.1 - Copyright Barry A. Scott (c) 2003-2007
 Packager:	Barry A. Scott <barry@barrys-emacs.org>
 %%description
 PySVN %(pysvn_version_string)s for Python %(python_version_string)s and Subversion %(svn_version_string)s
 
-Copyright Barry A. Scott (c) 2003-2006
+Copyright Barry A. Scott (c) 2003-2007
 
 mailto:barry@barrys-emacs.org
 http://pysvn.tigris.org
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Kit/MacOSX/make_pkg.py pysvn-1.5.1/Kit/MacOSX/make_pkg.py
--- pysvn-1.5.0dfsg/Kit/MacOSX/make_pkg.py	2006-10-15 00:42:08.000000000 +0200
+++ pysvn-1.5.1/Kit/MacOSX/make_pkg.py	2006-12-30 13:20:19.000000000 +0100
@@ -20,7 +20,7 @@
 pysvn_short_version_string = '%d.%d.%d' % (pysvn.version[0], pysvn.version[1], pysvn.version[2])
 svn_version_package_string = '%d%d%d' % (pysvn.svn_version[0], pysvn.svn_version[1], pysvn.svn_version[2])
 svn_version_string = '%d.%d.%d' % (pysvn.svn_version[0], pysvn.svn_version[1], pysvn.svn_version[2])
-
+pysvn_so_string = '_pysvn_%d_%d.so' % (pymaj, pymin)
 pkg_filename = 'py%s%s_pysvn_svn%s-%s-%s' % (pymaj, pymin, svn_version_package_string, pysvn_version_string, processor)
 print 'Info: Packageing %s' % pkg_filename
 build_time  = time.time()
@@ -58,23 +58,34 @@
 
 
 print 'Info: Finding dylibs used by pysvn'
-dylib_list = []
-os.system( 'otool -L ../../Source/pysvn/_pysvn.so >/tmp/pysvn_otool.tmp' )
-for line in file( '/tmp/pysvn_otool.tmp' ).readlines():
-    line = line.strip()
-    if( line.startswith( '/' )
-    and not line.startswith( '/usr/lib' )
-    and not line.startswith( '/System' ) ):
+
+def findDylibs( image, dylib_list, depth=0 ):
+    cmd = 'otool -L "%s" >/tmp/pysvn_otool.tmp' % image
+    #print 'Debug: cmd %r' % cmd
+    os.system( cmd )
+    # always skip the first line that lists the image being dumped
+    for line in file( '/tmp/pysvn_otool.tmp' ).readlines()[1:]:
+        line = line.strip()
         libpath = line.split()[0]
-        print 'Info: Need lib',libpath
-        dylib_list.append( libpath )
+        #print 'Debug: line %r' % line
+        if( libpath.startswith( '/' )               # lines with libs on them
+        and not libpath.startswith( '/usr/lib' )    # ignore libs shipped by Apple
+        and not libpath.startswith( '/System' )     # ignore libs shipped by Apple
+        and not libpath.endswith( '/Python' ) ):    # do not need to ignore python
+            if libpath not in dylib_list:
+                #print 'Info: ',depth,' Need lib',libpath,'for',image
+                dylib_list.append( libpath )
+                findDylibs( libpath, dylib_list, depth+1 )
         
+dylib_list = []
+findDylibs( '../../Source/pysvn/%s' % pysvn_so_string, dylib_list )
+
 print 'Info: Copy files'
 
 cp_list = [
     ('../../Source/pysvn/__init__.py',
         'Contents/pysvn'),
-    ('../../Source/pysvn/_pysvn.so',
+    ('../../Source/pysvn/%s' % pysvn_so_string,
         'Contents/pysvn'),
     ('../../LICENSE.txt',
         'Resources/License.txt'),
@@ -103,13 +114,22 @@
     os.system( cmd )
 
 print 'Info: Fix the install paths for the dylib files'
+
+fixup_path_list = ['tmp/Contents/pysvn/%s' % pysvn_so_string]
 for libpath in dylib_list:
-    os.system( 'install_name_tool'
-        ' -change'
-        ' %s'
-        ' %s/pysvn/%s'
-        ' %s' %
-            (libpath, install_dir, os.path.basename( libpath ), 'tmp/Contents/pysvn/_pysvn.so') )
+    fixup_path_list.append( 'tmp/Contents/pysvn/' + os.path.basename( libpath ) )
+
+for fixup_path in fixup_path_list:
+    for libpath in dylib_list:
+        if libpath != fixup_path:
+            cmd = ( 'install_name_tool'
+                ' -change'
+                ' %s'
+                ' %s/pysvn/%s'
+                ' %s' %
+                    (libpath, install_dir, os.path.basename( libpath ), fixup_path) )
+            #print 'Debug: cmd %r' % cmd
+            os.system( cmd )
 
 print 'Info: Create tmp/Resources/ReadMe.txt'
 f = file('tmp/Resources/ReadMe.txt','w')
@@ -123,7 +143,7 @@
 
 <h2>Pysvn home <a href="http://pysvn.tigris.org">http://pysvn.tigris.org</a></h2>
 
-<h2>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Barry Scott</h2>
+<h2>&#160;&#160;&#160;&#160;&#160;Barry Scott</h2>
 </body>
 </html>
 ''' % locals() )
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Kit/Win32/pysvn.iss pysvn-1.5.1/Kit/Win32/pysvn.iss
--- pysvn-1.5.0dfsg/Kit/Win32/pysvn.iss	2006-02-11 00:13:42.000000000 +0100
+++ pysvn-1.5.1/Kit/Win32/pysvn.iss	2007-01-28 17:56:34.000000000 +0100
@@ -58,7 +58,7 @@
 [Setup]
 AppName=Python %(py_maj)d.%(py_min)d PySVN
 AppVerName=Python %(py_maj)d.%(py_min)d PySVN %(pysvn_version_string)s 
-AppCopyright=Copyright (C) 2003-2006 Barry A. Scott
+AppCopyright=Copyright (C) 2003-2007 Barry A. Scott
 DefaultDirName={code:pythondir}\lib\site-packages\pysvn
 DefaultGroupName=PySVN for Python %(py_maj)d.%(py_min)d
 DisableStartupPrompt=yes
@@ -70,7 +70,7 @@
 #include "msvc_system_files.iss"
 
 Source: "..\..\..\Source\pysvn\__init__.py"; DestDir: "{app}";
-Source: "..\..\..\Source\pysvn\_pysvn.pyd"; DestDir: "{app}";
+Source: "..\..\..\Source\pysvn\_pysvn_%(py_maj)d_%(py_min)d.pyd"; DestDir: "{app}";
 Source: "..\..\..\Docs\pysvn.html"; DestDir: "{app}";
 Source: "..\..\..\Docs\pysvn_prog_guide.html"; DestDir: "{app}";
 Source: "..\..\..\Docs\pysvn_prog_ref.html"; DestDir: "{app}";
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/LICENSE.txt pysvn-1.5.1/LICENSE.txt
--- pysvn-1.5.0dfsg/LICENSE.txt	2006-01-02 17:06:03.000000000 +0100
+++ pysvn-1.5.1/LICENSE.txt	2007-01-28 18:29:59.000000000 +0100
@@ -1,5 +1,5 @@
 =================================================================
-Copyright (C) 2003-2006 Barry A. Scott. All rights reserved.
+Copyright (C) 2003-2007 Barry A. Scott. All rights reserved.
 
 =================================================================
 The Apache Software License, Version 1.1
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Source/pysvn/__init__.py pysvn-1.5.1/Source/pysvn/__init__.py
--- pysvn-1.5.0dfsg/Source/pysvn/__init__.py	2006-09-30 13:55:28.000000000 +0200
+++ pysvn-1.5.1/Source/pysvn/__init__.py	2007-01-04 22:27:40.000000000 +0100
@@ -23,7 +23,7 @@
         raise AttributeError( "%s instance has no attribute '%s'" % (self.__class__.__name__, name) )
 
     def __repr__( self ):
-        return '<%s %s>' % (self.__class__.__name__, self.__name)
+        return '<%s %s>' % (self.__class__.__name__, repr(self.__name))
 
 
 class PysvnDirent(PysvnDictBase):
@@ -88,7 +88,27 @@
 SVN_DIRENT_ALL         = 0xffffffffl
 
 try:
-    from _pysvn import *
+    maj_min = sys.version_info[:2]
+
+    #
+    # use an if tree so that its easy for app makers to
+    # find the import that is requires
+    #
+    if maj_min == (2,3):
+        import _pysvn_2_3
+        _pysvn = _pysvn_2_3
+    elif maj_min == (2,4):
+        import _pysvn_2_4
+        _pysvn = _pysvn_2_4
+    elif maj_min == (2,5):
+        import _pysvn_2_5
+        _pysvn = _pysvn_2_5
+    else:
+        raise ImportError( 'Fix pysvn/__init__.py to support python %d.%d' % tuple(maj_min) )
+
+    for key, value in _pysvn.__dict__.items():
+        if not key.startswith( '__' ):
+            globals()[ key ] = value
 
 except ImportError, e:
     # check for common installation errors that show up as ImportError
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Source/pysvn_common.mak pysvn-1.5.1/Source/pysvn_common.mak
--- pysvn-1.5.0dfsg/Source/pysvn_common.mak	2006-10-28 23:19:25.000000000 +0200
+++ pysvn-1.5.1/Source/pysvn_common.mak	2007-02-18 14:20:45.000000000 +0100
@@ -3,16 +3,15 @@
 #
 #	include this mak file after defining the variables it needs
 #
-
 CXX_OBJECTS=cxxsupport.o cxx_extensions.o cxxextensions.o IndirectPythonInterface.o
 PYSVN_OBJECTS=pysvn.o pysvn_callbacks.o pysvn_client.o pysvn_enum_string.o \
 	pysvn_transaction.o pysvn_revision.o pysvn_docs.o pysvn_path.o \
 	pysvn_arg_processing.o pysvn_converters.o pysvn_svnenv.o pysvn_profile.o
 PYSVN_INCLUDES=pysvn.hpp pysvn_docs.hpp pysvn_svnenv.hpp
 
-all: pysvn/_pysvn.so 
+all: pysvn/%(pysvn_module_name)s.so 
 
-pysvn/_pysvn.so: $(PYSVN_OBJECTS) $(CXX_OBJECTS)
+pysvn/%(pysvn_module_name)s.so: $(PYSVN_OBJECTS) $(CXX_OBJECTS)
 	$(LDSHARED) -o $@ $(PYSVN_OBJECTS) $(CXX_OBJECTS) $(LDLIBS)
 
 pysvn.o: pysvn.cpp $(PYSVN_INCLUDES) pysvn_version.hpp
@@ -76,7 +75,7 @@
 	rm -f pysvn_version.hpp
 	rm -f pysvn_docs.hpp pysvn_docs.cpp
 	rm -f *.o
-	rm -f pysvn/_pysvn.so
+	rm -f pysvn/*.so
 
-test: pysvn/_pysvn.so
+test: pysvn/%(pysvn_module_name)s.so
 	PYTHONPATH=. $(PYTHON) -c "import pysvn;print pysvn.version,pysvn.Client()"
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Source/pysvn.cpp pysvn-1.5.1/Source/pysvn.cpp
--- pysvn-1.5.0dfsg/Source/pysvn.cpp	2006-09-23 14:15:49.000000000 +0200
+++ pysvn-1.5.1/Source/pysvn.cpp	2006-12-28 14:37:32.000000000 +0100
@@ -327,8 +327,6 @@
 }
 
 //--------------------------------------------------------------------------------
-
-
 static pysvn_module* the_pysvn_module = NULL;
 extern "C" void init_pysvn()
 {
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Source/pysvn.rc.template pysvn-1.5.1/Source/pysvn.rc.template
--- pysvn-1.5.0dfsg/Source/pysvn.rc.template	2006-01-02 17:06:03.000000000 +0100
+++ pysvn-1.5.1/Source/pysvn.rc.template	2007-01-28 17:56:34.000000000 +0100
@@ -42,7 +42,7 @@
             VALUE "FileDescription", "pysvn extension\0"
             VALUE "FileVersion", "%(MAJOR)s, %(MINOR)s, %(PATCH)s, %(BUILD)s\0"
             VALUE "InternalName", "_pysvn.pyd\0"
-            VALUE "LegalCopyright", "Copyright Barry Scott 2003-2006\0"
+            VALUE "LegalCopyright", "Copyright Barry Scott 2003-2007\0"
             VALUE "OriginalFilename", "_pysvn.pyd\0"
             VALUE "ProductName", "pysvn extension\0"
             VALUE "ProductVersion", "%(MAJOR)s, %(MINOR)s, %(PATCH)s, %(BUILD)s\0"
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Source/pysvn_svnenv.cpp pysvn-1.5.1/Source/pysvn_svnenv.cpp
--- pysvn-1.5.0dfsg/Source/pysvn_svnenv.cpp	2006-10-15 13:04:53.000000000 +0200
+++ pysvn-1.5.1/Source/pysvn_svnenv.cpp	2006-11-05 17:59:13.000000000 +0100
@@ -360,7 +360,7 @@
     svn_auth_get_windows_simple_provider(&provider, m_pool);
     *(svn_auth_provider_object_t **)apr_array_push( providers ) = provider;
 #endif
-#ifdef SVN_HAVE_KEYCHAIN_SERVICES
+#ifdef DARWIN
     svn_auth_get_keychain_simple_provider(&provider, m_pool);
     *(svn_auth_provider_object_t **)apr_array_push( providers ) = provider;
 #endif
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Source/pysvn.vcproj pysvn-1.5.1/Source/pysvn.vcproj
--- pysvn-1.5.0dfsg/Source/pysvn.vcproj	2006-09-23 16:50:48.000000000 +0200
+++ pysvn-1.5.1/Source/pysvn.vcproj	2006-12-30 00:39:36.000000000 +0100
@@ -41,15 +41,15 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/export:init_pysvn"
+				AdditionalOptions="/export:init_pysvn_$(PY_MAJ)_$(PY_MIN)"
 				AdditionalDependencies="odbc32.lib odbccp32.lib Rpcrt4.lib Mswsock.lib libsvn_client-1.lib $(SUBVERSION)\Release\subversion\libsvn_delta\libsvn_delta-1.lib $(SUBVERSION)\Release\subversion\libsvn_diff\libsvn_diff-1.lib $(SUBVERSION)\Release\subversion\libsvn_fs\libsvn_fs-1.lib $(SUBVERSION)\Release\subversion\libsvn_fs_base\libsvn_fs_base-1.lib $(SUBVERSION)\Release\subversion\libsvn_fs_fs\libsvn_fs_fs-1.lib $(SUBVERSION)\Release\subversion\libsvn_ra\libsvn_ra-1.lib $(SUBVERSION)\Release\subversion\libsvn_ra_dav\libsvn_ra_dav-1.lib $(SUBVERSION)\Release\subversion\libsvn_ra_local\libsvn_ra_local-1.lib $(SUBVERSION)\Release\subversion\libsvn_ra_svn\libsvn_ra_svn-1.lib $(SUBVERSION)\Release\subversion\libsvn_repos\libsvn_repos-1.lib $(SUBVERSION)\Release\subversion\libsvn_subr\libsvn_subr-1.lib $(SUBVERSION)\Release\subversion\libsvn_wc\libsvn_wc-1.lib $(APR)\apr-iconv\RELEASE\libapriconv.lib $(APR)\apr-util\RELEASE\libaprutil.lib intl3_svn.lib $(APR)\apr-util\xml\expat\lib\LibR\xml.lib $(APR)\apr\RELEASE\libapr.lib $(DB4_DB4LIB).lib $(SUBVERSION)\neon\libneon.lib ws2_32.lib $(PYLIB).lib $(SUBVERSION)\zlib\zlibstat.lib"
-				OutputFile="pysvn\_pysvn.pyd"
+				OutputFile="pysvn\_pysvn_$(PY_MAJ)_$(PY_MIN).pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="&quot;$(PY)\libs&quot;;&quot;$(SUBVERSION)\svn-win32-libintl\lib&quot;;&quot;$(SUBVERSION)\db4-win\lib&quot;;&quot;$(SUBVERSION)\Release\subversion\libsvn_client&quot;"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
-				ImportLibrary=".\pysvn/_pysvn.lib"
+				ImportLibrary=".\pysvn/_pysvn_$(PY_MAJ)_$(PY_MIN).lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -107,16 +107,16 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/export:init_pysvn"
+				AdditionalOptions="/export:init_pysvn_$(PY_MAJ)_$(PY_MIN)_d"
 				AdditionalDependencies="odbc32.lib odbccp32.lib Rpcrt4.lib Mswsock.lib libsvn_client-1.lib $(SUBVERSION)\Debug\subversion\libsvn_delta\libsvn_delta-1.lib $(SUBVERSION)\Debug\subversion\libsvn_diff\libsvn_diff-1.lib $(SUBVERSION)\Debug\subversion\libsvn_fs\libsvn_fs-1.lib $(SUBVERSION)\Debug\subversion\libsvn_fs_base\libsvn_fs_base-1.lib $(SUBVERSION)\Debug\subversion\libsvn_fs_fs\libsvn_fs_fs-1.lib $(SUBVERSION)\Debug\subversion\libsvn_ra\libsvn_ra-1.lib $(SUBVERSION)\Debug\subversion\libsvn_ra_dav\libsvn_ra_dav-1.lib $(SUBVERSION)\Debug\subversion\libsvn_ra_local\libsvn_ra_local-1.lib $(SUBVERSION)\Debug\subversion\libsvn_ra_svn\libsvn_ra_svn-1.lib $(SUBVERSION)\Debug\subversion\libsvn_repos\libsvn_repos-1.lib $(SUBVERSION)\Debug\subversion\libsvn_subr\libsvn_subr-1.lib $(SUBVERSION)\Debug\subversion\libsvn_wc\libsvn_wc-1.lib $(APR)\apr-iconv\Debug\libapriconv.lib $(APR)\apr-util\Debug\libaprutil.lib intl3_svn.lib $(APR)\apr-util\xml\expat\lib\LibD\xml.lib $(APR)\apr\Debug\libapr.lib $(DB4_DB4LIB).lib $(SUBVERSION)\neon\libneonD.lib ws2_32.lib $(PYLIB).lib $(SUBVERSION)\zlib\zlibstatD.lib"
-				OutputFile="pysvn\_pysvn.pyd"
+				OutputFile="pysvn\_pysvn_$(PY_MAJ)_$(PY_MIN).pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="&quot;$(PY)\libs&quot;;&quot;$(SUBVERSION)\svn-win32-libintl\lib&quot;;&quot;$(SUBVERSION)\db4-win\lib&quot;;&quot;$(SUBVERSION)\Debug\subversion\libsvn_client&quot;"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="sept"
 				SubSystem="2"
-				ImportLibrary=".\pysvn/_pysvn.lib"
+				ImportLibrary=".\pysvn/_pysvn_$(PY_MAJ)_$(PY_MIN).lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -175,16 +175,16 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/export:init_pysvn"
+				AdditionalOptions="/export:init_pysvn_$(PY_MAJ)_$(PY_MIN)"
 				AdditionalDependencies="odbc32.lib odbccp32.lib Rpcrt4.lib Mswsock.lib libsvn_client-1.lib $(SUBVERSION)\Release\subversion\libsvn_delta\libsvn_delta-1.lib $(SUBVERSION)\Release\subversion\libsvn_diff\libsvn_diff-1.lib $(SUBVERSION)\Release\subversion\libsvn_fs\libsvn_fs-1.lib $(SUBVERSION)\Release\subversion\libsvn_fs_base\libsvn_fs_base-1.lib $(SUBVERSION)\Release\subversion\libsvn_fs_fs\libsvn_fs_fs-1.lib $(SUBVERSION)\Release\subversion\libsvn_ra\libsvn_ra-1.lib $(SUBVERSION)\Release\subversion\libsvn_ra_dav\libsvn_ra_dav-1.lib $(SUBVERSION)\Release\subversion\libsvn_ra_local\libsvn_ra_local-1.lib $(SUBVERSION)\Release\subversion\libsvn_ra_svn\libsvn_ra_svn-1.lib $(SUBVERSION)\Release\subversion\libsvn_repos\libsvn_repos-1.lib $(SUBVERSION)\Release\subversion\libsvn_subr\libsvn_subr-1.lib $(SUBVERSION)\Release\subversion\libsvn_wc\libsvn_wc-1.lib $(APR)\apr-iconv\RELEASE\libapriconv.lib $(APR)\apr-util\RELEASE\libaprutil.lib intl3_svn.lib $(APR)\apr-util\xml\expat\lib\LibR\xml.lib $(APR)\apr\RELEASE\libapr.lib $(DB4_DB4LIB).lib $(SUBVERSION)\neon\libneon.lib ws2_32.lib $(PYLIB).lib $(SUBVERSION)\zlib\zlibstat.lib"
-				OutputFile="pysvn\_pysvn.pyd"
+				OutputFile="pysvn\_pysvn_$(PY_MAJ)_$(PY_MIN).pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="&quot;$(PY)\libs&quot;;&quot;$(SUBVERSION)\svn-win32-libintl\lib&quot;;&quot;$(SUBVERSION)\db4-win\lib&quot;;&quot;$(SUBVERSION)\Release\subversion\libsvn_client\&quot;"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="sept"
 				SubSystem="2"
-				ImportLibrary=".\pysvn/_pysvn.lib"
+				ImportLibrary=".\pysvn/_pysvn_$(PY_MAJ)_$(PY_MIN).lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -357,7 +357,7 @@
 					Name="VCCLCompilerTool"
 					Optimization="0"
 					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;noPY_WIN32_DELAYLOAD_PYTHON_DLL;$(NoInherit)"
+					PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;noPY_WIN32_DELAYLOAD_PYTHON_DLL;init_pysvn=init_pysvn_$(PY_MAJ)_$(PY_MIN);init_pysvn_d=init_pysvn_$(PY_MAJ)_$(PY_MIN)_d;$(NoInherit)"
 					BrowseInformation="1"
 					CompileAs="2"/>
 			</FileConfiguration>
@@ -367,7 +367,7 @@
 					Name="VCCLCompilerTool"
 					Optimization="0"
 					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;noPY_WIN32_DELAYLOAD_PYTHON_DLL;$(NoInherit)"
+					PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;noPY_WIN32_DELAYLOAD_PYTHON_DLL;init_pysvn=init_pysvn_$(PY_MAJ)_$(PY_MIN);init_pysvn_d=init_pysvn_$(PY_MAJ)_$(PY_MIN)_d;$(NoInherit)"
 					BrowseInformation="1"
 					CompileAs="2"/>
 			</FileConfiguration>
@@ -377,7 +377,7 @@
 					Name="VCCLCompilerTool"
 					Optimization="0"
 					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;noPY_WIN32_DELAYLOAD_PYTHON_DLL;$(NoInherit)"
+					PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;noPY_WIN32_DELAYLOAD_PYTHON_DLL;init_pysvn=init_pysvn_$(PY_MAJ)_$(PY_MIN);init_pysvn_d=init_pysvn_$(PY_MAJ)_$(PY_MIN)_d;$(NoInherit)"
 					BrowseInformation="1"
 					CompileAs="2"/>
 			</FileConfiguration>
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Source/run_devenv.cmd pysvn-1.5.1/Source/run_devenv.cmd
--- pysvn-1.5.0dfsg/Source/run_devenv.cmd	1970-01-01 01:00:00.000000000 +0100
+++ pysvn-1.5.1/Source/run_devenv.cmd	2006-12-30 00:39:36.000000000 +0100
@@ -0,0 +1 @@
+devenv pysvn.sln /useenv %*
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Source/setup.py pysvn-1.5.1/Source/setup.py
--- pysvn-1.5.0dfsg/Source/setup.py	2007-02-18 14:03:36.000000000 +0100
+++ pysvn-1.5.1/Source/setup.py	2007-02-18 15:24:31.000000000 +0100
@@ -33,14 +33,14 @@
             creater = MakeFileCreater()
             return creater.createMakefile( argv )
         elif argv[1:2] == ['help']:
-            return help( argv )
+            return setup_help( argv )
         else:
-            return help( argv )
+            return setup_help( argv )
     except SetupError, e:
         print 'Error:',str(e)
         return 1
 
-def help( argv ):
+def setup_help( argv ):
     basename = os.path.basename( argv[0] )
     print '''
 
@@ -140,12 +140,25 @@
             if flag.startswith( '-O' ) or flag.startswith( '-f' ) or flag.startswith( '-g' ):
                 py_cflags_list.append( flag )
 
+        # add platform specific defines
+        if self.is_mac_os_x:
+            py_cflags_list.append( '-DDARWIN' )
+
         # get user supplied defines
         for arg in argv:
             if arg.startswith( '--define=' ):
                 py_cflags_list.append( '-D%s' % arg[len('--define-'):] )
 
+        # name of the module including the python version to help
+        # ensure that only a matching _pysvn.so for the version of
+        # python is imported
+        py_cflags_list.append( '-Dinit_pysvn=init_pysvn_%d_%d' % sys.version_info[:2] )
+        py_cflags_list.append( '-Dinit_pysvn_d=init_pysvn_%d_%d_d' % sys.version_info[:2] )
+
         template_values = {
+#            'pysvn_module_name': '_pysvn_%d_%d' % sys.version_info[:2],
+            'pysvn_module_name': '_pysvn',
+
             # python executable
             'python_exe':       sys.executable,
 
@@ -219,13 +232,17 @@
                 else:
                     template_values['python_exp'] = 'python.exp'
             makefile.write( self.makefile_template_aix % template_values )
+        elif sys.platform.startswith('linux'):
+            if self.verbose:
+                print 'Info: Using Linux makefile template'
+            makefile.write( self.makefile_template_linux % template_values )
         else:
             if self.verbose:
                 print 'Info: Using unix makefile template'
             makefile.write( self.makefile_template % template_values )
 
         f = file( 'pysvn_common.mak', 'r' )
-        makefile.write( f.read() )
+        makefile.write( f.read() % template_values )
         f.close()
         makefile.close()
 
@@ -263,6 +280,27 @@
 LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \
 -lsvn_client-1 \
 -lsvn_diff-1 \
+-lsvn_repos-1 \
+ -lcom_err -lresolv -lexpat -lneon
+
+#include pysvn_common.mak
+'''
+
+    makefile_template_linux = '''#
+#	Created by pysvn Extension/Source/setup.py
+#       -- makefile_template_linux --
+#
+PYTHON=%(python_exe)s
+SVN_INCLUDE=%(svn_include)s
+CCC=g++ -c
+CCCFLAGS=-Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s
+CC=gcc -c
+CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s
+PYCXX=%(pycxx_dir)s
+LDSHARED=g++ -shared %(debug_cflags)s
+LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \
+-lsvn_client-1 \
+-lsvn_diff-1 \
 -lsvn_repos-1 `apr-config --link-ld --libs`
 
 #include pysvn_common.mak
@@ -301,6 +339,7 @@
 -lexpat          \
 -lintl           \
 -lpthread        \
+-lz              \
 -Wl,-bI:%(python_exp)s
 
 #include pysvn_common.mak
@@ -416,7 +455,7 @@
                     'PyCXX include',
                     '--pycxx-dir=',
                     None,
-                    [   '../Import/pycxx-5.3.6'],
+                    [   '../Import/pycxx-5.4.0'],
                     'cxxsupport.cxx' )
 
     def find_svn_inc( self, argv ):
@@ -460,6 +499,18 @@
                 return self.find_dir( argv,
                     'APR include',
                     '--apr-inc-dir=',
+                    'include/%s' % apr_ver,
+                    [
+                    ],
+                    'apr.h' )
+            except SetupError:
+                pass
+
+        for apr_ver in ['apr-1', 'apr-0']:
+            try:
+                return self.find_dir( argv,
+                    'APR include',
+                    '--apr-inc-dir=',
                     None,
                     [
                         '/opt/local/include/%s' % apr_ver,      # Darwin - darwin ports
@@ -486,6 +537,19 @@
                 return self.find_dir( argv,
                     'APR library',
                     '--apr-lib-dir=',
+                    'lib',
+                    [],
+                    apr_libname )
+            except SetupError:
+                pass
+
+        for apr_libname, self.lib_apr in [
+                            (self.is_mac_os_x and 'libapr-1.dylib' or 'libapr-1.so', 'apr-1'),
+                            (self.is_mac_os_x and 'libapr-0.dylib' or 'libapr-0.so', 'apr-0')]:
+            try:
+                return self.find_dir( argv,
+                    'APR library',
+                    '--apr-lib-dir=',
                     None,
                     [
                         '/opt/local/lib',                       # Darwin - darwin ports
diff -urN --exclude=debian --exclude=Import pysvn-1.5.0dfsg/Tests/pysvn_test_common.mak pysvn-1.5.1/Tests/pysvn_test_common.mak
--- pysvn-1.5.0dfsg/Tests/pysvn_test_common.mak	2006-10-15 18:11:30.000000000 +0200
+++ pysvn-1.5.1/Tests/pysvn_test_common.mak	2006-12-11 22:58:30.000000000 +0100
@@ -3,7 +3,7 @@
 #
 #	include this mak file after defining the variables it needs
 #
-all: test-01.unix.new.log test-03.unix.new.log test-04.unix.new.log test-05.unix.new.log test-06.unix.new.log
+all: test-01.unix.new.log test-04.unix.new.log test-05.unix.new.log test-06.unix.new.log
 
 help:
 	@echo "make clean         - clean all tests"
@@ -35,8 +35,8 @@
 
 test-03.unix.new.log: test-03.sh test-03.unix.known_good.log
 	-rm -rf testroot-03
-	if [ "$$(id -u -n)" = "barry" ]; then PYTHON=$(PYTHON) ./test-03.sh >test-03.unix.new.log 2>&1;fi
-	if [ "$$(id -u -n)" = "barry" ]; then $(PYTHON) benchmark_diff.py test-03.unix.known_good.log test-03.unix.new.log; fi
+	PYTHON=$(PYTHON) ./test-03.sh >test-03.unix.new.log 2>&1;fi
+	$(PYTHON) benchmark_diff.py test-03.unix.known_good.log test-03.unix.new.log; fi
 
 clean-03:
 	-rm -f test-03.unix.new.log