[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.7.2-1-29-gf947ab6
Jakub Adam
jakub.adam at ktknet.cz
Mon May 7 11:16:34 UTC 2012
The following commit has been merged in the master-3.8 branch:
commit dbae46b530244b40eba2ed2ae46940028510cb6f
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sun May 6 23:21:21 2012 +0200
Refreshed d/patches for new upstream tarball
diff --git a/debian/patches/arch-dont-copy-removed-about-files.patch b/debian/patches/arch-dont-copy-removed-about-files.patch
new file mode 100644
index 0000000..9dc91e7
--- /dev/null
+++ b/debian/patches/arch-dont-copy-removed-about-files.patch
@@ -0,0 +1,22 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sun, 6 May 2012 16:41:33 +0200
+Subject: arch-dont-copy-removed-about-files
+
+---
+ build.xml | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index f99abfa..4fce261 100644
+--- a/build.xml
++++ b/build.xml
+@@ -288,9 +288,6 @@
+ <include name="*@{newArch}/**/*.*" />
+ <excludesfile name="${buildDirectory}/plugins/rename.sh" />
+ </replace>
+- <copy todir="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.@{newArch}/">
+- <fileset dir="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.@{archBase}"/>
+- </copy>
+ <mkdir dir="${buildDirectory}/features/" />
+ </sequential>
+ </macrodef>
diff --git a/debian/patches/bump-ant-version.patch b/debian/patches/bump-ant-version.patch
new file mode 100644
index 0000000..2caa5df
--- /dev/null
+++ b/debian/patches/bump-ant-version.patch
@@ -0,0 +1,84 @@
+From: Benjamin Drung <bdrung at ubuntu.com>
+Date: Thu, 15 Mar 2012 20:03:39 +0100
+Subject: bump-ant-version
+
+---
+ dependencies/nonosgidependencies.properties | 56 ++++++++++----------
+ .../META-INF/MANIFEST.MF | 2 +-
+ 2 files changed, 29 insertions(+), 29 deletions(-)
+
+diff --git a/dependencies/nonosgidependencies.properties b/dependencies/nonosgidependencies.properties
+index 727a944..42e73b9 100644
+--- a/dependencies/nonosgidependencies.properties
++++ b/dependencies/nonosgidependencies.properties
+@@ -1,29 +1,29 @@
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-antlr.jar=/usr/share/java/ant/ant-antlr.jar:/usr/share/java/ant-antlr.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-apache-bcel.jar=/usr/share/java/ant/ant-apache-bcel.jar:/usr/share/java/ant-apache-bcel.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-apache-bsf.jar=/usr/share/java/ant/ant-apache-bsf.jar:/usr/share/java/ant-apache-bsf.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-apache-log4j.jar=/usr/share/java/ant/ant-apache-log4j.jar:/usr/share/java/ant-apache-log4j.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-apache-oro.jar=/usr/share/java/ant/ant-apache-oro.jar:/usr/share/java/ant-apache-oro.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-apache-regexp.jar=/usr/share/java/ant/ant-apache-regexp.jar:/usr/share/java/ant-apache-regexp.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-apache-resolver.jar=/usr/share/java/ant/ant-apache-resolver.jar:/usr/share/java/ant-apache-resolver.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-apache-xalan2.jar=/usr/share/java/ant/ant-apache-xalan2.jar:/usr/share/java/ant-apache-xalan2.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-commons-logging.jar=/usr/share/java/ant/ant-commons-logging.jar:/usr/share/java/ant-commons-logging.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-commons-net.jar=/usr/share/java/ant/ant-commons-net.jar:/usr/share/java/ant-commons-net.jar
+-#org.apache.ant_1.8.3.v20120316-1400/lib/ant-jai.jar=/usr/share/java/ant/ant-jai.jar:/usr/share/java/ant-jai.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-javamail.jar=/usr/share/java/ant/ant-javamail.jar:/usr/share/java/ant-javamail.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-jdepend.jar=/usr/share/java/ant/ant-jdepend.jar:/usr/share/java/ant-jdepend.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-jmf.jar=/usr/share/java/ant/ant-jmf.jar:/usr/share/java/ant-jmf.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-jsch.jar=/usr/share/java/ant/ant-jsch.jar:/usr/share/java/ant-jsch.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-junit.jar=/usr/share/java/ant/ant-junit.jar:/usr/share/java/ant-junit.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-junit4.jar=/usr/share/java/ant/ant-junit.jar:/usr/share/java/ant-junit.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-launcher.jar=/usr/share/java/ant-launcher.jar:/usr/share/java/ant-launcher.jar
+-#org.apache.ant_1.8.3.v20120316-1400/lib/ant-netrexx.jar=/usr/share/java/ant-netrexx.jar:/usr/share/java/ant-netrexx.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant-testutil.jar=/usr/share/java/ant/ant-testutil.jar:/usr/share/java/ant-testutil.jar
+-org.apache.ant_1.8.3.v20120316-1400/lib/ant.jar=/usr/share/java/ant.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-antlr.jar=/usr/share/java/ant/ant-antlr.jar:/usr/share/java/ant-antlr.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-apache-bcel.jar=/usr/share/java/ant/ant-apache-bcel.jar:/usr/share/java/ant-apache-bcel.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-apache-bsf.jar=/usr/share/java/ant/ant-apache-bsf.jar:/usr/share/java/ant-apache-bsf.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-apache-log4j.jar=/usr/share/java/ant/ant-apache-log4j.jar:/usr/share/java/ant-apache-log4j.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-apache-oro.jar=/usr/share/java/ant/ant-apache-oro.jar:/usr/share/java/ant-apache-oro.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-apache-regexp.jar=/usr/share/java/ant/ant-apache-regexp.jar:/usr/share/java/ant-apache-regexp.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-apache-resolver.jar=/usr/share/java/ant/ant-apache-resolver.jar:/usr/share/java/ant-apache-resolver.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-apache-xalan2.jar=/usr/share/java/ant/ant-apache-xalan2.jar:/usr/share/java/ant-apache-xalan2.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-commons-logging.jar=/usr/share/java/ant/ant-commons-logging.jar:/usr/share/java/ant-commons-logging.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-commons-net.jar=/usr/share/java/ant/ant-commons-net.jar:/usr/share/java/ant-commons-net.jar
++#org.apache.ant_1.8.3.v20120321-1730/lib/ant-jai.jar=/usr/share/java/ant/ant-jai.jar:/usr/share/java/ant-jai.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-javamail.jar=/usr/share/java/ant/ant-javamail.jar:/usr/share/java/ant-javamail.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-jdepend.jar=/usr/share/java/ant/ant-jdepend.jar:/usr/share/java/ant-jdepend.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-jmf.jar=/usr/share/java/ant/ant-jmf.jar:/usr/share/java/ant-jmf.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-jsch.jar=/usr/share/java/ant/ant-jsch.jar:/usr/share/java/ant-jsch.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-junit.jar=/usr/share/java/ant/ant-junit.jar:/usr/share/java/ant-junit.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-junit4.jar=/usr/share/java/ant/ant-junit.jar:/usr/share/java/ant-junit.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-launcher.jar=/usr/share/java/ant-launcher.jar:/usr/share/java/ant-launcher.jar
++#org.apache.ant_1.8.3.v20120321-1730/lib/ant-netrexx.jar=/usr/share/java/ant-netrexx.jar:/usr/share/java/ant-netrexx.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar
++#org.apache.ant_1.8.3.v20120321-1730/lib/ant-testutil.jar=/usr/share/java/ant/ant-testutil.jar:/usr/share/java/ant-testutil.jar
++org.apache.ant_1.8.3.v20120321-1730/lib/ant.jar=/usr/share/java/ant.jar
+ #bin folder
+-org.apache.ant_1.8.3.v20120316-1400/bin/ant=/usr/bin/ant
+-org.apache.ant_1.8.3.v20120316-1400/bin/antRun=/usr/bin/antRun
+-org.apache.ant_1.8.3.v20120316-1400/bin/antRun.pl=/usr/bin/antRun.pl
+-org.apache.ant_1.8.3.v20120316-1400/bin/runant.pl=/usr/bin/runant.pl
+-org.apache.ant_1.8.3.v20120316-1400/bin/runant.py=/usr/bin/runant.py
+-org.apache.ant_1.8.3.v20120316-1400/bin/complete-ant-cmd.pl=/usr/bin/complete-ant-cmd.pl
++org.apache.ant_1.8.3.v20120321-1730/bin/ant=/usr/bin/ant
++org.apache.ant_1.8.3.v20120321-1730/bin/antRun=/usr/bin/antRun:/usr/share/ant/bin/antRun
++org.apache.ant_1.8.3.v20120321-1730/bin/antRun.pl=/usr/share/ant/bin/antRun.pl:/usr/bin/antRun.pl
++org.apache.ant_1.8.3.v20120321-1730/bin/runant.pl=/usr/share/ant/bin/runant.pl:/usr/bin/runant.pl
++#org.apache.ant_1.8.3.v20120321-1730/bin/runant.py=/usr/bin/runant.py
++org.apache.ant_1.8.3.v20120321-1730/bin/complete-ant-cmd.pl=/usr/share/ant/bin/complete-ant-cmd.pl:/usr/bin/complete-ant-cmd.pl
+diff --git a/eclipse/plugins/org.apache.ant_1.8.3.v20120321-1730/META-INF/MANIFEST.MF b/eclipse/plugins/org.apache.ant_1.8.3.v20120321-1730/META-INF/MANIFEST.MF
+index 9a62cd3..2014a62 100644
+--- a/eclipse/plugins/org.apache.ant_1.8.3.v20120321-1730/META-INF/MANIFEST.MF
++++ b/eclipse/plugins/org.apache.ant_1.8.3.v20120321-1730/META-INF/MANIFEST.MF
+@@ -1,7 +1,7 @@
+ Manifest-Version: 1.0
+ Require-Bundle: org.eclipse.osgi
+ Bundle-Vendor: %providerName
+-Bundle-Version: 1.8.3.qualifier
++Bundle-Version: 1.8.3
+ Bundle-Name: %pluginName
+ Bundle-ManifestVersion: 2
+ Bundle-SymbolicName: org.apache.ant
diff --git a/debian/patches/bump-eclipse-version.patch b/debian/patches/bump-eclipse-version.patch
new file mode 100644
index 0000000..f5179ba
--- /dev/null
+++ b/debian/patches/bump-eclipse-version.patch
@@ -0,0 +1,68 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sat, 5 May 2012 22:21:56 +0200
+Subject: bump-eclipse-version
+
+---
+ build.properties | 4 ++--
+ buildSDKSource.sh | 4 ++--
+ pdebuild.properties | 4 ++--
+ regenerateBootstrapFiles.sh | 2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/build.properties b/build.properties
+index 366bbe1..5180125 100644
+--- a/build.properties
++++ b/build.properties
+@@ -1,7 +1,7 @@
+ #baseLocation=${basedir}/bootstrap
+ # Note: this is also in pdebuild.properties
+-buildId=I20120320-1400
+-label=3.8.0-I20120320-1400
++buildId=I20120502-2000
++label=3.8.0-I20120502-2000
+ EMFlabel=2.7.0
+ testsBuildLabel=3.8.0-I20120320-1400
+ testframework=org.eclipse.test_3.3.100
+diff --git a/buildSDKSource.sh b/buildSDKSource.sh
+index 83f418c..cb2044a 100755
+--- a/buildSDKSource.sh
++++ b/buildSDKSource.sh
+@@ -6,10 +6,10 @@ workDirectory=
+ baseBuilder=
+ eclipseBuilder=
+
+-buildID="I20120320-1400"
++buildID="I20120502-2000"
+ baseBuilderTag="R4_2_primary"
+ eclipseBuilderTag="R4_2_primary"
+-label="3.8.0-I20120320-1400"
++label="3.8.0-I20120502-2000"
+ fetchTests="yes"
+
+ usage="usage: <build ID> [-workdir <working directory>] [-baseBuilder <path to org.eclipse.releng.basebuilder checkout>] [-eclipseBuilder <path to org.eclipse.releng.eclipsebuilder checkout>] [-baseBuilderTag <org.eclipse.releng.basebuilder tag to check out>] [-noTests]"
+diff --git a/pdebuild.properties b/pdebuild.properties
+index 94f0cd2..7be324b 100644
+--- a/pdebuild.properties
++++ b/pdebuild.properties
+@@ -2,8 +2,8 @@ buildArch=x86
+ ws=gtk
+ os=linux
+
+-buildId=I20120320-1400
+-label=3.8.0-I20120320-1400
++buildId=I20120502-2000
++label=3.8.0-I20120502-2000
+ bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+ #build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
+
+diff --git a/regenerateBootstrapFiles.sh b/regenerateBootstrapFiles.sh
+index d9f0b42..7700449 100755
+--- a/regenerateBootstrapFiles.sh
++++ b/regenerateBootstrapFiles.sh
+@@ -18,5 +18,5 @@ $launcherDir/plugins/org.eclipse.equinox.launcher_*.jar \
+ -application org.eclipse.ant.core.antRunner \
+ -f pdebuild.xml generateScripts \
+ -DskipBase=true \
+--DsdkSource=build/eclipse-3.8.0-I20120320-1400-src \
++-DsdkSource=build/eclipse-3.8.0-I20120502-2000-src \
+ 2>&1 | tee ./generatePdeBuildScripts.log
diff --git a/debian/patches/eclipse-help-feature-adjust-dependencies-lucene-vers.patch b/debian/patches/eclipse-help-feature-adjust-dependencies-lucene-vers.patch
new file mode 100644
index 0000000..49a93a9
--- /dev/null
+++ b/debian/patches/eclipse-help-feature-adjust-dependencies-lucene-vers.patch
@@ -0,0 +1,25 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sun, 6 May 2012 18:09:37 +0200
+Subject: eclipse-help-feature-adjust-dependencies-lucene-version
+
+---
+ patches/eclipse-help-feature-adjust-dependencies.patch | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/patches/eclipse-help-feature-adjust-dependencies.patch b/patches/eclipse-help-feature-adjust-dependencies.patch
+index d2e042a..0028ec4 100644
+--- a/patches/eclipse-help-feature-adjust-dependencies.patch
++++ b/patches/eclipse-help-feature-adjust-dependencies.patch
+@@ -74,9 +74,9 @@ diff --git a/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF b/plugins/org.ec
+ org.eclipse.help.search,
+ org.eclipse.help.server,
+ org.eclipse.help.standalone
+--Require-Bundle: org.apache.lucene;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+-+Require-Bundle: org.apache.lucene.core;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+- org.apache.lucene.analysis;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
++-Require-Bundle: org.apache.lucene;bundle-version="2.9.0";visibility:=reexport,
+++Require-Bundle: org.apache.lucene.core;bundle-version="2.9.0";visibility:=reexport,
++ org.apache.lucene.analysis;bundle-version="2.9.0";visibility:=reexport,
+ org.eclipse.ant.core;bundle-version="3.2.200";resolution:=optional,
+ org.eclipse.core.runtime;bundle-version="3.6.0",
+ diff --git a/eclipse/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java b/eclipse/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
diff --git a/debian/patches/refresh-eclipse-nosourcebundlesfordependencies.patch b/debian/patches/refresh-eclipse-nosourcebundlesfordependencies.patch
new file mode 100644
index 0000000..c3f5703
--- /dev/null
+++ b/debian/patches/refresh-eclipse-nosourcebundlesfordependencies.patch
@@ -0,0 +1,80 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sun, 6 May 2012 21:50:50 +0200
+Subject: refresh-eclipse-nosourcebundlesfordependencies
+
+---
+ .../eclipse-nosourcebundlesfordependencies.patch | 33 ++++++++++----------
+ 1 file changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/patches/eclipse-nosourcebundlesfordependencies.patch b/patches/eclipse-nosourcebundlesfordependencies.patch
+index cee5a4e..fd412f8 100644
+--- a/patches/eclipse-nosourcebundlesfordependencies.patch
++++ b/patches/eclipse-nosourcebundlesfordependencies.patch
+@@ -1,6 +1,6 @@
+---- a/features/org.eclipse.platform/sourceTemplateFeature/build.properties.orig 2011-05-03 13:46:41.000000000 -0500
+-+++ b/features/org.eclipse.platform/sourceTemplateFeature/build.properties 2011-05-08 13:11:40.376862727 -0500
+-@@ -13,7 +13,7 @@
++--- a/features/org.eclipse.platform/sourceTemplateFeature/build.properties
+++++ b/features/org.eclipse.platform/sourceTemplateFeature/build.properties
++@@ -13,7 +13,7 @@ eclipse_update_120.jpg,\
+ feature.xml,\
+ feature.properties
+
+@@ -9,10 +9,10 @@
+ plugin at org.apache.felix.gogo.command.source;version=0.8.0.qualifier;unpack="false",\
+ plugin at org.apache.felix.gogo.runtime.source;version=0.8.0.qualifier;unpack="false",\
+ plugin at org.apache.felix.gogo.shell.source;version=0.8.0.qualifier;unpack="false"
+-@@ -28,12 +28,10 @@
++@@ -28,12 +28,10 @@ generate.feature at org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.us
+ plugin at org.eclipse.ecf.provider.filetransfer.source;version=3.2.0.qualifier;unpack="false",\
+ plugin at org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\
+- plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source;version=4.0.1.qualifier;unpack="false",\
++ plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source;version=4.0.200.qualifier;unpack="false",\
+ - plugin at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\
+ - plugin at org.apache.commons.codec.source;version=1.3.0.qualifier;unpack="false,\
+ - plugin at org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false"
+@@ -25,8 +25,8 @@
+ -
+ \ No newline at end of file
+ +
+---- a/features/org.eclipse.sdk/build.properties.orig 2012-02-29 11:31:24.000000000 +0100
+-+++ b/features/org.eclipse.sdk/build.properties 2012-03-06 14:16:10.024880242 +0100
++--- a/features/org.eclipse.sdk/build.properties
+++++ b/features/org.eclipse.sdk/build.properties
+ @@ -11,33 +11,11 @@
+ bin.includes=eclipse_update_120.jpg,feature.xml,feature.properties
+
+@@ -37,7 +37,7 @@
+
+ -generate.feature at org.eclipse.jdt.source=org.eclipse.jdt, plugin at org.eclipse.jdt.doc.isv;unpack="false",\
+ -plugin at org.junit.source;version=3.8.2.qualifier;unpack="false",\
+--plugin at org.junit.source;version=4.8.2.qualifier;unpack="false",\
++-plugin at org.junit.source;version=4.10.0.qualifier;unpack="false",\
+ -plugin at org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\
+ -exclude at org.eclipse.jdt.doc.user
+ +generate.feature at org.eclipse.jdt.source=org.eclipse.jdt, plugin at org.eclipse.jdt.doc.isv;unpack="false", exclude at org.eclipse.jdt.doc.user
+@@ -52,15 +52,16 @@
+ - plugin at org.apache.lucene.source;version=2.9.1.qualifier;unpack="false",\
+ - plugin at org.apache.lucene.analysis.source;version=2.9.1.qualifier;unpack="false",\
+ - plugin at org.apache.lucene.core.source;version=2.9.1.qualifier;unpack="false",\
+-- plugin at org.eclipse.jetty.continuation.source;version=8.1.1.qualifier;unpack="false",\
+-- plugin at org.eclipse.jetty.http.source;version=8.1.1.qualifier;unpack="false",\
+-- plugin at org.eclipse.jetty.io.source;version=8.1.1.qualifier;unpack="false",\
+-- plugin at org.eclipse.jetty.security.source;version=8.1.1.qualifier;unpack="false",\
+-- plugin at org.eclipse.jetty.server.source;version=8.1.1.qualifier;unpack="false",\
+-- plugin at org.eclipse.jetty.servlet.source;version=8.1.1.qualifier;unpack="false",\
+-- plugin at org.eclipse.jetty.util.source;version=8.1.1.qualifier;unpack="false",\
++- plugin at org.eclipse.jetty.continuation.source;version=8.1.3.qualifier;unpack="false",\
++- plugin at org.eclipse.jetty.http.source;version=8.1.3.qualifier;unpack="false",\
++- plugin at org.eclipse.jetty.io.source;version=8.1.3.qualifier;unpack="false",\
++- plugin at org.eclipse.jetty.security.source;version=8.1.3.qualifier;unpack="false",\
++- plugin at org.eclipse.jetty.server.source;version=8.1.3.qualifier;unpack="false",\
++- plugin at org.eclipse.jetty.servlet.source;version=8.1.3.qualifier;unpack="false",\
++- plugin at org.eclipse.jetty.util.source;version=8.1.3.qualifier;unpack="false",\
+ - plugin at org.eclipse.javax.el.source;version=2.2.0.qualifier;unpack="false"
+ +generate.feature at org.eclipse.help.source=org.eclipse.help
+
+ generatedVersionLength=45
+-
++--
++1.7.10
diff --git a/debian/patches/series b/debian/patches/series
index 4cfb682..7d05fed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@ ecj-gccmain-java.patch
fix-help-contents.patch
pdebuild-path-copy-platform.patch
pdebuild-script.patch
-symlink-system-files.patch
remove-unnecessary-files.patch
strip-destDir.patch
clean-source.patch
@@ -26,3 +25,8 @@ eclipse-equinox-jsp-jasper-7.0.26.patch
use-jsch-0.1.42.patch
jdt-junit4-fix.patch
remove-org-apache-commons-el.patch
+bump-eclipse-version.patch
+arch-dont-copy-removed-about-files.patch
+eclipse-help-feature-adjust-dependencies-lucene-vers.patch
+bump-ant-version.patch
+refresh-eclipse-nosourcebundlesfordependencies.patch
diff --git a/debian/patches/symlink-system-files.patch b/debian/patches/symlink-system-files.patch
deleted file mode 100644
index 55d1afe..0000000
--- a/debian/patches/symlink-system-files.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Benjamin Drung <bdrung at ubuntu.com>
-Date: Thu, 15 Mar 2012 20:03:39 +0100
-Subject: symlink-system-files
-
----
- dependencies/nonosgidependencies.properties | 12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/dependencies/nonosgidependencies.properties b/dependencies/nonosgidependencies.properties
-index 727a944..ed616c8 100644
---- a/dependencies/nonosgidependencies.properties
-+++ b/dependencies/nonosgidependencies.properties
-@@ -18,12 +18,12 @@ org.apache.ant_1.8.3.v20120316-1400/lib/ant-junit4.jar=/usr/share/java/ant/ant-j
- org.apache.ant_1.8.3.v20120316-1400/lib/ant-launcher.jar=/usr/share/java/ant-launcher.jar:/usr/share/java/ant-launcher.jar
- #org.apache.ant_1.8.3.v20120316-1400/lib/ant-netrexx.jar=/usr/share/java/ant-netrexx.jar:/usr/share/java/ant-netrexx.jar
- org.apache.ant_1.8.3.v20120316-1400/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar
--org.apache.ant_1.8.3.v20120316-1400/lib/ant-testutil.jar=/usr/share/java/ant/ant-testutil.jar:/usr/share/java/ant-testutil.jar
-+#org.apache.ant_1.8.3.v20120316-1400/lib/ant-testutil.jar=/usr/share/java/ant/ant-testutil.jar:/usr/share/java/ant-testutil.jar
- org.apache.ant_1.8.3.v20120316-1400/lib/ant.jar=/usr/share/java/ant.jar
- #bin folder
- org.apache.ant_1.8.3.v20120316-1400/bin/ant=/usr/bin/ant
--org.apache.ant_1.8.3.v20120316-1400/bin/antRun=/usr/bin/antRun
--org.apache.ant_1.8.3.v20120316-1400/bin/antRun.pl=/usr/bin/antRun.pl
--org.apache.ant_1.8.3.v20120316-1400/bin/runant.pl=/usr/bin/runant.pl
--org.apache.ant_1.8.3.v20120316-1400/bin/runant.py=/usr/bin/runant.py
--org.apache.ant_1.8.3.v20120316-1400/bin/complete-ant-cmd.pl=/usr/bin/complete-ant-cmd.pl
-+org.apache.ant_1.8.3.v20120316-1400/bin/antRun=/usr/bin/antRun:/usr/share/ant/bin/antRun
-+org.apache.ant_1.8.3.v20120316-1400/bin/antRun.pl=/usr/share/ant/bin/antRun.pl:/usr/bin/antRun.pl
-+org.apache.ant_1.8.3.v20120316-1400/bin/runant.pl=/usr/share/ant/bin/runant.pl:/usr/bin/runant.pl
-+#org.apache.ant_1.8.3.v20120316-1400/bin/runant.py=/usr/bin/runant.py
-+org.apache.ant_1.8.3.v20120316-1400/bin/complete-ant-cmd.pl=/usr/share/ant/bin/complete-ant-cmd.pl:/usr/bin/complete-ant-cmd.pl
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list