[eclipse-pydev] 04/05: Refreshed d/patches/add-orbit-dependencies.patch

Jakub Adam xhaakon-guest at moszumanska.debian.org
Thu Jan 2 19:54:01 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-pydev.

commit bca23a8935a9a1a77e6f3bd49eb4b2204bdffa2b
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Jan 2 20:30:08 2014 +0100

    Refreshed d/patches/add-orbit-dependencies.patch
---
 debian/patches/add-orbit-dependencies.patch | 60 ++++++++++++++---------------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/debian/patches/add-orbit-dependencies.patch b/debian/patches/add-orbit-dependencies.patch
index abc0e8b..4339b9c 100644
--- a/debian/patches/add-orbit-dependencies.patch
+++ b/debian/patches/add-orbit-dependencies.patch
@@ -7,16 +7,16 @@ Subject: add-orbit-dependencies
  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, 108 insertions(+), 12 deletions(-)
+ .../META-INF/MANIFEST.MF                           | 12 +--
+ 5 files changed, 108 insertions(+), 11 deletions(-)
 
 diff --git a/features/org.python.pydev.feature/feature.xml b/features/org.python.pydev.feature/feature.xml
-index 3278400..ec47f39 100644
+index bee77e7..0277850 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="3.0.0.qualifier"/>
+          version="3.2.0.qualifier"/>
  
 +   <plugin
 +         id="javax.inject"
@@ -116,7 +116,7 @@ index 3278400..ec47f39 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 89702a2..c06b970 100644
+index dd00cc5..d6b2d24 100644
 --- a/plugins/org.python.pydev.core/META-INF/MANIFEST.MF
 +++ b/plugins/org.python.pydev.core/META-INF/MANIFEST.MF
 @@ -18,7 +18,8 @@ Require-Bundle: org.junit;bundle-version="4.0.0";resolution:=optional,
@@ -127,10 +127,10 @@ index 89702a2..c06b970 100644
 + org.python.pydev.shared_ui,
 + name.pachler.nio.file
  Bundle-ActivationPolicy: lazy
- Export-Package: org.python.pydev.core,
-  org.python.pydev.core.cache,
+ Export-Package: org.python.pydev.core,org.python.pydev.core.cache,org.
+  python.pydev.core.concurrency,org.python.pydev.core.docutils,org.pyth
 diff --git a/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF b/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF
-index aae251e..e9b1932 100644
+index 2e1b03c..58644f2 100644
 --- a/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF
 +++ b/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF
 @@ -28,7 +28,9 @@ Require-Bundle: org.junit;bundle-version="4.0.0";resolution:=optional,
@@ -142,10 +142,10 @@ index aae251e..e9b1932 100644
 + org.apache.xmlrpc,
 + org.apache.xmlrpc.server
  Bundle-ActivationPolicy: lazy
- Export-Package: org.python.pydev.debug.codecoverage,
-  org.python.pydev.debug.core,
+ Export-Package: org.python.pydev.debug.codecoverage,org.python.pydev.d
+  ebug.core,org.python.pydev.debug.model,org.python.pydev.debug.model.r
 diff --git a/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF b/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF
-index 2a391e5..c6bbd33 100644
+index 4867726..4896777 100644
 --- a/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF
 +++ b/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF
 @@ -15,7 +15,9 @@ Require-Bundle: org.eclipse.core.runtime,
@@ -157,16 +157,16 @@ index 2a391e5..c6bbd33 100644
 + org.python,
 + com.google.guava
  Bundle-ActivationPolicy: lazy
- Export-Package: org.python.compiler,
-  org.python.core,
+ Export-Package: org.python.compiler,org.python.core,org.python.modules
+  ,org.python.modules.sre,org.python.parser,org.python.pydev.jython,org
 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 3a2db0e..19c00cc 100644
+index 89e3918..6dc8621 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: 3.0.0.qualifier
+ Bundle-Version: 3.2.0.qualifier
 -Bundle-ClassPath: interactive_console.jar,
 - commons-logging-1.1.1.jar,
 - ws-commons-util-1.0.2.jar,
@@ -177,23 +177,19 @@ index 3a2db0e..19c00cc 100644
  Bundle-Activator: org.python.pydev.shared_interactive_console.InteractiveConsolePlugin
  Bundle-Localization: plugin
  Eclipse-BundleShape: dir
-@@ -23,7 +18,7 @@ Require-Bundle: org.eclipse.ui,
+@@ -23,12 +18,13 @@ Require-Bundle: org.eclipse.ui,
   org.eclipse.ui.ide,
   org.python.pydev.shared_ui
  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,
-@@ -37,8 +32,8 @@ Export-Package: org.apache.commons.logging,
-  org.apache.xmlrpc.serializer,
-  org.apache.xmlrpc.server,
-  org.apache.xmlrpc.util,
-- org.apache.xmlrpc.webserver,
-- org.python.pydev.shared_interactive_console,
-+ org.apache.xmlrpc.webserver
-+Export-Package: org.python.pydev.shared_interactive_console,
-  org.python.pydev.shared_interactive_console.console,
-  org.python.pydev.shared_interactive_console.console.codegen,
-  org.python.pydev.shared_interactive_console.console.ui,
+-Export-Package: org.apache.commons.logging,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,org.a
+  pache.xmlrpc,org.apache.xmlrpc.client,org.apache.xmlrpc.client.util,o
+  rg.apache.xmlrpc.common,org.apache.xmlrpc.jaxb,org.apache.xmlrpc.meta
+  data,org.apache.xmlrpc.parser,org.apache.xmlrpc.serializer,org.apache
+- .xmlrpc.server,org.apache.xmlrpc.util,org.apache.xmlrpc.webserver,org
++ .xmlrpc.server,org.apache.xmlrpc.util,org.apache.xmlrpc.webserver
++Export-Package: org
+  .python.pydev.shared_interactive_console,org.python.pydev.shared_inte
+  ractive_console.console,org.python.pydev.shared_interactive_console.c
+  onsole.codegen,org.python.pydev.shared_interactive_console.console.ui

-- 
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