[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. upstream/3.6.5-49-gf53a69b

[Jakub Adam]

The following commit has been merged in the master branch:
commit bface45b1760c70ffbb0d095be252698b9e46c5b
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Feb 26 11:16:09 2012 +0100

    Refreshed debian-orbit-deps.patch

diff --git a/debian/patches/debian-orbit-deps.patch b/debian/patches/debian-orbit-deps.patch
index d443ff3..5d82db5 100644
--- a/debian/patches/debian-orbit-deps.patch
+++ b/debian/patches/debian-orbit-deps.patch
@@ -13,30 +13,29 @@ Subject: debian-orbit-deps
  * remove versions from Import-Package directives so that distribution jars in
    /usr/share/java can be used
 ---
- .../org.eclipse.mylyn.hudson-feature/feature.xml   |   19 +++++++-
+ .../org.eclipse.mylyn.hudson-feature/feature.xml   |   18 ++++++-
  .../META-INF/MANIFEST.MF                           |    5 +-
  .../org.eclipse.mylyn.commons-feature/feature.xml  |   46 ++++++++++++++------
  .../META-INF/MANIFEST.MF                           |    7 +--
  .../META-INF/MANIFEST.MF                           |    3 +-
  .../META-INF/MANIFEST.MF                           |   10 ++--
  .../META-INF/MANIFEST.MF                           |    3 +-
- 7 files changed, 62 insertions(+), 31 deletions(-)
+ 7 files changed, 61 insertions(+), 31 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 232c47b..1820bcc 100644
+index 7db75df..5354d9e 100644
 --- a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml
 +++ b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml
-@@ -32,15 +32,28 @@
-       <import plugin="org.eclipse.mylyn.commons.net" version="3.6.0" match="compatible"/>
-       <import plugin="org.eclipse.mylyn.commons.repositories" version="0.8.0" match="compatible"/>
-       <import plugin="org.eclipse.mylyn.commons.ui" version="3.6.1" match="compatible"/>
+@@ -32,15 +32,27 @@
+       <import plugin="org.eclipse.mylyn.commons.net" version="3.6.0" match="equivalent"/>
+       <import plugin="org.eclipse.mylyn.commons.repositories" version="0.8.0" match="equivalent"/>
+       <import plugin="org.eclipse.mylyn.commons.ui" version="3.6.1" match="equivalent"/>
 -      <import plugin="com.google.gson" version="1.6.0" match="compatible"/>
        <import plugin="com.sun.xml.bind" version="2.2.0" match="compatible"/>
        <import plugin="javax.xml" version="1.3.4" match="compatible"/>
 -      <import plugin="javax.xml.bind" version="2.1.0" match="compatible"/>
 -      <import plugin="javax.xml.stream" version="1.0.1" match="compatible"/>
-+      <!--import plugin="javax.xml.stream" version="1.0.1" match="compatible"/-->
-       <import feature="org.eclipse.mylyn.builds" version="0.7.0" match="compatible"/>
+       <import feature="org.eclipse.mylyn.builds" version="0.8.5" match="compatible"/>
     </requires>
  
     <plugin
@@ -79,7 +78,7 @@ index 7760b98..3ef5c57 100644
 - javax.xml.stream;version="1.0.1"
 +Import-Package: com.google.gson
 diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml
-index b2959b6..e2c9129 100644
+index a439e74..20b6822 100644
 --- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml
 +++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml
 @@ -78,24 +78,32 @@
@@ -237,7 +236,7 @@ index be13572..35ab073 100644
  Export-Package: org.eclipse.mylyn.internal.commons.xmlrpc;x-internal:=true
  Bundle-RequiredExecutionEnvironment: J2SE-1.5
 diff --git a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
-index c795c68..fffc132 100644
+index e306896..1dabe64 100644
 --- a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
 +++ b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
 @@ -19,9 +19,9 @@ Export-Package: org.eclipse.mylyn.internal.provisional.tasks.core;x-internal:=tr
@@ -256,7 +255,7 @@ index c795c68..fffc132 100644
 + org.jdom;resolution:=optional
  Bundle-Localization: plugin
 diff --git a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
-index 8091b18..984d35e 100644
+index e051bda..bdaa1b4 100644
 --- a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
 +++ b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
 @@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.core.runtime,

-- 
eclipse-mylyn - Plug-in for eclipse - Debian package.