[pkg-java] r12352 - trunk/libmx4j-java/debian

[Torsten Werner]

Author: twerner
Date: 2010-05-08 13:27:08 +0000 (Sat, 08 May 2010)
New Revision: 12352

Modified:
   trunk/libmx4j-java/debian/changelog
   trunk/libmx4j-java/debian/control
   trunk/libmx4j-java/debian/rules
Log:
* Team upload.
* Merge changes from Ubuntu.
* Update Standards-Version: 3.8.4.
* debian/control, debian/rules: Build-depend on libservlet2.5-java instead
  of libservlet2.4-java (LP: #534913)

Modified: trunk/libmx4j-java/debian/changelog
===================================================================
--- trunk/libmx4j-java/debian/changelog	2010-05-08 11:36:08 UTC (rev 12351)
+++ trunk/libmx4j-java/debian/changelog	2010-05-08 13:27:08 UTC (rev 12352)
@@ -1,3 +1,18 @@
+libmx4j-java (3.0.2-9) unstable; urgency=low
+
+  * Team upload.
+  * Merge changes from Ubuntu.
+  * Update Standards-Version: 3.8.4.
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 08 May 2010 15:26:35 +0200
+
+libmx4j-java (3.0.2-8ubuntu1) lucid; urgency=low
+
+  * debian/control, debian/rules: Build-depend on libservlet2.5-java instead
+    of libservlet2.4-java (LP: #534913)
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Tue, 09 Mar 2010 09:57:23 +0100
+
 libmx4j-java (3.0.2-8) unstable; urgency=low
 
   [ Michael Koch ]

Modified: trunk/libmx4j-java/debian/control
===================================================================
--- trunk/libmx4j-java/debian/control	2010-05-08 11:36:08 UTC (rev 12351)
+++ trunk/libmx4j-java/debian/control	2010-05-08 13:27:08 UTC (rev 12352)
@@ -6,11 +6,11 @@
  Damien Raude-Morvan <drazzib at debian.org>, Niels Thykier <niels at thykier.net>
 Build-Depends: cdbs, debhelper (>= 7), default-jdk-builddep, ant,
                liblog4j1.2-java, libcommons-logging-java, libbcel-java (>=5.0),
-               libgnujaf-java, libgnumail-java, libservlet2.4-java, jython, 
+               libgnujaf-java, libgnumail-java, libservlet2.5-java, jython, 
                libaxis-java, javahelper
-Standards-Version: 3.8.3
+Standards-Version: 3.8.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
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libmx4j-java/
 Homepage: http://mx4j.sourceforge.net/
 
 Package: libmx4j-java

Modified: trunk/libmx4j-java/debian/rules
===================================================================
--- trunk/libmx4j-java/debian/rules	2010-05-08 11:36:08 UTC (rev 12351)
+++ trunk/libmx4j-java/debian/rules	2010-05-08 13:27:08 UTC (rev 12352)
@@ -13,7 +13,7 @@
   with_gcj_native := yes
 endif
 
-DEB_JARS := log4j-1.2 commons-logging servlet-api-2.4 bcel jython gnumail activation axis jaxrpc saaj
+DEB_JARS := log4j-1.2 commons-logging servlet-api-2.5 bcel jython gnumail activation axis jaxrpc saaj
 
 DEB_ANT_BUILDFILE := build/build.xml
 DEB_ANT_BUILD_TARGET := compile.tools