[SCM] Debian packaging for activemq branch, master, updated. debian/5.5.0+dfsg-7-12-ga42d5b4

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit 1ca57882eb7ab994a712e1b3270cbb1f7f23bcfc
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Mon May 28 14:11:04 2012 +0200

    d/patches/exclude_leveldb.diff: Diable LevelDB Store for now.

diff --git a/debian/changelog b/debian/changelog
index 3ca834c..ab8fad2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ activemq (5.6.0+dfsg-1) UNRELEASED; urgency=low
     - Refresh all patches.
     - Drop d/patches/CVE-2011-4605.diff: merged upstream.
     - d/patches/exclude_mqtt.diff: Disable MQTT transport for now.
+    - d/patches/exclude_leveldb.diff: Diable LevelDB Store for now.
   * d/maven.rules: Upgrade internal components version.
 
  -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 25 May 2012 00:47:55 +0200
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index fec67cb..fcc9abe 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -28,6 +28,7 @@ org.apache.ftpserver ftpserver-core * * * *
 org.jencks jencks * * * *
 org.eclipse.jetty.aggregate jetty-all-server * * * *
 org.fusesource.mqtt-client mqtt-client * * * *
+org.fusesource.fuse-extra fusemq-leveldb * * * *
 
 # Replaced by glassfish-j2ee
 org.apache.geronimo.specs geronimo-jta_1.0.1B_spec * * * *
diff --git a/debian/patches/exclude_leveldb.diff b/debian/patches/exclude_leveldb.diff
new file mode 100644
index 0000000..5e4e089
--- /dev/null
+++ b/debian/patches/exclude_leveldb.diff
@@ -0,0 +1,23 @@
+Description: Disable LevelDB Store (new feature of 5.6 release)
+ because it depends on non-existing library in Debian.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2012-05-28
+Forwarded: not-needed
+--- a/activemq-core/pom.xml
++++ b/activemq-core/pom.xml
+@@ -53,7 +53,6 @@
+       org.springframework.beans.factory.xml;resolution:=optional,
+       org.w3c.dom.traversal*;resolution:=optional,
+       org.fusesource.hawtbuf*;resolution:=optional,
+-      org.fusesource.mq.leveldb*;resolution:=optional,
+       *
+     </activemq.osgi.import.pkg>
+     <activemq.osgi.export>
+@@ -410,6 +409,7 @@
+         <configuration>
+         <excludes>
+            <exclude>**/mqtt/*</exclude>
++           <exclude>**/leveldb/*</exclude>
+         </excludes>
+         </configuration>
+       </plugin>
diff --git a/debian/patches/series b/debian/patches/series
index ba91e6d..2e8a2ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ javadoc_links.diff
 init_debian_default_values.diff
 activemq-admin.patch
 exclude_mqtt.diff
+exclude_leveldb.diff

-- 
Debian packaging for activemq