[SCM] Debian packaging for activemq branch, master, updated. debian/5.5.0+dfsg-2-1-gac864d3
Damien Raude-Morvan
drazzib at debian.org
Tue Oct 11 21:53:50 UTC 2011
The following commit has been merged in the master branch:
commit ac864d3408c0bd7cd44801cae602f7c92d0c31e5
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Tue Oct 11 23:05:44 2011 +0200
d/control: Wrap-and-sort Build-Depends.
* d/control: Wrap-and-sort Build-Depends.
* d/activemq.links: Since libasm3-java package now provide splited JAR
also link all ASM3 jars (Closes: #644834).
* d/maven.rules: Don't replace osgi artifacts since they are now provided by
official osgi-core package.
diff --git a/debian/activemq.install b/debian/activemq.install
index 89d2a47..2b91ef5 100644
--- a/debian/activemq.install
+++ b/debian/activemq.install
@@ -1,22 +1,14 @@
# File list from assembly/src/main/descriptors/common-bin.xml
# and assembly/src/main/descriptors/unix-bin.xml
+assembly/src/release/README.txt /usr/share/activemq/
+assembly/src/release/bin/activemq /usr/bin/
+assembly/src/release/bin/activemq-admin /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/sample-conf/activemq-*.xml /usr/share/doc/activemq/examples/conf/
-
-# Sample client code
+assembly/src/release/conf/log4j.properties /etc/activemq/instances-available/main/
assembly/src/release/example/ruby/* /usr/share/doc/activemq/examples/ruby/
assembly/src/release/example/transactions/* /usr/share/doc/activemq/examples/transactions/
-
-# Main
assembly/src/release/lib/activemq-rar.txt /usr/share/activemq/lib/
-assembly/src/release/README.txt /usr/share/activemq/
-assembly/src/release/bin/activemq-admin /usr/bin/
-assembly/src/release/bin/activemq /usr/bin/
-
-# Default configuration
-debian/activemq.xml /etc/activemq/instances-available/main/
-assembly/src/release/conf/log4j.properties /etc/activemq/instances-available/main/
-
-# Default env
+assembly/src/sample-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 b66472e..126b7d4 100644
--- a/debian/activemq.links
+++ b/debian/activemq.links
@@ -14,6 +14,7 @@
/usr/share/java/activemq-pool.jar /usr/share/activemq/lib/optional/activemq-pool.jar
/usr/share/java/activemq-spring.jar /usr/share/activemq/lib/optional/activemq-spring.jar
/usr/share/java/asm3.jar /usr/share/activemq/lib/optional/asm3.jar
+/usr/share/java/asm3-commons.jar /usr/share/activemq/lib/optional/asm3-commons.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
/usr/share/java/commons-collections3.jar /usr/share/activemq/lib/optional/commons-collections3.jar
diff --git a/debian/changelog b/debian/changelog
index bc0e397..7c337aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+activemq (5.5.0+dfsg-3) unstable; urgency=low
+
+ * d/control: Wrap-and-sort Build-Depends.
+ * d/activemq.links: Since libasm3-java package now provide splited JAR
+ also link all ASM3 jars (Closes: #644834).
+ * d/maven.rules:
+ - Don't replace osgi artifacts since they are now provided by
+ official osgi-core package.
+ - Force 2.1.1 version of maven-war-plugin.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 11 Oct 2011 23:11:16 +0200
+
activemq (5.5.0+dfsg-2) unstable; urgency=low
* Drop d/patches/exclude_xsd_install.diff and install XSD files into JAR.
diff --git a/debian/control b/debian/control
index 1eb6fd4..0d2ec08 100644
--- a/debian/control
+++ b/debian/control
@@ -3,38 +3,71 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
-Build-Depends-Indep: libbuild-helper-maven-plugin-java, libjavacc-maven-plugin-java,
- libmaven-antrun-plugin-java, libmaven-enforcer-plugin-java, ant,
- libaopalliance-java, libaxis-java, libcommons-beanutils-java,
- libcommons-collections3-java, libcommons-httpclient-java,
- libcommons-io-java, libcommons-logging-java, libcommons-net2-java,
- libjdom1-java (>= 1.0), liblog4j1.2-java, libslf4j-java, libspring-test-java,
- libspring-context-java (>= 3.0.5.RELEASE-3),
- libspring-web-java, libspring-web-servlet-java, libstax-java, libxalan2-java,
- libxpp3-java, libxstream-java, libactivemq-activeio-java, libactivemq-protobuf-java,
- libmaven-bundle-plugin-java, libmaven-install-plugin-java,
- libjettison-java, libmaven-war-plugin-java, libgentlyweb-utils-java, libjosql-java,
- libcommons-pool-java, libspring-jms-java, glassfish-javaee (>= 2.1.1-b31g),
- libcommons-daemon-java, libjasypt-java, libmaven-shade-plugin-java,
- libmaven-javadoc-plugin-java, default-jdk-doc, libcommons-pool-java-doc,
- libjasypt-java-doc, libjosql-java-doc, libgentlyweb-utils-java-doc,
- libjdom1-java-doc, libcommons-net2-java-doc, libcommons-logging-java-doc,
- libcommons-beanutils-java-doc, libaxis-java-doc,
- libxbean-java (>= 3.7), libxbean-java-doc
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: ant,
+ default-jdk-doc,
+ glassfish-javaee (>= 2.1.1-b31g),
+ libactivemq-activeio-java,
+ libactivemq-protobuf-java,
+ libaopalliance-java,
+ libaxis-java,
+ libaxis-java-doc,
+ libbuild-helper-maven-plugin-java,
+ libcommons-beanutils-java,
+ libcommons-beanutils-java-doc,
+ libcommons-collections3-java,
+ libcommons-daemon-java,
+ libcommons-httpclient-java,
+ libcommons-io-java,
+ libcommons-logging-java,
+ libcommons-logging-java-doc,
+ libcommons-net2-java,
+ libcommons-net2-java-doc,
+ libcommons-pool-java,
+ libcommons-pool-java-doc,
+ libgentlyweb-utils-java,
+ libgentlyweb-utils-java-doc,
+ libjasypt-java,
+ libjasypt-java-doc,
+ libjavacc-maven-plugin-java,
+ libjdom1-java (>= 1.0),
+ libjdom1-java-doc,
+ libjettison-java,
+ libjosql-java,
+ libjosql-java-doc,
+ liblog4j1.2-java,
+ libmaven-antrun-plugin-java,
+ libmaven-bundle-plugin-java,
+ libmaven-enforcer-plugin-java,
+ libmaven-install-plugin-java,
+ libmaven-javadoc-plugin-java,
+ libmaven-shade-plugin-java,
+ libmaven-war-plugin-java,
+ libslf4j-java,
+ libspring-context-java (>= 3.0.5.RELEASE-3),
+ libspring-jms-java,
+ libspring-test-java,
+ libspring-web-java,
+ libspring-web-servlet-java,
+ libstax-java,
+ libxalan2-java,
+ libxbean-java (>= 3.7),
+ libxbean-java-doc,
+ libxpp3-java,
+ libxstream-java
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/pkg-java/activemq.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/activemq.git
-Homepage: http://activemq.apache.org
+Homepage: http://activemq.apache.org
Package: libactivemq-java
Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
Recommends: ${maven:OptionalDepends}
Suggests: libactivemq-java-doc
Description: Java message broker core libraries
Apache ActiveMQ is a message broker built around Java Message Service (JMS)
- API : allow sending messages between two or more clients in a loosely coupled,
+ API : allow sending messages between two or more clients in a loosely coupled,
reliable, and asynchronous way.
.
This message broker supports :
@@ -52,12 +85,12 @@ Description: Java message broker core libraries
Package: libactivemq-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}, ${maven:DocDepends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
Recommends: ${maven:DocOptionalDepends}
Suggests: libactivemq-java
Description: Java message broker core libraries - documentation
Apache ActiveMQ is a message broker built around Java Message Service (JMS)
- API : allow sending messages between two or more clients in a loosely coupled,
+ API : allow sending messages between two or more clients in a loosely coupled,
reliable, and asynchronous way.
.
This message broker supports :
@@ -74,11 +107,13 @@ Description: Java message broker core libraries - documentation
Package: activemq
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre-headless | java6-runtime-headless,
- adduser (>= 3.11), libactivemq-java (= ${source:Version})
+Depends: adduser (>= 3.11),
+ libactivemq-java (= ${source:Version}),
+ openjdk-6-jre-headless | java6-runtime-headless,
+ ${misc:Depends}
Description: Java message broker - server
Apache ActiveMQ is a message broker built around Java Message Service (JMS)
- API : allow sending messages between two or more clients in a loosely coupled,
+ API : allow sending messages between two or more clients in a loosely coupled,
reliable, and asynchronous way.
.
This message broker supports :
@@ -92,4 +127,3 @@ Description: Java message broker - server
Stomp (Streaming Text Orientated Messaging Protocol) protocols
.
This package contains a server installation of ActiveMQ.
-
diff --git a/debian/copyright b/debian/copyright
index 2874863..425f6b2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,4 +15,3 @@ License: Apache-2.0
License: Apache-2.0
On Debian GNU/Linux system you can find the complete text of the
Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
-
diff --git a/debian/maven.rules b/debian/maven.rules
index 0def4f2..52a69e2 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -37,7 +37,6 @@ commons-logging commons-logging-api * s/.*/debian/ * *
s/ant/org.apache.ant/ * * s/.*/debian/ * *
org.springframework * * s/.*/3.x/ * *
s/velocity/org.apache.velocity/ * * s/.*/debian/ * *
-s/org.osgi/org.eclipse.osgi/ s/org.osgi.core/org.eclipse.osgi/ jar s/.*/debian/ * *
# JEE
s/org.apache.geronimo.specs/javax/ s/geronimo-jms_1.1_spec/javaee-api/ jar s/.*/5.0/ * *
--
Debian packaging for activemq
More information about the pkg-java-commits
mailing list