[dumbster] 08/18: Depend on libmail-java instead of libgnumail-java

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository dumbster.

commit 0d152099c6bc482b69cfba88d284a1134f8d7dfb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 23 16:50:47 2017 +0200

    Depend on libmail-java instead of libgnumail-java
---
 debian/README.Debian                       |  9 ---------
 debian/changelog                           |  1 +
 debian/control                             |  4 ++--
 debian/patches/buildxml.diff               | 16 ++++++----------
 debian/patches/javamail-compatibility.diff | 11 +++++++++++
 debian/patches/series                      |  1 +
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index e01cc9a..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,9 +0,0 @@
-dumbster for Debian
--------------------
-
-  * The .jar files resides under /usr/share/java/dumbster.jar. 
-    you also need to add gnumail.jar, gnumail-providers.jar and inetlib.jar
-    to your classpath for dumbster to work. Alternativly, you could use
-    oracles javamail project (non-free).
-
- -- Stefan Denker <thinker at dn-kr.de>  Sat, 25 Jun 2011 15:17:08 +0200
diff --git a/debian/changelog b/debian/changelog
index b89ec0e..300f864 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ dumbster (1.6+debian-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * The package is now co-maintained with the Java Team
+  * Depend on libmail-java instead of libgnumail-java
   * No longer install the javadoc and the test results in the binary package
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index fb4ec19..9ecc383 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Stefan Denker <Stefan+Debian at dn-kr.de>
 Build-Depends: cdbs, debhelper (>= 10)
 Build-Depends-Indep: 
    default-jdk
- , libgnumail-java
+ , libmail-java
  , junit
  , ant
  , ant-optional
@@ -19,7 +19,7 @@ Package: libdumbster-java
 Architecture: all
 Depends: ${shlibs:Depends}
  , ${misc:Depends}
- , libgnumail-java
+ , libmail-java
 Suggests: junit
 Description: very simple fake SMTP Server for testing purposes
  The Dumbster is a very simple fake SMTP server designed for unit and
diff --git a/debian/patches/buildxml.diff b/debian/patches/buildxml.diff
index 8fcbbf3..58d7871 100644
--- a/debian/patches/buildxml.diff
+++ b/debian/patches/buildxml.diff
@@ -19,16 +19,14 @@
    <property name="testsrcdir" value="test-src" />
    <property name="testcompiledir" value="${builddir}/test" />
    <property name="debug" value="" />
-@@ -35,12 +38,24 @@
+@@ -35,12 +38,20 @@
    <property name="build.compiler" value="modern" />
  
    <path id="compile.path">
 -    <fileset dir="${libdir}">
 -      <include name="**/*.jar" />
 +    <fileset dir="/usr/share/java/">
-+      <include name="gnumail.jar" />
-+	<include name="gnumail-providers.jar" />
-+	<include name="inetlib.jar" />
++      <include name="javax.mail.jar" />
 +	<include name="junit.jar" />
 +	<include name="ant-junit.jar" />
      </fileset>
@@ -37,16 +35,14 @@
  
 +  <path id="jar.classpath" >
 +    <fileset dir="/usr/share/java/">
-+      <include name="gnumail.jar" />
-+	<include name="gnumail-providers.jar" />
-+	<include name="inetlib.jar" />
++      <include name="javax.mail.jar" />
 +    </fileset>
 +  </path>
 +
    <!-- === world ========================================================== -->
  
    <target name="world" depends="jar, test" />
-@@ -58,7 +73,11 @@
+@@ -58,7 +69,11 @@
  
    <target name="jar" depends="compile">
      <delete file="${builddir}/dumbster.jar"/>
@@ -59,7 +55,7 @@
    </target>
  
    <!-- === clean ========================================================== -->
-@@ -90,12 +109,16 @@
+@@ -90,12 +105,16 @@
        <classpath>
          <pathelement path="${testcompiledir}" />
  	      <pathelement path="${compiledir}" />
@@ -78,7 +74,7 @@
      </junit>
    </target>
  
-@@ -114,4 +137,4 @@
+@@ -114,4 +133,4 @@
        <zipfileset dir="." includes="build/dumbster.jar" fullpath="dumbster${release}.jar"/>
      </zip>
    </target>
diff --git a/debian/patches/javamail-compatibility.diff b/debian/patches/javamail-compatibility.diff
new file mode 100644
index 0000000..d11f545
--- /dev/null
+++ b/debian/patches/javamail-compatibility.diff
@@ -0,0 +1,11 @@
+--- a/test-src/com/dumbster/smtp/SimpleSmtpServerTest.java
++++ b/test-src/com/dumbster/smtp/SimpleSmtpServerTest.java
+@@ -74,7 +74,7 @@
+     assertTrue(server.getReceivedEmailSize() == 1);
+     Iterator emailIter = server.getReceivedEmail();
+     SmtpMessage email = (SmtpMessage) emailIter.next();
+-    assertTrue(email.getBody().equals(bodyWithCR));
++    assertEquals("body", "\n\nKeep these pesky carriage returns\n", email.getBody());
+   }
+ 
+   public void testSendTwoMessagesSameConnection() {
diff --git a/debian/patches/series b/debian/patches/series
index ba2a752..82f0e64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 BindProblemTest.diff
 SynchronizeSimpleSmtpServer.diff
 buildxml.diff
+javamail-compatibility.diff

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