This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jetty9.
commit 5b428ce4620780531c6dde7dc102119737024c04 Author: Emmanuel Bourg <[email protected]> Date: Fri Sep 12 00:01:59 2014 +0200 Depend on libmail-java instead of libgnumail-java --- debian/changelog | 1 + debian/control | 6 +++--- debian/libjetty8-extra-java.links | 2 +- debian/maven.rules | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index bb03bcd..96d7b0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ jetty8 (8.1.16-1) unstable; urgency=medium - libjetty8-java-doc depends on libservlet3.0-java-doc instead of libservlet2.5-java-doc - libjetty8-java-doc suggests libjetty8-java instead of libjetty-java + - Depend on libmail-java instead of libgnumail-java - Updated the Homepage field * debian/rules: Install the upstream changelog * debian/watch: Watch the tags from the Git repository diff --git a/debian/control b/debian/control index 0a65be5..da2a8b4 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: ant-optional, junit, libbuild-helper-maven-plugin-java, libgeronimo-jta-1.1-spec-java, - libgnumail-java (>= 1.1.2-7), + libmail-java, libjstl1.1-java, libmaven-bundle-plugin-java, libmaven-javadoc-plugin-java, @@ -43,7 +43,7 @@ Package: libjetty8-java-doc Section: doc Architecture: all Depends: ${misc:Depends} -Recommends: default-jdk-doc, libgnumail-java-doc, libservlet3.0-java-doc +Recommends: default-jdk-doc, libmail-java-doc, libservlet3.0-java-doc Suggests: libjetty8-java Description: Javadoc for the Jetty API Jetty is an Open Source HTTP Servlet Server written in 100% Java. @@ -56,7 +56,7 @@ Description: Javadoc for the Jetty API Package: libjetty8-extra-java Architecture: all Depends: libasm3-java, - libgnumail-java, + libmail-java, libjakarta-taglibs-standard-java, libjetty8-java (>= ${source:Version}), libjstl1.1-java, diff --git a/debian/libjetty8-extra-java.links b/debian/libjetty8-extra-java.links index 0549192..2fefbdc 100644 --- a/debian/libjetty8-extra-java.links +++ b/debian/libjetty8-extra-java.links @@ -1,7 +1,7 @@ usr/share/tomcat7/lib/annotations-api.jar usr/share/jetty8/lib/annotations/javax.annotation.jar usr/share/java/asm3.jar usr/share/jetty8/lib/annotations/org.objectweb.asm.jar usr/share/java/asm3-commons.jar usr/share/jetty8/lib/annotations/org.objectweb.asm.commons.jar -usr/share/java/gnumail.jar usr/share/jetty8/lib/jndi/javax.mail.jar +usr/share/java/javax.mail.jar usr/share/jetty8/lib/jndi/javax.mail.jar usr/share/java/jsp-api-2.2.jar usr/share/jetty8/lib/jsp/javax.servlet.jsp.jar usr/share/tomcat7/lib/jasper.jar usr/share/jetty8/lib/jsp/jasper.jar usr/share/tomcat7/lib/jasper-el.jar usr/share/jetty8/lib/jsp/jasper-el.jar diff --git a/debian/maven.rules b/debian/maven.rules index 8e86021..ba1bfd3 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -4,7 +4,7 @@ javax.servlet.jsp jsp-api jar s/.*/2.2/ * * junit junit * s/4\..*/4.x/ * * org.apache.felix maven-bundle-plugin * s/.*/2.3.5/ * * s/org.eclipse.jetty.orbit/asm/ s/org.objectweb.asm/asm/ jar s/.*/3.x/ * * -s/org.eclipse.jetty.orbit/javax.mail/ s/javax.mail.glassfish/gnumail/ jar s/.*/debian/ * * +s/org.eclipse.jetty.orbit/com.sun.mail/ s/javax.mail.glassfish/javax.mail/ jar s/.*/debian/ * * s/org.eclipse.jetty.orbit/javax.security.auth.message/ s/javax.security.auth.message/jmac-api/ jar s/.*/debian/ * * s/org.eclipse.jetty.orbit/org.apache.geronimo.specs/ s/javax.transaction/geronimo-jta_1.1_spec/ jar s/.*/debian/ * * s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.annotation/tomcat-annotations-api/ jar s/.*/debian/ * * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
