[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.6.5+dfsg1-1-13-g53e333e
Jakub Adam
jakub.adam at ktknet.cz
Mon Apr 30 20:01:56 UTC 2012
The following commit has been merged in the master branch:
commit 31b5d91a94bb639a9bbc4a33837946cd4faf54f0
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sun Apr 1 18:14:22 2012 +0200
Refresh d/patches
diff --git a/debian/patches/correct-wikitext-core-version.patch b/debian/patches/correct-wikitext-core-version.patch
deleted file mode 100644
index c73a757..0000000
--- a/debian/patches/correct-wikitext-core-version.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Mon, 21 Nov 2011 22:15:41 +0100
-Subject: correct-wikitext-core-version
-
----
- .../META-INF/MANIFEST.MF | 2 +-
- .../META-INF/MANIFEST.MF | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core/META-INF/MANIFEST.MF
-index 231a8ec..2ad318f 100644
---- a/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core/META-INF/MANIFEST.MF
-+++ b/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core/META-INF/MANIFEST.MF
-@@ -2,7 +2,7 @@ Manifest-Version: 1.0
- Bundle-ManifestVersion: 2
- Bundle-Name: %Bundle-Name.0
- Bundle-SymbolicName: org.eclipse.mylyn.wikitext.core;singleton:=true
--Bundle-Version: 1.5.1.v20110720-0100
-+Bundle-Version: 1.5.0
- Bundle-Vendor: %Bundle-Vendor.0
- Export-Package: org.eclipse.mylyn.internal.wikitext.core;x-internal:=true,
- org.eclipse.mylyn.internal.wikitext.core.parser.builder;x-internal:=true,
-diff --git a/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.mediawiki.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.mediawiki.core/META-INF/MANIFEST.MF
-index 475d6e4..844965f 100644
---- a/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.mediawiki.core/META-INF/MANIFEST.MF
-+++ b/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.mediawiki.core/META-INF/MANIFEST.MF
-@@ -2,7 +2,7 @@ Manifest-Version: 1.0
- Bundle-ManifestVersion: 2
- Bundle-Name: %Bundle-Name.0
- Bundle-SymbolicName: org.eclipse.mylyn.wikitext.mediawiki.core;singleton:=true
--Bundle-Version: 1.5.2.v20110830-0100
-+Bundle-Version: 1.5.0
- Bundle-Vendor: %Bundle-Vendor.0
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
- Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="1.5.0",
---
diff --git a/debian/patches/debian-orbit-deps.patch b/debian/patches/debian-orbit-deps.patch
index 5d82db5..72e6251 100644
--- a/debian/patches/debian-orbit-deps.patch
+++ b/debian/patches/debian-orbit-deps.patch
@@ -13,29 +13,38 @@ 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 | 18 ++++++-
+ .../org.eclipse.mylyn.hudson-feature/feature.xml | 33 +++++-
+ .../META-INF/MANIFEST.MF | 24 ++--
+ .../org.eclipse.mylyn.commons-feature/feature.xml | 119 ++++++++++++++++++++
+ .../feature.xml | 2 +-
+ .../feature.xml | 4 +-
+ .../feature.xml | 8 +-
+ .../META-INF/MANIFEST.MF | 36 +++---
.../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 ++--
+ .../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.trac-feature/feature.xml | 7 +
.../META-INF/MANIFEST.MF | 3 +-
- 7 files changed, 61 insertions(+), 31 deletions(-)
+ 14 files changed, 213 insertions(+), 49 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 7db75df..5354d9e 100644
+index 2e5cfc9..5d3553c 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,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"/>
+@@ -29,17 +29,28 @@
+ </license>
+
+ <requires>
- <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 feature="org.eclipse.mylyn.builds" version="0.8.5" match="compatible"/>
+-
+ <import feature="org.eclipse.mylyn.builds" version="0.9.0" match="compatible"/>
+ <import feature="org.eclipse.mylyn.commons.repositories.http" version="0.9.0" match="compatible"/>
</requires>
<plugin
@@ -57,93 +66,223 @@ index 7db75df..5354d9e 100644
id="org.eclipse.mylyn.hudson.core"
download-size="0"
install-size="0"
+@@ -53,4 +64,18 @@
+ version="0.0.0"
+ unpack="false"/>
+
++ <plugin
++ id="org.apache.httpcomponents.httpcore"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.apache.httpcomponents.httpclient"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
+ </feature>
diff --git a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
-index 7760b98..3ef5c57 100644
+index 75603c5..e8a6ef3 100644
--- a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
- org.eclipse.mylyn.commons.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.mylyn.commons.net;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.mylyn.commons.repositories,
+ org.eclipse.mylyn.commons.core;bundle-version="3.7.0",
+ org.eclipse.mylyn.commons.repositories.core;bundle-version="0.9.0",
+ org.eclipse.mylyn.commons.repositories.http.core;bundle-version="0.9.0",
- javax.xml.bind;bundle-version="2.1.0",
+ javax.xml.bind,
com.sun.xml.bind;bundle-version="2.2.0";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-@@ -19,5 +19,4 @@ Export-Package: org.eclipse.mylyn.internal.hudson.core;x-internal:=true,
+@@ -20,15 +20,13 @@ Export-Package: org.eclipse.mylyn.hudson.core;x-internal:=true,
org.eclipse.mylyn.internal.hudson.core.client;x-internal:=true,
org.eclipse.mylyn.internal.hudson.model;x-internal:=true
Bundle-Activator: org.eclipse.mylyn.internal.hudson.core.HudsonCorePlugin
-Import-Package: com.google.gson;version="1.6.0",
-- javax.xml.stream;version="1.0.1"
-+Import-Package: com.google.gson
+- javax.activation,
+- javax.xml.stream;version="1.0.1",
+- org.apache.http;version="4.1.4",
+- org.apache.http.client;version="4.1.2",
+- org.apache.http.client.entity;version="4.1.2",
+- org.apache.http.client.methods;version="4.1.2",
+- org.apache.http.impl.client;version="4.1.2",
+- org.apache.http.cookie;version="4.1.2",
+- org.apache.http.message;version="4.1.4",
+- org.apache.http.protocol;version="4.1.4",
+- org.apache.http.util;version="4.1.4"
++Import-Package: com.google.gson,
++ org.apache.http,
++ org.apache.http.client,
++ org.apache.http.client.entity,
++ org.apache.http.client.methods,
++ org.apache.http.impl.client,
++ org.apache.http.cookie,
++ org.apache.http.message,
++ org.apache.http.protocol,
++ org.apache.http.util
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 a439e74..20b6822 100644
+index 2a7ec31..c1d760f 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 @@
- unpack="false"/>
+@@ -29,6 +29,104 @@
+ </license>
<plugin
-- id="org.apache.ws.commons.util"
++ id="org.apache.axis"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.apache.commons.discovery"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.apache.commons.lang"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.apache.xmlrpc"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
+ id="org.apache.xmlrpc.client"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
-- id="javax.xml.bind"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
+ id="org.apache.ws.commons.util"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="javax.activation"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="javax.mail"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="javax.wsdl"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="javax.xml"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="javax.xml.rpc"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="javax.xml.soap"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="com.sun.syndication"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
++ id="org.jdom"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
+ id="org.eclipse.mylyn.commons.core"
download-size="0"
install-size="0"
+@@ -56,4 +154,25 @@
version="0.0.0"
unpack="false"/>
-+ <!--plugin
-+ id="javax.xml.bind"
++ <plugin
++ id="org.eclipse.mylyn.commons.net"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
-+ unpack="false"/-->
-+
- <plugin
- id="org.apache.axis"
- download-size="0"
- install-size="0"
-- version="0.0.0"/>
-+ version="0.0.0"
+ unpack="false"/>
-
- <plugin
- id="javax.wsdl"
-@@ -108,26 +116,29 @@
- id="javax.xml.rpc"
- download-size="0"
- install-size="0"
-- version="0.0.0"/>
++
++ <plugin
++ id="org.eclipse.mylyn.commons.xmlrpc"
++ download-size="0"
++ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
-
- <plugin
- id="javax.xml.soap"
- download-size="0"
- install-size="0"
-- version="0.0.0"/>
++
++ <plugin
++ id="org.eclipse.mylyn.commons.soap"
++ download-size="0"
++ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
++
+ </feature>
+diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.identity-feature/feature.xml b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.identity-feature/feature.xml
+index de334ca..d74e080 100644
+--- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.identity-feature/feature.xml
++++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.identity-feature/feature.xml
+@@ -29,7 +29,7 @@
+ </license>
<plugin
- id="org.apache.commons.discovery"
+- id="org.eclipse.mylyn.commons.identity"
++ id="org.eclipse.mylyn.commons.identity.ui"
download-size="0"
install-size="0"
-- version="0.0.0"/>
-+ version="0.0.0"
-+ unpack="false"/>
+ version="0.0.0"
+diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.notifications-feature/feature.xml b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.notifications-feature/feature.xml
+index 54cee6a..54e89b4 100644
+--- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.notifications-feature/feature.xml
++++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.notifications-feature/feature.xml
+@@ -39,12 +39,12 @@
+ <import feature="org.eclipse.mylyn.commons" version="3.7.0" match="greaterOrEqual"/>
+ </requires>
- <plugin
+ <!--plugin
- id="org.apache.commons.logging"
+ id="org.eclipse.mylyn.commons.notifications"
download-size="0"
install-size="0"
version="0.0.0"
@@ -151,38 +290,27 @@ index a439e74..20b6822 100644
+ unpack="false"/-->
<plugin
- id="javax.activation"
-@@ -143,19 +154,19 @@
- version="0.0.0"
- unpack="false"/>
-
-- <plugin
-+ <!--plugin
- id="org.apache.commons.codec"
- download-size="0"
- install-size="0"
- version="0.0.0"
-- unpack="false"/>
-+ unpack="false"/-->
+ id="org.eclipse.mylyn.commons.notifications.core"
+diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories-feature/feature.xml b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories-feature/feature.xml
+index 23a00cd..cb5879e 100644
+--- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories-feature/feature.xml
++++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories-feature/feature.xml
+@@ -32,19 +32,19 @@
+ <import feature="org.eclipse.mylyn.commons" version="3.7.0" match="greaterOrEqual"/>
+ </requires>
- <plugin
+ <!--plugin
- id="org.apache.commons.httpclient"
+ id="org.eclipse.mylyn.commons.repositories"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="false"/-->
- <plugin
- id="org.apache.commons.lang"
-@@ -199,12 +210,12 @@
- version="0.0.0"
- unpack="false"/>
-
-- <plugin
-+ <!--plugin
- id="org.apache.commons.io"
+- <plugin
++ <!--plugin
+ id="org.eclipse.mylyn.commons.team"
download-size="0"
install-size="0"
version="0.0.0"
@@ -190,39 +318,69 @@ index a439e74..20b6822 100644
+ unpack="false"/-->
<plugin
- id="org.jdom"
-@@ -213,4 +224,11 @@
- version="0.0.0"
- unpack="false"/>
-
-+ <plugin
-+ id="com.sun.syndication"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
- </feature>
+ id="org.eclipse.mylyn.commons.repositories.core"
+diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF
+index 2893642..4d7fc68 100644
+--- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF
++++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF
+@@ -15,21 +15,21 @@ Export-Package: org.eclipse.mylyn.commons.repositories.http.core;x-internal:=tru
+ org.eclipse.mylyn.internal.commons.repositories.http.core;x-internal:=true
+ Bundle-Localization: plugin
+ Import-Package: org.apache.commons.logging;version="[1.0.4,2.0.0)",
+- org.apache.http;version="4.1.4",
+- org.apache.http.message;version="4.1.4",
+- org.apache.http.params;version="4.1.4",
+- org.apache.http.protocol;version="4.1.4",
+- org.apache.http.util;version="4.1.4",
+- org.apache.http.impl;version="4.1.4",
+- org.apache.http.auth;version="4.1.2",
+- org.apache.http.auth.params;version="4.1.2",
+- org.apache.http.client;version="4.1.2",
+- org.apache.http.client.methods;version="4.1.2",
+- org.apache.http.client.params;version="4.1.2",
+- org.apache.http.client.protocol;version="4.1.2",
+- org.apache.http.conn;version="4.1.2",
+- org.apache.http.conn.params;version="4.1.2",
+- org.apache.http.conn.scheme;version="4.1.2",
+- org.apache.http.impl.auth;version="4.1.2",
+- org.apache.http.impl.conn.tsccm;version="4.1.2",
+- org.apache.http.impl.client;version="4.1.2"
++ org.apache.http,
++ org.apache.http.message,
++ org.apache.http.params,
++ org.apache.http.protocol,
++ org.apache.http.util,
++ org.apache.http.impl,
++ org.apache.http.auth,
++ org.apache.http.auth.params,
++ org.apache.http.client,
++ org.apache.http.client.methods,
++ org.apache.http.client.params,
++ org.apache.http.client.protocol,
++ org.apache.http.conn,
++ org.apache.http.conn.params,
++ org.apache.http.conn.scheme,
++ org.apache.http.impl.auth,
++ org.apache.http.impl.conn.tsccm,
++ org.apache.http.impl.client
diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF
-index 4752377..ef2c4b1 100644
+index f98d36d..53cb21b 100644
--- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF
-@@ -5,10 +5,9 @@ Bundle-SymbolicName: org.eclipse.mylyn.commons.soap;singleton:=true
- Bundle-Version: 3.6.0.v20110608-1400
+@@ -5,9 +5,8 @@ Bundle-SymbolicName: org.eclipse.mylyn.commons.soap;singleton:=true
+ Bundle-Version: 3.7.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: javax.xml.rpc;bundle-version="1.1.0",
- javax.xml.soap;bundle-version="1.2.0",
- org.apache.axis;bundle-version="1.4.0",
-- org.apache.commons.httpclient;bundle-version="3.1.0",
+Require-Bundle: javax.xml.soap,
+ org.apache.axis,
-+ org.apache.commons.httpclient,
+ org.apache.commons.httpclient;bundle-version="[3.1.0,4.0.0)",
org.eclipse.core.runtime,
org.eclipse.core.net,
- org.eclipse.mylyn.commons.net;bundle-version="[3.1.0,4.0.0)"
diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF
-index be13572..35ab073 100644
+index e157ff1..b39d2e0 100644
--- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Vendor: %Bundle-Vendor
@@ -235,30 +393,80 @@ index be13572..35ab073 100644
Bundle-ActivationPolicy: lazy
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 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
- org.eclipse.mylyn.tasks.core,
- org.eclipse.mylyn.tasks.core.data,
- org.eclipse.mylyn.tasks.core.sync
--Import-Package: com.sun.syndication.feed;version="0.9.0";resolution:=optional,
-- com.sun.syndication.feed.module;version="0.9.0";resolution:=optional,
-- com.sun.syndication.feed.synd;version="0.9.0";resolution:=optional,
-- com.sun.syndication.io;version="0.9.0";resolution:=optional,
-- org.jdom;version="1.0.0";resolution:=optional
-+Import-Package: com.sun.syndication.feed;resolution:=optional,
-+ com.sun.syndication.feed.module;resolution:=optional,
-+ com.sun.syndication.feed.synd;resolution:=optional,
-+ com.sun.syndication.io;resolution:=optional,
-+ org.jdom;resolution:=optional
- Bundle-Localization: plugin
+diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.monitor-feature/feature.xml b/org.eclipse.mylyn.commons/org.eclipse.mylyn.monitor-feature/feature.xml
+index 981f1cd..e74d0bb 100644
+--- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.monitor-feature/feature.xml
++++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.monitor-feature/feature.xml
+@@ -29,6 +29,13 @@
+ </license>
+
+ <plugin
++ id="org.eclipse.mylyn.context.core"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
++ <plugin
+ id="org.eclipse.mylyn.monitor.core"
+ download-size="0"
+ install-size="0"
+diff --git a/org.eclipse.mylyn.context/org.eclipse.mylyn.context-feature/feature.xml b/org.eclipse.mylyn.context/org.eclipse.mylyn.context-feature/feature.xml
+index 138dee6..3b4d4ce 100644
+--- a/org.eclipse.mylyn.context/org.eclipse.mylyn.context-feature/feature.xml
++++ b/org.eclipse.mylyn.context/org.eclipse.mylyn.context-feature/feature.xml
+@@ -32,12 +32,12 @@
+ <import feature="org.eclipse.mylyn_feature" version="3.7.0" match="equivalent"/>
+ </requires>
+
+- <plugin
++ <!--plugin
+ id="org.eclipse.mylyn.context.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+- unpack="false"/>
++ unpack="false"/-->
+
+ <plugin
+ id="org.eclipse.mylyn.context.ui"
+diff --git a/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext-feature/feature.xml b/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext-feature/feature.xml
+index 67d0f2c..be556be 100644
+--- a/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext-feature/feature.xml
++++ b/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext-feature/feature.xml
+@@ -131,4 +131,11 @@
+ version="0.0.0"
+ unpack="false"/>
+
++ <plugin
++ id="org.jsoup"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
+ </feature>
+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 9f3196f..425cf40 100644
+--- a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac-feature/feature.xml
++++ b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac-feature/feature.xml
+@@ -46,4 +46,11 @@
+ version="0.0.0"
+ unpack="false"/>
+
++ <plugin
++ id="com.google.gson"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
+ </feature>
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 e051bda..bdaa1b4 100644
+index 74bf3c3..4ccac3b 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,
+@@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.commons.xmlrpc;bundle-version="[3.0.0,4.0.0)",
@@ -268,4 +476,3 @@ index e051bda..bdaa1b4 100644
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.mylyn.internal.trac.core;x-friends:="org.eclipse.mylyn.trac.ui",
org.eclipse.mylyn.internal.trac.core.client;x-friends:="org.eclipse.mylyn.trac.ui",
---
diff --git a/debian/patches/rebuild-prepare-install-profile-job-3-6.patch b/debian/patches/rebuild-prepare-install-profile-job-3-6.patch
index 701865f..e3937a5 100644
--- a/debian/patches/rebuild-prepare-install-profile-job-3-6.patch
+++ b/debian/patches/rebuild-prepare-install-profile-job-3-6.patch
@@ -4,10 +4,10 @@ Subject: rebuild-prepare-install-profile-job-3-6
---
.../build.properties | 8 +-
- .../ui/PrepareInstallProfileJob_e_3_6.java | 413 --------------------
+ .../ui/PrepareInstallProfileJob_e_3_6.java | 425 --------------------
.../mylyn/internal/discovery/ui/DiscoveryUi.java | 11 +-
- .../ui/PrepareInstallProfileJob_e_3_6.java | 413 ++++++++++++++++++++
- 4 files changed, 415 insertions(+), 430 deletions(-)
+ .../ui/PrepareInstallProfileJob_e_3_6.java | 425 ++++++++++++++++++++
+ 4 files changed, 427 insertions(+), 442 deletions(-)
delete mode 100644 org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java
create mode 100644 org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java
@@ -30,10 +30,10 @@ index ebba0e6..d4b87d9 100644
+src.includes = about.html
diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java b/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java
deleted file mode 100644
-index 8c3a09b..0000000
+index afaa427..0000000
--- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java
+++ /dev/null
-@@ -1,413 +0,0 @@
+@@ -1,425 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
@@ -59,6 +59,7 @@ index 8c3a09b..0000000
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
@@ -84,6 +85,10 @@ index 8c3a09b..0000000
-import org.eclipse.equinox.p2.ui.ProvisioningUI;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.mylyn.internal.discovery.core.model.ConnectorDescriptor;
+-import org.eclipse.mylyn.internal.discovery.ui.AbstractInstallJob;
+-import org.eclipse.mylyn.internal.discovery.ui.DiscoveryUi;
+-import org.eclipse.mylyn.internal.discovery.ui.InstalledItem;
+-import org.eclipse.mylyn.internal.discovery.ui.UninstallRequest;
-import org.eclipse.mylyn.internal.discovery.ui.util.DiscoveryUiUtil;
-import org.eclipse.mylyn.internal.discovery.ui.wizards.Messages;
-import org.eclipse.osgi.util.NLS;
@@ -396,13 +401,20 @@ index 8c3a09b..0000000
- if (repositoryLocations.add(uri)) {
- checkCancelled(monitor);
- repositoryTracker.addRepository(uri, null, session);
--// ProvisioningUtil.addMetaDataRepository(url.toURI(), true);
--// ProvisioningUtil.addArtifactRepository(url.toURI(), true);
--// ProvisioningUtil.setColocatedRepositoryEnablement(url.toURI(), true);
- }
- monitor.worked(1);
- }
-
+- // add selected repositories to resolve dependencies
+- URI[] knownRepositories = repositoryTracker.getKnownRepositories(session);
+- if (knownRepositories != null) {
+- for (URI uri : knownRepositories) {
+- if (Pattern.matches("http://download.eclipse.org/releases/.*", uri.toString())) {
+- repositoryLocations.add(uri);
+- }
+- }
+- }
+-
- // fetch meta-data for these repositories
- ArrayList<IMetadataRepository> repositories = new ArrayList<IMetadataRepository>();
- monitor.setWorkRemaining(repositories.size());
@@ -448,16 +460,16 @@ index 8c3a09b..0000000
-
-}
diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/DiscoveryUi.java b/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/DiscoveryUi.java
-index 17be5a6..65c8b07 100644
+index b76e697..45174f5 100644
--- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/DiscoveryUi.java
+++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/DiscoveryUi.java
-@@ -48,16 +48,7 @@ public abstract class DiscoveryUi {
+@@ -49,16 +49,7 @@ public abstract class DiscoveryUi {
}
public static AbstractInstallJob createInstallJob(List<ConnectorDescriptor> descriptors) {
- AbstractInstallJob runner = null;
- Bundle bundle = Platform.getBundle("org.eclipse.equinox.p2.engine"); //$NON-NLS-1$
-- if (bundle != null && new VersionRange("[1.0.0,1.1.0)").isIncluded(bundle.getVersion())) { //$NON-NLS-1$
+- if (bundle != null && new VersionRange("[1.0.0,1.1.0)").isIncluded(CoreUtil.getVersion(bundle))) { //$NON-NLS-1$
- // load class for Eclipse 3.5
- runner = new PrepareInstallProfileJob_e_3_5(descriptors);
- }
@@ -471,10 +483,10 @@ index 17be5a6..65c8b07 100644
public static boolean install(List<ConnectorDescriptor> descriptors, IRunnableContext context) {
diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java b/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java
new file mode 100644
-index 0000000..8c3a09b
+index 0000000..afaa427
--- /dev/null
+++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java
-@@ -0,0 +1,413 @@
+@@ -0,0 +1,425 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Tasktop Technologies and others.
+ * All rights reserved. This program and the accompanying materials
@@ -500,6 +512,7 @@ index 0000000..8c3a09b
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
++import java.util.regex.Pattern;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
@@ -525,6 +538,10 @@ index 0000000..8c3a09b
+import org.eclipse.equinox.p2.ui.ProvisioningUI;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.mylyn.internal.discovery.core.model.ConnectorDescriptor;
++import org.eclipse.mylyn.internal.discovery.ui.AbstractInstallJob;
++import org.eclipse.mylyn.internal.discovery.ui.DiscoveryUi;
++import org.eclipse.mylyn.internal.discovery.ui.InstalledItem;
++import org.eclipse.mylyn.internal.discovery.ui.UninstallRequest;
+import org.eclipse.mylyn.internal.discovery.ui.util.DiscoveryUiUtil;
+import org.eclipse.mylyn.internal.discovery.ui.wizards.Messages;
+import org.eclipse.osgi.util.NLS;
@@ -837,13 +854,20 @@ index 0000000..8c3a09b
+ if (repositoryLocations.add(uri)) {
+ checkCancelled(monitor);
+ repositoryTracker.addRepository(uri, null, session);
-+// ProvisioningUtil.addMetaDataRepository(url.toURI(), true);
-+// ProvisioningUtil.addArtifactRepository(url.toURI(), true);
-+// ProvisioningUtil.setColocatedRepositoryEnablement(url.toURI(), true);
+ }
+ monitor.worked(1);
+ }
+
++ // add selected repositories to resolve dependencies
++ URI[] knownRepositories = repositoryTracker.getKnownRepositories(session);
++ if (knownRepositories != null) {
++ for (URI uri : knownRepositories) {
++ if (Pattern.matches("http://download.eclipse.org/releases/.*", uri.toString())) {
++ repositoryLocations.add(uri);
++ }
++ }
++ }
++
+ // fetch meta-data for these repositories
+ ArrayList<IMetadataRepository> repositories = new ArrayList<IMetadataRepository>();
+ monitor.setWorkRemaining(repositories.size());
@@ -888,4 +912,3 @@ index 0000000..8c3a09b
+ }
+
+}
---
diff --git a/debian/patches/remove-eclipse-ecf-usage.patch b/debian/patches/remove-eclipse-ecf-usage.patch
index c76b119..2690366 100644
--- a/debian/patches/remove-eclipse-ecf-usage.patch
+++ b/debian/patches/remove-eclipse-ecf-usage.patch
@@ -3,14 +3,25 @@ Date: Fri, 6 Jan 2012 19:01:29 +0100
Subject: remove-eclipse-ecf-usage
---
- .../mylyn/internal/hudson/ui/HudsonDiscovery.java | 18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
+ .../org.eclipse.mylyn.hudson.ui/build.properties | 2 -
+ .../mylyn/internal/hudson/ui/HudsonDiscovery.java | 26 ++++++++++----------
+ 2 files changed, 13 insertions(+), 15 deletions(-)
+diff --git a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/build.properties b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/build.properties
+index 5ea1ded..a5c7918 100644
+--- a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/build.properties
++++ b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/build.properties
+@@ -17,5 +17,3 @@ bin.includes = META-INF/,\
+ plugin.xml,\
+ icons/
+ src.includes = about.html
+-
+-jars.extra.classpath = platform:/plugin/org.eclipse.ecf,platform:/plugin/org.eclipse.ecf.discovery,platform:/plugin/org.eclipse.ecf.provider.discovery,platform:/plugin/org.eclipse.ecf.provider.jmdns
diff --git a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java
-index 69db5ab..987ea18 100644
+index d64c6b0..6317e09 100644
--- a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java
+++ b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/internal/hudson/ui/HudsonDiscovery.java
-@@ -18,7 +18,7 @@ import java.util.UUID;
+@@ -20,7 +20,7 @@ import java.util.UUID;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -19,26 +30,23 @@ index 69db5ab..987ea18 100644
import org.eclipse.ecf.core.ContainerCreateException;
import org.eclipse.ecf.core.ContainerFactory;
import org.eclipse.ecf.core.IContainer;
-@@ -28,7 +28,7 @@ import org.eclipse.ecf.discovery.IServiceInfo;
+@@ -30,7 +30,7 @@ import org.eclipse.ecf.discovery.IServiceInfo;
import org.eclipse.ecf.discovery.IServiceListener;
import org.eclipse.ecf.discovery.IServiceProperties;
import org.eclipse.ecf.discovery.identity.IServiceID;
-import org.eclipse.ecf.discovery.identity.IServiceTypeID;
+import org.eclipse.ecf.discovery.identity.IServiceTypeID;*/
- import org.eclipse.mylyn.builds.core.IBuildServer;
import org.eclipse.mylyn.builds.ui.BuildsUi;
- import org.eclipse.mylyn.builds.ui.BuildsUiStartup;
-@@ -53,7 +53,7 @@ public class HudsonDiscovery extends BuildsUiStartup {
-
- private static HudsonDiscovery instance;
+ import org.eclipse.mylyn.commons.core.StatusHandler;
+ import org.eclipse.mylyn.commons.repositories.core.RepositoryLocation;
+@@ -55,14 +55,14 @@ public class HudsonDiscovery {
+ /** Server id property name (Jenkins only). */
+ private static final String SERVER_ID_PROPERTY = "server-id"; //$NON-NLS-1$
- private IContainer container;
+ //private IContainer container;
- public static HudsonDiscovery getInstance() {
- return instance;
-@@ -63,9 +63,9 @@ public class HudsonDiscovery extends BuildsUiStartup {
- instance = this;
+ public HudsonDiscovery() {
}
- protected IContainer getContainer() throws ContainerCreateException {
@@ -47,21 +55,34 @@ index 69db5ab..987ea18 100644
- }
+ }*/
- private boolean isNew(URI uri) {
- List<IBuildServer> servers = BuildsUi.getModel().getServers();
-@@ -85,7 +85,7 @@ public class HudsonDiscovery extends BuildsUiStartup {
+ /**
+ * Determines whether or not the detected server is a new server or not.
+@@ -73,7 +73,7 @@ public class HudsonDiscovery {
+ * the server identifier
+ * @return <code>true</code> if the detected server is new.
+ */
+- private boolean isNew(String url, String id) {
++ /*private boolean isNew(String url, String id) {
+ if (url == null) {
+ return false;
+ }
+@@ -84,10 +84,10 @@ public class HudsonDiscovery {
+ }
+ }
+ return true;
+- }
++ }*/
- @Override
- public void lazyStartup() {
+ public void start() {
- try {
+ /*try {
container = getContainer();
final IDiscoveryLocator adapter = (IDiscoveryLocator) container.getAdapter(IDiscoveryLocator.class);
adapter.addServiceListener(new IServiceListener() {
-@@ -132,14 +132,14 @@ public class HudsonDiscovery extends BuildsUiStartup {
+@@ -143,21 +143,21 @@ public class HudsonDiscovery {
} catch (ContainerConnectException e) {
StatusHandler.log(new Status(IStatus.WARNING, HudsonConnectorUi.ID_PLUGIN,
- Messages.HudsonDiscovery_CouldNotStartService, e));
+ Messages.Discovery_CouldNotStartService, e));
- }
+ }*/
}
@@ -76,4 +97,19 @@ index 69db5ab..987ea18 100644
}
private void notifyMessage(String title, String description) {
---
+ BuildsUi.serverDiscovered(title, description);
+ }
+
+- private void issueHudsonNotification(IServiceProperties properties) throws URISyntaxException {
++ /*private void issueHudsonNotification(IServiceProperties properties) throws URISyntaxException {
+ String url = properties.getProperty(URL_PROPERTY).toString();
+ String id = getId(properties);
+ if (isNew(url, id)) {
+@@ -187,6 +187,6 @@ public class HudsonDiscovery {
+ id = UUID.randomUUID().toString();
+ }
+ return id;
+- }
++ }*/
+
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 3879625..737f900 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
debian-orbit-deps.patch
rebuild-prepare-install-profile-job-3-6.patch
-correct-wikitext-core-version.patch
remove-eclipse-ecf-usage.patch
--
eclipse-mylyn - Plug-in for eclipse - Debian package.
More information about the pkg-java-commits
mailing list