[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.7.1-1-6-g884f733
Jakub Adam
jakub.adam at ktknet.cz
Fri Jun 22 20:25:38 UTC 2012
The following commit has been merged in the master branch:
commit 884f733bd71f03f841d6efd1a3e0bacf727a2e99
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Fri Jun 22 21:34:06 2012 +0200
Refreshed d/patches/debian-orbit-deps.patch
diff --git a/debian/changelog b/debian/changelog
index 946799b..cfb04de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
eclipse-mylyn (3.8.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Refreshed d/patches/debian-orbit-deps.patch.
-- Jakub Adam <jakub.adam at ktknet.cz> Fri, 22 Jun 2012 21:18:59 +0200
diff --git a/debian/patches/debian-orbit-deps.patch b/debian/patches/debian-orbit-deps.patch
index 61b7d5d..f6a5a06 100644
--- a/debian/patches/debian-orbit-deps.patch
+++ b/debian/patches/debian-orbit-deps.patch
@@ -13,7 +13,7 @@ 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 | 33 +++++-
+ .../org.eclipse.mylyn.hudson-feature/feature.xml | 32 +++++-
.../META-INF/MANIFEST.MF | 24 ++--
.../org.eclipse.mylyn.commons-feature/feature.xml | 119 ++++++++++++++++++++
.../feature.xml | 2 +-
@@ -27,24 +27,24 @@ Subject: debian-orbit-deps
.../org.eclipse.mylyn.wikitext-feature/feature.xml | 7 ++
.../org.eclipse.mylyn.trac-feature/feature.xml | 7 ++
.../META-INF/MANIFEST.MF | 7 +-
- 14 files changed, 215 insertions(+), 51 deletions(-)
+ 14 files changed, 215 insertions(+), 50 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 d2431eb..566ef93 100644
+index 24dbae2..2516d1f 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,28 @@
+@@ -29,17 +29,29 @@
</license>
<requires>
-- <import plugin="com.google.gson" version="1.6.0" match="compatible"/>
+- <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="0.9.0" match="compatible"/>
- <import feature="org.eclipse.mylyn.commons.repositories.http" version="0.9.0" 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"/>
</requires>
<plugin
@@ -66,7 +66,7 @@ index d2431eb..566ef93 100644
id="org.eclipse.mylyn.hudson.core"
download-size="0"
install-size="0"
-@@ -53,4 +64,18 @@
+@@ -53,4 +65,18 @@
version="0.0.0"
unpack="false"/>
@@ -86,13 +86,13 @@ index d2431eb..566ef93 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 4d1d66a..ebc1750 100644
+index 3774cbc..34e34a0 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.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",
+ 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",
+ javax.xml.bind,
com.sun.xml.bind;bundle-version="2.2.0";resolution:=optional
@@ -102,7 +102,7 @@ index 4d1d66a..ebc1750 100644
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,2.0.0)",
+-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",
@@ -125,7 +125,7 @@ index 4d1d66a..ebc1750 100644
+ 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 ebc0f07..d96cef7 100644
+index 096318a..5798cca 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,104 @@
@@ -260,7 +260,7 @@ index ebc0f07..d96cef7 100644
+
</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 ce42cf4..e0d2bc8 100644
+index a548750..23b3bec 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 @@
@@ -273,11 +273,11 @@ index ce42cf4..e0d2bc8 100644
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 205b07b..1ad60b0 100644
+index 00a37de..80dde95 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"/>
+ <import feature="org.eclipse.mylyn.commons" version="3.8.0" match="greaterOrEqual"/>
</requires>
- <plugin
@@ -292,11 +292,11 @@ index 205b07b..1ad60b0 100644
<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 64d173c..9835f94 100644
+index 9ca5914..89b4c17 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"/>
+ <import feature="org.eclipse.mylyn.commons" version="3.8.0" match="greaterOrEqual"/>
</requires>
- <plugin
@@ -320,7 +320,7 @@ index 64d173c..9835f94 100644
<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 c1fd1d7..2656b4c 100644
+index 98f7f42..91d924f 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
@@ -364,11 +364,11 @@ index c1fd1d7..2656b4c 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 caca849..985cfea 100644
+index ff3afc3..74cc4b0 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,9 +5,8 @@ Bundle-SymbolicName: org.eclipse.mylyn.commons.soap;singleton:=true
- Bundle-Version: 3.7.1.qualifier
+ Bundle-Version: 3.8.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: javax.xml.rpc;bundle-version="1.1.0",
@@ -380,13 +380,13 @@ index caca849..985cfea 100644
org.eclipse.core.runtime,
org.eclipse.core.net,
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 589779d..59f0a82 100644
+index 5b7ac67..603e436 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
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.core;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.mylyn.commons.net;bundle-version="[3.8.0,4.0.0)",
- org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)"
+ org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)",
+ org.apache.xmlrpc.client;bundle-version="[3.0.0,4.0.0)"
@@ -394,7 +394,7 @@ index 589779d..59f0a82 100644
Export-Package: org.eclipse.mylyn.internal.commons.xmlrpc;x-internal:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 ca8d437..02d36bf 100644
+index 59a5978..477a2c5 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 @@
@@ -412,11 +412,11 @@ index ca8d437..02d36bf 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 26fff8d..fed3253 100644
+index b1029ed..a8ffe1a 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.1" match="equivalent"/>
+ <import feature="org.eclipse.mylyn_feature" version="3.8.0" match="equivalent"/>
</requires>
- <plugin
@@ -431,7 +431,7 @@ index 26fff8d..fed3253 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 1696bb2..877a926 100644
+index f837039..2216a4e 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 @@
@@ -447,7 +447,7 @@ index 1696bb2..877a926 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 8ab918a..8aa6e72 100644
+index 2e3fb0f..0b983e5 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 @@
@@ -463,13 +463,13 @@ index 8ab918a..8aa6e72 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 8486193..d4490b3 100644
+index 5ea9d44..7b3510c 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,
- 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)",
+ org.eclipse.mylyn.commons.core;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.mylyn.commons.net;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.mylyn.commons.xmlrpc;bundle-version="[3.8.0,4.0.0)",
- org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)"
+ org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)",
+ org.apache.xmlrpc.client;bundle-version="[3.0.0,4.0.0)"
@@ -480,7 +480,7 @@ index 8486193..d4490b3 100644
Bundle-Activator: org.eclipse.mylyn.internal.trac.core.TracCorePlugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Localization: plugin
--Import-Package: com.google.gson;version="[1.6.0,2.0.0)",
-- com.google.gson.reflect;version="[1.6.0,2.0.0)"
+-Import-Package: com.google.gson;version="[2.1.0,3.0.0)",
+- com.google.gson.reflect;version="[2.1.0,3.0.0)"
+Import-Package: com.google.gson,
+ com.google.gson.reflect
--
eclipse-mylyn - Plug-in for eclipse - Debian package.
More information about the pkg-java-commits
mailing list