[javamail] 02/06: Refreshed the patches

[Emmanuel Bourg]

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

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

commit a831267366154a158e35a408c11ef61e87e2bf70
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Jan 2 12:45:17 2016 +0100

    Refreshed the patches
---
 debian/changelog                                      |  7 +++++++
 debian/patches/02-rename-jars.patch                   |  6 +++---
 debian/patches/03-disable-unstable-tests.patch        |  2 +-
 .../patches/04-disable-external-network-tests.patch   |  4 ++--
 debian/patches/05-remove-malformed-xml.patch          | 19 -------------------
 debian/patches/series                                 |  1 -
 6 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 62e5940..9ed1618 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+javamail (1.5.5-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 02 Jan 2016 12:24:52 +0100
+
 javamail (1.5.4-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/02-rename-jars.patch b/debian/patches/02-rename-jars.patch
index 4b07ee0..958f73f 100644
--- a/debian/patches/02-rename-jars.patch
+++ b/debian/patches/02-rename-jars.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/mailapi/pom.xml
 +++ b/mailapi/pom.xml
-@@ -136,7 +136,7 @@
+@@ -138,7 +138,7 @@
  	    <plugin>
  		<artifactId>maven-jar-plugin</artifactId>
  		<configuration>
@@ -25,9 +25,9 @@ Forwarded: not-needed
  			  ${project.build.outputDirectory}/META-INF/MANIFEST.MF
 --- a/pom.xml
 +++ b/pom.xml
-@@ -434,7 +434,7 @@
+@@ -445,7 +445,7 @@
+ 	    <plugin>
  		<artifactId>maven-jar-plugin</artifactId>
- 		<!-- need at least this version to make excludes work -->
  		<configuration>
 -		    <finalName>${project.artifactId}</finalName>
 +		    <!--<finalName>${project.artifactId}</finalName>-->
diff --git a/debian/patches/03-disable-unstable-tests.patch b/debian/patches/03-disable-unstable-tests.patch
index 616cce1..dc43838 100644
--- a/debian/patches/03-disable-unstable-tests.patch
+++ b/debian/patches/03-disable-unstable-tests.patch
@@ -5,7 +5,7 @@ Bug-Debian: https://bugs.debian.org/769267
 --- a/mail/src/test/java/com/sun/mail/imap/IMAPIdleUntaggedResponseTest.java
 +++ b/mail/src/test/java/com/sun/mail/imap/IMAPIdleUntaggedResponseTest.java
 @@ -68,6 +68,7 @@
-     public Timeout deadlockTimeout = new Timeout(20000);
+     public Timeout deadlockTimeout = Timeout.seconds(20);
  
      @Test
 +    @org.junit.Ignore
diff --git a/debian/patches/04-disable-external-network-tests.patch b/debian/patches/04-disable-external-network-tests.patch
index 60377fc..c4e0d27 100644
--- a/debian/patches/04-disable-external-network-tests.patch
+++ b/debian/patches/04-disable-external-network-tests.patch
@@ -10,9 +10,9 @@ Bug-Debian: https://bugs.debian.org/770744
  import org.junit.Rule;
 +import org.junit.Ignore;
  import org.junit.rules.Timeout;
- import static org.junit.Assert.assertTrue;
  import static org.junit.Assert.fail;
-@@ -70,6 +71,7 @@
+ 
+@@ -69,6 +70,7 @@
  
      private static final int TIMEOUT = 200;	// write timeout, in millis
  
diff --git a/debian/patches/05-remove-malformed-xml.patch b/debian/patches/05-remove-malformed-xml.patch
deleted file mode 100644
index 1b5d389..0000000
--- a/debian/patches/05-remove-malformed-xml.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Remove the compiler arguments specified as <Xlint:*/>
- since they break the XML parser used by maven-repo-helper
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/mail/pom.xml
-+++ b/mail/pom.xml
-@@ -113,10 +113,12 @@
- 				too hard to fix for now
- 			    -->
- 			    <compilerArguments>
-+<!--
- 				<Xlint:all/>
- 				<Xlint:-rawtypes/>
- 				<Xlint:-unchecked/>
- 				<Xlint:-finally/>
-+-->
- 			    </compilerArguments>
- 			    <showWarnings>true</showWarnings>
- 			</configuration>
diff --git a/debian/patches/series b/debian/patches/series
index cb59ef9..191b84e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@
 02-rename-jars.patch
 03-disable-unstable-tests.patch
 04-disable-external-network-tests.patch
-05-remove-malformed-xml.patch
 06-maven-compiler-compatibility.patch

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