[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 7ac8a2320d61695c38fbc83fe33822a0c8b46245

[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 has been updated
       via  7ac8a2320d61695c38fbc83fe33822a0c8b46245 (commit)
      from  a696f155fa9e17be85823cefe8e63b4b054ac7fe (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 7ac8a2320d61695c38fbc83fe33822a0c8b46245
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Dec 23 18:21:24 2009 +0100

    Added libjetty-java.

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

Summary of changes:
 debian/control                   |    3 ++-
 debian/patches/system-jars.patch |    4 ++--
 system-jars.csv                  |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index f9987d9..dcd6e2c 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: ant (>= 1.7.1),
                libgnomeui-dev,
                libgtk2.0-dev,
                libhamcrest-java (>= 1.1-4),
-               libjetty-java,
+               libjetty-java (>= 6.1.22),
                libjsch-java (>= 0.1.37-3),
                liblucene2-java,
                libpango1.0-dev,
@@ -110,6 +110,7 @@ Depends: default-jre | java1-runtime | java2-runtime | java5-runtime | java6-run
          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),
diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
index e8ba68b..d914a5d 100644
--- a/debian/patches/system-jars.patch
+++ b/debian/patches/system-jars.patch
@@ -197,7 +197,7 @@ Applied-Upstream: no
 +#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 fbc2f85..156da8d 100644
--- a/system-jars.csv
+++ b/system-jars.csv
@@ -40,7 +40,7 @@ plugins/org.apache.commons.logging_*.jar;/usr/share/java/commons-logging.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.