diff -Nru jetty-6.1.26/debian/changelog jetty-6.1.26/debian/changelog --- jetty-6.1.26/debian/changelog 2014-10-17 08:52:14.000000000 +0000 +++ jetty-6.1.26/debian/changelog 2015-06-04 06:30:43.000000000 +0000 @@ -1,3 +1,11 @@ +jetty (6.1.26-5) unstable; urgency=medium + + * Team upload. + * Removed the dependency on libmx4j-java + * Removed Niels Thykier from the uploaders (Closes: #770572) + + -- Emmanuel Bourg Thu, 04 Jun 2015 08:30:40 +0200 + jetty (6.1.26-4) unstable; urgency=medium * Team upload. diff -Nru jetty-6.1.26/debian/control jetty-6.1.26/debian/control --- jetty-6.1.26/debian/control 2014-10-17 06:52:35.000000000 +0000 +++ jetty-6.1.26/debian/control 2015-06-03 23:21:25.000000000 +0000 @@ -4,9 +4,9 @@ Maintainer: Debian Java Maintainers Uploaders: Thierry Carrez , Ludovic Claude , Torsten Werner , - Niels Thykier , Pablo Duboue + Pablo Duboue Build-Depends: debhelper (>= 9), cdbs (>> 0.4.5.3), default-jdk, ant-optional, maven-repo-helper, - libservlet2.5-java, libslf4j-java, libmx4j-java, libmail-java, + libservlet2.5-java, libslf4j-java, libmail-java, libcommons-daemon-java, junit, libgeronimo-jta-1.0.1b-spec-java, libtomcat7-java, default-jdk-doc, libmail-java-doc, libservlet2.5-java-doc, dpkg-dev (>= 1.16.1~) @@ -41,7 +41,7 @@ Package: libjetty-extra-java Architecture: all -Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}), libmx4j-java, +Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}), libmail-java, ant, libslf4j-java, libxerces2-java, libtomcat7-java, libgeronimo-jta-1.0.1b-spec-java Recommends: libjetty-extra diff -Nru jetty-6.1.26/debian/libjetty-extra-java.dirs jetty-6.1.26/debian/libjetty-extra-java.dirs --- jetty-6.1.26/debian/libjetty-extra-java.dirs 2014-02-21 11:06:49.000000000 +0000 +++ jetty-6.1.26/debian/libjetty-extra-java.dirs 2015-06-03 23:12:33.000000000 +0000 @@ -1,6 +1,5 @@ usr/share/jetty/lib/ext usr/share/jetty/lib/management -usr/share/jetty/lib/management/mx4j usr/share/jetty/lib/naming usr/share/jetty/lib/jsp-2.1 usr/share/jetty/lib/plus diff -Nru jetty-6.1.26/debian/libjetty-extra-java.links jetty-6.1.26/debian/libjetty-extra-java.links --- jetty-6.1.26/debian/libjetty-extra-java.links 2014-10-17 06:28:34.000000000 +0000 +++ jetty-6.1.26/debian/libjetty-extra-java.links 2015-06-03 23:10:56.000000000 +0000 @@ -1,5 +1,3 @@ -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/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 diff -Nru jetty-6.1.26/debian/module.xml jetty-6.1.26/debian/module.xml --- jetty-6.1.26/debian/module.xml 2014-10-17 06:27:55.000000000 +0000 +++ jetty-6.1.26/debian/module.xml 2015-06-03 23:12:16.000000000 +0000 @@ -80,7 +80,7 @@ - + diff -Nru jetty-6.1.26/debian/README.Debian-source jetty-6.1.26/debian/README.Debian-source --- jetty-6.1.26/debian/README.Debian-source 2014-10-17 06:31:34.000000000 +0000 +++ jetty-6.1.26/debian/README.Debian-source 2015-06-03 23:11:23.000000000 +0000 @@ -10,7 +10,6 @@ JAVA DEBS: ant libservlet2.5-java - libmx4j-java libmail-java libtomcat6-java geronimo-jta-1.0.1b-spec diff -Nru jetty-6.1.26/debian/rules jetty-6.1.26/debian/rules --- jetty-6.1.26/debian/rules 2014-10-17 08:51:21.000000000 +0000 +++ jetty-6.1.26/debian/rules 2015-06-03 22:44:57.000000000 +0000 @@ -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 javax.mail commons-daemon junit ant-junit geronimo-jta-1.0.1b-spec tomcat-annotations-api +DEB_JARS := servlet-api-2.5 slf4j-api slf4j-simple 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