Philip Herron <philip.her...@wandisco.com> writes: > Which patch are you referring in paticular?
subversion-1.7.5/debian/patches/apr-abi1 subversion-1.7.5/debian/patches/apr-abi2 Index: configure.ac =================================================================== --- configure.ac (revision 1420608) +++ configure.ac (working copy) @@ -99,19 +99,26 @@ if test `expr $apr_version : 2` -ne 0; then dnl Bump the library so-version to 2 if using APR-2 dnl (Debian uses so-version 1 for APR-1-with-largefile) - SVN_LT_SOVERSION="-version-info 2" + svn_lib_ver=2 dnl APR-2 provides APRUTIL apu_config=$apr_config AC_SUBST(SVN_APRUTIL_INCLUDES) AC_SUBST(SVN_APRUTIL_CONFIG, ["$apu_config"]) AC_SUBST(SVN_APRUTIL_LIBS) AC_SUBST(SVN_APRUTIL_PREFIX) +elif test `expr $apr_version : 1` -ne 0; then + svn_lib_ver=1 + APU_VER_REGEXES=["1\."] + SVN_LIB_APRUTIL($APU_VER_REGEXES) else - SVN_LT_SOVERSION="-version-info 0" - APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."] + svn_lib_ver=0 + APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9]"] SVN_LIB_APRUTIL($APU_VER_REGEXES) fi +SVN_LT_SOVERSION="-version-info $svn_lib_ver" AC_SUBST(SVN_LT_SOVERSION) +AC_DEFINE_UNQUOTED(SVN_SOVERSION, $svn_lib_ver, + [Subversion library major verson]) dnl Search for pkg-config AC_PATH_PROG(PKG_CONFIG, pkg-config) Index: subversion/libsvn_fs/fs-loader.c =================================================================== --- subversion/libsvn_fs/fs-loader.c (revision 1420608) +++ subversion/libsvn_fs/fs-loader.c (working copy) @@ -100,8 +100,8 @@ const char *funcname; apr_status_t status; - libname = apr_psprintf(pool, "libsvn_fs_%s-%d.so.0", - name, SVN_VER_MAJOR); + libname = apr_psprintf(pool, "libsvn_fs_%s-%d.so.%d", + name, SVN_VER_MAJOR, SVN_SOVERSION); funcname = apr_psprintf(pool, "svn_fs_%s__init", name); /* Find/load the specified library. If we get an error, assume Index: subversion/libsvn_ra/ra_loader.c =================================================================== --- subversion/libsvn_ra/ra_loader.c (revision 1420608) +++ subversion/libsvn_ra/ra_loader.c (working copy) @@ -159,8 +159,8 @@ const char *compat_funcname; apr_status_t status; - libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.0", - ra_name, SVN_VER_MAJOR); + libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.%d", + ra_name, SVN_VER_MAJOR, SVN_SOVERSION); funcname = apr_psprintf(pool, "svn_ra_%s__init", ra_name); compat_funcname = apr_psprintf(pool, "svn_ra_%s_init", ra_name); Index: subversion/libsvn_subr/auth.c =================================================================== --- subversion/libsvn_subr/auth.c (revision 1420608) +++ subversion/libsvn_subr/auth.c (working copy) @@ -399,9 +399,9 @@ const char *library_label, *library_name; const char *provider_function_name, *version_function_name; library_name = apr_psprintf(pool, - "libsvn_auth_%s-%d.so.0", + "libsvn_auth_%s-%d.so.%d", provider_name, - SVN_VER_MAJOR); + SVN_VER_MAJOR, SVN_SOVERSION); library_label = apr_psprintf(pool, "svn_%s", provider_name); provider_function_name = apr_psprintf(pool, "svn_auth_get_%s_%s_provider", -- Certified & Supported Apache Subversion Downloads: http://www.wandisco.com/subversion/download