diff --git a/.gitignore b/.gitignore
index 4d13710..c0dd737 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ dltk-2.0.0.tar.bz2
/dltk-3.0.tar.xz
dltk-3.0.1.tar.xz
/dltk-4.0.0.tar.xz
+/eclipse-dltk-5.0.0.tar.xz
diff --git a/.project b/.project
new file mode 100644
index 0000000..94ff89d
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+
+
+ eclipse-dltk
+
+
+
+
+
+
+
+
diff --git a/correct-CommonImages-path.patch b/correct-CommonImages-path.patch
deleted file mode 100644
index a0ecd1d..0000000
--- a/correct-CommonImages-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 74ef7d22916073f58273399468b2e762008f12ec Mon Sep 17 00:00:00 2001
-From: Sami Wagiaalla
-Date: Thu, 12 Jul 2012 16:08:12 -0400
-Subject: [PATCH] correct-CommonImages-path
-
----
- .../dltk/internal/mylyn/editor/FocusedDLTKProposalProcessor.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mylyn/plugins/org.eclipse.dltk.mylyn/src/org/eclipse/dltk/internal/mylyn/editor/FocusedDLTKProposalProcessor.java b/mylyn/plugins/org.eclipse.dltk.mylyn/src/org/eclipse/dltk/internal/mylyn/editor/FocusedDLTKProposalProcessor.java
-index cddb5e8..3f94572 100644
---- a/mylyn/plugins/org.eclipse.dltk.mylyn/src/org/eclipse/dltk/internal/mylyn/editor/FocusedDLTKProposalProcessor.java
-+++ b/mylyn/plugins/org.eclipse.dltk.mylyn/src/org/eclipse/dltk/internal/mylyn/editor/FocusedDLTKProposalProcessor.java
-@@ -24,7 +24,7 @@ import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposal;
- import org.eclipse.mylyn.commons.core.StatusHandler;
- import org.eclipse.mylyn.context.core.ContextCore;
- import org.eclipse.mylyn.context.core.IInteractionElement;
--import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
-+import org.eclipse.mylyn.commons.ui.CommonImages;
-
- /**
- * TODO: parametrize relevance levels (requires JDT changes, bug 119063)
---
-1.7.10.4
-
diff --git a/correct-mismatched-feature-and-artifactIds.patch b/correct-mismatched-feature-and-artifactIds.patch
deleted file mode 100644
index eae87e0..0000000
--- a/correct-mismatched-feature-and-artifactIds.patch
+++ /dev/null
@@ -1,339 +0,0 @@
-From be9dcb34ed4fbc64f68ce1977b7f2e6862780f80 Mon Sep 17 00:00:00 2001
-From: Sami Wagiaalla
-Date: Thu, 12 Jul 2012 10:46:12 -0400
-Subject: [PATCH 2/7] "correct-mismatched-feature-and-artifactIds"
-
----
- core/features/org.eclipse.dltk.core-feature/pom.xml | 4 ++--
- core/features/org.eclipse.dltk.core.index-feature/pom.xml | 4 ++--
- core/features/org.eclipse.dltk.core.index.sdk/pom.xml | 2 +-
- core/features/org.eclipse.dltk.core.sdk/pom.xml | 2 +-
- core/features/org.eclipse.dltk.core.tests/pom.xml | 4 ++--
- itcl/features/org.eclipse.dltk.itcl-feature/pom.xml | 4 ++--
- itcl/features/org.eclipse.dltk.itcl.sdk/pom.xml | 2 +-
- javascript/features/org.eclipse.dltk.javascript-feature/pom.xml | 2 +-
- javascript/features/org.eclipse.dltk.javascript.sdk/pom.xml | 2 +-
- javascript/features/org.eclipse.dltk.javascript.tests/pom.xml | 2 +-
- mylyn/features/org.eclipse.dltk.mylyn-feature/pom.xml | 4 ++--
- mylyn/features/org.eclipse.dltk.mylyn.sdk/pom.xml | 2 +-
- python/features/org.eclipse.dltk.python-feature/pom.xml | 4 ++--
- python/features/org.eclipse.dltk.python.sdk/pom.xml | 2 +-
- rse/features/org.eclipse.dltk.rse-feature/pom.xml | 4 ++--
- rse/features/org.eclipse.dltk.rse.sdk/pom.xml | 2 +-
- ruby/features/org.eclipse.dltk.ruby-feature/pom.xml | 4 ++--
- ruby/features/org.eclipse.dltk.ruby.sdk/pom.xml | 2 +-
- tcl/features/org.eclipse.dltk.tcl-feature/pom.xml | 4 ++--
- tcl/features/org.eclipse.dltk.tcl.sdk/pom.xml | 2 +-
- xotcl/features/org.eclipse.dltk.xotcl-feature/pom.xml | 4 ++--
- xotcl/features/org.eclipse.dltk.xotcl.sdk/pom.xml | 2 +-
- 22 files changed, 32 insertions(+), 32 deletions(-)
-
-diff --git a/core/features/org.eclipse.dltk.core-feature/pom.xml b/core/features/org.eclipse.dltk.core-feature/pom.xml
-index c2d4ae8..7e34e06 100644
---- a/core/features/org.eclipse.dltk.core-feature/pom.xml
-+++ b/core/features/org.eclipse.dltk.core-feature/pom.xml
-@@ -8,8 +8,8 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.core
-- org.eclipse.dltk.core-feature
-+ org.eclipse.dltk.core-feature
-+ org.eclipse.dltk.core
- 4.0.0-SNAPSHOT
- eclipse-feature
-
-diff --git a/core/features/org.eclipse.dltk.core.index-feature/pom.xml b/core/features/org.eclipse.dltk.core.index-feature/pom.xml
-index 4b1b543..c209d4d 100644
---- a/core/features/org.eclipse.dltk.core.index-feature/pom.xml
-+++ b/core/features/org.eclipse.dltk.core.index-feature/pom.xml
-@@ -8,8 +8,8 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.core
-- org.eclipse.dltk.core.index-feature
-+ org.eclipse.dltk.core-feature
-+ org.eclipse.dltk.core.index
- 4.0.0-SNAPSHOT
- eclipse-feature
-
-diff --git a/core/features/org.eclipse.dltk.core.index.sdk/pom.xml b/core/features/org.eclipse.dltk.core.index.sdk/pom.xml
-index 3837ebd..289f564 100644
---- a/core/features/org.eclipse.dltk.core.index.sdk/pom.xml
-+++ b/core/features/org.eclipse.dltk.core.index.sdk/pom.xml
-@@ -8,7 +8,7 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.core
-+ org.eclipse.dltk.core-feature
- org.eclipse.dltk.core.index.sdk
- 4.0.0-SNAPSHOT
- eclipse-feature
-diff --git a/core/features/org.eclipse.dltk.core.sdk/pom.xml b/core/features/org.eclipse.dltk.core.sdk/pom.xml
-index d573624..d1447cc 100644
---- a/core/features/org.eclipse.dltk.core.sdk/pom.xml
-+++ b/core/features/org.eclipse.dltk.core.sdk/pom.xml
-@@ -8,7 +8,7 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.core
-+ org.eclipse.dltk.core-feature
- org.eclipse.dltk.core.sdk
- 4.0.0-SNAPSHOT
- eclipse-feature
-diff --git a/core/features/org.eclipse.dltk.core.tests/pom.xml b/core/features/org.eclipse.dltk.core.tests/pom.xml
-index c61fdf5..b46c475 100644
---- a/core/features/org.eclipse.dltk.core.tests/pom.xml
-+++ b/core/features/org.eclipse.dltk.core.tests/pom.xml
-@@ -8,8 +8,8 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.core
-- org.eclipse.dltk.core.tests-feature
-+ org.eclipse.dltk.core-feature
-+ org.eclipse.dltk.core.tests
- 4.0.0-SNAPSHOT
- eclipse-feature
-
-diff --git a/itcl/features/org.eclipse.dltk.itcl-feature/pom.xml b/itcl/features/org.eclipse.dltk.itcl-feature/pom.xml
-index e72a700..fb754d8 100644
---- a/itcl/features/org.eclipse.dltk.itcl-feature/pom.xml
-+++ b/itcl/features/org.eclipse.dltk.itcl-feature/pom.xml
-@@ -8,8 +8,8 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.tcl
-- org.eclipse.dltk.itcl-feature
-+ org.eclipse.dltk.tcl-feature
-+ org.eclipse.dltk.itcl
- 4.0.0-SNAPSHOT
- eclipse-feature
-
-diff --git a/itcl/features/org.eclipse.dltk.itcl.sdk/pom.xml b/itcl/features/org.eclipse.dltk.itcl.sdk/pom.xml
-index 65bb15c..f621a0e 100644
---- a/itcl/features/org.eclipse.dltk.itcl.sdk/pom.xml
-+++ b/itcl/features/org.eclipse.dltk.itcl.sdk/pom.xml
-@@ -8,7 +8,7 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.itcl
-+ org.eclipse.dltk.itcl-feature
- org.eclipse.dltk.itcl.sdk
- 4.0.0-SNAPSHOT
- eclipse-feature
-diff --git a/javascript/features/org.eclipse.dltk.javascript-feature/pom.xml b/javascript/features/org.eclipse.dltk.javascript-feature/pom.xml
-index d8e2114..79de964 100644
---- a/javascript/features/org.eclipse.dltk.javascript-feature/pom.xml
-+++ b/javascript/features/org.eclipse.dltk.javascript-feature/pom.xml
-@@ -8,7 +8,7 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.javascript
-+ org.eclipse.dltk.javascript-feature
- org.eclipse.dltk.javascript
- 4.0.0-SNAPSHOT
- eclipse-feature
-diff --git a/javascript/features/org.eclipse.dltk.javascript.sdk/pom.xml b/javascript/features/org.eclipse.dltk.javascript.sdk/pom.xml
-index e0a67e2..9205888 100644
---- a/javascript/features/org.eclipse.dltk.javascript.sdk/pom.xml
-+++ b/javascript/features/org.eclipse.dltk.javascript.sdk/pom.xml
-@@ -8,7 +8,7 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.javascript
-+ org.eclipse.dltk.javascript-feature
- org.eclipse.dltk.javascript.sdk
- 4.0.0-SNAPSHOT
- eclipse-feature
-diff --git a/javascript/features/org.eclipse.dltk.javascript.tests/pom.xml b/javascript/features/org.eclipse.dltk.javascript.tests/pom.xml
-index c2078cd..e2d689e 100644
---- a/javascript/features/org.eclipse.dltk.javascript.tests/pom.xml
-+++ b/javascript/features/org.eclipse.dltk.javascript.tests/pom.xml
-@@ -7,7 +7,7 @@
- org.eclipse.dltk
- 1.0.0-SNAPSHOT
-
-- org.eclipse.dltk
-+ org.eclipse.dltk-feature
- org.eclipse.dltk.javascript.tests
- 4.0.0-SNAPSHOT
- eclipse-feature
-diff --git a/mylyn/features/org.eclipse.dltk.mylyn-feature/pom.xml b/mylyn/features/org.eclipse.dltk.mylyn-feature/pom.xml
-index 8bc4289..addb9fd 100644
---- a/mylyn/features/org.eclipse.dltk.mylyn-feature/pom.xml
-+++ b/mylyn/features/org.eclipse.dltk.mylyn-feature/pom.xml
-@@ -8,8 +8,8 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.mylyn
-- org.eclipse.dltk.mylyn-feature
-+ org.eclipse.dltk.mylyn-feature
-+ org.eclipse.dltk.mylyn
- 4.0.0-SNAPSHOT
- eclipse-feature
-
-diff --git a/mylyn/features/org.eclipse.dltk.mylyn.sdk/pom.xml b/mylyn/features/org.eclipse.dltk.mylyn.sdk/pom.xml
-index 55e9539..db3a684 100644
---- a/mylyn/features/org.eclipse.dltk.mylyn.sdk/pom.xml
-+++ b/mylyn/features/org.eclipse.dltk.mylyn.sdk/pom.xml
-@@ -8,7 +8,7 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.mylyn
-+ org.eclipse.dltk.mylyn-feature
- org.eclipse.dltk.mylyn.sdk
- 4.0.0-SNAPSHOT
- eclipse-feature
-diff --git a/python/features/org.eclipse.dltk.python-feature/pom.xml b/python/features/org.eclipse.dltk.python-feature/pom.xml
-index e15fd0b..5d28d5d 100644
---- a/python/features/org.eclipse.dltk.python-feature/pom.xml
-+++ b/python/features/org.eclipse.dltk.python-feature/pom.xml
-@@ -8,8 +8,8 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.python
-- org.eclipse.dltk.python-feature
-+ org.eclipse.dltk.python-feature
-+ org.eclipse.dltk.python
- 4.0.0-SNAPSHOT
- eclipse-feature
-
-diff --git a/python/features/org.eclipse.dltk.python.sdk/pom.xml b/python/features/org.eclipse.dltk.python.sdk/pom.xml
-index d9c28bd..89dda56 100644
---- a/python/features/org.eclipse.dltk.python.sdk/pom.xml
-+++ b/python/features/org.eclipse.dltk.python.sdk/pom.xml
-@@ -8,7 +8,7 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.python
-+ org.eclipse.dltk.python-feature
- org.eclipse.dltk.python.sdk
- 4.0.0-SNAPSHOT
- eclipse-feature
-diff --git a/rse/features/org.eclipse.dltk.rse-feature/pom.xml b/rse/features/org.eclipse.dltk.rse-feature/pom.xml
-index 477724e..49747dc 100644
---- a/rse/features/org.eclipse.dltk.rse-feature/pom.xml
-+++ b/rse/features/org.eclipse.dltk.rse-feature/pom.xml
-@@ -8,8 +8,8 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.rse
-- org.eclipse.dltk.rse-feature
-+ org.eclipse.dltk.rse-feature
-+ org.eclipse.dltk.rse
- 4.0.0-SNAPSHOT
- eclipse-feature
-
-diff --git a/rse/features/org.eclipse.dltk.rse.sdk/pom.xml b/rse/features/org.eclipse.dltk.rse.sdk/pom.xml
-index c137f53..79ad1ff 100644
---- a/rse/features/org.eclipse.dltk.rse.sdk/pom.xml
-+++ b/rse/features/org.eclipse.dltk.rse.sdk/pom.xml
-@@ -8,7 +8,7 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.rse
-+ org.eclipse.dltk.rse-feature
- org.eclipse.dltk.rse.sdk
- 4.0.0-SNAPSHOT
- eclipse-feature
-diff --git a/ruby/features/org.eclipse.dltk.ruby-feature/pom.xml b/ruby/features/org.eclipse.dltk.ruby-feature/pom.xml
-index 63a5021..03daefc 100644
---- a/ruby/features/org.eclipse.dltk.ruby-feature/pom.xml
-+++ b/ruby/features/org.eclipse.dltk.ruby-feature/pom.xml
-@@ -8,8 +8,8 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.ruby
-- org.eclipse.dltk.ruby-feature
-+ org.eclipse.dltk.ruby-feature
-+ org.eclipse.dltk.ruby
- 4.0.0-SNAPSHOT
- eclipse-feature
-
-diff --git a/ruby/features/org.eclipse.dltk.ruby.sdk/pom.xml b/ruby/features/org.eclipse.dltk.ruby.sdk/pom.xml
-index 9dc9475..9c95820 100644
---- a/ruby/features/org.eclipse.dltk.ruby.sdk/pom.xml
-+++ b/ruby/features/org.eclipse.dltk.ruby.sdk/pom.xml
-@@ -8,7 +8,7 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.ruby
-+ org.eclipse.dltk.ruby-feature
- org.eclipse.dltk.ruby.sdk
- 4.0.0-SNAPSHOT
- eclipse-feature
-diff --git a/tcl/features/org.eclipse.dltk.tcl-feature/pom.xml b/tcl/features/org.eclipse.dltk.tcl-feature/pom.xml
-index 8dc2f89..d477045 100644
---- a/tcl/features/org.eclipse.dltk.tcl-feature/pom.xml
-+++ b/tcl/features/org.eclipse.dltk.tcl-feature/pom.xml
-@@ -8,8 +8,8 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.tcl
-- org.eclipse.dltk.tcl-feature
-+ org.eclipse.dltk.tcl-feature
-+ org.eclipse.dltk.tcl
- 4.0.0-SNAPSHOT
- eclipse-feature
-
-diff --git a/tcl/features/org.eclipse.dltk.tcl.sdk/pom.xml b/tcl/features/org.eclipse.dltk.tcl.sdk/pom.xml
-index 2a2a51f..012e0b9 100644
---- a/tcl/features/org.eclipse.dltk.tcl.sdk/pom.xml
-+++ b/tcl/features/org.eclipse.dltk.tcl.sdk/pom.xml
-@@ -8,7 +8,7 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.tcl
-+ org.eclipse.dltk.tcl-feature
- org.eclipse.dltk.tcl.sdk
- 4.0.0-SNAPSHOT
- eclipse-feature
-diff --git a/xotcl/features/org.eclipse.dltk.xotcl-feature/pom.xml b/xotcl/features/org.eclipse.dltk.xotcl-feature/pom.xml
-index ce1b282..def17df 100644
---- a/xotcl/features/org.eclipse.dltk.xotcl-feature/pom.xml
-+++ b/xotcl/features/org.eclipse.dltk.xotcl-feature/pom.xml
-@@ -8,8 +8,8 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.tcl
-- org.eclipse.dltk.xotcl-feature
-+ org.eclipse.dltk.tcl-feature
-+ org.eclipse.dltk.xotcl
- 4.0.0-SNAPSHOT
- eclipse-feature
-
-diff --git a/xotcl/features/org.eclipse.dltk.xotcl.sdk/pom.xml b/xotcl/features/org.eclipse.dltk.xotcl.sdk/pom.xml
-index 7f141e9..aa730aa 100644
---- a/xotcl/features/org.eclipse.dltk.xotcl.sdk/pom.xml
-+++ b/xotcl/features/org.eclipse.dltk.xotcl.sdk/pom.xml
-@@ -8,7 +8,7 @@
- 1.0.0-SNAPSHOT
- ../..
-
-- org.eclipse.dltk.xotcl
-+ org.eclipse.dltk.xotcl-feature
- org.eclipse.dltk.xotcl.sdk
- 4.0.0-SNAPSHOT
- eclipse-feature
---
-1.7.10.4
-
diff --git a/correct-required-version-of-org.eclipse.rse.services.ssh.patch b/correct-required-version-of-org.eclipse.rse.services.ssh.patch
deleted file mode 100644
index c70cc32..0000000
--- a/correct-required-version-of-org.eclipse.rse.services.ssh.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit cbb2c7fa2ce65ce457817202a2f0ea6215e75375
-Author: Sami Wagiaalla
-Date: Thu Apr 19 10:55:26 2012 -0400
-
- Fix org.eclipse.rse.services.ssh required version
-
-diff --git a/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
-index 2d9c981..09739c5 100644
---- a/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
-+++ b/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
-@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rse.efs,
- org.eclipse.rse.services,
- org.eclipse.rse.connectorservice.ssh;resolution:=optional,
-- org.eclipse.rse.services.ssh;bundle-version="4.0.0";resolution:=optional
-+ org.eclipse.rse.services.ssh;bundle-version="3.0.0";resolution:=optional
- Bundle-ActivationPolicy: lazy
- Export-Package: org.eclipse.dltk.core.internal.rse;x-friends:=org.eclipse.dltk.rse.ui,
- org.eclipse.dltk.core.internal.rse.perfomance;x-internal:=true
diff --git a/disable-javascript-and-python.patch b/disable-javascript-and-python.patch
deleted file mode 100644
index b041e68..0000000
--- a/disable-javascript-and-python.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 7763d05707c366f4274844321fb5169224aac93c Mon Sep 17 00:00:00 2001
-From: Sami Wagiaalla
-Date: Thu, 12 Jul 2012 10:46:12 -0400
-Subject: [PATCH 6/7] disable-javascript-and-python
-
----
- build/pom.xml | 8 ++++----
- build/update.site/site.xml | 2 ++
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/build/pom.xml b/build/pom.xml
-index f088c15..5d20a0a 100644
---- a/build/pom.xml
-+++ b/build/pom.xml
-@@ -30,13 +30,13 @@
- ../xotcl
- ../itcl
- ../ruby
-- ../javascript
- ../rse
-- ../python
- ../mylyn
- update.site
-- testplatform
-- javascript.tests
-+
-
-
-
-diff --git a/build/update.site/site.xml b/build/update.site/site.xml
-index 61ecc3b..8bcb33c 100644
---- a/build/update.site/site.xml
-+++ b/build/update.site/site.xml
-@@ -44,6 +44,7 @@
-
-
-
-+
-
-
-
---
-1.7.10.4
-
diff --git a/disable-specific-environment-settings.patch b/disable-specific-environment-settings.patch
deleted file mode 100644
index 7d94cfb..0000000
--- a/disable-specific-environment-settings.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 0f5896e097b7a6c834d8059c1acf20c7f99b3d76 Mon Sep 17 00:00:00 2001
-From: Sami Wagiaalla
-Date: Thu, 12 Jul 2012 10:46:12 -0400
-Subject: [PATCH 5/7] "disable-specific-environment-settings"
-
----
- build/pom.xml | 36 ------------------------------------
- 1 file changed, 36 deletions(-)
-
-diff --git a/build/pom.xml b/build/pom.xml
-index 4e26659..f088c15 100644
---- a/build/pom.xml
-+++ b/build/pom.xml
-@@ -78,42 +78,6 @@
-
-
-
--
--
-- org.eclipse.tycho
-- target-platform-configuration
-- ${tycho-version}
--
-- p2
--
--
-- linux
-- gtk
-- x86
--
--
-- linux
-- gtk
-- x86_64
--
--
-- win32
-- win32
-- x86
--
--
-- win32
-- win32
-- x86_64
--
--
-- macosx
-- cocoa
-- x86_64
--
--
--
--
-
-
-
---
-1.7.10.4
-
diff --git a/drop_from_p2.patch b/drop_from_p2.patch
new file mode 100644
index 0000000..de3e1f4
--- /dev/null
+++ b/drop_from_p2.patch
@@ -0,0 +1,31 @@
+--- org.eclipse.dltk.releng/build/update.site/site.xml.sav 2013-06-06 14:45:17.000000000 +0300
++++ org.eclipse.dltk.releng/build/update.site/site.xml 2013-07-05 20:58:55.483602845 +0300
+@@ -32,9 +32,6 @@
+
+
+
+-
+-
+-
+
+
+
+@@ -47,18 +44,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+
+
diff --git a/eclipse-dltk.spec b/eclipse-dltk.spec
index 717a32b..81623da 100644
--- a/eclipse-dltk.spec
+++ b/eclipse-dltk.spec
@@ -1,8 +1,8 @@
%global eclipse_dropin %{_datadir}/eclipse/dropins
Name: eclipse-dltk
-Version: 4.0.0
-Release: 5%{?dist}
+Version: 5.0.0
+Release: 1%{?dist}
Summary: Dynamic Languages Toolkit (DLTK) Eclipse plugin
Group: System Environment/Libraries
License: EPL
@@ -11,10 +11,10 @@ URL: http://www.eclipse.org/dltk/
# source tarball and the script used to generate it from upstream's source control
# script usage:
# $ sh get-dltk.sh
-Source0: dltk-%{version}.tar.xz
+Source0: %{name}-%{version}.tar.xz
Source1: get-dltk.sh
-Patch1: remove-dependencies-on-empty-source-bundles.patch
+Patch0: drop_from_p2.patch
Patch2: correct-mismatched-feature-and-artifactIds.patch
Patch3: remove-missing-files-from-build.properties-files.patch
Patch4: correct-required-version-of-org.eclipse.rse.services.ssh.patch
@@ -31,7 +31,6 @@ BuildRequires: eclipse-pde >= 1:3.5.0
BuildRequires: eclipse-emf >= 2.5.0
BuildRequires: eclipse-mylyn >= 3.2
BuildRequires: eclipse-mylyn-ide
-BuildRequires: eclipse-mylyn-context
BuildRequires: eclipse-rse
BuildRequires: h2
BuildRequires: maven-local
@@ -98,7 +97,6 @@ Group: Development/Tools
Requires: %{name} = %{version}-%{release}
Requires: eclipse-mylyn >= 3.2
Requires: eclipse-mylyn-ide
-Requires: eclipse-mylyn-context
%description mylyn
Mylyn task-focused UI integration for Eclipse Dynamic Languages Toolkit
@@ -130,36 +128,38 @@ Requires: %{name}-rse = %{version}-%{release}
%description sdk
Documentation and source for the Eclipse Dynamic Languages Toolkit (DLTK).
-# TODO: Python IDE
# TODO: Uncomment the Javascript package bits when upstream gets their Rhino dependencies sanely externalised
%prep
-%setup -q -n dltk-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-
-# make sure upstream hasn't sneaked in any jars we don't know about
-JARS=""
-for j in `find -name "*.jar"`; do
- if [ ! -L $j ]; then
- JARS="$JARS $j"
- fi
-done
-if [ ! -z "$JARS" ]; then
- echo "These jars should be deleted and symlinked to system jars: $JARS"
- exit 1
-fi
-
-mkdir orbitDeps
-pushd orbitDeps
-ln -s %{_javadir}/h2.jar org.h2.jar
-popd
+%setup -q
+
+%pom_disable_module "../../org.eclipse.dltk.javascript" org.eclipse.dltk.releng/build/pom.xml
+%pom_disable_module "../../org.eclipse.dltk.python" org.eclipse.dltk.releng/build/pom.xml
+
+%pom_disable_module "releng/org.eclipse.dltk.core.targetplatform" org.eclipse.dltk.core/core/pom.xml
+%pom_disable_module "features/org.eclipse.dltk.core.tests" org.eclipse.dltk.core/core/pom.xml
+%pom_disable_module "tests" org.eclipse.dltk.core/core/pom.xml
+%pom_disable_module "tests" org.eclipse.dltk.tcl/tcl/pom.xml
+%pom_disable_module "tests/org.eclipse.dltk.itcl.core.tests" org.eclipse.dltk.tcl/itcl/pom.xml
+%pom_disable_module "tests/org.eclipse.dltk.xotcl.core.tests" org.eclipse.dltk.tcl/xotcl/pom.xml
+%pom_disable_module "tests/org.eclipse.dltk.ruby.core.tests" org.eclipse.dltk.ruby/pom.xml
+%pom_disable_module "tests/org.eclipse.dltk.ruby.formatter.tests" org.eclipse.dltk.ruby/pom.xml
+%pom_disable_module "tests/org.eclipse.dltk.ruby.ui.tests" org.eclipse.dltk.ruby/pom.xml
+%pom_disable_module "tests/org.eclipse.dltk.ruby.testing.tests" org.eclipse.dltk.ruby/pom.xml
+
+%patch0
+
+sed -i -e "s/org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages/org.eclipse.mylyn.commons.ui.CommonImages/g" org.eclipse.dltk.core/mylyn/plugins/org.eclipse.dltk.mylyn/src/org/eclipse/dltk/internal/mylyn/editor/FocusedDLTKProposalProcessor.java
+
+#%patch1 -p1
+#%patch2 -p1
+#%patch3 -p1
+#%patch4 -p1
+#%patch5 -p1
+#%patch6 -p1
+#%patch7 -p1
+#%patch8 -p1
+
%build
# Note: Use date from the cvs tag as the context qualifier.
@@ -170,7 +170,7 @@ OPTIONS="-DforceContextQualifier=v201201070225 -DskipTychoVersionCheck -Dmaven.t
# Ensure that all required dependencies are available in a local p2 repo
# build all features
-pushd build
+pushd org.eclipse.dltk.releng/build
mvn-rpmbuild $OPTIONS
popd
@@ -182,7 +182,7 @@ SUBPACKAGES="core.index core ruby tcl itcl xotcl mylyn rse"
mkdir -p %{buildroot}%{eclipse_dropin}/dltk-sdk/eclipse/plugins
mkdir -p %{buildroot}%{eclipse_dropin}/dltk-sdk/eclipse/features
-pushd build/update.site/target/site
+pushd org.eclipse.dltk.releng/build/update.site/target/site
mv plugins/org.eclipse.dltk.*.source* %{buildroot}%{eclipse_dropin}/dltk-sdk/eclipse/plugins
mv features/org.eclipse.dltk.*.sdk* %{buildroot}%{eclipse_dropin}/dltk-sdk/eclipse/features
@@ -197,6 +197,7 @@ done
#Install .launching, .debug*, .ui, .console bundles into core
mv plugins/org.eclipse.dltk_* %{buildroot}%{eclipse_dropin}/dltk-core/eclipse/plugins
+mv plugins/org.eclipse.dltk.annotations* %{buildroot}%{eclipse_dropin}/dltk-core/eclipse/plugins
mv plugins/org.eclipse.dltk.console* %{buildroot}%{eclipse_dropin}/dltk-core/eclipse/plugins
mv plugins/org.eclipse.dltk.debug* %{buildroot}%{eclipse_dropin}/dltk-core/eclipse/plugins
mv plugins/org.eclipse.dltk.formatter* %{buildroot}%{eclipse_dropin}/dltk-core/eclipse/plugins
@@ -217,23 +218,23 @@ popd
%files
%{eclipse_dropin}/dltk-core
%{eclipse_dropin}/dltk-core.index
-%doc core/features/org.eclipse.dltk.core-feature/rootfiles/*
+%doc org.eclipse.dltk.core/core/features/org.eclipse.dltk.core-feature/rootfiles/*
%files ruby
%{eclipse_dropin}/dltk-ruby
-%doc ruby/features/org.eclipse.dltk.ruby-feature/rootfiles/*
+%doc org.eclipse.dltk.ruby/features/org.eclipse.dltk.ruby-feature/rootfiles/*
%files tcl
%{eclipse_dropin}/dltk-tcl
-%doc tcl/features/org.eclipse.dltk.tcl-feature/rootfiles/*
+%doc org.eclipse.dltk.tcl/tcl/features/org.eclipse.dltk.tcl-feature/rootfiles/*
%files itcl
%{eclipse_dropin}/dltk-itcl
-%doc itcl/features/org.eclipse.dltk.itcl-feature/rootfiles/*
+%doc org.eclipse.dltk.tcl/itcl/features/org.eclipse.dltk.itcl-feature/rootfiles/*
%files xotcl
%{eclipse_dropin}/dltk-xotcl
-%doc xotcl/features/org.eclipse.dltk.xotcl-feature/rootfiles/*
+%doc org.eclipse.dltk.tcl/xotcl/features/org.eclipse.dltk.xotcl-feature/rootfiles/*
#%files javascript
#%defattr(-,root,root,-)
@@ -242,17 +243,20 @@ popd
%files mylyn
%{eclipse_dropin}/dltk-mylyn
-%doc mylyn/features/org.eclipse.dltk.mylyn-feature/rootfiles/*
+%doc org.eclipse.dltk.core/mylyn/features/org.eclipse.dltk.mylyn-feature/rootfiles/*
%files rse
%{eclipse_dropin}/dltk-rse
-%doc rse/features/org.eclipse.dltk.rse-feature/rootfiles/*
+%doc org.eclipse.dltk.core/rse/features/org.eclipse.dltk.rse-feature/rootfiles/*
%files sdk
%{eclipse_dropin}/dltk-sdk
-%doc core/features/org.eclipse.dltk.core.sdk/rootfiles/*
+%doc org.eclipse.dltk.core/core/features/org.eclipse.dltk.core.sdk/rootfiles/*
%changelog
+* Fri Jul 5 2013 Alexander Kurtakov 5.0.0-1
+- Update to upstream Kepler release 5.0.0.
+
* Thu Feb 21 2013 Alexander Kurtakov 4.0.0-5
- Let tycho skip its version checks.
diff --git a/get-dltk.sh b/get-dltk.sh
index 55982cf..ad2a62b 100644
--- a/get-dltk.sh
+++ b/get-dltk.sh
@@ -1,17 +1,37 @@
#!/bin/bash
-NAME="dltk"
-VERSION=4.0.0
-TAG="Root_R4_0_maintenance"
+NAME="eclipse-dltk"
+VERSION=5.0.0
+TAG="Root_R5_0_maintenance"
DATE=""
-if [ -n "$DATE" ]
-then
- cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/technology export -D "$DATE" org.eclipse.dltk
-else
- cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/technology export -r $TAG org.eclipse.dltk
-fi
-
-mv org.eclipse.dltk $NAME-$VERSION
+rm -fr $NAME-$VERSION
+mkdir $NAME-$VERSION
+pushd $NAME-$VERSION
+wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.releng.git/snapshot/Root_R5_0_maintenance.tar.bz2
+tar xfs Root_R5_0_maintenance.tar.bz2
+rm -fr Root_R5_0_maintenance.tar.bz2
+mkdir org.eclipse.dltk.releng
+mv Root_R5_0_maintenance/* org.eclipse.dltk.releng
+rm -fr Root_R5_0_maintenance
+wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.core.git/snapshot/Root_R5_0_maintenance.tar.bz2
+tar xfs Root_R5_0_maintenance.tar.bz2
+rm -fr Root_R5_0_maintenance.tar.bz2
+mkdir org.eclipse.dltk.core
+mv Root_R5_0_maintenance/* org.eclipse.dltk.core
+rm -fr Root_R5_0_maintenance
+wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.ruby.git/snapshot/Root_R5_0_maintenance.tar.bz2
+tar xfs Root_R5_0_maintenance.tar.bz2
+rm -fr Root_R5_0_maintenance.tar.bz2
+mkdir org.eclipse.dltk.ruby
+mv Root_R5_0_maintenance/* org.eclipse.dltk.ruby
+rm -fr Root_R5_0_maintenance
+wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.tcl.git/snapshot/Root_R5_0_maintenance.tar.bz2
+tar xfs Root_R5_0_maintenance.tar.bz2
+rm -fr Root_R5_0_maintenance.tar.bz2
+mkdir org.eclipse.dltk.tcl
+mv Root_R5_0_maintenance/* org.eclipse.dltk.tcl
+rm -fr Root_R5_0_maintenance
+popd
#Remove any commited jars
find $NAME-$VERSION -name *.jar -delete
diff --git a/remove-dependencies-on-empty-source-bundles.patch b/remove-dependencies-on-empty-source-bundles.patch
deleted file mode 100644
index abb2665..0000000
--- a/remove-dependencies-on-empty-source-bundles.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 6abe3d7fa876db9a9fe6f2138b8b71537c85b53f Mon Sep 17 00:00:00 2001
-From: Sami Wagiaalla
-Date: Thu, 12 Jul 2012 10:46:12 -0400
-Subject: [PATCH 1/7] "remove-dependencies-on-empty-source-bundles"
-
----
- core/features/org.eclipse.dltk.core.index.sdk/feature.xml | 6 ------
- core/features/org.eclipse.dltk.core.sdk/feature.xml | 7 -------
- itcl/features/org.eclipse.dltk.itcl.sdk/feature.xml | 6 ------
- ruby/features/org.eclipse.dltk.ruby.sdk/feature.xml | 7 -------
- tcl/features/org.eclipse.dltk.tcl.sdk/feature.xml | 13 -------------
- xotcl/features/org.eclipse.dltk.xotcl.sdk/feature.xml | 7 -------
- 6 files changed, 46 deletions(-)
-
-diff --git a/core/features/org.eclipse.dltk.core.index.sdk/feature.xml b/core/features/org.eclipse.dltk.core.index.sdk/feature.xml
-index a837a13..2a455d2 100644
---- a/core/features/org.eclipse.dltk.core.index.sdk/feature.xml
-+++ b/core/features/org.eclipse.dltk.core.index.sdk/feature.xml
-@@ -32,10 +32,4 @@
- version="0.0.0"
- unpack="false"/>
-
--
--
-
-diff --git a/core/features/org.eclipse.dltk.core.sdk/feature.xml b/core/features/org.eclipse.dltk.core.sdk/feature.xml
-index 600221d..e84b1a0 100644
---- a/core/features/org.eclipse.dltk.core.sdk/feature.xml
-+++ b/core/features/org.eclipse.dltk.core.sdk/feature.xml
-@@ -82,13 +82,6 @@
- unpack="false"/>
-
-
--
--
-
--
-
-diff --git a/ruby/features/org.eclipse.dltk.ruby.sdk/feature.xml b/ruby/features/org.eclipse.dltk.ruby.sdk/feature.xml
-index ae47826..4329852 100644
---- a/ruby/features/org.eclipse.dltk.ruby.sdk/feature.xml
-+++ b/ruby/features/org.eclipse.dltk.ruby.sdk/feature.xml
-@@ -64,13 +64,6 @@
- unpack="false"/>
-
-
--
--
-
-
--
--
-
-
--
--
-
--
--
-
---
-1.7.10.4
-
diff --git a/remove-missing-files-from-build.properties-files.patch b/remove-missing-files-from-build.properties-files.patch
deleted file mode 100644
index c5dddc2..0000000
--- a/remove-missing-files-from-build.properties-files.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 57f085e32dc5e667af65fd01b26567eb721fc07f Mon Sep 17 00:00:00 2001
-From: Sami Wagiaalla
-Date: Thu, 12 Jul 2012 10:46:12 -0400
-Subject: [PATCH 3/7] "remove-missing-files-from-build.properties-files"
-
----
- ruby/plugins/org.eclipse.dltk.ruby.debug/build.properties | 1 -
- tcl/docs/org.eclipse.dltk.tcl.doc.user/build.properties | 9 ---------
- tcl/plugins/org.eclipse.dltk.tcl.launching/build.properties | 1 -
- tcl/plugins/org.eclipse.dltk.tcl.tclchecker/build.properties | 1 -
- 4 files changed, 12 deletions(-)
-
-diff --git a/ruby/plugins/org.eclipse.dltk.ruby.debug/build.properties b/ruby/plugins/org.eclipse.dltk.ruby.debug/build.properties
-index bdcf028..3531e32 100644
---- a/ruby/plugins/org.eclipse.dltk.ruby.debug/build.properties
-+++ b/ruby/plugins/org.eclipse.dltk.ruby.debug/build.properties
-@@ -13,5 +13,4 @@ bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- about.html,\
-- debugger/,\
- plugin.xml
-diff --git a/tcl/docs/org.eclipse.dltk.tcl.doc.user/build.properties b/tcl/docs/org.eclipse.dltk.tcl.doc.user/build.properties
-index 505ff1b..ddec73f 100644
---- a/tcl/docs/org.eclipse.dltk.tcl.doc.user/build.properties
-+++ b/tcl/docs/org.eclipse.dltk.tcl.doc.user/build.properties
-@@ -3,11 +3,6 @@ bin.includes = META-INF/,\
- about.properties,\
- book.css,\
- concepts/,\
-- contexts_APT.xml,\
-- contexts_Debugger.xml,\
-- contexts_JDT.xml,\
-- contexts_JDT_Debugger.xml,\
-- contexts_JDT_JUnit.xml,\
- cpy.png,\
- eclipse32.png,\
- gettingStarted/,\
-@@ -16,12 +11,8 @@ bin.includes = META-INF/,\
- notices.html,\
- plugin.properties,\
- plugin.xml,\
-- reference/,\
- tasks/,\
-- tips/,\
- toc.xml,\
- topics_Concepts.xml,\
- topics_GettingStarted.xml,\
-- topics_Reference.xml,\
-- topics_Tasks.xml,\
- whatsNew/
-diff --git a/tcl/plugins/org.eclipse.dltk.tcl.launching/build.properties b/tcl/plugins/org.eclipse.dltk.tcl.launching/build.properties
-index 1ce546c..43621b6 100644
---- a/tcl/plugins/org.eclipse.dltk.tcl.launching/build.properties
-+++ b/tcl/plugins/org.eclipse.dltk.tcl.launching/build.properties
-@@ -15,5 +15,4 @@ bin.includes = META-INF/,\
- scripts/,\
- plugin.properties,\
- about.html,\
-- icons/,\
- console/
-diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/build.properties b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/build.properties
-index 3fc6549..342192d 100644
---- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/build.properties
-+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/build.properties
-@@ -14,7 +14,6 @@ bin.includes = plugin.xml,\
- .,\
- plugin.properties,\
- build.properties,\
-- icons/,\
- resources/,\
- about.html
- src.includes = models/,\
---
-1.7.10.4
-
diff --git a/rename-tycho-plugins-to-0.14.0-names.patch b/rename-tycho-plugins-to-0.14.0-names.patch
deleted file mode 100644
index 6628e22..0000000
--- a/rename-tycho-plugins-to-0.14.0-names.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8ec74bf4fcad2183afa6128aa4113a4dc945bdc2 Mon Sep 17 00:00:00 2001
-From: Sami Wagiaalla
-Date: Thu, 12 Jul 2012 10:46:12 -0400
-Subject: [PATCH 7/7] "rename-tycho-plugins-to-0.14.0-names"
-
----
- build/pom.xml | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/build/pom.xml b/build/pom.xml
-index 5d20a0a..3fba580 100644
---- a/build/pom.xml
-+++ b/build/pom.xml
-@@ -9,7 +9,7 @@
- pom
-
-
-- 0.12.0
-+ 0.14.0
- org.eclipse.tycho
- UTF-8
- http://download.eclipse.org/releases/indigo/
-@@ -44,7 +44,7 @@
-
-
- org.eclipse.tycho
-- maven-osgi-packaging-plugin
-+ tycho-packaging-plugin
- ${tycho-version}
-
-
-@@ -61,7 +61,7 @@
-
-
- ${tycho-groupid}
-- maven-osgi-compiler-plugin
-+ tycho-compiler-plugin
- ${tycho-version}
-
-
---
-1.7.10.4
-
diff --git a/sources b/sources
index ae7b0ca..8daca82 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d778c984f5d48aa4bb7b5723fd3c3414 dltk-4.0.0.tar.xz
+465cb4a0a364670431928f7c7c1a7fd3 eclipse-dltk-5.0.0.tar.xz