[eclipse-mylyn] 05/07: Refreshed patches
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Wed Jul 9 14:19:47 UTC 2014
This is an automated email from the git hooks/post-receive script.
xhaakon-guest pushed a commit to branch master
in repository eclipse-mylyn.
commit bcd697237da9510b1273cbb0bf7783637773a7e0
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Wed Jul 9 13:59:51 2014 +0200
Refreshed patches
---
debian/changelog | 2 +
debian/patches/debian-orbit-deps.patch | 110 ++++++++++----------------
debian/patches/remove-eclipse-ecf-usage.patch | 38 ++++++---
3 files changed, 70 insertions(+), 80 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 64be9dd..41a15a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
eclipse-mylyn (3.12.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Refreshed d/patches/remove-eclipse-ecf-usage.patch and
+ d/patches/debian-orbit-deps.patch.
-- Jakub Adam <jakub.adam at ktknet.cz> Wed, 09 Jul 2014 13:45:35 +0200
diff --git a/debian/patches/debian-orbit-deps.patch b/debian/patches/debian-orbit-deps.patch
index 5b05ba6..986a938 100644
--- a/debian/patches/debian-orbit-deps.patch
+++ b/debian/patches/debian-orbit-deps.patch
@@ -13,32 +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 | 23 ++++-
- .../META-INF/MANIFEST.MF | 22 +++--
- .../org.eclipse.mylyn.commons-feature/feature.xml | 105 +++++++++++++++++++++
- .../META-INF/MANIFEST.MF | 36 +++----
- .../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-feature/feature.xml | 8 +-
- .../org.eclipse.mylyn.trac-feature/feature.xml | 7 ++
- .../META-INF/MANIFEST.MF | 7 +-
- 12 files changed, 194 insertions(+), 40 deletions(-)
+ .../org.eclipse.mylyn.hudson-feature/feature.xml | 23 ++++-
+ .../META-INF/MANIFEST.MF | 22 ++---
+ .../org.eclipse.mylyn.commons-feature/feature.xml | 98 ++++++++++++++++++++++
+ .../META-INF/MANIFEST.MF | 36 ++++----
+ .../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-feature/feature.xml | 8 +-
+ .../org.eclipse.mylyn.trac-feature/feature.xml | 7 ++
+ .../META-INF/MANIFEST.MF | 7 +-
+ 11 files changed, 185 insertions(+), 37 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 0fdc14b..dccec70 100644
+index a9f25b9..2c9e5cf 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,13 +29,18 @@
+@@ -31,13 +31,18 @@
</license>
<requires>
- <import plugin="com.google.gson" version="2.1.0" match="compatible"/>
-
- <import feature="org.eclipse.mylyn.builds" version="1.3.0" match="compatible"/>
- <import feature="org.eclipse.mylyn.commons.repositories.http" version="1.3.0" match="compatible"/>
+ <import feature="org.eclipse.mylyn.builds" version="1.4.0" match="compatible"/>
+ <import feature="org.eclipse.mylyn.commons.repositories.http" version="1.4.0" match="compatible"/>
</requires>
<plugin
@@ -52,7 +51,7 @@ index 0fdc14b..dccec70 100644
id="org.eclipse.mylyn.hudson.core"
download-size="0"
install-size="0"
-@@ -49,4 +54,18 @@
+@@ -51,4 +56,18 @@
version="0.0.0"
unpack="false"/>
@@ -72,7 +71,7 @@ index 0fdc14b..dccec70 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 378c635..0bbd639 100644
+index 079b55a..d5042bd 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
@@ -18,13 +18,15 @@ Export-Package: org.eclipse.mylyn.hudson.core;x-friends:="org.eclipse.mylyn.huds
@@ -102,10 +101,10 @@ index 378c635..0bbd639 100644
+ javax.xml.bind,
+ 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 c96e57e..3277788 100644
+index 2d1f06f..ce7bad0 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,90 @@
+@@ -31,6 +31,90 @@
</license>
<plugin
@@ -196,7 +195,7 @@ index c96e57e..3277788 100644
id="org.eclipse.mylyn.commons.core"
download-size="0"
install-size="0"
-@@ -56,4 +140,25 @@
+@@ -58,4 +142,18 @@
version="0.0.0"
unpack="false"/>
@@ -214,16 +213,9 @@ index c96e57e..3277788 100644
+ version="0.0.0"
+ unpack="false"/>
+
-+ <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.repositories.http.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF
-index 3438128..b7f2d9a 100644
+index 2d2f178..29f267b 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
@@ -266,30 +258,8 @@ index 3438128..b7f2d9a 100644
+ 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 07333fd..8624075 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,7 @@ Bundle-SymbolicName: org.eclipse.mylyn.commons.soap;singleton:=true
- Bundle-Version: 3.11.0.qualifier
- Bundle-Vendor: %Bundle-Vendor
- 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",
-+Require-Bundle: org.apache.axis,
- org.apache.commons.httpclient;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.core.runtime,
- org.eclipse.core.net,
-@@ -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
-+Import-Package: javax.xml.soap
- 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 9f026e9..9ff5f14 100644
+index c402c1f..26362a7 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
@@ -303,10 +273,10 @@ index 9f026e9..9ff5f14 100644
Export-Package: org.eclipse.mylyn.internal.commons.xmlrpc;x-internal:=true
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 f967483..a6d5450 100644
+index 2482866..b11892b 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 @@
+@@ -31,6 +31,13 @@
</license>
<plugin
@@ -321,11 +291,11 @@ index f967483..a6d5450 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 6cf7627..bd1ccef 100644
+index ac2acd7..78bd78f 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.11.0" match="equivalent"/>
+@@ -34,12 +34,12 @@
+ <import feature="org.eclipse.mylyn_feature" version="3.12.0" match="equivalent"/>
</requires>
- <plugin
@@ -340,10 +310,10 @@ index 6cf7627..bd1ccef 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 e2c77b9..2e5d4c3 100644
+index 4a35eac..3ab3feb 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
-@@ -173,4 +173,11 @@
+@@ -175,4 +175,11 @@
version="0.0.0"
unpack="false"/>
@@ -356,18 +326,18 @@ index e2c77b9..2e5d4c3 100644
+
</feature>
diff --git a/org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/feature.xml b/org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/feature.xml
-index ce3f236..090b8f1 100644
+index 28ce19b..a62cdd1 100644
--- a/org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/feature.xml
+++ b/org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/feature.xml
-@@ -39,7 +39,6 @@
+@@ -41,7 +41,6 @@
<import plugin="org.apache.commons.logging" version="1.0.4" match="compatible"/>
<import plugin="org.apache.commons.httpclient" version="3.1.0" match="compatible"/>
<import plugin="org.apache.lucene.core" version="2.9.1" match="greaterOrEqual"/>
-- <import plugin="com.google.guava" version="10.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.mylyn.discovery" version="3.11.0" match="compatible"/>
- <import feature="org.eclipse.mylyn.monitor" version="3.11.0" match="compatible"/>
- <import feature="org.eclipse.mylyn.commons" version="3.11.0" match="compatible"/>
-@@ -49,6 +48,13 @@
+- <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.mylyn.discovery" version="3.12.0" match="compatible"/>
+ <import feature="org.eclipse.mylyn.monitor" version="3.12.0" match="compatible"/>
+ <import feature="org.eclipse.mylyn.commons" version="3.12.0" match="compatible"/>
+@@ -51,6 +50,13 @@
</requires>
<plugin
@@ -382,10 +352,10 @@ index ce3f236..090b8f1 100644
download-size="0"
install-size="0"
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 7819ded..0f1dd67 100644
+index f8e9abb..67abfd1 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 @@
+@@ -48,4 +48,11 @@
version="0.0.0"
unpack="false"/>
@@ -398,7 +368,7 @@ index 7819ded..0f1dd67 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 95b4871..6b1f439 100644
+index 216ec96..ad86f38 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,
diff --git a/debian/patches/remove-eclipse-ecf-usage.patch b/debian/patches/remove-eclipse-ecf-usage.patch
index 2690366..2055bc2 100644
--- a/debian/patches/remove-eclipse-ecf-usage.patch
+++ b/debian/patches/remove-eclipse-ecf-usage.patch
@@ -3,9 +3,9 @@ Date: Fri, 6 Jan 2012 19:01:29 +0100
Subject: remove-eclipse-ecf-usage
---
- .../org.eclipse.mylyn.hudson.ui/build.properties | 2 -
- .../mylyn/internal/hudson/ui/HudsonDiscovery.java | 26 ++++++++++----------
- 2 files changed, 13 insertions(+), 15 deletions(-)
+ .../org.eclipse.mylyn.hudson.ui/build.properties | 2 --
+ .../mylyn/internal/hudson/ui/HudsonDiscovery.java | 30 +++++++++++-----------
+ 2 files changed, 15 insertions(+), 17 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
@@ -18,7 +18,7 @@ index 5ea1ded..a5c7918 100644
-
-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 d64c6b0..6317e09 100644
+index 9500904..1f4f00a 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
@@ -20,7 +20,7 @@ import java.util.UUID;
@@ -39,7 +39,25 @@ index d64c6b0..6317e09 100644
import org.eclipse.mylyn.builds.ui.BuildsUi;
import org.eclipse.mylyn.commons.core.StatusHandler;
import org.eclipse.mylyn.commons.repositories.core.RepositoryLocation;
-@@ -55,14 +55,14 @@ public class HudsonDiscovery {
+@@ -53,7 +53,7 @@ public class HudsonDiscovery {
+ public abstract boolean triggerDiscovery();
+ }
+
+- private final class HudsonServiceListener extends AbstractServiceListener implements IServiceListener {
++ /*private final class HudsonServiceListener extends AbstractServiceListener implements IServiceListener {
+ public void serviceDiscovered(IServiceEvent anEvent) {
+ IServiceInfo serviceInfo = anEvent.getServiceInfo();
+ IServiceID serviceId = serviceInfo.getServiceID();
+@@ -102,7 +102,7 @@ public class HudsonDiscovery {
+ public boolean triggerDiscovery() {
+ return false;
+ }
+- }
++ }*/
+
+ private static final String ECF_DISCOVERY_JMDNS = "ecf.discovery.jmdns"; //$NON-NLS-1$
+
+@@ -115,14 +115,14 @@ public class HudsonDiscovery {
/** Server id property name (Jenkins only). */
private static final String SERVER_ID_PROPERTY = "server-id"; //$NON-NLS-1$
@@ -57,7 +75,7 @@ index d64c6b0..6317e09 100644
/**
* Determines whether or not the detected server is a new server or not.
-@@ -73,7 +73,7 @@ public class HudsonDiscovery {
+@@ -133,7 +133,7 @@ public class HudsonDiscovery {
* the server identifier
* @return <code>true</code> if the detected server is new.
*/
@@ -66,7 +84,7 @@ index d64c6b0..6317e09 100644
if (url == null) {
return false;
}
-@@ -84,10 +84,10 @@ public class HudsonDiscovery {
+@@ -144,10 +144,10 @@ public class HudsonDiscovery {
}
}
return true;
@@ -78,8 +96,8 @@ index d64c6b0..6317e09 100644
+ /*try {
container = getContainer();
final IDiscoveryLocator adapter = (IDiscoveryLocator) container.getAdapter(IDiscoveryLocator.class);
- adapter.addServiceListener(new IServiceListener() {
-@@ -143,21 +143,21 @@ public class HudsonDiscovery {
+ adapter.addServiceListener(new HudsonServiceListener());
+@@ -159,21 +159,21 @@ public class HudsonDiscovery {
} catch (ContainerConnectException e) {
StatusHandler.log(new Status(IStatus.WARNING, HudsonConnectorUi.ID_PLUGIN,
Messages.Discovery_CouldNotStartService, e));
@@ -105,7 +123,7 @@ index d64c6b0..6317e09 100644
String url = properties.getProperty(URL_PROPERTY).toString();
String id = getId(properties);
if (isNew(url, id)) {
-@@ -187,6 +187,6 @@ public class HudsonDiscovery {
+@@ -203,6 +203,6 @@ public class HudsonDiscovery {
id = UUID.randomUUID().toString();
}
return id;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-mylyn.git
More information about the pkg-java-commits
mailing list