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

[Niels Thykier]

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  60df01f7f99eea9a93a856182850145e25f69eb9 (commit)
      from  eb83dd26cbc5c39364119250ddf793bfbd4c7c08 (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 60df01f7f99eea9a93a856182850145e25f69eb9
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Mar 16 00:26:02 2010 +0100

    Corrected servlet patch and added missing headers.

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

Summary of changes:
 build.xml                           |    5 +++++
 debian/patches/add-servlet2.4.patch |   14 ++++++++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/build.xml b/build.xml
index 94c4f4a..cbe348a 100644
--- a/build.xml
+++ b/build.xml
@@ -663,6 +663,11 @@
 				<include name="org.eclipse.equinox.initializer*.jar" />
 			</fileset>
 		</copy>
+		<copy todir="${buildDirectory}/installation/plugins">
+			<fileset dir="${buildDirectory}/plugins/">
+				<include name="javax.servlet_2.4*.jar" />
+			</fileset>
+		</copy>
 
 		<!-- Re-symlink system JARs -->
 		<symlinkInstalledOSGiJars dependencies="${basedir}/dependencies.properties" 
diff --git a/debian/patches/add-servlet2.4.patch b/debian/patches/add-servlet2.4.patch
index feac230..82b756d 100644
--- a/debian/patches/add-servlet2.4.patch
+++ b/debian/patches/add-servlet2.4.patch
@@ -214,3 +214,17 @@
  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
 +javax.servlet_2.4.0.v200806031604.jar=/usr/share/java/servlet-api-2.4.jar
+--- a/build.xml
++++ b/build.xml
+@@ -663,6 +663,11 @@
+ 				<include name="org.eclipse.equinox.initializer*.jar" />
+ 			</fileset>
+ 		</copy>
++		<copy todir="${buildDirectory}/installation/plugins">
++			<fileset dir="${buildDirectory}/plugins/">
++				<include name="javax.servlet_2.4*.jar" />
++			</fileset>
++		</copy>
+ 
+ 		<!-- Re-symlink system JARs -->
+ 		<symlinkInstalledOSGiJars dependencies="${basedir}/dependencies.properties" 


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