[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. upstream/3.6.2-14-gf71019b

[Jakub Adam]

The following commit has been merged in the master branch:
commit f71019bb6be75bd245d2b1f735429bf782c52619
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Nov 7 19:22:27 2011 +0100

    Enable dependencies of org.apache.axis

diff --git a/debian/control b/debian/control
index 97312d9..2a73953 100644
--- a/debian/control
+++ b/debian/control
@@ -11,11 +11,14 @@ Build-Depends: debhelper (>= 8~),
                eclipse-pde (>= 3.7~exp),
                eclipse-egit,
                libaxis-java (>= 1.4-16),
+               libcommons-discovery-java (>= 0.5-2),
                libcommons-lang-java,
+               libgnumail-java (>= 1.1.2-6),
                libjaxp1.3-java (>= 1.3.05-2),
                libjdom1-java (>= 1.1.2+dfsg-2),
-               librome-java (>= 1.0-3),
+               librome-java (>= 1.0-2),
                libws-commons-util-java,
+               libwsdl4j-java (>= 1.6.2-4),
                libxmlrpc3-client-java (>= 3.1.3-4),
                libxmlrpc3-common-java (>= 3.1.3-4),
                javahelper (>= 0.31),
diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps
index 8e5f95c..b5e4d53 100644
--- a/debian/eclipse.orbitdeps
+++ b/debian/eclipse.orbitdeps
@@ -1,9 +1,14 @@
+activation
 axis
+axis-jaxrpc
 axis-saaj
+commons-discovery
 commons-lang
+gnumail
 jdom1
 rome
 ws-commons-util
+wsdl4j
 xml-apis
 xmlrpc-common-3.1
 xmlrpc-client-3.1
diff --git a/debian/patches/debian-orbit-deps.patch b/debian/patches/debian-orbit-deps.patch
index ce49e0e..05a9aaa 100644
--- a/debian/patches/debian-orbit-deps.patch
+++ b/debian/patches/debian-orbit-deps.patch
@@ -12,20 +12,19 @@ Subject: debian-orbit-deps
  * add com.sun.syndication
  * remove versions from Import-Package directives so that distribution jars in
    /usr/share/java can be used
-
 ---
- .../org.eclipse.mylyn.commons-feature/feature.xml  |   62 +++++++++++++-------
- .../META-INF/MANIFEST.MF                           |    7 +-
+ .../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 +-
- 5 files changed, 52 insertions(+), 33 deletions(-)
+ 7 files changed, 53 insertions(+), 26 deletions(-)
 
 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 312741f..eae1f27 100644
+index 312741f..a085fde 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,84 +78,95 @@
+@@ -78,24 +78,32 @@
           unpack="false"/>
  
     <plugin
@@ -59,23 +58,15 @@ index 312741f..eae1f27 100644
 +         version="0.0.0"
 +         unpack="false"/>
  
--   <plugin
-+   <!--plugin
+    <plugin
           id="javax.wsdl"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/>
-+         unpack="false"/-->
- 
--   <plugin
-+   <!--plugin
+@@ -108,26 +116,29 @@
           id="javax.xml.rpc"
           download-size="0"
           install-size="0"
 -         version="0.0.0"/>
 +         version="0.0.0"
-+         unpack="false"/-->
++         unpack="false"/>
  
     <plugin
           id="javax.xml.soap"
@@ -85,14 +76,13 @@ index 312741f..eae1f27 100644
 +         version="0.0.0"
 +         unpack="false"/>
  
--   <plugin
-+   <!--plugin
+    <plugin
           id="org.apache.commons.discovery"
           download-size="0"
           install-size="0"
 -         version="0.0.0"/>
 +         version="0.0.0"
-+         unpack="false"/-->
++         unpack="false"/>
  
 -   <plugin
 +   <!--plugin
@@ -103,23 +93,11 @@ index 312741f..eae1f27 100644
 -         unpack="false"/>
 +         unpack="false"/-->
  
--   <plugin
-+   <!--plugin
+    <plugin
           id="javax.activation"
-          download-size="0"
-          install-size="0"
+@@ -143,19 +154,19 @@
           version="0.0.0"
--         unpack="false"/>
-+         unpack="false"/-->
- 
--   <plugin
-+   <!--plugin
-          id="javax.mail"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/>
-+         unpack="false"/-->
+          unpack="false"/>
  
 -   <plugin
 +   <!--plugin

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