[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 7f6552f9f1d85fda60815569971798dfc96435fe
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Mon May 28 14:03:49 2012 +0200

    New upstream release:
    
    * New upstream release:
      - Refresh all patches.
      - d/patches/exclude_mqtt.diff: Disable MQTT transport for now.

diff --git a/debian/changelog b/debian/changelog
index a348d23..3ca834c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 activemq (5.6.0+dfsg-1) UNRELEASED; urgency=low
 
-  * New upstream release.
-  * Refresh all patches:
+  * New upstream release:
+    - Refresh all patches.
     - Drop d/patches/CVE-2011-4605.diff: merged upstream.
+    - d/patches/exclude_mqtt.diff: Disable MQTT transport 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 c89a28f..fec67cb 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -27,6 +27,7 @@ org.apache.directory.server apacheds-server-integ * * * *
 org.apache.ftpserver ftpserver-core * * * *
 org.jencks jencks * * * *
 org.eclipse.jetty.aggregate jetty-all-server * * * *
+org.fusesource.mqtt-client mqtt-client * * * *
 
 # Replaced by glassfish-j2ee
 org.apache.geronimo.specs geronimo-jta_1.0.1B_spec * * * *
diff --git a/debian/patches/exclude_mqtt.diff b/debian/patches/exclude_mqtt.diff
new file mode 100644
index 0000000..8335012
--- /dev/null
+++ b/debian/patches/exclude_mqtt.diff
@@ -0,0 +1,32 @@
+Description: Disable MQTT transport (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
+@@ -54,8 +54,6 @@
+       org.w3c.dom.traversal*;resolution:=optional,
+       org.fusesource.hawtbuf*;resolution:=optional,
+       org.fusesource.mq.leveldb*;resolution:=optional,
+-      org.fusesource.mqtt.client*;resolution:=optional,
+-      org.fusesource.mqtt.codec*;resolution:=optional,
+       *
+     </activemq.osgi.import.pkg>
+     <activemq.osgi.export>
+@@ -407,6 +405,15 @@
+         </configuration>
+       </plugin>
+ 
++      <plugin>
++        <artifactId>maven-compiler-plugin</artifactId>
++        <configuration>
++        <excludes>
++           <exclude>**/mqtt/*</exclude>
++        </excludes>
++        </configuration>
++      </plugin>
++
+       <!-- Configure which tests are included/excuded -->
+       <plugin>
+         <artifactId>maven-surefire-plugin</artifactId>
diff --git a/debian/patches/series b/debian/patches/series
index 8cdb9d7..ba91e6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ exclude_spring_osgi.diff
 javadoc_links.diff
 init_debian_default_values.diff
 activemq-admin.patch
+exclude_mqtt.diff

-- 
Debian packaging for activemq