[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.8.4-2-9-g8e435cf
Jakub Adam
jakub.adam at ktknet.cz
Fri Jun 28 17:40:07 UTC 2013
The following commit has been merged in the master branch:
commit 0633d606f95d2c6e387287dbfd3d7ea43135cc89
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Fri Jun 28 14:43:30 2013 +0200
Refreshed d/patches/debian-orbit-deps.patch
diff --git a/debian/changelog b/debian/changelog
index 5c6935c..ea9bdf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
eclipse-mylyn (3.9.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Refreshed d/patches/debian-orbit-deps.patch.
-- Jakub Adam <jakub.adam at ktknet.cz> Fri, 28 Jun 2013 19:11:03 +0200
diff --git a/debian/patches/debian-orbit-deps.patch b/debian/patches/debian-orbit-deps.patch
index 6ab23e2..08bb20c 100644
--- a/debian/patches/debian-orbit-deps.patch
+++ b/debian/patches/debian-orbit-deps.patch
@@ -13,38 +13,31 @@ 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 | 25 ++++-
- .../META-INF/MANIFEST.MF | 26 +++---
+ .../org.eclipse.mylyn.hudson-feature/feature.xml | 23 ++++-
+ .../META-INF/MANIFEST.MF | 22 +++--
.../org.eclipse.mylyn.commons-feature/feature.xml | 98 ++++++++++++++++++++
- .../feature.xml | 2 +-
- .../feature.xml | 4 +-
- .../feature.xml | 8 +-
.../META-INF/MANIFEST.MF | 36 +++----
- .../META-INF/MANIFEST.MF | 6 +-
+ .../META-INF/MANIFEST.MF | 5 +-
.../META-INF/MANIFEST.MF | 3 +-
.../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 | 7 +-
- 14 files changed, 187 insertions(+), 53 deletions(-)
+ 11 files changed, 180 insertions(+), 39 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 18a4f1a..5231267 100644
+index a38c772..f396171 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
-@@ -29,17 +29,20 @@
+@@ -29,13 +29,18 @@
</license>
<requires>
- <import plugin="com.google.gson" version="2.1.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="1.0.0" match="compatible"/>
- <import feature="org.eclipse.mylyn.commons.repositories.http" version="1.0.0" match="compatible"/>
+-
+ <import feature="org.eclipse.mylyn.builds" version="1.1.0" match="compatible"/>
+ <import feature="org.eclipse.mylyn.commons.repositories.http" version="1.1.0" match="compatible"/>
</requires>
<plugin
@@ -58,7 +51,7 @@ index 18a4f1a..5231267 100644
id="org.eclipse.mylyn.hudson.core"
download-size="0"
install-size="0"
-@@ -53,4 +56,18 @@
+@@ -49,4 +54,18 @@
version="0.0.0"
unpack="false"/>
@@ -78,32 +71,20 @@ index 18a4f1a..5231267 100644
+
</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 a22d579..0276ff5 100644
+index 6358559..bdd2e16 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,25 +10,23 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
- org.eclipse.mylyn.commons.core;bundle-version="3.8.0",
- org.eclipse.mylyn.commons.repositories.core;bundle-version="1.0.0",
- org.eclipse.mylyn.commons.repositories.http.core;bundle-version="1.0.0",
-- javax.xml.bind;bundle-version="2.1.0",
- com.sun.xml.bind;bundle-version="2.2.0";resolution:=optional
- Bundle-ActivationPolicy: lazy
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
- Bundle-Localization: plugin
- Export-Package: org.eclipse.mylyn.hudson.core;x-internal:=true,
- org.eclipse.mylyn.internal.hudson.core;x-internal:=true,
- org.eclipse.mylyn.internal.hudson.core.client;x-internal:=true,
- org.eclipse.mylyn.internal.hudson.model;x-internal:=true
+@@ -18,13 +18,15 @@ Export-Package: org.eclipse.mylyn.hudson.core;x-friends:="org.eclipse.mylyn.huds
+ org.eclipse.mylyn.internal.hudson.core.client;x-friends:="org.eclipse.mylyn.hudson.ui",
+ org.eclipse.mylyn.internal.hudson.model;x-friends:="org.eclipse.mylyn.hudson.ui"
Bundle-Activator: org.eclipse.mylyn.internal.hudson.core.HudsonCorePlugin
-Import-Package: com.google.gson;version="[2.1.0,3.0.0)",
-- 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.client;version="4.1.3",
+- org.apache.http.client.entity;version="4.1.3",
+- org.apache.http.client.methods;version="4.1.3",
+- org.apache.http.impl.client;version="4.1.3",
+- org.apache.http.cookie;version="4.1.3",
- org.apache.http.message;version="4.1.4",
- org.apache.http.protocol;version="4.1.4",
- org.apache.http.util;version="4.1.4"
@@ -118,9 +99,9 @@ index a22d579..0276ff5 100644
+ org.apache.http.protocol,
+ org.apache.http.util,
+ javax.xml.bind,
-+ javax.xml.bind.annotation
++ javax.xml.bind.annotation
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 36e2394..c13c7d2 100644
+index 4119219..fc50464 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
@@ -29,6 +29,83 @@
@@ -233,68 +214,8 @@ index 36e2394..c13c7d2 100644
+ 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 07e6349..41a5ff0 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.eclipse.mylyn.commons.identity"
-+ id="org.eclipse.mylyn.commons.identity.ui"
- download-size="0"
- install-size="0"
- 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 2686d9a..de0dbde 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.8.0" match="greaterOrEqual"/>
- </requires>
-
-- <plugin
-+ <!--plugin
- id="org.eclipse.mylyn.commons.notifications"
- download-size="0"
- install-size="0"
- version="0.0.0"
-- unpack="false"/>
-+ unpack="false"/-->
-
- <plugin
- 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 55a1f9b..91af748 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.8.0" match="greaterOrEqual"/>
- </requires>
-
-- <plugin
-+ <!--plugin
- id="org.eclipse.mylyn.commons.repositories"
- download-size="0"
- install-size="0"
- version="0.0.0"
-- unpack="false"/>
-+ unpack="false"/-->
-
-- <plugin
-+ <!--plugin
- id="org.eclipse.mylyn.commons.team"
- download-size="0"
- install-size="0"
- version="0.0.0"
-- unpack="false"/>
-+ unpack="false"/-->
-
- <plugin
- 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 0d265cb..0b3d13e 100644
+index 20f2333..3784455 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
@@ -307,18 +228,18 @@ index 0d265cb..0b3d13e 100644
- 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.auth;version="4.1.3",
+- org.apache.http.auth.params;version="4.1.3",
+- org.apache.http.client;version="4.1.3",
+- org.apache.http.client.methods;version="4.1.3",
+- org.apache.http.client.params;version="4.1.3",
+- org.apache.http.client.protocol;version="4.1.3",
+- org.apache.http.conn;version="4.1.3",
+- org.apache.http.conn.params;version="4.1.3",
+- org.apache.http.conn.scheme;version="4.1.3",
+- org.apache.http.impl.auth;version="4.1.3",
+- org.apache.http.impl.conn.tsccm;version="4.1.3",
+- org.apache.http.impl.client;version="4.1.3"
+ org.apache.http,
+ org.apache.http.message,
+ org.apache.http.params,
@@ -338,14 +259,13 @@ index 0d265cb..0b3d13e 100644
+ 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 1c45a91..8d9af5a 100644
+index cdad483..7c3eb7a 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
-@@ -4,10 +4,7 @@ Bundle-Name: %Bundle-Name
- Bundle-SymbolicName: org.eclipse.mylyn.commons.soap;singleton:=true
- Bundle-Version: 3.8.4.qualifier
+@@ -5,9 +5,7 @@ Bundle-SymbolicName: org.eclipse.mylyn.commons.soap;singleton:=true
+ Bundle-Version: 3.9.0.qualifier
Bundle-Vendor: %Bundle-Vendor
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-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",
@@ -353,7 +273,7 @@ index 1c45a91..8d9af5a 100644
org.apache.commons.httpclient;bundle-version="[3.1.0,4.0.0)",
org.eclipse.core.runtime,
org.eclipse.core.net,
-@@ -15,5 +12,6 @@ Require-Bundle: javax.xml.rpc;bundle-version="1.1.0",
+@@ -15,5 +13,6 @@ Require-Bundle: javax.xml.rpc;bundle-version="1.1.0",
Bundle-ClassPath: .
Export-Package: org.eclipse.mylyn.internal.commons.soap;x-internal:=true,
org.eclipse.mylyn.internal.provisional.commons.soap;x-internal:=true
@@ -361,7 +281,7 @@ index 1c45a91..8d9af5a 100644
Bundle-Localization: plugin
Eclipse-RegisterBuddy: org.apache.axis
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 dc54e53..6c1b475 100644
+index ce07b02..f208644 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
@@ -373,9 +293,9 @@ index dc54e53..6c1b475 100644
+ org.apache.xmlrpc.client;bundle-version="[3.0.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.mylyn.internal.commons.xmlrpc;x-internal:=true
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
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 5d122e7..00815e4 100644
+index 5cbb3bb..c9aaf9b 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 @@
@@ -393,11 +313,11 @@ index 5d122e7..00815e4 100644
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 544a7bc..efbf30b 100644
+index cf203f5..91af78e 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.8.4" match="equivalent"/>
+ <import feature="org.eclipse.mylyn_feature" version="3.9.0" match="equivalent"/>
</requires>
- <plugin
@@ -412,10 +332,10 @@ index 544a7bc..efbf30b 100644
<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 c8cb1c4..54b5c0f 100644
+index 6a1d867..d5848b7 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 @@
+@@ -138,4 +138,11 @@
version="0.0.0"
unpack="false"/>
@@ -428,7 +348,7 @@ index c8cb1c4..54b5c0f 100644
+
</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 6b0582f..b8dc2c6 100644
+index 35bb25b..d990e53 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 @@
@@ -444,7 +364,7 @@ index 6b0582f..b8dc2c6 100644
+
</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 7e2f59a..12c352d 100644
+index 3847b7d..1a4aa09 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
@@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.core.runtime,
@@ -459,7 +379,7 @@ index 7e2f59a..12c352d 100644
org.eclipse.mylyn.internal.trac.core.client;x-friends:="org.eclipse.mylyn.trac.ui",
@@ -18,5 +19,5 @@ Export-Package: org.eclipse.mylyn.internal.trac.core;x-friends:="org.eclipse.myl
Bundle-Activator: org.eclipse.mylyn.internal.trac.core.TracCorePlugin
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Localization: plugin
-Import-Package: com.google.gson;version="[2.1.0,3.0.0)",
- com.google.gson.reflect;version="[2.1.0,3.0.0)"
--
eclipse-mylyn - Plug-in for eclipse - Debian package.
More information about the pkg-java-commits
mailing list