This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, upstream has been updated
via 9cd5c63d4c364f7e10cb723255e49ef9e9994f9f (commit)
from ee36190fe35892d638661bfc77fd3bf486c376f5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 17 +++++++++++
build.xml | 9 +++++-
dependencies.properties | 24 ++++++++--------
nonosgidependencies.properties | 36 ++++++++++++------------
patches/eclipse-use-newer-commons-codec.patch | 11 +++++++
5 files changed, 66 insertions(+), 31 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3628556..2a7809f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2010-02-26 Andrew Overholt <[email protected]>
+
+ Bug #280688
+
+ * dependencies.properties: Add Debian/Ubuntu locations (Benjamin
Drung).
+ * nonosgidependencies.properties: Likewise.
+
+2010-02-26 Alexander Kurtakov <[email protected]>
+
+ * patches/eclipse-use-newer-commons-codec.patch: New file.
+ * build.xml: Apply patch to use whatever commons-codec version is
available.
+ * dependencies.properties: Add unversioned jetty jars (needed for
Fedora 13).
+
+2010-02-25 Andrew Overholt <[email protected]>
+
+ * build.xml: Re-symlink in installation directory.
+
2010-02-25 Andrew Overholt <[email protected]>
* task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
diff --git a/build.xml b/build.xml
index 47ffed6..3906548 100644
--- a/build.xml
+++ b/build.xml
@@ -253,6 +253,7 @@
<patch
patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch"
dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch"
dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch"
dir="${buildDirectory}" strip="1" />
+ <patch
patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch"
dir="${buildDirectory}" strip="0" />
<replace
file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties"
token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
<chmod
dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build"
includes="*.sh" perm="a+x" />
<!-- end eclipse-build-only patches -->
@@ -604,6 +605,12 @@
<include
name="org.eclipse.equinox.initializer*.jar" />
</fileset>
</copy>
+
+ <symlinkOSGiJars
dependencies="${basedir}/dependencies.properties"
+ topLevelDir="${buildDirectory}/installation/plugins"/>
+ <symlinkNonOSGiJars
dependencies="${basedir}/nonosgidependencies.properties"
+ topLevelDir="${buildDirectory}/installation/plugins"/>
+
<echo file="provision.sdk-stamp" />
</target>
@@ -799,7 +806,7 @@
<mkdir dir="${destDir}/etc" />
<move file="${destDir}${prefix}/lib/eclipse/eclipse.ini"
tofile="${destDir}/etc/eclipse.ini" />
<symlink link="${destDir}${prefix}/lib/eclipse/eclipse.ini"
resource="/etc/eclipse.ini" />
-
+
</target>
<target name="package.extract.swt">
diff --git a/dependencies.properties b/dependencies.properties
index 7867523..0a61a75 100644
--- a/dependencies.properties
+++ b/dependencies.properties
@@ -1,17 +1,17 @@
-com.ibm.icu_4.0.1.v20090822.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar
+com.ibm.icu_4.0.1.v20090822.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar::/usr/share/java/com.ibm.icu.jar
com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar
-javax.servlet_2.5.0.v200806031605.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar
-javax.servlet.jsp_2.0.0.v200806031607.jar=/usr/share/java/tomcat5-jsp-2.0-api.jar
+javax.servlet_2.5.0.v200806031605.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.jar
+javax.servlet.jsp_2.0.0.v200806031607.jar=/usr/share/java/tomcat5-jsp-2.0-api.jar:/usr/share/java/jsp-api-2.0.jar
org.apache.commons.codec_1.3.0.v20080530-1600.jar=/usr/share/java/commons-codec.jar
org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
org.apache.commons.httpclient_3.1.0.v20080605-1935.jar=/usr/share/java/commons-httpclient.jar
org.apache.commons.logging_1.0.4.v200904062259.jar=/usr/share/java/commons-logging.jar
-org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar
-org.apache.lucene_1.9.1.v20080530-1600.jar=/usr/share/java/lucene.jar
-org.apache.lucene.analysis_1.9.1.v20080530-1600.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar
-org.hamcrest.core_1.1.0.v20090501071000.jar=/usr/share/java/hamcrest/core.jar
-org.mortbay.jetty.server_6.1.15.v200905151201.jar=/usr/share/java/jetty/jetty-6.1.20.jar
-org.mortbay.jetty.util_6.1.15.v200905182336.jar=/usr/share/java/jetty/jetty-util-6.1.20.jar
-org.objectweb.asm_3.1.0.v200803061910.jar=/usr/share/java/objectweb-asm/asm-all.jar
-org.sat4j.core_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.core.jar
-org.sat4j.pb_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.pb.jar
\ No newline at end of file
+org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper.jar
+org.apache.lucene_1.9.1.v20080530-1600.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
+org.apache.lucene.analysis_1.9.1.v20080530-1600.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
+org.hamcrest.core_1.1.0.v20090501071000.jar=/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest-core.jar
+org.mortbay.jetty.server_6.1.15.v200905151201.jar=/usr/share/java/jetty/jetty-6.1.20.jar:/usr/share/java/jetty/jetty.jar
+org.mortbay.jetty.util_6.1.15.v200905182336.jar=/usr/share/java/jetty/jetty-util-6.1.20.jar:/usr/share/java/jetty/jetty-util.jar
+org.objectweb.asm_3.1.0.v200803061910.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
+org.sat4j.core_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
+org.sat4j.pb_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
\ No newline at end of file
diff --git a/nonosgidependencies.properties b/nonosgidependencies.properties
index 8b84d5e..9d15526 100644
--- a/nonosgidependencies.properties
+++ b/nonosgidependencies.properties
@@ -1,20 +1,20 @@
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-antlr.jar=/usr/share/java/ant/ant-antlr.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-bcel.jar=/usr/share/java/ant/ant-apache-bcel.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-bsf.jar=/usr/share/java/ant/ant-apache-bsf.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-log4j.jar=/usr/share/java/ant/ant-apache-log4j.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-oro.jar=/usr/share/java/ant/ant-apache-oro.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-regexp.jar=/usr/share/java/ant/ant-apache-regexp.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-resolver.jar=/usr/share/java/ant/ant-apache-resolver.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-commons-logging.jar=/usr/share/java/ant/ant-commons-logging.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-commons-net.jar=/usr/share/java/ant/ant-commons-net.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-antlr.jar=/usr/share/java/ant/ant-antlr.jar:/usr/share/java/ant-antlr.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-bcel.jar=/usr/share/java/ant/ant-apache-bcel.jar:/usr/share/java/ant-apache-bcel.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-bsf.jar=/usr/share/java/ant/ant-apache-bsf.jar:/usr/share/java/ant-apache-bsf.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-log4j.jar=/usr/share/java/ant/ant-apache-log4j.jar:/usr/share/java/ant-apache-log4j.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-oro.jar=/usr/share/java/ant/ant-apache-oro.jar:/usr/share/java/ant-apache-oro.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-regexp.jar=/usr/share/java/ant/ant-apache-regexp.jar:/usr/share/java/ant-apache-regexp.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-resolver.jar=/usr/share/java/ant/ant-apache-resolver.jar:/usr/share/java/ant-apache-resolver.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-commons-logging.jar=/usr/share/java/ant/ant-commons-logging.jar:/usr/share/java/ant-commons-logging.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-commons-net.jar=/usr/share/java/ant/ant-commons-net.jar:/usr/share/java/ant-commons-net.jar
org.apache.ant_1.7.1.v20090120-1145/lib/ant.jar=/usr/share/java/ant.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-javamail.jar=/usr/share/java/ant/ant-javamail.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-jdepend.jar=/usr/share/java/ant/ant-jdepend.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-jsch.jar=/usr/share/java/ant/ant-jsch.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-junit.jar=/usr/share/java/ant/ant-junit.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-launcher.jar=/usr/share/java/ant-launcher.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-nodeps.jar=/usr/share/java/ant/ant-nodeps.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar
-org.apache.ant_1.7.1.v20090120-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-trax.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-javamail.jar=/usr/share/java/ant/ant-javamail.jar:/usr/share/java/ant-javamail.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-jdepend.jar=/usr/share/java/ant/ant-jdepend.jar:/usr/share/java/ant-jdepend.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-jsch.jar=/usr/share/java/ant/ant-jsch.jar:/usr/share/java/ant-jsch.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-junit.jar=/usr/share/java/ant/ant-junit.jar:/usr/share/java/ant-junit.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-launcher.jar=/usr/share/java/ant-launcher.jar:/usr/share/java/ant-launcher.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-nodeps.jar=/usr/share/java/ant/ant-nodeps.jar:/usr/share/java/ant-nodeps.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar
+org.apache.ant_1.7.1.v20090120-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-trax.jar:/usr/share/java/ant-trax.jar
org.junit_3.8.2.v20090203-1005/junit.jar=/usr/share/java/junit.jar
-org.junit4/junit.jar=/usr/share/java/junit4.jar
\ No newline at end of file
+org.junit4/junit.jar=/usr/share/java/junit4.jar
diff --git a/patches/eclipse-use-newer-commons-codec.patch
b/patches/eclipse-use-newer-commons-codec.patch
new file mode 100644
index 0000000..340b35a
--- /dev/null
+++ b/patches/eclipse-use-newer-commons-codec.patch
@@ -0,0 +1,11 @@
+--- features/org.eclipse.equinox.p2.user.ui/feature.xml.old 2009-11-06
21:52:00.000000000 +0200
++++ features/org.eclipse.equinox.p2.user.ui/feature.xml 2010-02-26
12:25:20.754557749 +0200
+@@ -305,7 +305,7 @@
+ id="org.apache.commons.codec"
+ download-size="0"
+ install-size="0"
+- version="1.3.0.qualifier"
++ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
