[apache-log4j1.2] 18/40: Removed the dependency on libjboss-jmx-java

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository apache-log4j1.2.

commit 19f78d955408f873da154a236b5406d152cfc6af
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 27 07:09:59 2013 +0000

    Removed the dependency on libjboss-jmx-java
---
 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 debian/rules     | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 84811d8..400aed8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache-log4j1.2 (1.2.17-4) unstable; urgency=low
+
+  * Removed the dependency on libjboss-jmx-java since javax.management
+    is now part of the JDK.
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 27 Aug 2013 09:09:18 +0200
+
 apache-log4j1.2 (1.2.17-3) unstable; urgency=low
 
   * Removed the dependency on the Activation Framework (libgnujaf-java)
diff --git a/debian/control b/debian/control
index 1099763..fce66bd 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders: Varun Hiremath <varun at debian.org>,
  Jakub Adam <jakub.adam at ktknet.cz>,
  Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant,
- libgnumail-java, maven-repo-helper, default-jdk-doc, libjboss-jmx-java, bnd
+ libgnumail-java, maven-repo-helper, default-jdk-doc, bnd
 Standards-Version: 3.9.4
 Homepage: http://logging.apache.org/log4j/1.2/
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/apache-log4j1.2
@@ -18,7 +18,7 @@ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/apache-log4j1.2
 Package: liblog4j1.2-java
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: liblog4j1.2-java-doc, libgnumail-java, libjboss-jmx-java
+Suggests: liblog4j1.2-java-doc, libgnumail-java
 Description: Logging library for java
  log4j is a tool to help the programmer output log statements to a variety of
  output targets. 
diff --git a/debian/rules b/debian/rules
index 3b3b332..c2fa38f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ common-build-indep::
 	cat debian/log4j.bnd | sed s/VERSION/$(VERSION)/ > debian/.log4j-versioned.bnd
 	java -jar /usr/share/java/bnd.jar wrap -properties debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar
 	java -jar /usr/share/java/bnd.jar wrap -properties debian/.log4j-versioned.bnd \
-		-classpath /usr/share/java/jboss-jmx.jar,/usr/share/java/gnumail.jar \
+		-classpath /usr/share/java/gnumail.jar \
 		-output log4j.jar dist/lib/log4j-$(VERSION).jar
 	rm debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar
 	mv log4j.jar dist/lib/log4j-$(VERSION).jar

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