[eclipse-pydev] 01/01: Fix Export-Package in shared_interactive_console jar manifest

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch experimental
in repository eclipse-pydev.

commit ce38b8eca7a61df98970676e1eb902298b888466
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Feb 27 22:20:48 2015 +0100

    Fix Export-Package in shared_interactive_console jar manifest
    
    We can't export packages we're actually importing after we replaced bundled
    Apache xmlrpc with a version from the distribution.
---
 ...org.python.pydev.shared_interactive_console.patch | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/patches/MANIFEST-org.python.pydev.shared_interactive_console.patch b/debian/patches/MANIFEST-org.python.pydev.shared_interactive_console.patch
index 54f2b0d..c32d271 100644
--- a/debian/patches/MANIFEST-org.python.pydev.shared_interactive_console.patch
+++ b/debian/patches/MANIFEST-org.python.pydev.shared_interactive_console.patch
@@ -3,11 +3,11 @@ Date: Thu, 26 Feb 2015 22:59:11 +0100
 Subject: MANIFEST org.python.pydev.shared_interactive_console
 
 ---
- .../META-INF/MANIFEST.MF                                     | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
+ .../META-INF/MANIFEST.MF                              | 19 ++++++-------------
+ 1 file changed, 6 insertions(+), 13 deletions(-)
 
 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 3ec4a94..8093c82 100644
+index 3ec4a94..e0ff673 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
@@ -24,7 +24,7 @@ index 3ec4a94..8093c82 100644
  Bundle-Activator: org.python.pydev.shared_interactive_console.InteractiveConsolePlugin
  Bundle-Localization: plugin
  Eclipse-BundleShape: dir
-@@ -21,7 +16,10 @@ Require-Bundle: org.eclipse.ui,
+@@ -21,14 +16,12 @@ Require-Bundle: org.eclipse.ui,
   org.eclipse.ui.workbench.texteditor,
   org.python.pydev.shared_core,
   org.eclipse.ui.ide,
@@ -34,5 +34,13 @@ index 3ec4a94..8093c82 100644
 + org.apache.xmlrpc.server,
 + org.apache.xmlrpc.client
  Bundle-ActivationPolicy: lazy
- Export-Package: org.apache.commons.logging,org.apache.commons.logging.
-  impl,org.apache.ws.commons.serialize,org.apache.ws.commons.util,org.a
+-Export-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
++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