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

[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  ab9e62000472a31936147fd856ed7d2d50de0b04 (commit)
      from  9203efb7d6590accc6435d2c7fc43bb5771d1116 (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 ab9e62000472a31936147fd856ed7d2d50de0b04
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Jan 28 18:37:57 2010 +0100

    Fix icu4j install and added icu4j to (B-)D.

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

Summary of changes:
 build.xml                                  |    6 ++++++
 debian/control                             |    2 ++
 debian/eclipse-rcp.install                 |    2 ++
 debian/patches/install-icu4j-bundles.patch |   18 ++++++++++++++++++
 debian/patches/series                      |    1 +
 debian/patches/system-jars.patch           |    3 ++-
 system-jars.csv                            |    1 +
 7 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/build.xml b/build.xml
index a470ea4..19ba175 100644
--- a/build.xml
+++ b/build.xml
@@ -597,6 +597,12 @@
 				<filename name="org.eclipse.*.jar" />
 			</fileset>
 		</copy>
+		<copy todir="${buildDirectory}/installation/plugins">
+		        <!-- Apparently something forgets these. -->
+		        <fileset dir="${buildDirectory}/plugins/">
+		                <include name="com.ibm.icu.base*.jar" />
+			</fileset>
+		</copy>
 		<exec executable="./symlink-system-jars" failonerror="true">
 			<arg line="-c" />
 			<arg line="${buildDirectory}/installation" />
diff --git a/debian/control b/debian/control
index 238ce3a..44488b4 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends: ant (>= 1.7.1),
                libgnomeui-dev,
                libgtk2.0-dev,
                libhamcrest-java (>= 1.1-4),
+               libicu4j-java (>= 4.0.1.1),
                libjetty-java (>= 6.1.22),
                libjsch-java (>= 0.1.37-3),
                liblucene2-java (>= 2.9.1+ds1-5),
@@ -192,6 +193,7 @@ Package: eclipse-rcp
 Architecture: any
 Depends: default-jre | java1-runtime | java2-runtime | java5-runtime | java6-runtime,
          libequinox-osgi-java (= ${source:Version}),
+         libicu4j-java (>= 4.0.1.1),
          libswt-eclipse-java (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
diff --git a/debian/eclipse-rcp.install b/debian/eclipse-rcp.install
index b7cab42..9b8a709 100644
--- a/debian/eclipse-rcp.install
+++ b/debian/eclipse-rcp.install
@@ -1,6 +1,8 @@
 usr/*/eclipse/features/org.eclipse.rcp.source_*
 usr/*/eclipse/features/org.eclipse.rcp_*
 usr/lib/eclipse/configuration/org.eclipse.osgi/
+usr/lib/eclipse/plugins/com.ibm.icu.base.source_*.jar
+usr/lib/eclipse/plugins/com.ibm.icu.base_*.jar
 usr/lib/eclipse/plugins/com.ibm.icu.source_*.jar
 usr/lib/eclipse/plugins/com.ibm.icu_*.jar
 usr/lib/eclipse/plugins/org.eclipse.core.commands.source_*.jar
diff --git a/debian/patches/install-icu4j-bundles.patch b/debian/patches/install-icu4j-bundles.patch
new file mode 100644
index 0000000..554acd6
--- /dev/null
+++ b/debian/patches/install-icu4j-bundles.patch
@@ -0,0 +1,18 @@
+Description: Installs com.ibm.icu.base, which would otherwise be left behind.
+Forwarded: no
+
+--- eclipse-3.5.1+repack.orig/build.xml
++++ eclipse-3.5.1+repack/build.xml
+@@ -597,6 +597,12 @@
+ 				<filename name="org.eclipse.*.jar" />
+ 			</fileset>
+ 		</copy>
++		<copy todir="${buildDirectory}/installation/plugins">
++		        <!-- Apparently something forgets these. -->
++		        <fileset dir="${buildDirectory}/plugins/">
++		                <include name="com.ibm.icu.base*.jar" />
++			</fileset>
++		</copy>
+ 		<exec executable="./symlink-system-jars" failonerror="true">
+ 			<arg line="-c" />
+ 			<arg line="${buildDirectory}/installation" />
diff --git a/debian/patches/series b/debian/patches/series
index 7477c92..cab9909 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ codec.patch
 lucene.patch
 swtbug291128.patch
 source-jars.patch
+install-icu4j-bundles.patch
diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
index 20c5984..35d0a62 100644
--- a/debian/patches/system-jars.patch
+++ b/debian/patches/system-jars.patch
@@ -154,7 +154,7 @@ Applied-Upstream: no
 +fi
 --- /dev/null
 +++ eclipse-3.5.1+repack/system-jars.csv
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,51 @@
 +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
@@ -205,3 +205,4 @@ Applied-Upstream: no
 +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.ws.commons.util_*.jar;/usr/share/java/ws-commons-util.jar
diff --git a/system-jars.csv b/system-jars.csv
index da38c13..6d2f975 100644
--- a/system-jars.csv
+++ b/system-jars.csv
@@ -48,3 +48,4 @@ plugins/com.ibm.icu_*.jar;/usr/share/java/com.ibm.icu.jar
 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.ws.commons.util_*.jar;/usr/share/java/ws-commons-util.jar


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