This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository javamail.
commit 25db76428ce5fc9999ce298ec4fb81999c346f7d
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Fri Mar 2 11:09:48 2018 +0100
Refreshed the patches
---
debian/changelog | 2 +-
debian/patches/01-disable-modules.patch | 2 +-
debian/patches/02-rename-jars.patch | 4 ++--
debian/patches/07-javadoc-dependencies.patch | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f7bf63a..7439cdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-javamail (1.6.0-1) UNRELEASED; urgency=medium
+javamail (1.6.1-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
diff --git a/debian/patches/01-disable-modules.patch
b/debian/patches/01-disable-modules.patch
index 38532a8..597e669 100644
--- a/debian/patches/01-disable-modules.patch
+++ b/debian/patches/01-disable-modules.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: not-needed
--- a/pom.xml
+++ b/pom.xml
-@@ -172,16 +172,16 @@
+@@ -173,16 +173,16 @@
<profile>
<id>build-only</id>
<modules>
diff --git a/debian/patches/02-rename-jars.patch
b/debian/patches/02-rename-jars.patch
index e7d5e32..b0083ee 100644
--- a/debian/patches/02-rename-jars.patch
+++ b/debian/patches/02-rename-jars.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: not-needed
--- a/mailapi/pom.xml
+++ b/mailapi/pom.xml
-@@ -138,7 +138,7 @@
+@@ -244,7 +244,7 @@
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
@@ -25,7 +25,7 @@ Forwarded: not-needed
${project.build.outputDirectory}/META-INF/MANIFEST.MF
--- a/pom.xml
+++ b/pom.xml
-@@ -440,7 +440,7 @@
+@@ -534,7 +534,7 @@
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
diff --git a/debian/patches/07-javadoc-dependencies.patch
b/debian/patches/07-javadoc-dependencies.patch
index e48518a..88db29b 100644
--- a/debian/patches/07-javadoc-dependencies.patch
+++ b/debian/patches/07-javadoc-dependencies.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: not-needed
--- a/pom.xml
+++ b/pom.xml
-@@ -633,11 +633,13 @@
+@@ -727,11 +727,13 @@
<artifactId>javax.mail</artifactId>
<version>${mail.version}</version>
</additionalDependency>
@@ -15,5 +15,5 @@ Forwarded: not-needed
</additionalDependency>
+-->
</additionalDependencies>
- </configuration>
- </plugin>
+ <sourceFileExcludes>
+ <sourceFileExclude>
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/javamail.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
