[eclipse-pydev] 16/19: Refreshed patches
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Fri Nov 22 08:31:54 UTC 2013
This is an automated email from the git hooks/post-receive script.
xhaakon-guest pushed a commit to branch master
in repository eclipse-pydev.
commit 8b0ef413b1c44592969ec026c12e4e3439c299d2
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Thu Nov 21 17:17:45 2013 +0100
Refreshed patches
---
debian/patches/add-orbit-dependencies.patch | 48 ++++++++-------------
debian/patches/jython-compatibility-fixes.patch | 6 +--
debian/patches/no-e4.patch | 33 ++++++--------
debian/patches/remove-windows-specific-code.patch | 10 ++---
4 files changed, 40 insertions(+), 57 deletions(-)
diff --git a/debian/patches/add-orbit-dependencies.patch b/debian/patches/add-orbit-dependencies.patch
index c19691f..abc0e8b 100644
--- a/debian/patches/add-orbit-dependencies.patch
+++ b/debian/patches/add-orbit-dependencies.patch
@@ -4,19 +4,19 @@ Subject: add-orbit-dependencies
---
features/org.python.pydev.feature/feature.xml | 96 ++++++++++++++++++++++
- plugins/org.python.pydev.core/META-INF/MANIFEST.MF | 6 +-
+ plugins/org.python.pydev.core/META-INF/MANIFEST.MF | 3 +-
.../org.python.pydev.debug/META-INF/MANIFEST.MF | 4 +-
.../org.python.pydev.jython/META-INF/MANIFEST.MF | 4 +-
.../META-INF/MANIFEST.MF | 13 +--
- 5 files changed, 109 insertions(+), 14 deletions(-)
+ 5 files changed, 108 insertions(+), 12 deletions(-)
diff --git a/features/org.python.pydev.feature/feature.xml b/features/org.python.pydev.feature/feature.xml
-index 6bbc275..f38be36 100644
+index 3278400..ec47f39 100644
--- a/features/org.python.pydev.feature/feature.xml
+++ b/features/org.python.pydev.feature/feature.xml
@@ -240,4 +240,100 @@ This Agreement is governed by the laws of the State of New York and the intellec
install-size="160"
- version="2.8.2"/>
+ version="3.0.0.qualifier"/>
+ <plugin
+ id="javax.inject"
@@ -116,34 +116,24 @@ index 6bbc275..f38be36 100644
+ unpack="false"/>
</feature>
diff --git a/plugins/org.python.pydev.core/META-INF/MANIFEST.MF b/plugins/org.python.pydev.core/META-INF/MANIFEST.MF
-index 1d57ccf..47edfb8 100644
+index 89702a2..c06b970 100644
--- a/plugins/org.python.pydev.core/META-INF/MANIFEST.MF
+++ b/plugins/org.python.pydev.core/META-INF/MANIFEST.MF
-@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
- Bundle-Name: Core Plug-in
- Bundle-SymbolicName: org.python.pydev.core; singleton:=true
- Bundle-Version: 2.8.2
--Bundle-ClassPath: core.jar,
-- lib/jpathwatch-0-95.jar
-+Bundle-ClassPath: core.jar
- Bundle-Activator: org.python.pydev.core.CorePlugin
- Bundle-Vendor: Aptana
- Bundle-Localization: plugin
-@@ -18,7 +17,8 @@ Require-Bundle: org.junit;bundle-version="4.0.0";resolution:=optional,
+@@ -18,7 +18,8 @@ Require-Bundle: org.junit;bundle-version="4.0.0";resolution:=optional,
org.eclipse.ui.console,
org.eclipse.core.variables,
org.python.pydev.shared_core;visibility:=reexport,
- org.python.pydev.shared_ui
+ org.python.pydev.shared_ui,
+ name.pachler.nio.file
- Eclipse-LazyStart: true
+ Bundle-ActivationPolicy: lazy
Export-Package: org.python.pydev.core,
org.python.pydev.core.cache,
diff --git a/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF b/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF
-index c50e1c5..c63c43d 100644
+index aae251e..e9b1932 100644
--- a/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF
-@@ -27,7 +27,9 @@ Require-Bundle: org.junit;bundle-version="4.0.0";resolution:=optional,
+@@ -28,7 +28,9 @@ Require-Bundle: org.junit;bundle-version="4.0.0";resolution:=optional,
org.eclipse.core.expressions,
org.python.pydev.jython,
org.python.pydev.shared_interactive_console,
@@ -151,14 +141,14 @@ index c50e1c5..c63c43d 100644
+ org.python.pydev.shared_ui,
+ org.apache.xmlrpc,
+ org.apache.xmlrpc.server
- Eclipse-LazyStart: true
+ Bundle-ActivationPolicy: lazy
Export-Package: org.python.pydev.debug.codecoverage,
org.python.pydev.debug.core,
diff --git a/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF b/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF
-index 69d1a30..48e240c 100644
+index 2a391e5..c6bbd33 100644
--- a/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF
+++ b/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF
-@@ -14,7 +14,9 @@ Require-Bundle: org.eclipse.core.runtime,
+@@ -15,7 +15,9 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.console,
org.eclipse.jface.text,
org.junit;bundle-version="4.0";resolution:=optional,
@@ -166,17 +156,17 @@ index 69d1a30..48e240c 100644
+ org.python.pydev.shared_ui,
+ org.python,
+ com.google.guava
- Eclipse-LazyStart: true
+ Bundle-ActivationPolicy: lazy
Export-Package: org.python.compiler,
org.python.core,
diff --git a/plugins/org.python.pydev.shared_interactive_console/META-INF/MANIFEST.MF b/plugins/org.python.pydev.shared_interactive_console/META-INF/MANIFEST.MF
-index ec42049..56d1453 100644
+index 3a2db0e..19c00cc 100644
--- a/plugins/org.python.pydev.shared_interactive_console/META-INF/MANIFEST.MF
+++ b/plugins/org.python.pydev.shared_interactive_console/META-INF/MANIFEST.MF
@@ -3,12 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Interactive Console Plug-in
Bundle-SymbolicName: org.python.pydev.shared_interactive_console;singleton:=true
- Bundle-Version: 2.8.2
+ Bundle-Version: 3.0.0.qualifier
-Bundle-ClassPath: interactive_console.jar,
- commons-logging-1.1.1.jar,
- ws-commons-util-1.0.2.jar,
@@ -186,17 +176,17 @@ index ec42049..56d1453 100644
+Bundle-ClassPath: interactive_console.jar
Bundle-Activator: org.python.pydev.shared_interactive_console.InteractiveConsolePlugin
Bundle-Localization: plugin
- Require-Bundle: org.eclipse.ui,
-@@ -22,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
+ Eclipse-BundleShape: dir
+@@ -23,7 +18,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.ide,
org.python.pydev.shared_ui
- Eclipse-LazyStart: true
+ Bundle-ActivationPolicy: lazy
-Export-Package: org.apache.commons.logging,
+Import-Package: org.apache.commons.logging,
org.apache.commons.logging.impl,
org.apache.ws.commons.serialize,
org.apache.ws.commons.util,
-@@ -36,8 +31,8 @@ Export-Package: org.apache.commons.logging,
+@@ -37,8 +32,8 @@ Export-Package: org.apache.commons.logging,
org.apache.xmlrpc.serializer,
org.apache.xmlrpc.server,
org.apache.xmlrpc.util,
diff --git a/debian/patches/jython-compatibility-fixes.patch b/debian/patches/jython-compatibility-fixes.patch
index 23c26d8..901405b 100644
--- a/debian/patches/jython-compatibility-fixes.patch
+++ b/debian/patches/jython-compatibility-fixes.patch
@@ -8,7 +8,7 @@ Subject: jython-compatibility-fixes
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/plugins/org.python.pydev.jython/src/org/python/pydev/jython/IPythonInterpreter.java b/plugins/org.python.pydev.jython/src/org/python/pydev/jython/IPythonInterpreter.java
-index d39861d..04d9a8a 100644
+index d9caad8..84d7616 100644
--- a/plugins/org.python.pydev.jython/src/org/python/pydev/jython/IPythonInterpreter.java
+++ b/plugins/org.python.pydev.jython/src/org/python/pydev/jython/IPythonInterpreter.java
@@ -38,7 +38,7 @@ public interface IPythonInterpreter {
@@ -21,7 +21,7 @@ index d39861d..04d9a8a 100644
/**
* This method returns the variable that we want to get from the interpreter as a PyObject
diff --git a/plugins/org.python.pydev.jython/src/org/python/pydev/jython/JythonPlugin.java b/plugins/org.python.pydev.jython/src/org/python/pydev/jython/JythonPlugin.java
-index a68bc97..d9c4681 100644
+index 8b8e464..fcc56b2 100644
--- a/plugins/org.python.pydev.jython/src/org/python/pydev/jython/JythonPlugin.java
+++ b/plugins/org.python.pydev.jython/src/org/python/pydev/jython/JythonPlugin.java
@@ -28,7 +28,6 @@ import org.osgi.framework.Bundle;
@@ -31,7 +31,7 @@ index a68bc97..d9c4681 100644
-import org.python.core.PyJavaClass;
import org.python.core.PyObject;
import org.python.core.PySystemState;
- import org.python.pydev.core.docutils.StringUtils;
+ import org.python.pydev.core.log.Log;
@@ -517,14 +516,11 @@ public class JythonPlugin extends AbstractUIPlugin {
//actually, this is more likely to happen when raising an exception in jython
if (e instanceof PyException) {
diff --git a/debian/patches/no-e4.patch b/debian/patches/no-e4.patch
index c2c72c3..7769af5 100644
--- a/debian/patches/no-e4.patch
+++ b/debian/patches/no-e4.patch
@@ -1,25 +1,25 @@
From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Sat, 28 Sep 2013 09:23:52 +0200
+Date: Thu, 21 Nov 2013 17:06:05 +0100
Subject: no-e4
---
- .../src/org/python/pydev/plugin/PydevPlugin.java | 17 +----------------
- 1 file changed, 1 insertion(+), 16 deletions(-)
+ .../src/org/python/pydev/shared_ui/SharedUiPlugin.java | 15 ---------------
+ 1 file changed, 15 deletions(-)
-diff --git a/plugins/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java b/plugins/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java
-index 9521ae4..45bc450 100644
---- a/plugins/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java
-+++ b/plugins/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java
-@@ -23,8 +23,6 @@ import org.eclipse.core.runtime.IPath;
- import org.eclipse.core.runtime.Path;
- import org.eclipse.core.runtime.Platform;
- import org.eclipse.core.runtime.Status;
+diff --git a/plugins/org.python.pydev.shared_ui/src/org/python/pydev/shared_ui/SharedUiPlugin.java b/plugins/org.python.pydev.shared_ui/src/org/python/pydev/shared_ui/SharedUiPlugin.java
+index b07253e..30f5468 100644
+--- a/plugins/org.python.pydev.shared_ui/src/org/python/pydev/shared_ui/SharedUiPlugin.java
++++ b/plugins/org.python.pydev.shared_ui/src/org/python/pydev/shared_ui/SharedUiPlugin.java
+@@ -8,8 +8,6 @@ package org.python.pydev.shared_ui;
+
+ import java.lang.reflect.Field;
+
-import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
-import org.eclipse.e4.ui.services.IStylingEngine;
- import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Color;
-@@ -539,19 +537,6 @@ public class PydevPlugin extends AbstractUIPlugin {
+ import org.eclipse.swt.widgets.Control;
+@@ -103,19 +101,6 @@ public class SharedUiPlugin extends AbstractUIPlugin {
@SuppressWarnings("restriction")
public static void setCssId(Object control, String id, boolean applyToChildren) {
@@ -39,10 +39,3 @@ index 9521ae4..45bc450 100644
}
public static void fixSelectionStatusDialogStatusLineColor(Object dialog, Color color) {
-@@ -566,4 +551,4 @@ public class PydevPlugin extends AbstractUIPlugin {
- Log.log(e);
- }
- }
--}
-\ No newline at end of file
-+}
diff --git a/debian/patches/remove-windows-specific-code.patch b/debian/patches/remove-windows-specific-code.patch
index b17e7c2..c568263 100644
--- a/debian/patches/remove-windows-specific-code.patch
+++ b/debian/patches/remove-windows-specific-code.patch
@@ -7,11 +7,11 @@ Subject: remove-windows-specific-code
1 file changed, 50 deletions(-)
diff --git a/plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterProviderFactory.java b/plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterProviderFactory.java
-index e12f3de..94e7c39 100644
+index a333c18..0a3a2e3 100644
--- a/plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterProviderFactory.java
+++ b/plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterProviderFactory.java
-@@ -7,9 +7,6 @@ import java.util.List;
- import org.python.pydev.core.log.Log;
+@@ -24,9 +24,6 @@ import org.python.pydev.runners.SimpleRunner;
+ import org.python.pydev.shared_core.string.StringUtils;
import org.python.pydev.shared_core.utils.PlatformUtils;
-import at.jta.Key;
@@ -20,8 +20,8 @@ index e12f3de..94e7c39 100644
public class PythonInterpreterProviderFactory extends AbstractInterpreterProviderFactory {
public IInterpreterProvider[] getInterpreterProviders(InterpreterType type) {
-@@ -25,53 +22,6 @@ public class PythonInterpreterProviderFactory extends AbstractInterpreterProvide
- if (ret != null) {
+@@ -59,53 +56,6 @@ public class PythonInterpreterProviderFactory extends AbstractInterpreterProvide
+ if (ret.length > 0) {
return AlreadyInstalledInterpreterProvider.create("python", ret);
}
- } else {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-pydev.git
More information about the pkg-java-commits
mailing list