[davmail] 02/03: Explicitly depend on libcommons-logging-java (Closes: #868057)

Alexandre Rossi alexandre.rossi at gmail.com
Tue Jul 11 17:15:10 UTC 2017


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

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

commit 59d61fce3a2001cb6e14f59a57ca54bcc55110dc
Author: Alexandre Rossi <alexandre.rossi at gmail.com>
Date:   Tue Jul 11 18:12:39 2017 +0200

    Explicitly depend on libcommons-logging-java (Closes: #868057)
---
 debian/ant.properties                                          | 1 +
 debian/control                                                 | 1 +
 debian/patches/0004-Set-classpath-add-target-davmail-lib.patch | 5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index d3ce95f..536d37e 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -5,6 +5,7 @@ installdir   = /usr/share/java
 commons-codec      = /usr/share/java/commons-codec.jar
 servlet-api        = /usr/share/java/servlet-api-3.1.jar
 commons-httpclient = /usr/share/java/commons-httpclient.jar
+commons-logging    = /usr/share/java/commons-logging.jar
 htmlcleaner        = /usr/share/java/htmlcleaner.jar
 mail               = /usr/share/java/javax.mail.jar
 jcifs              = /usr/share/java/jcifs.jar
diff --git a/debian/control b/debian/control
index 4b41d2f..48edb89 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: debhelper (>= 10),
 Build-Depends-Indep: libcommons-codec-java,
                      libservlet3.1-java,
                      libcommons-httpclient-java,
+                     libcommons-logging-java,
                      libhtmlcleaner-java,
                      libmail-java,
                      libjcifs-java,
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 ecabba4..28cc0b3 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,13 +3,19 @@
+@@ -3,13 +3,20 @@
      <property name="version" value="4.8.0"/>
  
      <path id="classpath">
@@ -24,6 +24,7 @@ Index: davmail.git/build.xml
 +        <pathelement location="${commons-codec}" />
 +        <pathelement location="${servlet-api}" />
 +        <pathelement location="${commons-httpclient}" />
++        <pathelement location="${commons-logging}" />
 +        <pathelement location="${htmlcleaner}" />
 +        <pathelement location="${mail}" />
 +        <pathelement location="${jcifs}" />
@@ -37,7 +38,7 @@ Index: davmail.git/build.xml
      </path>
  
      <target name="clean">
-@@ -286,28 +292,7 @@
+@@ -286,28 +293,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