[eclipse-mylyn] 04/05: Build-Depends on libguava-java

[Jakub Adam]

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

xhaakon-guest pushed a commit to branch master
in repository eclipse-mylyn.

commit dcdba664680c970450fbf71e02bbd74ed5d10068
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Mar 31 22:38:52 2014 +0200

    Build-Depends on libguava-java
---
 debian/changelog                       |  1 +
 debian/control                         |  1 +
 debian/eclipse.orbitdeps               |  1 +
 debian/patches/debian-orbit-deps.patch | 29 ++++++++++++++++++++++++++++-
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1966398..e101d54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ eclipse-mylyn (3.11.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Refreshed d/patches/debian-orbit-deps.patch.
+  * Build-Depends on libguava-java.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 31 Mar 2014 22:00:40 +0200
 
diff --git a/debian/control b/debian/control
index bc0e468..cc75ca4 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends: debhelper (>= 8~),
                libcommons-io-java,
                libcommons-lang-java,
                libgnumail-java (>= 1.1.2-8),
+               libguava-java,
                libgoogle-gson-java,
                libhttpclient-java (>= 4.1.1-2),
                libhttpcore-java (>= 4.1.4-2),
diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps
index 5850521..0aaac94 100644
--- a/debian/eclipse.orbitdeps
+++ b/debian/eclipse.orbitdeps
@@ -5,6 +5,7 @@ commons-io
 commons-lang
 gnumail
 gson
+guava
 httpclient
 httpcore
 jdom1
diff --git a/debian/patches/debian-orbit-deps.patch b/debian/patches/debian-orbit-deps.patch
index d00b292..5b05ba6 100644
--- a/debian/patches/debian-orbit-deps.patch
+++ b/debian/patches/debian-orbit-deps.patch
@@ -22,9 +22,10 @@ Subject: debian-orbit-deps
  .../org.eclipse.mylyn.monitor-feature/feature.xml  |   7 ++
  .../org.eclipse.mylyn.context-feature/feature.xml  |   4 +-
  .../org.eclipse.mylyn.wikitext-feature/feature.xml |   7 ++
+ .../org.eclipse.mylyn-feature/feature.xml          |   8 +-
  .../org.eclipse.mylyn.trac-feature/feature.xml     |   7 ++
  .../META-INF/MANIFEST.MF                           |   7 +-
- 11 files changed, 187 insertions(+), 39 deletions(-)
+ 12 files changed, 194 insertions(+), 40 deletions(-)
 
 diff --git a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml
 index 0fdc14b..dccec70 100644
@@ -354,6 +355,32 @@ index e2c77b9..2e5d4c3 100644
 +         unpack="false"/>
 +
  </feature>
+diff --git a/org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/feature.xml b/org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/feature.xml
+index ce3f236..090b8f1 100644
+--- a/org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/feature.xml
++++ b/org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/feature.xml
+@@ -39,7 +39,6 @@
+       <import plugin="org.apache.commons.logging" version="1.0.4" match="compatible"/>
+       <import plugin="org.apache.commons.httpclient" version="3.1.0" match="compatible"/>
+       <import plugin="org.apache.lucene.core" version="2.9.1" match="greaterOrEqual"/>
+-      <import plugin="com.google.guava" version="10.0.0" match="greaterOrEqual"/>
+       <import feature="org.eclipse.mylyn.discovery" version="3.11.0" match="compatible"/>
+       <import feature="org.eclipse.mylyn.monitor" version="3.11.0" match="compatible"/>
+       <import feature="org.eclipse.mylyn.commons" version="3.11.0" match="compatible"/>
+@@ -49,6 +48,13 @@
+    </requires>
+ 
+    <plugin
++         id="com.google.guava"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
+          id="org.eclipse.mylyn.tasks.core"
+          download-size="0"
+          install-size="0"
 diff --git a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac-feature/feature.xml b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac-feature/feature.xml
 index 7819ded..0f1dd67 100644
 --- a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac-feature/feature.xml

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