[activemq] 27/29: Add spring dependencies, libhawtbuf-java, libxbean-java and

Markus Koschany apo-guest at moszumanska.debian.org
Sat Mar 19 19:25:11 UTC 2016


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

apo-guest pushed a commit to branch master
in repository activemq.

commit 6ec69a8320c7641eda3a97216849d081688f9734
Author: Markus Koschany <apo at debian.org>
Date:   Sat Mar 19 19:41:50 2016 +0100

    Add spring dependencies, libhawtbuf-java, libxbean-java and
    
    libactivemq-protobuf-java
---
 debian/activemq.install |  2 +-
 debian/activemq.links   | 36 +++++++++++++++++-------------------
 debian/control          | 21 +++++++++++++++------
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/debian/activemq.install b/debian/activemq.install
index a7a54de..b65572c 100644
--- a/debian/activemq.install
+++ b/debian/activemq.install
@@ -4,9 +4,9 @@ assembly/src/release/README.txt           /usr/share/activemq/
 assembly/src/release/bin/activemq         /usr/bin/
 assembly/src/release/conf/*.properties   /usr/share/doc/activemq/examples/conf/
 assembly/src/release/conf/*.xml          /usr/share/doc/activemq/examples/conf/
+assembly/src/release/conf/activemq.xml  /usr/share/doc/activemq/examples/conf/
 assembly/src/release/conf/log4j.properties  /etc/activemq/instances-available/main/
 assembly/src/release/examples/*         /usr/share/doc/activemq/examples/
 assembly/src/release/lib/activemq-rar.txt /usr/share/activemq/lib/
-assembly/src/release/conf/activemq.xml  /usr/share/doc/activemq/examples/conf/
 debian/activemq-options                     /usr/share/activemq/
 debian/activemq.xml                         /etc/activemq/instances-available/main/
diff --git a/debian/activemq.links b/debian/activemq.links
index 0e896e7..c513605 100644
--- a/debian/activemq.links
+++ b/debian/activemq.links
@@ -1,23 +1,14 @@
-/usr/share/java/activemq-kahadb-store.jar /usr/share/activemq/lib/activemq-kahadb-store.jar
-/usr/share/java/activemq-ra.jar           /usr/share/activemq/lib/activemq-ra.jar
-/usr/share/java/activemq-mqtt.jar         /usr/share/activemq/lib/activemq-mqtt.jar
+/usr/share/java/activeio-core.jar        /usr/share/activemq/lib/optional/activeio-core.jar
+/usr/share/java/activemq-broker.jar       /usr/share/activemq/lib/activemq-broker.jar
 /usr/share/java/activemq-client.jar       /usr/share/activemq/lib/activemq-client.jar
 /usr/share/java/activemq-console.jar      /usr/share/activemq/lib/activemq-console.jar
-/usr/share/java/activemq-broker.jar       /usr/share/activemq/lib/activemq-broker.jar
-/usr/share/java/activemq-openwire-legacy.jar /usr/share/activemq/lib/activemq-openwire-legacy.jar
 /usr/share/java/activemq-jaas.jar         /usr/share/activemq/lib/activemq-jaas.jar
-/usr/share/java/glassfish-javaee.jar      /usr/share/activemq/lib/glassfish-javaee.jar
-/usr/share/java/jcl-over-slf4j.jar        /usr/share/activemq/lib/jcl-over-slf4j.jar
-/usr/share/java/slf4j-api.jar             /usr/share/activemq/lib/slf4j-api.jar
-/usr/share/java/jackson-databind.jar      /usr/share/activemq/lib/jackson-databind.jar
-/usr/share/java/jackson-core.jar          /usr/share/activemq/lib/jackson-core.jar
-/usr/share/java/jackson-annotations.jar   /usr/share/activemq/lib/jackson-annotations.jar
+/usr/share/java/activemq-kahadb-store.jar /usr/share/activemq/lib/activemq-kahadb-store.jar
+/usr/share/java/activemq-mqtt.jar         /usr/share/activemq/lib/activemq-mqtt.jar
+/usr/share/java/activemq-openwire-legacy.jar /usr/share/activemq/lib/activemq-openwire-legacy.jar
 /usr/share/java/activemq-protobuf.jar     /usr/share/activemq/lib/activemq-protobuf.jar
-/usr/share/java/hawtbuf.jar               /usr/share/activemq/lib/hawtbuf.jar
-
+/usr/share/java/activemq-ra.jar           /usr/share/activemq/lib/activemq-ra.jar
 /usr/share/java/activemq-run.jar          /usr/share/activemq/bin/activemq.jar
-
-/usr/share/java/activeio-core.jar        /usr/share/activemq/lib/optional/activeio-core.jar
 /usr/share/java/activemq-spring.jar      /usr/share/activemq/lib/optional/activemq-spring.jar
 /usr/share/java/commons-beanutils.jar    /usr/share/activemq/lib/optional/commons-beanutils.jar
 /usr/share/java/commons-codec.jar        /usr/share/activemq/lib/optional/commons-codec.jar
@@ -25,14 +16,18 @@
 /usr/share/java/commons-dbcp.jar         /usr/share/activemq/lib/optional/commons-dbcp.jar
 /usr/share/java/commons-httpclient.jar   /usr/share/activemq/lib/optional/commons-httpclient.jar
 /usr/share/java/commons-lang.jar         /usr/share/activemq/lib/optional/commons-lang.jar
+/usr/share/java/commons-net.jar          /usr/share/activemq/lib/optional/commons-net.jar
 /usr/share/java/commons-pool.jar         /usr/share/activemq/lib/optional/commons-pool.jar
+/usr/share/java/glassfish-javaee.jar      /usr/share/activemq/lib/glassfish-javaee.jar
+/usr/share/java/hawtbuf.jar               /usr/share/activemq/lib/hawtbuf.jar
+/usr/share/java/jackson-annotations.jar   /usr/share/activemq/lib/jackson-annotations.jar
+/usr/share/java/jackson-core.jar          /usr/share/activemq/lib/jackson-core.jar
+/usr/share/java/jackson-databind.jar      /usr/share/activemq/lib/jackson-databind.jar
 /usr/share/java/jasypt.jar               /usr/share/activemq/lib/optional/jasypt.jar
+/usr/share/java/jcl-over-slf4j.jar        /usr/share/activemq/lib/jcl-over-slf4j.jar
 /usr/share/java/log4j-1.2.jar            /usr/share/activemq/lib/optional/log4j-1.2.jar
+/usr/share/java/slf4j-api.jar             /usr/share/activemq/lib/slf4j-api.jar
 /usr/share/java/slf4j-log4j12.jar        /usr/share/activemq/lib/optional/slf4j-log4j12.jar
-/usr/share/java/stax-api.jar             /usr/share/activemq/lib/optional/stax-api.jar
-/usr/share/java/velocity.jar             /usr/share/activemq/lib/optional/velocity.jar
-/usr/share/java/xpp3.jar                 /usr/share/activemq/lib/optional/xpp3.jar
-/usr/share/java/commons-net.jar          /usr/share/activemq/lib/optional/commons-net.jar
 /usr/share/java/spring3-aop.jar          /usr/share/activemq/lib/optional/spring3-aop.jar
 /usr/share/java/spring3-beans.jar        /usr/share/activemq/lib/optional/spring3-beans.jar
 /usr/share/java/spring3-context.jar      /usr/share/activemq/lib/optional/spring3-context.jar
@@ -41,4 +36,7 @@
 /usr/share/java/spring3-jms.jar          /usr/share/activemq/lib/optional/spring3-jms.jar
 /usr/share/java/spring3-orm.jar          /usr/share/activemq/lib/optional/spring3-orm.jar
 /usr/share/java/spring3-transaction.jar  /usr/share/activemq/lib/optional/spring3-transaction.jar
+/usr/share/java/stax-api.jar             /usr/share/activemq/lib/optional/stax-api.jar
+/usr/share/java/velocity.jar             /usr/share/activemq/lib/optional/velocity.jar
 /usr/share/java/xbean-spring.jar         /usr/share/activemq/lib/optional/xbean-spring.jar
+/usr/share/java/xpp3.jar                 /usr/share/activemq/lib/optional/xpp3.jar
diff --git a/debian/control b/debian/control
index 452a91d..4023741 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends:
  debhelper (>= 9),
  default-jdk,
  glassfish-javaee,
+ junit4,
  libactivemq-activeio-java,
  libactivemq-protobuf-java,
  libaopalliance-java,
@@ -29,6 +30,7 @@ Build-Depends:
  libgentlyweb-utils-java,
  libgentlyweb-utils-java-doc,
  libhawtbuf-java,
+ libhawtdispatch-java,
  libhttpclient-java,
  libjackson2-annotations-java,
  libjackson2-core-java,
@@ -43,7 +45,6 @@ Build-Depends:
  libjosql-java,
  libjosql-java-doc,
  liblog4j1.2-java,
- junit4,
  libmaven-antrun-plugin-java,
  libmaven-bundle-plugin-java,
  libmaven-enforcer-plugin-java,
@@ -51,24 +52,23 @@ Build-Depends:
  libmaven-javadoc-plugin-java,
  libmaven-shade-plugin-java,
  libmaven-war-plugin-java,
+ libmqtt-client-java,
+ libqdox-java,
  libregexp-java,
+ libservlet3.1-java,
  libslf4j-java,
  libspring-context-java (>= 3.0.5.RELEASE-3),
  libspring-jms-java,
  libspring-test-java,
  libspring-web-java,
- libmqtt-client-java,
- libhawtdispatch-java,
  libspring-web-servlet-java,
  libstax-java,
  libxalan2-java,
  libxbean-java (>= 3.7),
  libxbean-java-doc,
  libxpp3-java,
- libzookeeper-java,
  libxstream-java (>= 1.4),
- libservlet3.1-java,
- libqdox-java,
+ libzookeeper-java,
  maven-debian-helper
 Standards-Version: 3.9.7
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/activemq.git
@@ -78,6 +78,15 @@ Homepage: http://activemq.apache.org
 Package: libactivemq-java
 Architecture: all
 Depends:
+ libactivemq-protobuf-java,
+ libhawtbuf-java,
+ libspring-beans-java,
+ libspring-context-java,
+ libspring-core-java,
+ libspring-jms-java,
+ libspring-orm-java,
+ libspring-test-java,
+ libxbean-java,
  ${maven:Depends},
  ${misc:Depends}
 Recommends:

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



More information about the pkg-java-commits mailing list