Author: ebourg-guest Date: 2014-10-17 06:45:48 +0000 (Fri, 17 Oct 2014) New Revision: 18541
Modified: trunk/jetty/debian/README.Debian-source trunk/jetty/debian/changelog trunk/jetty/debian/control trunk/jetty/debian/libjetty-extra-java.links trunk/jetty/debian/module.xml trunk/jetty/debian/rules trunk/jetty/debian/start.config Log: Replaced the dependency on libgnumail-java with libmail-java Modified: trunk/jetty/debian/README.Debian-source =================================================================== --- trunk/jetty/debian/README.Debian-source 2014-10-17 06:16:48 UTC (rev 18540) +++ trunk/jetty/debian/README.Debian-source 2014-10-17 06:45:48 UTC (rev 18541) @@ -11,8 +11,7 @@ ant libservlet2.5-java libmx4j-java - libgnumail-java - libgnujaf-java + libmail-java libtomcat6-java geronimo-jta-1.0.1b-spec Modified: trunk/jetty/debian/changelog =================================================================== --- trunk/jetty/debian/changelog 2014-10-17 06:16:48 UTC (rev 18540) +++ trunk/jetty/debian/changelog 2014-10-17 06:45:48 UTC (rev 18541) @@ -3,6 +3,7 @@ * Team upload. * Removed the jetty binary package, jetty8 should be used instead * Removed the obsolete dependency on libgnujaf-java + * Replaced the dependency on libgnumail-java with libmail-java * Switch to debhelper level 9 -- Emmanuel Bourg <[email protected]> Fri, 17 Oct 2014 08:07:06 +0200 Modified: trunk/jetty/debian/control =================================================================== --- trunk/jetty/debian/control 2014-10-17 06:16:48 UTC (rev 18540) +++ trunk/jetty/debian/control 2014-10-17 06:45:48 UTC (rev 18541) @@ -6,9 +6,9 @@ Ludovic Claude <[email protected]>, Torsten Werner <[email protected]>, Niels Thykier <[email protected]>, Pablo Duboue <[email protected]> Build-Depends: debhelper (>= 9), cdbs (>> 0.4.5.3), default-jdk, ant-optional, maven-repo-helper, - libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java, + libservlet2.5-java, libslf4j-java, libmx4j-java, libmail-java, libcommons-daemon-java, junit, libgeronimo-jta-1.0.1b-spec-java, - libtomcat7-java, default-jdk-doc, libgnumail-java-doc, libservlet2.5-java-doc, + libtomcat7-java, default-jdk-doc, libmail-java-doc, libservlet2.5-java-doc, dpkg-dev (>= 1.16.1~) Standards-Version: 3.9.5 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jetty @@ -29,7 +29,7 @@ Section: doc Architecture: all Depends: ${misc:Depends} -Recommends: default-jdk-doc, libgnumail-java-doc, libservlet2.5-java-doc +Recommends: default-jdk-doc, libmail-java-doc, libservlet2.5-java-doc Suggests: libjetty-java Description: Javadoc for the Jetty API Jetty is an Open Source HTTP Servlet Server written in 100% Java. @@ -42,7 +42,7 @@ Package: libjetty-extra-java Architecture: all Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}), libmx4j-java, - libgnumail-java, ant, libslf4j-java, libxerces2-java, + libmail-java, ant, libslf4j-java, libxerces2-java, libtomcat7-java, libgeronimo-jta-1.0.1b-spec-java Recommends: libjetty-extra Suggests: jetty Modified: trunk/jetty/debian/libjetty-extra-java.links =================================================================== --- trunk/jetty/debian/libjetty-extra-java.links 2014-10-17 06:16:48 UTC (rev 18540) +++ trunk/jetty/debian/libjetty-extra-java.links 2014-10-17 06:45:48 UTC (rev 18541) @@ -1,7 +1,6 @@ usr/share/java/mx4j.jar usr/share/jetty/lib/management/mx4j/mx4j.jar usr/share/java/mx4j-tools.jar usr/share/jetty/lib/management/mx4j/mx4j-tools.jar -usr/share/java/activation.jar usr/share/jetty/lib/naming/activation.jar -usr/share/java/gnumail.jar usr/share/jetty/lib/naming/mail.jar +usr/share/java/javax.mail.jar usr/share/jetty/lib/naming/mail.jar usr/share/java/ant.jar usr/share/jetty/lib/jsp-2.1/ant.jar usr/share/java/ant-launcher.jar usr/share/jetty/lib/jsp-2.1/ant-launcher.jar usr/share/java/jasper.jar usr/share/jetty/lib/jsp-2.1/jasper.jar Modified: trunk/jetty/debian/module.xml =================================================================== --- trunk/jetty/debian/module.xml 2014-10-17 06:16:48 UTC (rev 18540) +++ trunk/jetty/debian/module.xml 2014-10-17 06:45:48 UTC (rev 18541) @@ -19,7 +19,7 @@ <path refid="classpath"/> </classpath> <link href="/usr/share/doc/default-jdk-doc/api/" /> - <link href="/usr/share/doc/libgnumail-java/api/" /> + <link href="/usr/share/doc/libmail-java/api/" /> <link href="/usr/share/doc/libservlet2.5-java/api/" /> <sourcepath> <pathelement path="${src.dir}"/> @@ -80,7 +80,7 @@ <include name="**/*"/> </fileset> <manifest> - <attribute name="Class-Path" value="jetty.jar mx4j.jar gnumail.jar gnujaf.jar slf4j.jar xerces2.java tomcat7.jar geronimo-jta-1.0.1b-spec.jar"/> + <attribute name="Class-Path" value="jetty.jar mx4j.jar javax.mail.jar slf4j.jar xerces2.java tomcat7.jar geronimo-jta-1.0.1b-spec.jar"/> </manifest> </jar> </target> Modified: trunk/jetty/debian/rules =================================================================== --- trunk/jetty/debian/rules 2014-10-17 06:16:48 UTC (rev 18540) +++ trunk/jetty/debian/rules 2014-10-17 06:45:48 UTC (rev 18541) @@ -8,7 +8,7 @@ PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := servlet-api-2.5 slf4j-api slf4j-simple mx4j mx4j-tools gnumail activation commons-daemon junit ant-junit geronimo-jta-1.0.1b-spec tomcat-annotations-api +DEB_JARS := servlet-api-2.5 slf4j-api slf4j-simple mx4j mx4j-tools javax.mail commons-daemon junit ant-junit geronimo-jta-1.0.1b-spec tomcat-annotations-api DEB_ANT_BUILD_TARGET := package DEB_ANT_BUILDFILE := debian/build.xml DEB_ANT_ARGS := -DVERSION=$(VERSION) -Dbuild.sysclasspath=last Modified: trunk/jetty/debian/start.config =================================================================== --- trunk/jetty/debian/start.config 2014-10-17 06:16:48 UTC (rev 18540) +++ trunk/jetty/debian/start.config 2014-10-17 06:45:48 UTC (rev 18541) @@ -51,9 +51,7 @@ /usr/share/java/slf4j-api.jar # Optional stuff for libjetty-extra-java -/usr/share/java/gnumail.jar -/usr/share/java/gnumail-providers.jar -/usr/share/java/activation.jar +/usr/share/java/javax.mail.jar /usr/share/java/ant.jar # Set the jetty classpath _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
