[svnclientadapter] 03/07: Refresh d/patches/subclipse-load-nativelib-from-single-bundle.patch

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository svnclientadapter.

commit 7b734204956e2be4b2b587806d41f159567dd5dc
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Feb 22 09:09:50 2014 +0100

    Refresh d/patches/subclipse-load-nativelib-from-single-bundle.patch
---
 debian/changelog                                     |  1 +
 ...subclipse-load-nativelib-from-single-bundle.patch | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2492e05..9b80185 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 svnclientadapter (1.10.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh d/patches/subclipse-load-nativelib-from-single-bundle.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 22 Feb 2014 08:54:26 +0100
 
diff --git a/debian/patches/subclipse-load-nativelib-from-single-bundle.patch b/debian/patches/subclipse-load-nativelib-from-single-bundle.patch
index c02e27d..817bc53 100644
--- a/debian/patches/subclipse-load-nativelib-from-single-bundle.patch
+++ b/debian/patches/subclipse-load-nativelib-from-single-bundle.patch
@@ -1,13 +1,13 @@
 From: Jakub Adam <jakub.adam at ktknet.cz>
 Date: Tue, 4 Oct 2011 22:38:45 +0200
-Subject: subclipse-load-nativelib-from-single-bundle.patch
+Subject: subclipse-load-nativelib-from-single-bundle
 
 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,
+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
@@ -19,11 +19,11 @@ 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 +++++---------------
+ .../javahl/JhlClientAdapterFactory.java            | 95 +++++-----------------
  1 file 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 40b9834..82a45cb 100644
+index d8d0c41..ddb5e9f 100644
 --- a/src/javahl/org/tigris/subversion/svnclientadapter/javahl/JhlClientAdapterFactory.java
 +++ b/src/javahl/org/tigris/subversion/svnclientadapter/javahl/JhlClientAdapterFactory.java
 @@ -118,81 +118,28 @@ public class JhlClientAdapterFactory extends SVNClientAdapterFactory {
@@ -94,15 +94,15 @@ index 40b9834..82a45cb 100644
 -    			try {
 -	                ISVNClient svnClient = new SVNClient();
 -    				Version version = svnClient.getVersion();
--    				if (version.getMajor() == 1 && version.getMinor() == 7)
+-    				if (version.getMajor() == 1 && version.getMinor() == 8)
 -    					available = true;
 -    				else {
 -    					available = false;
--    					javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded.  Subversion 1.7.x required.");
+-    					javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded.  Subversion 1.8.x required.");
 -    				}
 -    			} catch (UnsatisfiedLinkError e) {
 -    				available = false;
--    				javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded.  1.7.x or later required.");
+-    				javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded.  1.8.x or later required.");
 -    			}
 -    		}
 +			// At this point, the library appears to be available, but
@@ -111,18 +111,18 @@ index 40b9834..82a45cb 100644
 +			try {
 +				ISVNClient svnClient = new SVNClient();
 +				Version version = svnClient.getVersion();
-+				if (version.getMajor() == 1 && version.getMinor() == 7)
++				if (version.getMajor() == 1 && version.getMinor() == 8)
 +					available = true;
 +				else {
 +					available = false;
-+					javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded.  Subversion 1.7.x required.");
++					javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded.  Subversion 1.8.x required.");
 +				}
 +			} catch (UnsatisfiedLinkError e) {
 +				available = false;
 +				javaHLErrors = new StringBuffer(e.getMessage());
 +			} catch (LinkageError e) {
 +				available = false;
-+				javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded.  1.7.x or later required.");
++				javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded.  1.8.x or later required.");
 +			} finally {
 +				availabilityCached = true;
 +			}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/svnclientadapter.git