[SCM] eclipse - Powerful IDE written in java - Debian package. branch, ubuntu, updated. 55138a80f2c745d158a08d3729bd8ad06e79c855
Benjamin Drung
bdrung-guest at alioth.debian.org
Tue Dec 29 17:49:11 UTC 2009
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, ubuntu has been updated
via 55138a80f2c745d158a08d3729bd8ad06e79c855 (commit)
via e34e45c15edf177b8de5fbf5189593cbb357b061 (commit)
via 82bf5e21dbf9cf0f3db0c7b3a55eb17a6233082e (commit)
via 7d9e7214747b0be6bf69b0fc26ea83de4087fad7 (commit)
from 387e18dea1bd166b39fe73c323f9743420f52a40 (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 -----------------------------------------------------------------
commit 55138a80f2c745d158a08d3729bd8ad06e79c855
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Tue Dec 29 18:48:37 2009 +0100
Release 3.5.1+repack~3-0ubuntu1 to Ubuntu lucid.
commit e34e45c15edf177b8de5fbf5189593cbb357b061
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Tue Dec 29 17:44:23 2009 +0100
Drop versioned dependency on libcommons-el-java, libjetty-java, libservlet2.4-java; they are not yet available in Ubuntu.
commit 82bf5e21dbf9cf0f3db0c7b3a55eb17a6233082e
Merge: 387e18dea1bd166b39fe73c323f9743420f52a40 7d9e7214747b0be6bf69b0fc26ea83de4087fad7
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Tue Dec 29 17:34:26 2009 +0100
Merge branch 'master' into ubuntu
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 ++++--
debian/control | 10 ++--------
debian/patches/system-jars.patch | 10 +++++-----
system-jars.csv | 10 +++++-----
4 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d8bb203..a6c3ce0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-eclipse (3.5.1+repack~3-0ubuntu1) UNRELEASED; urgency=low
+eclipse (3.5.1+repack~3-0ubuntu1) lucid; urgency=low
* Rebase to packaging from pkg-java/eclipse:
+ Stopped using special hacks and work arounds to find JVMs.
@@ -16,8 +16,10 @@ eclipse (3.5.1+repack~3-0ubuntu1) UNRELEASED; urgency=low
+ Rewrote symlink script to handle folders that are renamed on different
archs/builds. (LP: #471859)
+ Move eclipse.ini into /etc (LP: #43162)
+ * Drop versioned dependency on libcommons-el-java, libjetty-java,
+ libservlet2.4-java; they are not yet available in Ubuntu.
- -- Benjamin Drung <bdrung at ubuntu.com> Tue, 29 Dec 2009 17:10:27 +0100
+ -- Benjamin Drung <bdrung at ubuntu.com> Tue, 29 Dec 2009 18:48:17 +0100
eclipse (3.5.1+repack~2-0ubuntu1) lucid; urgency=low
diff --git a/debian/control b/debian/control
index 388a0a9..3159a41 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends: ant (>= 1.7.1),
libatk1.0-dev,
libcairo2-dev,
libcommons-codec-java (>= 1.4-2),
- libcommons-el-java (>= 1.0-5),
libcommons-httpclient-java (>= 3.1-9),
libcommons-logging-java (>= 1.1.1-6),
libgl1-mesa-dev | libgl-dev,
@@ -25,11 +24,9 @@ Build-Depends: ant (>= 1.7.1),
libgnomeui-dev,
libgtk2.0-dev,
libhamcrest-java (>= 1.1-4),
- libjetty-java (>= 6.1.22),
libjsch-java (>= 0.1.37-3),
liblucene2-java,
libpango1.0-dev,
- libservlet2.4-java (>= 5.0.30-10),
libservlet2.5-java (>= 6.0.20-8),
libxt-dev,
libxtst-dev,
@@ -108,19 +105,16 @@ Depends: default-jre | java1-runtime | java2-runtime | java5-runtime | java6-run
eclipse-rcp (= ${binary:Version}),
java-common (>= 0.23),
libcommons-codec-java (>= 1.4-2),
- libcommons-el-java (>= 1.0-5),
libcommons-httpclient-java (>= 3.1-9),
libcommons-logging-java (>= 1.1.1-6),
- libjetty-java (>= 6.1.22),
libjsch-java (>= 0.1.37-3),
- libservlet2.4-java (>= 5.0.30-10),
libservlet2.5-java (>= 6.0.20-8),
libswt-gtk-3.5-java (= ${binary:Version}),
sat4j (>= 2.1.0),
xulrunner-1.9.1,
${misc:Depends},
${shlibs:Depends}
-Replaces: eclipse-jdt (<< 3.5.1+repack),
+Replaces: eclipse-jdt (<< 3.5.1+repack~3),
eclipse-platform-common,
eclipse-platform-gcj,
eclipse-source (<= 3.1.1-3),
@@ -151,7 +145,7 @@ Description: Eclipse platform without plug-ins to develop any language
Package: eclipse-platform-data
Architecture: all
Depends: ${misc:Depends}
-Replaces: eclipse-platform (<< 3.5.1-0ubuntu8),
+Replaces: eclipse-platform (<< 3.5.1+repack~3),
eclipse-platform-gcj
Description: Eclipse platform without plug-ins to develop any language (data)
The Eclipse Platform is an open and extensible platform for anything and yet
diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
index d914a5d..ca2c82a 100644
--- a/debian/patches/system-jars.patch
+++ b/debian/patches/system-jars.patch
@@ -186,18 +186,18 @@ Applied-Upstream: no
+plugins/org.apache.ant_*/lib/ant.jar;/usr/share/java/ant.jar
+plugins/org.junit_3.*/junit.jar;/usr/share/java/junit.jar
+plugins/com.jcraft.jsch_*.jar;/usr/share/java/jsch.jar
-+plugins/javax.servlet.jsp_*.jar;/usr/share/java/jsp-api-2.0.jar
-+plugins/javax.servlet_2.4*.jar;/usr/share/java/servlet-api-2.4.jar
++#plugins/javax.servlet.jsp_*.jar;/usr/share/java/jsp-api-2.0.jar
++#plugins/javax.servlet_2.4*.jar;/usr/share/java/servlet-api-2.4.jar
+plugins/javax.servlet_2.5*.jar;/usr/share/java/servlet-api-2.5.jar
+#plugins/org.apache.commons.codec_*.jar;/usr/share/java/commons-codec.jar
-+plugins/org.apache.commons.el_*.jar;/usr/share/java/commons-el.jar
++#plugins/org.apache.commons.el_*.jar;/usr/share/java/commons-el.jar
+plugins/org.apache.commons.httpclient_*.jar;/usr/share/java/commons-httpclient.jar
+plugins/org.apache.commons.logging_*.jar;/usr/share/java/commons-logging.jar
+#plugins/org.apache.lucene.analysis_*.jar;/usr/share/java/lucene-analyzers.jar
+#plugins/org.apache.lucene_*.jar;/usr/share/java/lucene-core.jar
+plugins/org.hamcrest.core_*.jar;/usr/share/java/hamcrest-core.jar
+plugins/org.junit4/junit.jar;/usr/share/java/junit4.jar
-+plugins/org.mortbay.jetty.server_*.jar;/usr/share/java/jetty.jar
-+plugins/org.mortbay.jetty.util_*.jar;/usr/share/java/jetty-util.jar
++#plugins/org.mortbay.jetty.server_*.jar;/usr/share/java/jetty.jar
++#plugins/org.mortbay.jetty.util_*.jar;/usr/share/java/jetty-util.jar
+plugins/org.sat4j.core_*.jar;/usr/share/sat4j/org.sat4j.core.jar
+plugins/org.sat4j.pb_*.jar;/usr/share/sat4j/org.sat4j.pb.jar
diff --git a/system-jars.csv b/system-jars.csv
index 156da8d..6224ad9 100644
--- a/system-jars.csv
+++ b/system-jars.csv
@@ -29,18 +29,18 @@ plugins/org.apache.ant_*/lib/ant-weblogic.jar;/usr/share/java/ant-weblogic.jar
plugins/org.apache.ant_*/lib/ant.jar;/usr/share/java/ant.jar
plugins/org.junit_3.*/junit.jar;/usr/share/java/junit.jar
plugins/com.jcraft.jsch_*.jar;/usr/share/java/jsch.jar
-plugins/javax.servlet.jsp_*.jar;/usr/share/java/jsp-api-2.0.jar
-plugins/javax.servlet_2.4*.jar;/usr/share/java/servlet-api-2.4.jar
+#plugins/javax.servlet.jsp_*.jar;/usr/share/java/jsp-api-2.0.jar
+#plugins/javax.servlet_2.4*.jar;/usr/share/java/servlet-api-2.4.jar
plugins/javax.servlet_2.5*.jar;/usr/share/java/servlet-api-2.5.jar
#plugins/org.apache.commons.codec_*.jar;/usr/share/java/commons-codec.jar
-plugins/org.apache.commons.el_*.jar;/usr/share/java/commons-el.jar
+#plugins/org.apache.commons.el_*.jar;/usr/share/java/commons-el.jar
plugins/org.apache.commons.httpclient_*.jar;/usr/share/java/commons-httpclient.jar
plugins/org.apache.commons.logging_*.jar;/usr/share/java/commons-logging.jar
#plugins/org.apache.lucene.analysis_*.jar;/usr/share/java/lucene-analyzers.jar
#plugins/org.apache.lucene_*.jar;/usr/share/java/lucene-core.jar
plugins/org.hamcrest.core_*.jar;/usr/share/java/hamcrest-core.jar
plugins/org.junit4/junit.jar;/usr/share/java/junit4.jar
-plugins/org.mortbay.jetty.server_*.jar;/usr/share/java/jetty.jar
-plugins/org.mortbay.jetty.util_*.jar;/usr/share/java/jetty-util.jar
+#plugins/org.mortbay.jetty.server_*.jar;/usr/share/java/jetty.jar
+#plugins/org.mortbay.jetty.util_*.jar;/usr/share/java/jetty-util.jar
plugins/org.sat4j.core_*.jar;/usr/share/sat4j/org.sat4j.core.jar
plugins/org.sat4j.pb_*.jar;/usr/share/sat4j/org.sat4j.pb.jar
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list