[SCM] svnclientadapter packaging branch, master, updated. debian/0.9.100-2-20-g1fe9041

[Jakub Adam]

The following commit has been merged in the master branch:
commit 07cc99a1c329c1062aaddad2fcc12673028be223
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Jun 17 23:17:07 2012 +0200

    Refreshed d/patches/subclipse-load-nativelib-from-single-bundle.patch

diff --git a/debian/patches/subclipse-load-nativelib-from-single-bundle.patch b/debian/patches/subclipse-load-nativelib-from-single-bundle.patch
index 62012fc..c02e27d 100644
--- a/debian/patches/subclipse-load-nativelib-from-single-bundle.patch
+++ b/debian/patches/subclipse-load-nativelib-from-single-bundle.patch
@@ -18,16 +18,15 @@ 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(-)
+ 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 f3108a4..2d76836 100644
+index 40b9834..82a45cb 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 {
+@@ -118,81 +118,28 @@ public class JhlClientAdapterFactory extends SVNClientAdapterFactory {
      		}
      		//workaround to solve Subclipse ISSUE #83
      		available = false;
@@ -93,41 +92,40 @@ index f3108a4..2d76836 100644
 -    			// 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();
+-	                ISVNClient svnClient = new SVNClient();
 -    				Version version = svnClient.getVersion();
--    				if (version.getMajor() == 1 && version.getMinor() == 6)
+-    				if (version.getMajor() == 1 && version.getMinor() == 7)
 -    					available = true;
 -    				else {
 -    					available = false;
--    					javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded.  1.6.x or later required.");
+-    					javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded.  Subversion 1.7.x required.");
 -    				}
 -    			} catch (UnsatisfiedLinkError e) {
 -    				available = false;
--    				javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded.  1.6.x or later required.");
+-    				javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded.  1.7.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();
++				ISVNClient svnClient = new SVNClient();
 +				Version version = svnClient.getVersion();
-+				if (version.getMajor() == 1 && version.getMinor() == 6)
++				if (version.getMajor() == 1 && version.getMinor() == 7)
 +					available = true;
 +				else {
 +					available = false;
-+					javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded.  1.6.x or later required.");
++					javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded.  Subversion 1.7.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.6.x or later required.");
++				javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded.  1.7.x or later required.");
 +			} finally {
 +				availabilityCached = true;
 +			}
      	}
  
      	return available;
--- 

-- 
svnclientadapter packaging