This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mina2.
commit 4f65832e452eb484bbfe722a631aad9f257a8e75 Author: Emmanuel Bourg <[email protected]> Date: Tue May 3 22:44:59 2016 +0200 Refreshed the patches --- debian/changelog | 4 +++- debian/maven.rules | 2 +- debian/patches/01-tomcat-jni-compatibility.patch | 15 --------------- debian/patches/03-easymock-compatibility.patch | 11 ----------- debian/patches/05-spring-dependency.patch | 2 +- debian/patches/series | 1 - 6 files changed, 5 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index 10bc25d..a47c822 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -mina2 (2.0.9-3) UNRELEASED; urgency=medium +mina2 (2.0.10-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Refreshed the patches * Removed orig-tar.sh and use uscan with debian/copyright File-Excluded -- Emmanuel Bourg <[email protected]> Tue, 03 May 2016 22:18:59 +0200 diff --git a/debian/maven.rules b/debian/maven.rules index 92cc366..e67aabd 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -7,4 +7,4 @@ org.apache.mina mina-parent pom s/2\..*/2.x/ * * org.springframework s/spring/spring-beans/ jar s/.*/3.x/ * * org.springframework * jar s/.*/3.x/ * * org.apache.mina * s/.*/jar/ s/2\..*/2.x/ * * -s/tomcat/org.apache.tomcat/ s/tomcat-apr/tomcat-jni/ * s/.*/8.x/ * * +org.apache.tomcat tomcat-jni * s/.*/8.x/ * * diff --git a/debian/patches/01-tomcat-jni-compatibility.patch b/debian/patches/01-tomcat-jni-compatibility.patch deleted file mode 100644 index 6225834..0000000 --- a/debian/patches/01-tomcat-jni-compatibility.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Ensures the compatibility with tomcat-jni 8.x -Author: Emmanuel Bourg <[email protected]> -Bug: https://github.com/apache/mina/pull/5 - ---- a/src/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java -+++ b/src/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java -@@ -76,7 +76,7 @@ - private AprLibrary() { - try { - Library.initialize(null); -- } catch (Exception e) { -+ } catch (Throwable e) { - throw new RuntimeException("Error loading Apache Portable Runtime (APR).", e); - } - pool = Pool.create(0); diff --git a/debian/patches/03-easymock-compatibility.patch b/debian/patches/03-easymock-compatibility.patch index 12ac2ed..5630186 100644 --- a/debian/patches/03-easymock-compatibility.patch +++ b/debian/patches/03-easymock-compatibility.patch @@ -1,17 +1,6 @@ Description: Ensures the compatibility with EasyMock 3 Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed ---- a/src/mina-core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java -+++ b/src/mina-core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java -@@ -47,7 +47,7 @@ - import org.apache.mina.transport.socket.nio.NioSocketConnector; - import org.apache.mina.util.AvailablePortFinder; - import org.easymock.IArgumentMatcher; --import org.easymock.classextension.EasyMock; -+import org.easymock.EasyMock; - import org.junit.Test; - import org.slf4j.Logger; - import org.slf4j.LoggerFactory; --- a/src/mina-filter-compression/src/test/java/org/apache/mina/filter/compression/CompressionFilterTest.java +++ b/src/mina-filter-compression/src/test/java/org/apache/mina/filter/compression/CompressionFilterTest.java @@ -27,20 +27,16 @@ diff --git a/debian/patches/05-spring-dependency.patch b/debian/patches/05-spring-dependency.patch index c870c9a..2b0f51d 100644 --- a/debian/patches/05-spring-dependency.patch +++ b/debian/patches/05-spring-dependency.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: no --- a/src/mina-integration-xbean/pom.xml +++ b/src/mina-integration-xbean/pom.xml -@@ -66,6 +66,12 @@ +@@ -68,6 +68,12 @@ </dependency> <dependency> diff --git a/debian/patches/series b/debian/patches/series index 01618e1..1824341 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -01-tomcat-jni-compatibility.patch 03-easymock-compatibility.patch 05-spring-dependency.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mina2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
