[jetty9] 34/99: Removed dependencies on libgnujaf-java

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository jetty9.

commit d32d46b745403e5420ea990d329a8d8d970dfbf9
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu May 16 16:34:44 2013 +0200

    Removed dependencies on libgnujaf-java
---
 debian/changelog                  | 6 ++++++
 debian/control                    | 6 +++---
 debian/libjetty8-extra-java.links | 1 -
 debian/maven.rules                | 1 -
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3063523..fe03bac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jetty8 (8.1.3-7) UNRELEASED; urgency=low
+
+  * Removed dependencies on libgnujaf-java.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 16 May 2013 16:34:13 +0200
+
 jetty8 (8.1.3-6) unstable; urgency=low
 
   [ Emmanuel Bourg ]
diff --git a/debian/control b/debian/control
index d8bba6a..498d017 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends: debhelper (>= 7), cdbs (>> 0.4.5.3), default-jdk, ant-optional, maven-repo-helper,
  javahelper, maven-debian-helper, libbuild-helper-maven-plugin-java, libgnumail-java (>= 1.1.2-7),
- libgnujaf-java, junit, libtomcat7-java (>= 7.0.28), default-jdk-doc, libmaven-bundle-plugin-java,
+ junit, libtomcat7-java (>= 7.0.28), default-jdk-doc, libmaven-bundle-plugin-java,
  libmockito-java, glassfish-jmac-api (>= 1:2.1.1-b31g-2), libgeronimo-jta-1.1-spec-java,
  libjstl1.1-java, libservlet3.0-java, libmaven-javadoc-plugin-java
 Standards-Version: 3.9.4
@@ -40,8 +40,8 @@ Description: Javadoc for the Jetty API
 Package: libjetty8-extra-java
 Architecture: all
 Depends: ${misc:Depends}, libjetty8-java (>= ${source:Version}),
- libtomcat7-java (>= 7.0.28), libasm3-java, libgnujaf-java,
- libgnumail-java, libjakarta-taglibs-standard-java, libservlet3.0-java,
+ libtomcat7-java (>= 7.0.28), libasm3-java, libgnumail-java,
+ libjakarta-taglibs-standard-java, libservlet3.0-java,
  libjstl1.1-java
 Suggests: jetty8
 Description: Java servlet engine and webserver -- extra libraries
diff --git a/debian/libjetty8-extra-java.links b/debian/libjetty8-extra-java.links
index e1d65a0..fe1d32e 100644
--- a/debian/libjetty8-extra-java.links
+++ b/debian/libjetty8-extra-java.links
@@ -1,7 +1,6 @@
 usr/share/java/tomcat-annotations-api.jar    usr/share/jetty8/lib/annotations/javax.annotation.jar
 usr/share/java/asm3.jar                      usr/share/jetty8/lib/annotations/org.objectweb.asm.jar
 usr/share/java/asm3-commons.jar              usr/share/jetty8/lib/annotations/org.objectweb.asm.commons.jar
-usr/share/java/activation.jar                usr/share/jetty8/lib/jndi/javax.activation.jar
 usr/share/java/gnumail.jar                   usr/share/jetty8/lib/jndi/javax.mail.jar
 usr/share/java/jsp-api-2.2.jar               usr/share/jetty8/lib/jsp/javax.servlet.jsp.jar
 usr/share/java/tomcat-jasper.jar             usr/share/jetty8/lib/jsp/org.apache.jasper.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index 7b2d639..8e86021 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -7,7 +7,6 @@ s/org.eclipse.jetty.orbit/asm/ s/org.objectweb.asm/asm/ jar s/.*/3.x/ * *
 s/org.eclipse.jetty.orbit/javax.mail/ s/javax.mail.glassfish/gnumail/ jar s/.*/debian/ * *
 s/org.eclipse.jetty.orbit/javax.security.auth.message/ s/javax.security.auth.message/jmac-api/ jar s/.*/debian/ * *
 s/org.eclipse.jetty.orbit/org.apache.geronimo.specs/ s/javax.transaction/geronimo-jta_1.1_spec/ jar s/.*/debian/ * *
-s/org.eclipse.jetty.orbit/javax.activation/ s/javax.activation/gnujaf/ jar s/.*/debian/ * *
 s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.annotation/tomcat-annotations-api/ jar s/.*/debian/ * *
 s/org.eclipse.jetty.orbit/javax.el/ s/javax.el/el-api/ jar s/.*/2.2/ * *
 s/org.eclipse.jetty.orbit/javax.servlet/ s/javax.servlet/servlet-api/ jar s/.*/3.0/ * *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git