debian/0000755000000000000000000000000012163307363007172 5ustar debian/changelog0000644000000000000000000000335212163307363011047 0ustar svnclientadapter (1.8.16-2) unstable; urgency=low * Team upload to unstable. -- Niels Thykier Fri, 28 Jun 2013 15:22:01 +0200 svnclientadapter (1.8.16-1) experimental; urgency=low * New Upstream release. * Add Jakub Adam to Uploaders. * Build depend on libsvn-java (>= 1.7.5~). * Disable commandline SVN client wrapper. - Seems upstream stopped maintaining commandline SVN client wrapper and it now became uncompilable as a result. * Use real version number during build. * Bump Standards-Version to 3.9.3. * Remove dependency on libganymed-ssh2-java. - Was a dependency of old SVNKit version, not needed anymore. * Don't depend on both JavaHL and SVNKit, require only one of them to be installed. * Remove emma.jar and emma_ant.jar from Class-Path, they are required only for running tests. * Refreshed d/patches/packaging-changes.patch. * Use bnd to generate OSGi metadata. -- Jakub Adam Sun, 14 Oct 2012 15:43:00 +0200 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 ] * Initial release. (Closes: #374257) [ Damien Raude-Morvan ] * d/control: Drop Depends: default-jre | java2-runtime as a Java library don't need to depends on runtime (Java Policy). * d/control: Fix indentation for long description. -- Andres Mejia Sat, 22 Jan 2011 09:47:57 -0500 debian/compat0000644000000000000000000000000212036540461010365 0ustar 8 debian/control0000644000000000000000000000417212036540461010576 0ustar Source: svnclientadapter Section: java Priority: optional Maintainer: Debian Java Maintainers Uploaders: Andres Mejia , Jakub Adam Build-Depends: debhelper (>= 8~), javahelper, ant, ant-optional, bnd, default-jdk, libsvn-java (>= 1.7.5~), libsvnkit-java (>= 1.7.5~), libemma-java Standards-Version: 3.9.3 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 Package: libsvnclientadapter-java Architecture: all Depends: libsvn-java (>= 1.7.5~) | libsvnkit-java (>= 1.7.5~), ${java:Depends}, ${misc:Depends} Suggests: libsvnclientadapter-java-doc Provides: libnb-svnclientadapter-java Replaces: libnb-svnclientadapter-java Conflicts: libnb-svnclientadapter-java Description: High-level Java API for Subversion (library) SVNClientAdapter is a high-level Java API for Subversion. It can use one of 3 low-level svn client implementations to provide access to the Subversion API: - JavaHL native (JNI) Subversion library - JavaSVN (pure Java) Subversion API implementation - svn command line client wrapper . This package contains the SvnClientAdapter library. Package: libsvnclientadapter-java-doc Architecture: all Section: doc Depends: ${misc:Depends} Recommends: ${java:Recommends} Provides: libnb-svnclientadapter-java-doc Replaces: libnb-svnclientadapter-java-doc Conflicts: libnb-svnclientadapter-java-doc Description: High-level Java API for Subversion (documentation) SVNClientAdapter is a high-level Java API for Subversion. It can use one of 3 low-level svn client implementations to provide access to the Subversion API: - JavaHL native (JNI) Subversion library - JavaSVN (pure Java) Subversion API implementation - svn command line client wrapper . This package contains Javadoc API documentation. debian/copyright0000644000000000000000000000175012036540461011125 0ustar svnclientadapter was retrieved from http://subclipse.tigris.org/ This package was debianized by Andres Mejia. The debian packaging is licensed under the same terms as svnclientadapter. Copyright: Copyright (C) 2003-2010 svnClientAdapter project and others. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. Contributors: svnClientAdapter project committers On Debian based systems, a copy of the Apache-2.0 license can be found at /usr/share/common-licenses/Apache-2.0. debian/libsvnclientadapter-java-doc.doc-base0000644000000000000000000000052612036540461016310 0ustar Document: libsvnclientadapter-java-doc Title: SVNClientAdapter API Author: svnClientAdapter project and others. Abstract: This is the API documentation for SVNClientAdapter. Section: Programming/Java Format: HTML Index: /usr/share/doc/libsvnclientadapter-java-doc/api/index.html Files: /usr/share/doc/libsvnclientadapter-java-doc/api/*.html debian/libsvnclientadapter-java-doc.javadoc0000644000000000000000000000001612036540461016234 0ustar build/javadoc debian/libsvnclientadapter-java.jlibs0000644000000000000000000000004112036540461015163 0ustar build/lib/svnClientAdapter-*.jar debian/patches/0000755000000000000000000000000012036540461010616 5ustar debian/patches/disable-cmdline-wrapper.patch0000644000000000000000000001045512036540461016336 0ustar From: Jakub Adam Date: Fri, 6 Jul 2012 12:51:04 +0200 Subject: disable-cmdline-wrapper Seems upstream stopped maintaining commandline SVN client wrapper and it now became uncompilable as a result. --- build.xml | 15 +++++++++------ .../subversion/svnclientadapter/testUtils/SVNTest.java | 8 ++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/build.xml b/build.xml index 8eac813..c04e1fa 100644 --- a/build.xml +++ b/build.xml @@ -35,9 +35,9 @@ - + cache="${build.cache.dir}"/--> - - + @@ -169,7 +169,7 @@ - + @@ -211,12 +211,15 @@ + + + diff --git a/src/testcases/org/tigris/subversion/svnclientadapter/testUtils/SVNTest.java b/src/testcases/org/tigris/subversion/svnclientadapter/testUtils/SVNTest.java index 0b3579a..6b19e39 100644 --- a/src/testcases/org/tigris/subversion/svnclientadapter/testUtils/SVNTest.java +++ b/src/testcases/org/tigris/subversion/svnclientadapter/testUtils/SVNTest.java @@ -27,7 +27,7 @@ import junit.framework.TestCase; import org.tigris.subversion.svnclientadapter.ISVNClientAdapter; import org.tigris.subversion.svnclientadapter.SVNClientAdapterFactory; import org.tigris.subversion.svnclientadapter.SVNClientException; -import org.tigris.subversion.svnclientadapter.commandline.CmdLineClientAdapterFactory; +//import org.tigris.subversion.svnclientadapter.commandline.CmdLineClientAdapterFactory; import org.tigris.subversion.svnclientadapter.javahl.JhlClientAdapterFactory; import org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory; @@ -77,11 +77,11 @@ public abstract class SVNTest extends TestCase { } catch (SVNClientException e) { // can't register this factory } - try { + /*try { CmdLineClientAdapterFactory.setup(); } catch (SVNClientException e1) { // can't register this factory - } + }*/ try { SvnKitClientAdapterFactory.setup(); } catch (SVNClientException e1) { @@ -223,4 +223,4 @@ public abstract class SVNTest extends TestCase { super.tearDown(); } -} \ No newline at end of file +} debian/patches/packaging-changes.patch0000644000000000000000000001034412036540461015173 0ustar From: Debian Java Maintainers Date: Sun, 17 Jun 2012 23:28:03 +0200 Subject: packaging-changes --- build.xml | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/build.xml b/build.xml index 20126dd..0b6c326 100644 --- a/build.xml +++ b/build.xml @@ -18,13 +18,13 @@ - + + classpathref="project.classpath" + encoding="ISO-8859-1"> + classpathref="project.classpath" + encoding="ISO-8859-1"> + classpathref="project.classpath" + encoding="ISO-8859-1"> + classpathref="project.classpath" + encoding="ISO-8859-1"> @@ -87,7 +91,8 @@ destdir="${build.javadoc.dir}" packagenames="org.*" windowtitle="svnClientAdapter API" - doctitle="svnClientAdapter"> + doctitle="svnClientAdapter" + encoding="ISO-8859-1"> @@ -97,7 +102,7 @@ - @@ -119,17 +124,10 @@ - + - - - - - - - @@ -213,7 +211,8 @@ + includes="**" + encoding="ISO-8859-1"> debian/patches/series0000644000000000000000000000015012036540461012027 0ustar packaging-changes.patch subclipse-load-nativelib-from-single-bundle.patch disable-cmdline-wrapper.patch debian/patches/subclipse-load-nativelib-from-single-bundle.patch0000644000000000000000000001220512036540461022207 0ustar 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 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 --- 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 { } //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 { - ISVNClient svnClient = new SVNClient(); - Version version = svnClient.getVersion(); - if (version.getMajor() == 1 && version.getMinor() == 7) - available = true; - else { - available = false; - 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.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 { + ISVNClient svnClient = new SVNClient(); + Version version = svnClient.getVersion(); + if (version.getMajor() == 1 && version.getMinor() == 7) + available = true; + else { + available = false; + 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.7.x or later required."); + } finally { + availabilityCached = true; + } } return available; debian/rules0000755000000000000000000000115212036540461010246 0ustar #!/usr/bin/make -f JARS = /usr/share/java/svn-javahl.jar JARS := $(JARS):/usr/share/java/svnkit.jar JARS := $(JARS):/usr/share/java/svnkit-javahl16.jar export CLASSPATH=$(JARS) export JAVA_HOME=/usr/lib/jvm/default-java VERSION := $(shell dpkg-parsechangelog | grep Version: | sed 's/Version: \(.*\)-.*/\1/') %: dh $@ --with javahelper override_dh_auto_build: ant -DsvnClientAdapter.version=$(VERSION) bnd wrap -properties debian/svnClientAdapter.bnd \ -output build/lib/svnClientAdapter-*.jar build/lib/svnClientAdapter-*.jar override_jh_depends: jh_depends --exclude=libsvn-java --exclude=libsvnkit-java debian/source/0000755000000000000000000000000012036540461010467 5ustar debian/source/format0000644000000000000000000000001412036540461011675 0ustar 3.0 (quilt) debian/svnClientAdapter.bnd0000644000000000000000000000030312036540461013116 0ustar Bundle-Name: High-level API for Subversion Bundle-SymbolicName: org.tigris.subversion.svnclientadapter Bundle-Vendor: Debian.org Bundle-Version: 1.6.12 Import-Package: !org.tmatesoft.svn.core*,* debian/svnclientadapter-get-orig-source0000755000000000000000000000335112036540461015476 0ustar #!/bin/sh # This script is used to download the upstream source for svnclientadapter # and generate it into an orig source tarball for Debian. # Common variables used to ease maintenance of this script SVNCLIENTADAPTER_VERSION="0.9.100" SVN_REVISION="4767" USAGE="\n\ This script is used to generate the orig tarball used in building\n\ Debian packages for svnclientadapter-$SVNCLIENTADAPTER_VERSION.\n\ Usage: svnclientadapter-get-orig-source [OPTION]\n\ \n\ -h, --help Display this help message.\n\ --remove-upstream-source Remove the upstream source.\n" while [ "$#" -gt "0" ] do case "$1" in --remove-upstream-tarball) REMOVE_UPSTREAM_TARBALL=1 shift ;; -h|--help|*) echo "${USAGE}" exit 1 ;; esac done make_current_tarball() { # Download the source if it's not available in the current directory [ -d svnclientadapter-$SVNCLIENTADAPTER_VERSION ] || \ svn export -r $SVN_REVISION http://subclipse.tigris.org/svn/subclipse/tags/subclipse/1.6.16/svnClientAdapter \ svnclientadapter-$SVNCLIENTADAPTER_VERSION --username guest --password "" rm -rf svnclientadapter-${SVNCLIENTADAPTER_VERSION}/lib rm -rf svnclientadapter-${SVNCLIENTADAPTER_VERSION}/test/lib tar --exclude-vcs -czf svnclientadapter_${SVNCLIENTADAPTER_VERSION}.orig.tar.gz \ svnclientadapter-${SVNCLIENTADAPTER_VERSION}/ jh_repack --upstream-version ${SVNCLIENTADAPTER_VERSION} svnclientadapter_${SVNCLIENTADAPTER_VERSION}.orig.tar.gz if [ $REMOVE_UPSTREAM_TARBALL ]; then echo -n "Removing upstream source..." rm svnclientadapter-$SVNCLIENTADAPTER_VERSION echo "done." fi } make_current_tarball debian/watch0000644000000000000000000000020112036540461010211 0ustar version=3 http://subclipse.tigris.org/source/browse/subclipse/tags/subclipse/ \ /source/browse/subclipse/tags/subclipse/(\d.+)/