[davmail] 02/20: debian/patches: simplify 0004-Set-classpath-add-target-davmail-lib.patch

[Alexandre Rossi]

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

niol-guest pushed a commit to branch master
in repository davmail.

commit d1a4e157160d6db75a548222dd2821665d4a75df
Author: Antonio Ospite <ao2 at ao2.it>
Date:   Sat Oct 29 18:26:51 2016 +0200

    debian/patches: simplify 0004-Set-classpath-add-target-davmail-lib.patch
    
    Upstream now has a target to build just the jar, use it.
---
 ...0004-Set-classpath-add-target-davmail-lib.patch | 30 +++-------------------
 debian/rules                                       |  2 +-
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch b/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
index fb095c3..7fcea51 100644
--- a/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
+++ b/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
@@ -3,8 +3,8 @@ Date: Sat, 13 Apr 2013 00:51:23 +0200
 Subject: Set classpath, add target davmail-lib
 
 ---
- build.xml |   45 ++++++++++++++++-----------------------------
- 1 file changed, 16 insertions(+), 29 deletions(-)
+ build.xml |   39 +++++++++++++--------------------------
+ 1 file changed, 13 insertions(+), 26 deletions(-)
 
 --- a/build.xml
 +++ b/build.xml
@@ -31,13 +31,7 @@ Subject: Set classpath, add target davmail-lib
      </path>
  
      <target name="clean">
-@@ -243,33 +251,12 @@
- 
-     </target>
- 
--    <target name="jar" depends="compile">
-+    <target name="davmail-lib" depends="compile">
-         <delete dir="dist"/>
+@@ -248,28 +256,7 @@
          <mkdir dir="dist"/>
          <property name="release-name" value="${release}-trunk"/>
          <pathconvert property="manifest-classpath" pathsep=" ">
@@ -67,21 +61,3 @@ Subject: Set classpath, add target davmail-lib
          </pathconvert>
          <jar basedir="target/classes" destfile="dist/davmail.jar">
              <manifest>
-@@ -284,7 +271,7 @@
-         </jar>
-     </target>
- 
--    <target name="prepare-dist" depends="jar">
-+    <target name="prepare-dist" depends="davmail-lib">
-         <echo file="dist/version.txt" message="${release}"/>
-         <copy todir="dist/lib">
-             <fileset dir="lib">
-@@ -487,7 +474,7 @@
-             </fileset>
-         </concat>
-     </target>
--    <target name="debupload" depends="jar">
-+    <target name="debupload" depends="davmail-lib">
-         <scp todir="testuser at 192.168.11.164:/home/testuser" password="Passw0rd" verbose="true" trust="true">
-             <fileset file="dist/davmail.jar"/>
-         </scp>
diff --git a/debian/rules b/debian/rules
index bbe52c5..e162019 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,5 +11,5 @@ export DH_OPTIONS
 	dh $@ --with javahelper
 
 override_dh_auto_build:
-	ANT_OPTS=-Dfile.encoding=UTF-8  ant  -propertyfile debian/ant.properties davmail-lib
+	ANT_OPTS=-Dfile.encoding=UTF-8  ant  -propertyfile debian/ant.properties jar
 	cp -a src/java/tray48.png dist/davmail.png

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