[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 28f2134ebb91c9af5f1e7c25929f5b2d8e1390fc
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Oct 12 00:38:49 2012 +0200

    Refreshed d/patches/packaging-changes.patch

diff --git a/debian/changelog b/debian/changelog
index 11f3d42..01e0ecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ svnclientadapter (1.8.16-1) UNRELEASED; urgency=low
     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.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sun, 17 Jun 2012 23:00:09 +0200
 
diff --git a/debian/patches/packaging-changes.patch b/debian/patches/packaging-changes.patch
index 37b874b..2cd4227 100644
--- a/debian/patches/packaging-changes.patch
+++ b/debian/patches/packaging-changes.patch
@@ -3,25 +3,11 @@ Date: Sun, 17 Jun 2012 23:28:03 +0200
 Subject: packaging-changes
 
 ---
- build.properties |    2 +-
- build.xml        |   32 +++++++++++++++-----------------
- 2 files changed, 16 insertions(+), 18 deletions(-)
+ build.xml |   31 +++++++++++++++----------------
+ 1 file changed, 15 insertions(+), 16 deletions(-)
 
-diff --git a/build.properties b/build.properties
-index 6ca229b..ccba634 100644
---- a/build.properties
-+++ b/build.properties
-@@ -7,7 +7,7 @@
- 
- # compile with debug on or off
- debug=on
--targetJvm=1.4
-+targetJvm=1.5
- 
- # svnClientAdapter version
- svnClientAdapter.buildRev=r2847
 diff --git a/build.xml b/build.xml
-index 6fb8186..8eac813 100644
+index 20126dd..0b6c326 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -18,13 +18,13 @@
@@ -98,7 +84,7 @@ index 6fb8186..8eac813 100644
           basedir="${build.classes.dir}"
           includes="**/*"
           excludes="**/*Test*.class">
-@@ -119,18 +124,10 @@
+@@ -119,17 +124,10 @@
      <delete dir="${build.distrib.dir}"/>
  	<mkdir dir="${build.distrib.dir}"/>
  	<mkdir dir="${build.distrib.dir}/lib"/>
@@ -110,15 +96,14 @@ index 6fb8186..8eac813 100644
 -  	<!-- required libs -->
 -	<copy file="${svnjavahl.jar}" todir="${build.distrib.dir}/lib"/>
 -	<copy file="${lib.dir}/JAVAHL-LICENSE" todir="${build.distrib.dir}/lib"/>  	
--	<copy file="${svnkit.jar}" todir="${build.distrib.dir}/lib"/>
--	<copy file="${lib.dir}/SVNKit-LICENSE" todir="${build.distrib.dir}/lib"/>  	
--	<copy file="${lib.dir}/SEQUENCE-LICENSE" todir="${build.distrib.dir}/lib"/>
--	<copy file="${ganymed.jar}" todir="${build.distrib.dir}/lib"/>
--	<copy file="${lib.dir}/GANYMED-LICENSE" todir="${build.distrib.dir}/lib"/>
+-  	<!-- SVNKit files -->
+-    <copy todir="${build.distrib.dir}/lib">
+-      <fileset dir="${lib.dir}/svnkit"/>
+-    </copy>
    	<!-- Javadoc files -->
      <copy todir="${build.distrib.dir}/javadoc">
        <fileset dir="${build.javadoc.dir}"/>
-@@ -214,7 +211,8 @@
+@@ -213,7 +211,8 @@
      <javac srcdir="${src.tests.dir}"
             destdir="${build.testClasses.dir}"
             debug="${debug}"

-- 
svnclientadapter packaging