[eclipse-pydev] 06/11: Refreshed d/patches
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Mon Aug 11 16:30:00 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 ec7e76477749fce46b4d7283e38d12c703389246
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Mon Aug 11 14:39:46 2014 +0200
Refreshed d/patches
---
debian/patches/add-orbit-dependencies.patch | 835 ++++++++++++++++++++--
debian/patches/jython-compatibility-fixes.patch | 53 --
debian/patches/pydev-jython-src-path.patch | 21 -
debian/patches/remove-windows-specific-code.patch | 6 +-
debian/patches/series | 2 -
5 files changed, 772 insertions(+), 145 deletions(-)
diff --git a/debian/patches/add-orbit-dependencies.patch b/debian/patches/add-orbit-dependencies.patch
index 4339b9c..3499ecc 100644
--- a/debian/patches/add-orbit-dependencies.patch
+++ b/debian/patches/add-orbit-dependencies.patch
@@ -3,21 +3,503 @@ Date: Fri, 27 Sep 2013 21:21:04 +0200
Subject: add-orbit-dependencies
---
- features/org.python.pydev.feature/feature.xml | 96 ++++++++++++++++++++++
- 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 | 12 +--
- 5 files changed, 108 insertions(+), 11 deletions(-)
+ features/org.python.pydev.feature/feature.xml | 582 ++++++++++++---------
+ plugins/org.python.pydev.core/META-INF/MANIFEST.MF | 57 +-
+ .../org.python.pydev.debug/META-INF/MANIFEST.MF | 96 ++--
+ .../org.python.pydev.jython/META-INF/MANIFEST.MF | 50 +-
+ .../META-INF/MANIFEST.MF | 76 ++-
+ 5 files changed, 479 insertions(+), 382 deletions(-)
diff --git a/features/org.python.pydev.feature/feature.xml b/features/org.python.pydev.feature/feature.xml
-index bee77e7..0277850 100644
+index f197ddf..2a2c4a7 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.2.0.qualifier"/>
-
+@@ -1,243 +1,339 @@
+-<?xml version = "1.0" encoding="UTF-8"?>
+-<!--
+-Note: it's important that the versions that need to be replaced are written as version="xxx", because that's what the
+-build matches when doing a replace (so, the version of the xml has some extra spaces so that it's not replaced)
+--->
+-<feature
+- id="org.python.pydev.feature"
+- label="PyDev for Eclipse"
+- version="3.6.0.qualifier"
+- provider-name="Aptana"
+- plugin="org.python.pydev">
+-
+- <description>
+- Python Development Environment
+- </description>
+-
+- <copyright>
+- © Appcelerator, Inc.
+- </copyright>
+-
+- <license url="http://www.opensource.org/licenses/eclipse-1.0.php">
+- Eclipse Public License - v 1.0
+-
+-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT’S ACCEPTANCE OF THIS AGREEMENT.
+-
+-1. DEFINITIONS
+-
+-"Contribution" means:
+-
+- a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+- b) in the case of each subsequent Contributor:
+-
+- i)changes to the Program, and
+-
+- ii)additions to the Program;
+-
+- where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor’s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative wo [...]
+-
+-"Contributor" means any person or entity that distributes the Program.
+-
+-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+-
+-"Program" means the Contributions distributed in accordance with this Agreement.
+-
+-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+-
+-2. GRANT OF RIGHTS
+-
+-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+-
+-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contributi [...]
+-
+-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted her [...]
+-
+-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+-
+-3. REQUIREMENTS
+-
+-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+-
+- a) it complies with the terms and conditions of this Agreement; and
+-
+- b) its license agreement:
+-
+- i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+-
+- ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+-
+- iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+-
+- iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+-
+-When the Program is made available in source code form:
+-
+- a) it must be made available under this Agreement; and
+-
+- b) a copy of this Agreement must be included with each copy of the Program.
+-
+-Contributors may not remove or alter any copyright notices contained within the Program.
+-
+-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+-
+-4. COMMERCIAL DISTRIBUTION
+-
+-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commerci [...]
+-
+-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor’s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims [...]
+-
+-5. NO WARRANTY
+-
+-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights un [...]
+-
+-6. DISCLAIMER OF LIABILITY
+-
+-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN I [...]
+-
+-7. GENERAL
+-
+-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+-
+-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient’s patent(s), then such Recipient’s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+-
+-All Recipient’s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient’s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient’s obligations under this Agreement and any licenses granted by Rec [...]
+-
+-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the respon [...]
+-
+-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+- </license>
+-
+- <requires>
+- <import plugin="org.eclipse.ui"/>
+- <import plugin="org.eclipse.core.runtime"/>
+- <import plugin="org.eclipse.jface.text"/>
+- <import plugin="org.eclipse.core.resources"/>
+- <import plugin="org.eclipse.ui.workbench.texteditor"/>
+- <import plugin="org.eclipse.core.filebuffers"/>
+- <import plugin="org.eclipse.ui.ide"/>
+- <import plugin="org.eclipse.ui.editors"/>
+- <import plugin="org.eclipse.ui.console"/>
+- <import plugin="org.eclipse.ui.views"/>
+- <import plugin="org.eclipse.debug.core"/>
+- <import plugin="org.eclipse.core.variables"/>
+- <import plugin="org.eclipse.search"/>
+- <import plugin="org.eclipse.debug.ui"/>
+- <import plugin="org.eclipse.ltk.core.refactoring"/>
+- <import plugin="org.eclipse.ltk.ui.refactoring"/>
+- </requires>
+-
+- <plugin
+- id="org.python.pydev.core"
+- download-size="188"
+- install-size="188"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="org.python.pydev.parser"
+- download-size="444"
+- install-size="444"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="org.python.pydev.ast"
+- download-size="20"
+- install-size="20"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="org.python.pydev.jython"
+- download-size="4280"
+- install-size="4280"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="org.python.pydev.help"
+- download-size="300"
+- install-size="300"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="org.python.pydev"
+- download-size="2440"
+- install-size="2440"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="org.python.pydev.debug"
+- download-size="1350"
+- install-size="1350"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="org.python.pydev.refactoring"
+- download-size="504"
+- install-size="504"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="org.python.pydev.customizations"
+- download-size="300"
+- install-size="300"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="org.python.pydev.django"
+- download-size="300"
+- install-size="300"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="com.python.pydev"
+- download-size="824"
+- install-size="824"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="com.python.pydev.analysis"
+- download-size="240"
+- install-size="240"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="com.python.pydev.fastparser"
+- download-size="40"
+- install-size="40"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="com.python.pydev.codecompletion"
+- download-size="60"
+- install-size="60"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="com.python.pydev.debug"
+- download-size="56"
+- install-size="56"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="com.python.pydev.refactoring"
+- download-size="160"
+- install-size="160"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="org.python.pydev.shared_interactive_console"
+- download-size="160"
+- install-size="160"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="org.python.pydev.shared_ui"
+- download-size="160"
+- install-size="160"
+- version="3.6.0.qualifier"/>
+-
+- <plugin
+- id="org.python.pydev.shared_core"
+- download-size="160"
+- install-size="160"
+- version="3.6.0.qualifier"/>
+-
+-</feature>
++<?xml version = "1.0" encoding="UTF-8"?>
++<!--
++Note: it's important that the versions that need to be replaced are written as version="xxx", because that's what the
++build matches when doing a replace (so, the version of the xml has some extra spaces so that it's not replaced)
++-->
++<feature
++ id="org.python.pydev.feature"
++ label="PyDev for Eclipse"
++ version="3.6.0.qualifier"
++ provider-name="Aptana"
++ plugin="org.python.pydev">
++
++ <description>
++ Python Development Environment
++ </description>
++
++ <copyright>
++ © Appcelerator, Inc.
++ </copyright>
++
++ <license url="http://www.opensource.org/licenses/eclipse-1.0.php">
++ Eclipse Public License - v 1.0
++
++THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT’S ACCEPTANCE OF THIS AGREEMENT.
++
++1. DEFINITIONS
++
++"Contribution" means:
++
++ a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
++ b) in the case of each subsequent Contributor:
++
++ i)changes to the Program, and
++
++ ii)additions to the Program;
++
++ where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor’s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative wo [...]
++
++"Contributor" means any person or entity that distributes the Program.
++
++"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
++
++"Program" means the Contributions distributed in accordance with this Agreement.
++
++"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
++
++2. GRANT OF RIGHTS
++
++a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
++
++b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contributi [...]
++
++c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted her [...]
++
++d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
++
++3. REQUIREMENTS
++
++A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
++
++ a) it complies with the terms and conditions of this Agreement; and
++
++ b) its license agreement:
++
++ i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
++
++ ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
++
++ iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
++
++ iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
++
++When the Program is made available in source code form:
++
++ a) it must be made available under this Agreement; and
++
++ b) a copy of this Agreement must be included with each copy of the Program.
++
++Contributors may not remove or alter any copyright notices contained within the Program.
++
++Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
++
++4. COMMERCIAL DISTRIBUTION
++
++Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commerci [...]
++
++For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor’s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims [...]
++
++5. NO WARRANTY
++
++EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights un [...]
++
++6. DISCLAIMER OF LIABILITY
++
++EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN I [...]
++
++7. GENERAL
++
++If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
++
++If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient’s patent(s), then such Recipient’s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
++
++All Recipient’s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient’s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient’s obligations under this Agreement and any licenses granted by Rec [...]
++
++Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the respon [...]
++
++This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
++ </license>
++
++ <requires>
++ <import plugin="org.eclipse.ui"/>
++ <import plugin="org.eclipse.core.runtime"/>
++ <import plugin="org.eclipse.jface.text"/>
++ <import plugin="org.eclipse.core.resources"/>
++ <import plugin="org.eclipse.ui.workbench.texteditor"/>
++ <import plugin="org.eclipse.core.filebuffers"/>
++ <import plugin="org.eclipse.ui.ide"/>
++ <import plugin="org.eclipse.ui.editors"/>
++ <import plugin="org.eclipse.ui.console"/>
++ <import plugin="org.eclipse.ui.views"/>
++ <import plugin="org.eclipse.debug.core"/>
++ <import plugin="org.eclipse.core.variables"/>
++ <import plugin="org.eclipse.search"/>
++ <import plugin="org.eclipse.debug.ui"/>
++ <import plugin="org.eclipse.ltk.core.refactoring"/>
++ <import plugin="org.eclipse.ltk.ui.refactoring"/>
++ </requires>
++
++ <plugin
++ id="org.python.pydev.core"
++ download-size="188"
++ install-size="188"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="org.python.pydev.parser"
++ download-size="444"
++ install-size="444"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="org.python.pydev.ast"
++ download-size="20"
++ install-size="20"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="org.python.pydev.jython"
++ download-size="4280"
++ install-size="4280"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="org.python.pydev.help"
++ download-size="300"
++ install-size="300"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="org.python.pydev"
++ download-size="2440"
++ install-size="2440"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="org.python.pydev.debug"
++ download-size="1350"
++ install-size="1350"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="org.python.pydev.refactoring"
++ download-size="504"
++ install-size="504"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="org.python.pydev.customizations"
++ download-size="300"
++ install-size="300"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="org.python.pydev.django"
++ download-size="300"
++ install-size="300"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="com.python.pydev"
++ download-size="824"
++ install-size="824"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="com.python.pydev.analysis"
++ download-size="240"
++ install-size="240"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="com.python.pydev.fastparser"
++ download-size="40"
++ install-size="40"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="com.python.pydev.codecompletion"
++ download-size="60"
++ install-size="60"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="com.python.pydev.debug"
++ download-size="56"
++ install-size="56"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="com.python.pydev.refactoring"
++ download-size="160"
++ install-size="160"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="org.python.pydev.shared_interactive_console"
++ download-size="160"
++ install-size="160"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="org.python.pydev.shared_ui"
++ download-size="160"
++ install-size="160"
++ version="3.6.0.qualifier"/>
++
++ <plugin
++ id="org.python.pydev.shared_core"
++ download-size="160"
++ install-size="160"
++ version="3.6.0.qualifier"/>
++
+ <plugin
+ id="javax.inject"
+ download-size="0"
@@ -114,82 +596,303 @@ index bee77e7..0277850 100644
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
- </feature>
++</feature>
diff --git a/plugins/org.python.pydev.core/META-INF/MANIFEST.MF b/plugins/org.python.pydev.core/META-INF/MANIFEST.MF
-index dd00cc5..d6b2d24 100644
+index 1ae88a2..29362a1 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,
- org.eclipse.ui.console,
- org.eclipse.core.variables,
- org.python.pydev.shared_core;visibility:=reexport,
-- org.python.pydev.shared_ui
+@@ -1,28 +1,29 @@
+-Manifest-Version: 1.0
+-Bundle-ManifestVersion: 2
+-Bundle-Name: Core Plug-in
+-Bundle-SymbolicName: org.python.pydev.core; singleton:=true
+-Bundle-Version: 3.6.0.qualifier
+-Bundle-ClassPath: core.jar
+-Bundle-Activator: org.python.pydev.core.CorePlugin
+-Bundle-Vendor: Aptana
+-Bundle-Localization: plugin
+-Eclipse-BundleShape: dir
+-Require-Bundle: org.junit;bundle-version="4.0.0";resolution:=optional,
+- org.eclipse.ui,
+- org.eclipse.core.runtime,
+- org.eclipse.jface.text,
+- org.eclipse.core.resources,
+- org.eclipse.ui.workbench.texteditor,
+- org.eclipse.core.filebuffers,
+- org.eclipse.ui.console,
+- org.eclipse.core.variables,
+- org.python.pydev.shared_core;visibility:=reexport,
+- org.python.pydev.shared_ui
+-Bundle-ActivationPolicy: lazy
+-Export-Package: org.python.pydev.core,org.python.pydev.core.cache,org.
+- python.pydev.core.concurrency,org.python.pydev.core.docutils,org.pyth
+- on.pydev.core.log,org.python.pydev.core.parser,org.python.pydev.core.
+- performanceeval,org.python.pydev.core.resource_stubs,org.python.pydev
+- .core.structure
+-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
++Manifest-Version: 1.0
++Bundle-ManifestVersion: 2
++Bundle-Name: Core Plug-in
++Bundle-SymbolicName: org.python.pydev.core; singleton:=true
++Bundle-Version: 3.6.0.qualifier
++Bundle-ClassPath: core.jar
++Bundle-Activator: org.python.pydev.core.CorePlugin
++Bundle-Vendor: Aptana
++Bundle-Localization: plugin
++Eclipse-BundleShape: dir
++Require-Bundle: org.junit;bundle-version="4.0.0";resolution:=optional,
++ org.eclipse.ui,
++ org.eclipse.core.runtime,
++ org.eclipse.jface.text,
++ org.eclipse.core.resources,
++ org.eclipse.ui.workbench.texteditor,
++ org.eclipse.core.filebuffers,
++ org.eclipse.ui.console,
++ org.eclipse.core.variables,
++ org.python.pydev.shared_core;visibility:=reexport,
+ org.python.pydev.shared_ui,
+ name.pachler.nio.file
- Bundle-ActivationPolicy: lazy
- Export-Package: org.python.pydev.core,org.python.pydev.core.cache,org.
- python.pydev.core.concurrency,org.python.pydev.core.docutils,org.pyth
++Bundle-ActivationPolicy: lazy
++Export-Package: org.python.pydev.core,org.python.pydev.core.cache,org.
++ python.pydev.core.concurrency,org.python.pydev.core.docutils,org.pyth
++ on.pydev.core.log,org.python.pydev.core.parser,org.python.pydev.core.
++ performanceeval,org.python.pydev.core.resource_stubs,org.python.pydev
++ .core.structure
++Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF b/plugins/org.python.pydev.debug/META-INF/MANIFEST.MF
-index 2e1b03c..58644f2 100644
+index 6d31626..9711ab0 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,
- org.eclipse.core.expressions,
- org.python.pydev.jython,
- org.python.pydev.shared_interactive_console,
-- org.python.pydev.shared_ui
+@@ -1,47 +1,49 @@
+-Manifest-Version: 1.0
+-Bundle-ManifestVersion: 2
+-Bundle-Name: Pydev debug
+-Bundle-SymbolicName: org.python.pydev.debug; singleton:=true
+-Bundle-Version: 3.6.0.qualifier
+-Bundle-ClassPath: pydev-debug.jar,
+- libs/winp-1.19.jar
+-Bundle-Activator: org.python.pydev.debug.core.PydevDebugPlugin
+-Bundle-Vendor: Aptana
+-Bundle-Localization: plugin
+-Eclipse-BundleShape: dir
+-Require-Bundle: org.junit;bundle-version="4.0.0";resolution:=optional,
+- org.eclipse.ui,
+- org.eclipse.ui.ide,
+- org.eclipse.core.runtime,
+- org.eclipse.core.resources,
+- org.eclipse.jface.text,
+- org.eclipse.ui.editors,
+- org.eclipse.ui.views,
+- org.eclipse.debug.core,
+- org.eclipse.debug.ui,
+- org.eclipse.ui.workbench.texteditor,
+- org.eclipse.core.variables,
+- org.eclipse.ui.console,
+- org.python.pydev.core,
+- org.python.pydev.ast,
+- org.python.pydev.parser,
+- org.python.pydev;bundle-version="2.7.6",
+- org.eclipse.core.expressions,
+- org.python.pydev.jython,
+- org.python.pydev.shared_interactive_console,
+- org.python.pydev.shared_ui
+-Bundle-ActivationPolicy: lazy
+-Export-Package: org.python.pydev.debug.codecoverage,org.python.pydev.d
+- ebug.console,org.python.pydev.debug.core,org.python.pydev.debug.curr_
+- exception,org.python.pydev.debug.handlers,org.python.pydev.debug.mode
+- l,org.python.pydev.debug.model.remote,org.python.pydev.debug.newconso
+- le,org.python.pydev.debug.newconsole.actions,org.python.pydev.debug.n
+- ewconsole.env,org.python.pydev.debug.newconsole.prefs,org.python.pyde
+- v.debug.pyunit,org.python.pydev.debug.quick_assist,org.python.pydev.d
+- ebug.referrers,org.python.pydev.debug.ui,org.python.pydev.debug.ui.ac
+- tions,org.python.pydev.debug.ui.blocks,org.python.pydev.debug.ui.hove
+- r,org.python.pydev.debug.ui.launching,org.python.pydev.debug.ui.prope
+- rtypages,org.python.pydev.debug.ui.variables,org.python.pydev.debug.v
+- iews
+-Import-Package: org.eclipse.core.filesystem
+-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
++Manifest-Version: 1.0
++Bundle-ManifestVersion: 2
++Bundle-Name: Pydev debug
++Bundle-SymbolicName: org.python.pydev.debug; singleton:=true
++Bundle-Version: 3.6.0.qualifier
++Bundle-ClassPath: pydev-debug.jar,
++ libs/winp-1.19.jar
++Bundle-Activator: org.python.pydev.debug.core.PydevDebugPlugin
++Bundle-Vendor: Aptana
++Bundle-Localization: plugin
++Eclipse-BundleShape: dir
++Require-Bundle: org.junit;bundle-version="4.0.0";resolution:=optional,
++ org.eclipse.ui,
++ org.eclipse.ui.ide,
++ org.eclipse.core.runtime,
++ org.eclipse.core.resources,
++ org.eclipse.jface.text,
++ org.eclipse.ui.editors,
++ org.eclipse.ui.views,
++ org.eclipse.debug.core,
++ org.eclipse.debug.ui,
++ org.eclipse.ui.workbench.texteditor,
++ org.eclipse.core.variables,
++ org.eclipse.ui.console,
++ org.python.pydev.core,
++ org.python.pydev.ast,
++ org.python.pydev.parser,
++ org.python.pydev;bundle-version="2.7.6",
++ org.eclipse.core.expressions,
++ org.python.pydev.jython,
++ org.python.pydev.shared_interactive_console,
+ org.python.pydev.shared_ui,
+ org.apache.xmlrpc,
+ org.apache.xmlrpc.server
- Bundle-ActivationPolicy: lazy
- Export-Package: org.python.pydev.debug.codecoverage,org.python.pydev.d
- ebug.core,org.python.pydev.debug.model,org.python.pydev.debug.model.r
++Bundle-ActivationPolicy: lazy
++Export-Package: org.python.pydev.debug.codecoverage,org.python.pydev.d
++ ebug.console,org.python.pydev.debug.core,org.python.pydev.debug.curr_
++ exception,org.python.pydev.debug.handlers,org.python.pydev.debug.mode
++ l,org.python.pydev.debug.model.remote,org.python.pydev.debug.newconso
++ le,org.python.pydev.debug.newconsole.actions,org.python.pydev.debug.n
++ ewconsole.env,org.python.pydev.debug.newconsole.prefs,org.python.pyde
++ v.debug.pyunit,org.python.pydev.debug.quick_assist,org.python.pydev.d
++ ebug.referrers,org.python.pydev.debug.ui,org.python.pydev.debug.ui.ac
++ tions,org.python.pydev.debug.ui.blocks,org.python.pydev.debug.ui.hove
++ r,org.python.pydev.debug.ui.launching,org.python.pydev.debug.ui.prope
++ rtypages,org.python.pydev.debug.ui.variables,org.python.pydev.debug.v
++ iews
++Import-Package: org.eclipse.core.filesystem
++Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF b/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF
-index 4867726..4896777 100644
+index 70c6b72..c1b3049 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,
- org.eclipse.ui.console,
- org.eclipse.jface.text,
- org.junit;bundle-version="4.0";resolution:=optional,
-- org.python.pydev.shared_ui
+@@ -1,24 +1,26 @@
+-Manifest-Version: 1.0
+-Bundle-ManifestVersion: 2
+-Bundle-Name: Jython Plug-in
+-Bundle-SymbolicName: org.python.pydev.jython; singleton:=true
+-Bundle-Version: 3.6.0.qualifier
+-Bundle-ClassPath: pydev-jython.jar,
+- jython.jar
+-Bundle-Activator: org.python.pydev.jython.JythonPlugin
+-Bundle-Vendor: Aptana
+-Bundle-Localization: plugin
+-Eclipse-BundleShape: dir
+-Eclipse-BuddyPolicy: global
+-Require-Bundle: org.eclipse.core.runtime,
+- org.python.pydev.core,
+- org.eclipse.ui,
+- org.eclipse.ui.console,
+- org.eclipse.jface.text,
+- org.junit;bundle-version="4.0";resolution:=optional,
+- org.python.pydev.shared_ui
+-Bundle-ActivationPolicy: lazy
+-Export-Package: org.python.core,
+- org.python.pydev.jython,
+- org.python.pydev.jython.ui
+-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
++Manifest-Version: 1.0
++Bundle-ManifestVersion: 2
++Bundle-Name: Jython Plug-in
++Bundle-SymbolicName: org.python.pydev.jython; singleton:=true
++Bundle-Version: 3.6.0.qualifier
++Bundle-ClassPath: pydev-jython.jar,
++ jython.jar
++Bundle-Activator: org.python.pydev.jython.JythonPlugin
++Bundle-Vendor: Aptana
++Bundle-Localization: plugin
++Eclipse-BundleShape: dir
++Eclipse-BuddyPolicy: global
++Require-Bundle: org.eclipse.core.runtime,
++ org.python.pydev.core,
++ org.eclipse.ui,
++ org.eclipse.ui.console,
++ org.eclipse.jface.text,
++ org.junit;bundle-version="4.0";resolution:=optional,
+ org.python.pydev.shared_ui,
+ org.python,
+ com.google.guava
- Bundle-ActivationPolicy: lazy
- Export-Package: org.python.compiler,org.python.core,org.python.modules
- ,org.python.modules.sre,org.python.parser,org.python.pydev.jython,org
++Bundle-ActivationPolicy: lazy
++Export-Package: org.python.core,
++ org.python.pydev.jython,
++ org.python.pydev.jython.ui
++Bundle-RequiredExecutionEnvironment: JavaSE-1.7
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 89e3918..6dc8621 100644
+index 9e6341e..2b3ff4e 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.2.0.qualifier
--Bundle-ClassPath: interactive_console.jar,
-- commons-logging-1.1.1.jar,
-- ws-commons-util-1.0.2.jar,
-- xmlrpc-client-3.1.3.jar,
-- xmlrpc-common-3.1.3.jar,
-- xmlrpc-server-3.1.3.jar
+@@ -1,40 +1,36 @@
+-Manifest-Version: 1.0
+-Bundle-ManifestVersion: 2
+-Bundle-Name: Interactive Console Plug-in
+-Bundle-SymbolicName: org.python.pydev.shared_interactive_console;singleton:=true
+-Bundle-Version: 3.6.0.qualifier
+-Bundle-ClassPath: interactive_console.jar,
+- commons-logging-1.1.1.jar,
+- ws-commons-util-1.0.2.jar,
+- xmlrpc-client-3.1.3.jar,
+- xmlrpc-common-3.1.3.jar,
+- xmlrpc-server-3.1.3.jar
+-Bundle-Activator: org.python.pydev.shared_interactive_console.InteractiveConsolePlugin
+-Bundle-Localization: plugin
+-Eclipse-BundleShape: dir
+-Require-Bundle: org.eclipse.ui,
+- org.eclipse.core.runtime,
+- org.eclipse.jface.text,
+- org.eclipse.ui.console,
+- org.eclipse.debug.core,
+- org.eclipse.debug.ui,
+- org.eclipse.ui.workbench.texteditor,
+- org.python.pydev.shared_core,
+- org.eclipse.ui.ide,
+- org.python.pydev.shared_ui
+-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
+- 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
+- .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
+- ,org.python.pydev.shared_interactive_console.console.ui.internal,org.
+- python.pydev.shared_interactive_console.console.ui.internal.actions,o
+- rg.python.pydev.shared_interactive_console.console.ui.internal.fromec
+- lipse
+-Bundle-Vendor: Appcelerator
+-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
++Manifest-Version: 1.0
++Bundle-ManifestVersion: 2
++Bundle-Name: Interactive Console Plug-in
++Bundle-SymbolicName: org.python.pydev.shared_interactive_console;singleton:=true
++Bundle-Version: 3.6.0.qualifier
+Bundle-ClassPath: interactive_console.jar
- Bundle-Activator: org.python.pydev.shared_interactive_console.InteractiveConsolePlugin
- Bundle-Localization: plugin
- Eclipse-BundleShape: dir
-@@ -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,org.apache.commons.logging.
++Bundle-Activator: org.python.pydev.shared_interactive_console.InteractiveConsolePlugin
++Bundle-Localization: plugin
++Eclipse-BundleShape: dir
++Require-Bundle: org.eclipse.ui,
++ org.eclipse.core.runtime,
++ org.eclipse.jface.text,
++ org.eclipse.ui.console,
++ org.eclipse.debug.core,
++ org.eclipse.debug.ui,
++ org.eclipse.ui.workbench.texteditor,
++ org.python.pydev.shared_core,
++ org.eclipse.ui.ide,
++ org.python.pydev.shared_ui
++Bundle-ActivationPolicy: lazy
+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
++ 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
+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
++ .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
++ ,org.python.pydev.shared_interactive_console.console.ui.internal,org.
++ python.pydev.shared_interactive_console.console.ui.internal.actions,o
++ rg.python.pydev.shared_interactive_console.console.ui.internal.fromec
++ lipse
++Bundle-Vendor: Appcelerator
++Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/debian/patches/jython-compatibility-fixes.patch b/debian/patches/jython-compatibility-fixes.patch
deleted file mode 100644
index 901405b..0000000
--- a/debian/patches/jython-compatibility-fixes.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Wed, 16 Jan 2013 21:42:27 +0100
-Subject: jython-compatibility-fixes
-
----
- .../src/org/python/pydev/jython/IPythonInterpreter.java | 2 +-
- .../src/org/python/pydev/jython/JythonPlugin.java | 12 ++++--------
- 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 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 {
- * @param class_ the java class that should be used as the return value
- * @return the object with the variable requested as a java object
- */
-- Object get(String varName, Class class_);
-+ <T> T get(String varName, Class<T> class_);
-
- /**
- * 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 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;
- import org.osgi.framework.BundleContext;
- import org.python.core.PyClass;
- import org.python.core.PyException;
--import org.python.core.PyJavaClass;
- import org.python.core.PyObject;
- import org.python.core.PySystemState;
- 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) {
- PyException pE = (PyException) e;
-- if (pE.type instanceof PyJavaClass) {
-- PyJavaClass t = (PyJavaClass) pE.type;
-- if (t.__name__ != null && t.__name__.equals("org.python.pydev.jython.ExitScriptException")) {
-- return null;
-- }
-- } else if (pE.type instanceof PyClass) {
-+ if (pE.type instanceof PyClass) {
- PyClass t = (PyClass) pE.type;
-- if (t.__name__ != null && t.__name__.equals("SystemExit")) {
-+ if (t.__name__ != null &&
-+ (t.__name__.equals("org.python.pydev.jython.ExitScriptException") ||
-+ t.__name__.equals("SystemExit"))) {
- return null;
- }
- }
diff --git a/debian/patches/pydev-jython-src-path.patch b/debian/patches/pydev-jython-src-path.patch
deleted file mode 100644
index 620ed3e..0000000
--- a/debian/patches/pydev-jython-src-path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Wed, 16 Jan 2013 19:56:02 +0100
-Subject: pydev-jython-src-path
-
----
- plugins/org.python.pydev.jython/build.properties | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/plugins/org.python.pydev.jython/build.properties b/plugins/org.python.pydev.jython/build.properties
-index 168f7a2..4b0ea49 100644
---- a/plugins/org.python.pydev.jython/build.properties
-+++ b/plugins/org.python.pydev.jython/build.properties
-@@ -9,7 +9,6 @@ bin.includes = META-INF/,\
- icons/,\
- LICENSE_PYHON.txt
- jars.compile.order = pydev-jython.jar
--source.pydev-jython.jar = src/,\
-- src_jython/
-+source.pydev-jython.jar = src/
- output.pydev-jython.jar = bin/
- jars.extra.classpath = jython.jar
diff --git a/debian/patches/remove-windows-specific-code.patch b/debian/patches/remove-windows-specific-code.patch
index c568263..94023a0 100644
--- a/debian/patches/remove-windows-specific-code.patch
+++ b/debian/patches/remove-windows-specific-code.patch
@@ -7,10 +7,10 @@ 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 a333c18..0a3a2e3 100644
+index a59ed28..9c18aef 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
-@@ -24,9 +24,6 @@ import org.python.pydev.runners.SimpleRunner;
+@@ -25,9 +25,6 @@ import org.python.pydev.runners.SimpleRunner;
import org.python.pydev.shared_core.string.StringUtils;
import org.python.pydev.shared_core.utils.PlatformUtils;
@@ -20,7 +20,7 @@ index a333c18..0a3a2e3 100644
public class PythonInterpreterProviderFactory extends AbstractInterpreterProviderFactory {
public IInterpreterProvider[] getInterpreterProviders(InterpreterType type) {
-@@ -59,53 +56,6 @@ public class PythonInterpreterProviderFactory extends AbstractInterpreterProvide
+@@ -60,53 +57,6 @@ public class PythonInterpreterProviderFactory extends AbstractInterpreterProvide
if (ret.length > 0) {
return AlreadyInstalledInterpreterProvider.create("python", ret);
}
diff --git a/debian/patches/series b/debian/patches/series
index 152c594..6bf222f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
add-orbit-dependencies.patch
-pydev-jython-src-path.patch
-jython-compatibility-fixes.patch
remove-windows-specific-code.patch
no-e4.patch
--
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