diff -Nru svnclientadapter-0.9.100/debian/changelog svnclientadapter-0.9.100/debian/changelog --- svnclientadapter-0.9.100/debian/changelog 2011-02-02 23:28:03.000000000 +0000 +++ svnclientadapter-0.9.100/debian/changelog 2011-10-24 19:01:27.000000000 +0000 @@ -1,3 +1,16 @@ +svnclientadapter (0.9.100-2) unstable; urgency=low + + [ Andres Mejia ] + * Update to my @debian.org email. + + [ Jakub Adam ] + * Add OSGi metadata to JAR manifest + * Fix compatibility with eclipse-subclipse + * Bump to Standards-Version 3.9.2. + * Increase debhelper compatibility to 8. + + -- Andres Mejia Sun, 17 Jul 2011 14:25:29 -0400 + svnclientadapter (0.9.100-1) unstable; urgency=low [ Andres Mejia ] diff -Nru svnclientadapter-0.9.100/debian/compat svnclientadapter-0.9.100/debian/compat --- svnclientadapter-0.9.100/debian/compat 2011-02-02 23:28:03.000000000 +0000 +++ svnclientadapter-0.9.100/debian/compat 2011-10-24 19:01:27.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru svnclientadapter-0.9.100/debian/control svnclientadapter-0.9.100/debian/control --- svnclientadapter-0.9.100/debian/control 2011-02-02 23:28:03.000000000 +0000 +++ svnclientadapter-0.9.100/debian/control 2011-10-24 19:01:27.000000000 +0000 @@ -2,10 +2,10 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers -Uploaders: Andres Mejia -Build-Depends: debhelper (>= 7.0.50~), javahelper, ant, ant-optional, +Uploaders: Andres Mejia +Build-Depends: debhelper (>= 8~), javahelper, ant, ant-optional, default-jdk, libsvn-java, libsvnkit-java, libganymed-ssh2-java, libemma-java -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://subclipse.tigris.org/svnClientAdapter.html Vcs-Browser: http://git.debian.org/?p=pkg-java/svnclientadapter.git Vcs-Git: git://git.debian.org/git/pkg-java/svnclientadapter.git diff -Nru svnclientadapter-0.9.100/debian/manifest svnclientadapter-0.9.100/debian/manifest --- svnclientadapter-0.9.100/debian/manifest 1970-01-01 00:00:00.000000000 +0000 +++ svnclientadapter-0.9.100/debian/manifest 2011-10-24 19:01:27.000000000 +0000 @@ -0,0 +1,8 @@ +usr/share/java/svnClientAdapter.jar: + Bundle-ManifestVersion: 2 + Bundle-Name: High-level API for Subversion + Bundle-Vendor: tigris.org + Bundle-SymbolicName: org.tigris.subversion.svnclientadapter + Bundle-Version: 1.6.12 + Export-Package: org.tigris.subversion.svnclientadapter,org.tigris.subversion.svnclientadapter.utils,org.tigris.subversion.svnclientadapter.javahl + Import-Package: org.tigris.subversion.javahl diff -Nru svnclientadapter-0.9.100/debian/patches/series svnclientadapter-0.9.100/debian/patches/series --- svnclientadapter-0.9.100/debian/patches/series 2011-02-02 23:28:03.000000000 +0000 +++ svnclientadapter-0.9.100/debian/patches/series 2011-10-24 19:01:27.000000000 +0000 @@ -1 +1,2 @@ packaging-changes.patch +subclipse-load-nativelib-from-single-bundle.patch diff -Nru svnclientadapter-0.9.100/debian/patches/subclipse-load-nativelib-from-single-bundle.patch svnclientadapter-0.9.100/debian/patches/subclipse-load-nativelib-from-single-bundle.patch --- svnclientadapter-0.9.100/debian/patches/subclipse-load-nativelib-from-single-bundle.patch 1970-01-01 00:00:00.000000000 +0000 +++ svnclientadapter-0.9.100/debian/patches/subclipse-load-nativelib-from-single-bundle.patch 2011-10-24 19:01:27.000000000 +0000 @@ -0,0 +1,133 @@ +From: Jakub Adam +Date: Tue, 4 Oct 2011 22:38:45 +0200 +Subject: subclipse-load-nativelib-from-single-bundle.patch + +We should avoid calling System.loadLibrary() for JavaHL native binaries in this +package. Eclipse has a limitation that one JNI library can't be loaded by multiple +bundles at once. + +If we load libsvnjavahl-1.so at JhlClientAdapterFactory.isAvailable(), another +attempt, that is performed upon instantiating of SVNClient from JavaHL bundle, +causes that UnsatisfiedLinkError is thrown. I removed the code that checks +availability of native library from JhlClientAdapterFactory, as it mostly +duplicates functionality of org.tigris.subversion.javahl.NativeResources. Now +there is only single place where JNI library is loaded and the above described +problem does not apply to us. + +Original binary distribution of Subclipse doesn't have this problem because +upstream bundles SvnClientAdapter and JavaHL together with some Subclipse +specific code into a single Eclipse plugin. It showed only after I removed the +repeating code and tried to use libraries already present in Debian instead. + +--- + .../javahl/JhlClientAdapterFactory.java | 95 +++++--------------- + 1 files changed, 21 insertions(+), 74 deletions(-) + +diff --git a/src/javahl/org/tigris/subversion/svnclientadapter/javahl/JhlClientAdapterFactory.java b/src/javahl/org/tigris/subversion/svnclientadapter/javahl/JhlClientAdapterFactory.java +index f3108a4..2d76836 100644 +--- a/src/javahl/org/tigris/subversion/svnclientadapter/javahl/JhlClientAdapterFactory.java ++++ b/src/javahl/org/tigris/subversion/svnclientadapter/javahl/JhlClientAdapterFactory.java +@@ -203,81 +203,28 @@ public class JhlClientAdapterFactory extends SVNClientAdapterFactory { + } + //workaround to solve Subclipse ISSUE #83 + available = false; +- try { +- /* +- * see if the user has specified the fully qualified path to the native +- * library +- */ +- try +- { +- String specifiedLibraryName = +- System.getProperty("subversion.native.library"); +- if(specifiedLibraryName != null) { +- System.load(specifiedLibraryName); +- available = true; +- } +- } +- catch(UnsatisfiedLinkError ex) +- { +- javaHLErrors.append(ex.getMessage()).append("\n"); +- } +- if (!available) { +- /* +- * first try to load the library by the new name. +- * if that fails, try to load the library by the old name. +- */ +- try +- { +- System.loadLibrary("libsvnjavahl-1"); +- } +- catch(UnsatisfiedLinkError ex) +- { +- javaHLErrors.append(ex.getMessage() + "\n"); +- try +- { +- System.loadLibrary("svnjavahl-1"); +- } +- catch (UnsatisfiedLinkError e) +- { +- javaHLErrors.append(e.getMessage()).append("\n"); +- System.loadLibrary("svnjavahl"); +- } +- } + +- available = true; +- } +- } catch (Exception e) { +- available = false; +- javaHLErrors.append(e.getMessage()).append("\n"); +- } catch (UnsatisfiedLinkError e) { +- available = false; +- javaHLErrors.append(e.getMessage()).append("\n"); +- } finally { +- availabilityCached = true; +- } +- if (!available) { +- String libraryPath = System.getProperty("java.library.path"); +- if (libraryPath != null) +- javaHLErrors.append("java.library.path = " + libraryPath); +- // System.out.println(javaHLErrors.toString()); +- } else { +- // At this point, the library appears to be available, but +- // it could be too old version of JavaHL library. We have to try +- // to get the version of the library to be sure. +- try { +- SVNClientInterface svnClient = new SVNClient(); +- Version version = svnClient.getVersion(); +- if (version.getMajor() == 1 && version.getMinor() == 6) +- available = true; +- else { +- available = false; +- javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded. 1.6.x or later required."); +- } +- } catch (UnsatisfiedLinkError e) { +- available = false; +- javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded. 1.6.x or later required."); +- } +- } ++ // At this point, the library appears to be available, but ++ // it could be too old version of JavaHL library. We have to try ++ // to get the version of the library to be sure. ++ try { ++ SVNClientInterface svnClient = new SVNClient(); ++ Version version = svnClient.getVersion(); ++ if (version.getMajor() == 1 && version.getMinor() == 6) ++ available = true; ++ else { ++ available = false; ++ javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded. 1.6.x or later required."); ++ } ++ } catch (UnsatisfiedLinkError e) { ++ available = false; ++ javaHLErrors = new StringBuffer(e.getMessage()); ++ } catch (LinkageError e) { ++ available = false; ++ javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded. 1.6.x or later required."); ++ } finally { ++ availabilityCached = true; ++ } + } + + return available; +--