diff -Nru libmx4j-java-3.0.2/debian/changelog libmx4j-java-3.0.2/debian/changelog --- libmx4j-java-3.0.2/debian/changelog 2013-07-11 10:26:47.000000000 +0000 +++ libmx4j-java-3.0.2/debian/changelog 2014-10-17 09:42:18.000000000 +0000 @@ -1,10 +1,14 @@ -libmx4j-java (3.0.2-13ubuntu1) saucy; urgency=low +libmx4j-java (3.0.2-14) unstable; urgency=medium - * Merge from Debian unstable. Remaining changes: - - d/control: Drop optional jython dependencies to reduce main requirements - in Ubuntu. + * Team upload. + * Transition to the Servlet API 3.1 + * Removed the suggested dependency on the Servlet API + * Replaced the dependency on libgnumail-java with libmail-java + * Updated Standards-Version to 3.9.6 (no changes) + * Use canonical URLs for the Vcs-* fields + * Switch to debhelper level 9 - -- James Page Thu, 11 Jul 2013 11:26:43 +0100 + -- Emmanuel Bourg Fri, 17 Oct 2014 11:42:02 +0200 libmx4j-java (3.0.2-13) unstable; urgency=low @@ -16,25 +20,6 @@ -- Emmanuel Bourg Fri, 17 May 2013 18:04:47 +0200 -libmx4j-java (3.0.2-12ubuntu3) quantal; urgency=low - - * Transition libservlet2.5-java -> libservlet3.0-java (LP: #1023405). - - -- James Page Thu, 12 Jul 2012 15:31:30 +0100 - -libmx4j-java (3.0.2-12ubuntu2) quantal; urgency=low - - * No-change rebuild with openjdk-7 as default-jdk. - - -- James Page Fri, 18 May 2012 11:44:15 +0100 - -libmx4j-java (3.0.2-12ubuntu1) precise; urgency=low - - * d/control: Drop optional jython dependencies to reduce main requirements - in Ubuntu. - - -- James Page Wed, 19 Oct 2011 16:39:43 +0100 - libmx4j-java (3.0.2-12) unstable; urgency=low * Team upload. @@ -326,4 +311,3 @@ Local variables: mode: debian-changelog End: - diff -Nru libmx4j-java-3.0.2/debian/compat libmx4j-java-3.0.2/debian/compat --- libmx4j-java-3.0.2/debian/compat 2013-06-26 16:15:56.000000000 +0000 +++ libmx4j-java-3.0.2/debian/compat 2014-10-17 09:30:59.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru libmx4j-java-3.0.2/debian/control libmx4j-java-3.0.2/debian/control --- libmx4j-java-3.0.2/debian/control 2013-07-11 10:25:34.000000000 +0000 +++ libmx4j-java-3.0.2/debian/control 2014-10-17 09:42:39.000000000 +0000 @@ -1,36 +1,37 @@ Source: libmx4j-java Section: java Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Java Maintainers -Uploaders: Damien Raude-Morvan , Emmanuel Bourg , - Niels Thykier -Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant, - liblog4j1.2-java, libcommons-logging-java, libbcel-java (>=5.0), - libgnumail-java, libservlet3.0-java, - libaxis-java, javahelper, libhessian-java -Standards-Version: 3.9.4 -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libmx4j-java -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libmx4j-java/ -Homepage: http://mx4j.sourceforge.net/ +Maintainer: Debian Java Maintainers +Uploaders: Damien Raude-Morvan , Niels Thykier +Build-Depends: ant, + cdbs, + debhelper (>= 9), + default-jdk, + javahelper, + jython, + libaxis-java, + libbcel-java (>= 5.0), + libcommons-logging-java, + libmail-java, + libhessian-java, + liblog4j1.2-java, + libservlet3.1-java +Standards-Version: 3.9.6 +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libmx4j-java +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libmx4j-java/ +Homepage: http://mx4j.sourceforge.net Package: libmx4j-java Architecture: all -Depends: libbcel-java (>=5.0), - liblog4j1.2-java, - ${misc:Depends} -Suggests: libservlet3.0-java, libgnumail-java, libjetty-java, libhessian-java +Depends: libbcel-java (>= 5.0), liblog4j1.2-java, ${misc:Depends} +Suggests: jython, + libmail-java, + libhessian-java, + libjetty-java Description: Open Source implementation of the JMX(TM) technology - JMX defines the architecture, the patterns , the API and services to + JMX defines the architecture, the patterns , the API and services to build manageable Java applications. It provide flexible framework to - stop and restart services, and remove it from the application or to add - it to an application, to change its configuration files, to ask it to - do some operation (such as downloading information from an URL the + stop and restart services, and remove it from the application or to add + it to an application, to change its configuration files, to ask it to + do some operation (such as downloading information from an URL the system administrator passes in), and so on. - -#Package: libmx4j-java-doc -#Architecture: all -#Suggests: junit -#Description: Document for mx4j which is the JMX(TM) implementation. -# This package provide documents and examples for mx4j which is opensource -# implementataion of JMX(TM) technology. diff -Nru libmx4j-java-3.0.2/debian/rules libmx4j-java-3.0.2/debian/rules --- libmx4j-java-3.0.2/debian/rules 2013-07-11 10:25:55.000000000 +0000 +++ libmx4j-java-3.0.2/debian/rules 2014-10-17 09:39:49.000000000 +0000 @@ -8,7 +8,7 @@ JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := log4j-1.2 commons-logging servlet-api-3.0 bcel jython gnumail axis jaxrpc saaj hessian +DEB_JARS := log4j-1.2 commons-logging servlet-api-3.1 bcel jython javax.mail axis jaxrpc saaj hessian DEB_ANT_BUILDFILE := build/build.xml DEB_ANT_BUILD_TARGET := compile.tools