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

[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  0f477f990b71de8b958a995c001fe3b52c37ea81 (commit)
       via  7440a1659db7cf3c111932b04b83187082b4ecd2 (commit)
       via  386084da34b8a5f472f531a20b4358b005f3b7ad (commit)
       via  a7dbeef51d1b2b9f07e1d0fda99909f3a08bf9ff (commit)
      from  534e0e67d383a80a8d57d28da30152ebbe26d56d (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 0f477f990b71de8b958a995c001fe3b52c37ea81
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Feb 24 17:45:24 2010 +0100

    Drop plugins/org.mortbay.jetty_5*.jar and libmortbay-java from build dependency.

commit 7440a1659db7cf3c111932b04b83187082b4ecd2
Merge: a7dbeef51d1b2b9f07e1d0fda99909f3a08bf9ff 386084da34b8a5f472f531a20b4358b005f3b7ad
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Feb 24 17:40:17 2010 +0100

    Merge branch 'upstream'

commit a7dbeef51d1b2b9f07e1d0fda99909f3a08bf9ff
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Feb 24 17:35:44 2010 +0100

    Fix permission.

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

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

diff --git a/debian/control b/debian/control
index 5a96fad..c1a19d2 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,6 @@ Build-Depends: ant (>= 1.7.1),
                libjetty-java (>= 6.1.22),
                libjsch-java (>= 0.1.37-3),
                liblucene2-java (>= 2.9.1+ds1-5),
-               libmortbay-java,
                libmx4j-java (>= 3.0.2-8),
                libpango1.0-dev,
                libservlet2.4-java (>= 5.0.30-10),
diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
index 781c700..4788f01 100644
--- a/debian/patches/system-jars.patch
+++ b/debian/patches/system-jars.patch
@@ -171,7 +171,7 @@ Index: debian.git/system-jars.csv
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ debian.git/system-jars.csv	2010-02-24 16:33:52.994089026 +0100
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,47 @@
 +plugins/org.apache.ant_*/bin/ant;/usr/share/ant/bin/ant
 +plugins/org.apache.ant_*/bin/antRun;/usr/share/ant/bin/antRun
 +plugins/org.apache.ant_*/bin/antRun.pl;/usr/share/ant/bin/antRun.pl
@@ -217,6 +217,5 @@ Index: debian.git/system-jars.csv
 +plugins/javax.management_*.jar;/usr/share/java/mx4j.jar
 +plugins/javax.management.remote_*.jar;/usr/share/java/mx4j-remote.jar
 +plugins/org.apache.jasper_*.jar;/usr/share/java/jasper.jar
-+plugins/org.mortbay.jetty_5*.jar;/usr/share/java/org.mortbay.jetty.jar
 +plugins/org.objectweb.asm_*.jar;/usr/share/java/asm3-all.jar
 +plugins/org.eclipse.osgi/osgi/xmlParserAPIs.jar;/usr/share/java/xmlParserAPIs.jar
diff --git a/eclipse/removed-jars b/eclipse/removed-jars
index 6f01803..12cbb74 100644
--- a/eclipse/removed-jars
+++ b/eclipse/removed-jars
@@ -37,7 +37,6 @@ plugins/org.junit4/junit.jar
 plugins/org.junit_3.8.2.v20090203-1005/junit.jar
 plugins/org.mortbay.jetty.server_6.1.15.v200905151201.jar
 plugins/org.mortbay.jetty.util_6.1.15.v200905182336.jar
-plugins/org.mortbay.jetty_5.1.14.v200806031611.jar
 plugins/org.objectweb.asm_3.1.0.v200803061910.jar
 plugins/org.sat4j.core_2.1.1.v20090825.jar
 plugins/org.sat4j.pb_2.1.1.v20090825.jar
diff --git a/symlink-system-jars b/symlink-system-jars
old mode 100644
new mode 100755
diff --git a/system-jars.csv b/system-jars.csv
index 6b2de34..b75d367 100644
--- a/system-jars.csv
+++ b/system-jars.csv
@@ -43,6 +43,5 @@ plugins/com.ibm.icu.base_*.jar;/usr/share/java/com.ibm.icu.base.jar
 plugins/javax.management_*.jar;/usr/share/java/mx4j.jar
 plugins/javax.management.remote_*.jar;/usr/share/java/mx4j-remote.jar
 plugins/org.apache.jasper_*.jar;/usr/share/java/jasper.jar
-plugins/org.mortbay.jetty_5*.jar;/usr/share/java/org.mortbay.jetty.jar
 plugins/org.objectweb.asm_*.jar;/usr/share/java/asm3-all.jar
 plugins/org.eclipse.osgi/osgi/xmlParserAPIs.jar;/usr/share/java/xmlParserAPIs.jar


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