[davmail] 01/02: add missing log4j dependency (Closes: #848018)

Alexandre Rossi alexandre.rossi at gmail.com
Tue Dec 13 11:32:20 UTC 2016


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

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

commit 20e16e7c8ddfe22314b68e9e4392026d6a73e8f3
Author: Alexandre Rossi <alexandre.rossi at gmail.com>
Date:   Tue Dec 13 12:27:52 2016 +0100

    add missing log4j dependency (Closes: #848018)
---
 debian/ant.properties                                          | 1 +
 debian/patches/0004-Set-classpath-add-target-davmail-lib.patch | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index df31ffc..378169e 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -14,3 +14,4 @@ stax2-api          = /usr/share/java/stax2-api.jar
 swt                = /usr/share/java/swt.jar
 slf4j-api          = /usr/share/java/slf4j-api.jar
 slf4j-simple       = /usr/share/java/slf4j-simple.jar
+log4j              = /usr/share/java/log4j-1.2.jar
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 3f48a54..777eae7 100644
--- a/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
+++ b/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
@@ -10,7 +10,7 @@ Index: davmail.git/build.xml
 ===================================================================
 --- davmail.git.orig/build.xml
 +++ davmail.git/build.xml
-@@ -3,10 +3,18 @@
+@@ -3,10 +3,19 @@
      <property name="version" value="4.7.3"/>
  
      <path id="classpath">
@@ -30,10 +30,11 @@ Index: davmail.git/build.xml
 +        <pathelement location="${swt}" />

 +        <pathelement location="${slf4j-api}" />

 +        <pathelement location="${slf4j-simple}" />

++        <pathelement location="${log4j}" />

      </path>
  
      <target name="clean">
-@@ -248,28 +256,7 @@
+@@ -248,28 +257,7 @@
          <mkdir dir="dist"/>
          <property name="release-name" value="${release}-trunk"/>
          <pathconvert property="manifest-classpath" pathsep=" ">

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



More information about the pkg-java-commits mailing list