[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-77-gde8f3c2

[Benjamin Drung]

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, master-3.6 has been updated
       via  de8f3c2e35ded833bb82dd559a68f2245e1d43fb (commit)
       via  7755c218acebd39317ecf4b8f47795cffee4ce1d (commit)
      from  c0afec40c7169874ff944b32206f9f901c85d4de (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 de8f3c2e35ded833bb82dd559a68f2245e1d43fb
Merge: c0afec4 7755c21
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Jun 30 21:47:00 2010 +0200

    Merge branch 'upstream-3.6' into master-3.6

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                              |    4 ++++
 debian/patches/update-dependency.patch |   11 -----------
 dependencies.properties                |    4 ++--
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 86df683..e5b53dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-23  Alexander Kurtakov  <akurtako at redhat.com>
+
+	* dependencies.properties: Fix jetty and jetty utils lists.
+
 2010-06-11  Alexander Kurtakov  <akurtako at redhat.com>
 
 	* patches/swt_webkit.patch: Removed. Applied upstream.
diff --git a/debian/patches/update-dependency.patch b/debian/patches/update-dependency.patch
index a4a8e17..42e8cf2 100644
--- a/debian/patches/update-dependency.patch
+++ b/debian/patches/update-dependency.patch
@@ -10,14 +10,3 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=317370
  com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar
  javax.servlet_2.5.0.v200910301333.jar=/home/akurtakov/orbit/servlet.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
-@@ -10,8 +10,8 @@
- org.apache.lucene_1.9.1.v20100518-1140.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
- org.apache.lucene.analysis_1.9.1.v20100518-1140.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.util_6.1.23.v201004211559.jar=/home/akurtakov/orbit/jetty-util.jar:/usr/share/java/jetty/jetty-6.1.20.jar:/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
--org.mortbay.jetty.server_6.1.23.v201004211559.jar=/home/akurtakov/orbit/jetty.jar:/usr/share/java/jetty/jetty-util-6.1.20.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
-+org.mortbay.jetty.util_6.1.23.v201004211559.jar=/home/akurtakov/orbit/jetty-util.jar:/usr/share/java/jetty/jetty-6.1.20.jar:/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar:/usr/share/java/jetty-util.jar
-+org.mortbay.jetty.server_6.1.23.v201004211559.jar=/home/akurtakov/orbit/jetty.jar:/usr/share/java/jetty/jetty-util-6.1.20.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty.jar:/usr/share/java/jetty-util.jar
- org.objectweb.asm_3.2.0.v200909071300.jar=/home/akurtakov/orbit/asm.jar:/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
- org.sat4j.core_2.2.0.v20100429.jar=/home/akurtakov/orbit/org.sat4j.core.jar:/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
- org.sat4j.pb_2.2.0.v20100429.jar=/home/akurtakov/orbit/org.sat4j.pb.jar:/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
diff --git a/dependencies.properties b/dependencies.properties
index ae6fa70..8418dea 100644
--- a/dependencies.properties
+++ b/dependencies.properties
@@ -10,8 +10,8 @@ org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache
 org.apache.lucene_1.9.1.v20100518-1140.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
 org.apache.lucene.analysis_1.9.1.v20100518-1140.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.util_6.1.23.v201004211559.jar=/home/akurtakov/orbit/jetty-util.jar:/usr/share/java/jetty/jetty-6.1.20.jar:/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar:/usr/share/java/jetty-util.jar
-org.mortbay.jetty.server_6.1.23.v201004211559.jar=/home/akurtakov/orbit/jetty.jar:/usr/share/java/jetty/jetty-util-6.1.20.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty.jar:/usr/share/java/jetty-util.jar
+org.mortbay.jetty.util_6.1.23.v201004211559.jar=/home/akurtakov/orbit/jetty-util.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
+org.mortbay.jetty.server_6.1.23.v201004211559.jar=/home/akurtakov/orbit/jetty.jar:/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
 org.objectweb.asm_3.2.0.v200909071300.jar=/home/akurtakov/orbit/asm.jar:/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
 org.sat4j.core_2.2.0.v20100429.jar=/home/akurtakov/orbit/org.sat4j.core.jar:/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
 org.sat4j.pb_2.2.0.v20100429.jar=/home/akurtakov/orbit/org.sat4j.pb.jar:/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.