[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 9c0388a12ad496051509df0e3ddfb01748eecdd2
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Jul 6 11:44:17 2012 +0200

    Disable commandline SVN client wrapper
    
    Seems upstream stopped maintaining commandline SVN client wrapper and it
    now became uncompilable as a result.

diff --git a/debian/changelog b/debian/changelog
index 9c567d5..5cda775 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ svnclientadapter (1.8.13-1) UNRELEASED; 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.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sun, 17 Jun 2012 23:00:09 +0200
 
diff --git a/debian/patches/disable-cmdline-wrapper.patch b/debian/patches/disable-cmdline-wrapper.patch
new file mode 100644
index 0000000..d890778
--- /dev/null
+++ b/debian/patches/disable-cmdline-wrapper.patch
@@ -0,0 +1,105 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+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 @@
+     <depend srcDir="${src.svnkit.dir}"
+             destDir="${build.classes.dir}"
+             cache="${build.cache.dir}"/>
+-    <depend srcDir="${src.cmdline.dir}"
++    <!--depend srcDir="${src.cmdline.dir}"
+             destDir="${build.classes.dir}"
+-            cache="${build.cache.dir}"/>
++            cache="${build.cache.dir}"/-->
+     <javac srcdir="${src.main.dir}"
+            destdir="${build.classes.dir}"
+            debug="${debug}"
+@@ -65,7 +65,7 @@
+ 		   classpathref="project.classpath"
+        encoding="ISO-8859-1">
+     </javac>
+-    <javac srcdir="${src.cmdline.dir}"
++    <!--javac srcdir="${src.cmdline.dir}"
+            destdir="${build.classes.dir}"
+            debug="${debug}"
+ 		   source="${targetJvm}"    	
+@@ -73,7 +73,7 @@
+            includes="**"
+ 		   classpathref="project.classpath"
+        encoding="ISO-8859-1">
+-    </javac>
++    </javac-->
+     <copy todir="${build.classes.dir}">
+       <fileset dir="${src.main.dir}">
+         <exclude name="**/*.java"/>
+@@ -169,7 +169,7 @@
+       <formatter type="brief" usefile="false"/>
+       <test name="org.tigris.subversion.svnclientadapter.basictests.SVNJavahlTests" fork="yes"/>
+       <test name="org.tigris.subversion.svnclientadapter.basictests.SVNSvnKitTests" fork="yes"/>
+-      <test name="org.tigris.subversion.svnclientadapter.basictests.SVNCmdLineTests" fork="yes"/>
++      <!--test name="org.tigris.subversion.svnclientadapter.basictests.SVNCmdLineTests" fork="yes"/-->
+     </junit>
+     <echo message="Running misc tests ..." level="info"/>
+     <junit printsummary="yes" haltonfailure="false" failureproperty="testFailed" fork="yes">
+@@ -211,12 +211,15 @@
+     <javac srcdir="${src.tests.dir}"
+            destdir="${build.testClasses.dir}"
+            debug="${debug}"
+-           includes="**"
++    	   sourcepath=""
+            encoding="ISO-8859-1">
+ 		<classpath>
+ 			<pathelement location="${build.classes.dir}"/>
+ 			<path refid="project.classpath"/>	
+ 		</classpath>
++    	<include name="**"/>
++    	<exclude name="org/tigris/subversion/svnclientadapter/commandline/**"/>
++    	<exclude name="org/tigris/subversion/svnclientadapter/regression/CmdLineBugRegressionTest.java"/>
+     </javac>
+   	<!-- run the EMMA instrumentation -->
+     <delete dir="${emma.instrClasses.dir}"/>
+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
++}
diff --git a/debian/patches/series b/debian/patches/series
index b352f64..22fe3b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 packaging-changes.patch
 subclipse-load-nativelib-from-single-bundle.patch
+disable-cmdline-wrapper.patch

-- 
svnclientadapter packaging