[pkg-java] r18718 - trunk/jetty/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2015-06-03 23:19:28 +0000 (Wed, 03 Jun 2015)
New Revision: 18718

Modified:
   trunk/jetty/debian/README.Debian-source
   trunk/jetty/debian/changelog
   trunk/jetty/debian/control
   trunk/jetty/debian/libjetty-extra-java.dirs
   trunk/jetty/debian/libjetty-extra-java.links
   trunk/jetty/debian/module.xml
   trunk/jetty/debian/rules
Log:
Removed the dependency on libmx4j-java



Modified: trunk/jetty/debian/README.Debian-source
===================================================================
--- trunk/jetty/debian/README.Debian-source	2015-05-28 11:27:46 UTC (rev 18717)
+++ trunk/jetty/debian/README.Debian-source	2015-06-03 23:19:28 UTC (rev 18718)
@@ -10,7 +10,6 @@
  JAVA DEBS:
  ant
  libservlet2.5-java
- libmx4j-java
  libmail-java
  libtomcat6-java
  geronimo-jta-1.0.1b-spec

Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog	2015-05-28 11:27:46 UTC (rev 18717)
+++ trunk/jetty/debian/changelog	2015-06-03 23:19:28 UTC (rev 18718)
@@ -1,3 +1,10 @@
+jetty (6.1.26-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Removed the dependency on libmx4j-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 04 Jun 2015 01:12:47 +0200
+
 jetty (6.1.26-4) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/jetty/debian/control
===================================================================
--- trunk/jetty/debian/control	2015-05-28 11:27:46 UTC (rev 18717)
+++ trunk/jetty/debian/control	2015-06-03 23:19:28 UTC (rev 18718)
@@ -6,7 +6,7 @@
  Ludovic Claude <ludovic.claude at laposte.net>, Torsten Werner <twerner at debian.org>,
  Niels Thykier <niels at thykier.net>, Pablo Duboue <pablo.duboue at gmail.com>
 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

Modified: trunk/jetty/debian/libjetty-extra-java.dirs
===================================================================
--- trunk/jetty/debian/libjetty-extra-java.dirs	2015-05-28 11:27:46 UTC (rev 18717)
+++ trunk/jetty/debian/libjetty-extra-java.dirs	2015-06-03 23:19:28 UTC (rev 18718)
@@ -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

Modified: trunk/jetty/debian/libjetty-extra-java.links
===================================================================
--- trunk/jetty/debian/libjetty-extra-java.links	2015-05-28 11:27:46 UTC (rev 18717)
+++ trunk/jetty/debian/libjetty-extra-java.links	2015-06-03 23:19:28 UTC (rev 18718)
@@ -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

Modified: trunk/jetty/debian/module.xml
===================================================================
--- trunk/jetty/debian/module.xml	2015-05-28 11:27:46 UTC (rev 18717)
+++ trunk/jetty/debian/module.xml	2015-06-03 23:19:28 UTC (rev 18718)
@@ -80,7 +80,7 @@
         <include name="**/*"/>
       </fileset>
       <manifest>
-         <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"/>
+         <attribute name="Class-Path" value="jetty.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	2015-05-28 11:27:46 UTC (rev 18717)
+++ trunk/jetty/debian/rules	2015-06-03 23:19:28 UTC (rev 18718)
@@ -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