Rev 1313: Merge fix for compatibility with svn built with --enable-runtime-module-search in http://people.samba.org/bzr/jelmer/bzr-svn/0.4

Jelmer Vernooij jelmer at samba.org
Mon Jun 23 14:20:30 BST 2008


At http://people.samba.org/bzr/jelmer/bzr-svn/0.4

------------------------------------------------------------
revno: 1313
revision-id: jelmer at samba.org-20080623132028-fvaugcbyuuemjipy
parent: jelmer at samba.org-20080623050802-kwz0semqip6fi1w9
parent: martin.vgagern at gmx.net-20080623122455-88uwwx2jvg0pxgjb
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-06-23 15:20:28 +0200
message:
  Merge fix for compatibility with svn built with --enable-runtime-module-search
modified:
  AUTHORS                        AUTHORS-20060508114718-4c90c0062645106d
  setup.py                       setup.py-20060502115218-86950492da22353f
    ------------------------------------------------------------
    revno: 1296.1.1
    revision-id: martin.vgagern at gmx.net-20080623122455-88uwwx2jvg0pxgjb
    parent: jelmer at samba.org-20080622233020-wn5tx8kser3qv4zp
    committer: Martin von Gagern <Martin.vGagern at gmx.net>
    branch nick: bug242321
    timestamp: Mon 2008-06-23 14:24:55 +0200
    message:
      Link ra extension against svn_delta-1 library.
      https://bugs.launchpad.net/bzr-svn/+bug/242321
    modified:
      setup.py                       setup.py-20060502115218-86950492da22353f
=== modified file 'AUTHORS'
--- a/AUTHORS	2008-06-08 23:30:15 +0000
+++ b/AUTHORS	2008-06-23 13:20:28 +0000
@@ -15,6 +15,7 @@
 Robert Collins
 David Foerster
 Mirko Friedenhagen
+Martin von Gagern
 Wouter van Heyst
 Michael Hudson
 David James

=== modified file 'setup.py'
--- a/setup.py	2008-06-22 22:08:50 +0000
+++ b/setup.py	2008-06-23 12:24:55 +0000
@@ -58,7 +58,7 @@
                 'bzrlib.plugins.svn.tests'],
       ext_modules=[
           SvnExtension("client", ["client.c", "editor.c", "util.c", "ra.c", "wc.c"], libraries=["svn_client-1"]), 
-          SvnExtension("ra", ["ra.c", "util.c", "editor.c"], libraries=["svn_ra-1"]),
+          SvnExtension("ra", ["ra.c", "util.c", "editor.c"], libraries=["svn_ra-1", "svn_delta-1"]),
           SvnExtension("repos", ["repos.c", "util.c"], libraries=["svn_repos-1"]),
           SvnExtension("wc", ["wc.c", "util.c", "editor.c"], libraries=["svn_wc-1"]),
           ]




More information about the bazaar-commits mailing list