[activemq] 18/29: Drop disable-org.linkedin-dependencies.patch

[Markus Koschany]

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

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

commit 19079b282dba1972771bd8d1ecaa5ba729e233e7
Author: Markus Koschany <apo at debian.org>
Date:   Sat Mar 19 16:01:31 2016 +0100

    Drop disable-org.linkedin-dependencies.patch
---
 .../disable-org.linkedin-dependencies.patch        | 30 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 31 deletions(-)

diff --git a/debian/patches/disable-org.linkedin-dependencies.patch b/debian/patches/disable-org.linkedin-dependencies.patch
deleted file mode 100644
index c87f936..0000000
--- a/debian/patches/disable-org.linkedin-dependencies.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sat, 19 Mar 2016 15:04:23 +0100
-Subject: disable org.linkedin dependencies
-
----
- activemq-spring/pom.xml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
-index 5ee43c5..e93ca17 100755
---- a/activemq-spring/pom.xml
-+++ b/activemq-spring/pom.xml
-@@ -87,7 +87,7 @@
-       <version>${hawtdispatch-version}</version>
-       <scope>provided</scope>
-     </dependency>
--    <dependency>
-+    <!--<dependency>
-       <groupId>org.linkedin</groupId>
-       <artifactId>org.linkedin.zookeeper-impl</artifactId>
-       <version>${linkedin-zookeeper-version}</version>
-@@ -98,7 +98,7 @@
-       <artifactId>org.linkedin.util-core</artifactId>
-       <version>${linkedin-zookeeper-version}</version>
-       <scope>provided</scope>
--    </dependency>
-+    </dependency>-->
-     <dependency>
-       <groupId>org.apache.zookeeper</groupId>
-       <artifactId>zookeeper</artifactId>
diff --git a/debian/patches/series b/debian/patches/series
index 16296e1..7fe3615 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ exclude-jmdns.patch
 disable-broker-test-dependency.patch
 disable-jetty-all-dependency.patch
 init-debian-default-values.patch
-disable-org.linkedin-dependencies.patch

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