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

Thu Feb 25 21:11:09 UTC 2010

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  49fa81d46e89aa14e37aec6ca625cb71ed28f1e5 (commit)
       via  fd858b0635e49155dc31e5b8c36a6c8e89d17f72 (commit)
      from  1c8a48dcd007514b9dd9003f1a10afef4802c230 (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 49fa81d46e89aa14e37aec6ca625cb71ed28f1e5
Merge: fd858b0635e49155dc31e5b8c36a6c8e89d17f72 1c8a48dcd007514b9dd9003f1a10afef4802c230
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Feb 25 22:11:00 2010 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-java/eclipse

commit fd858b0635e49155dc31e5b8c36a6c8e89d17f72
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Feb 25 22:10:40 2010 +0100

    Stopped installing icu.base, refreshed affected patches.

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

Summary of changes:
 build.xml                            |    6 ------
 debian/eclipse-rcp.install           |    2 --
 debian/patches/eclipse-manpage.patch |   12 ++++++------
 debian/patches/series                |    1 -
 debian/patches/system-jars.patch     |   18 +++++++++---------
 5 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/build.xml b/build.xml
index 113c1d3..0fcac8f 100644
--- a/build.xml
+++ b/build.xml
@@ -568,12 +568,6 @@
 				<include name="org.eclipse.equinox.initializer*.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/eclipse-rcp.install b/debian/eclipse-rcp.install
index c4caed1..91c4245 100644
--- a/debian/eclipse-rcp.install
+++ b/debian/eclipse-rcp.install
@@ -1,8 +1,6 @@
 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/eclipse-manpage.patch b/debian/patches/eclipse-manpage.patch
index 3067be8..2948c95 100644
--- a/debian/patches/eclipse-manpage.patch
+++ b/debian/patches/eclipse-manpage.patch
@@ -3,10 +3,10 @@ Author: Pablo Duboue <pablo.duboue at gmail.com>
 Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=30107
 Bug-Ubuntu: https://launchpad.net/bugs/494065
 
-Index: debian.git/eclipse.1.xml
+Index: eclipse/eclipse.1.xml
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ debian.git/eclipse.1.xml	2010-02-24 16:33:57.404088906 +0100
++++ eclipse/eclipse.1.xml	2010-02-25 22:09:13.069650886 +0100
 @@ -0,0 +1,616 @@
 +ï»¿<?xml version="1.0" encoding="UTF-8"?>
 + <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
@@ -624,11 +624,11 @@ Index: debian.git/eclipse.1.xml
 +
 +</refsect1>
 +</refentry>
-Index: debian.git/build.xml
+Index: eclipse/build.xml
 ===================================================================
---- debian.git.orig/build.xml	2010-02-24 16:33:52.994089026 +0100
-+++ debian.git/build.xml	2010-02-24 16:33:57.404088906 +0100
-@@ -763,6 +763,12 @@
+--- eclipse.orig/build.xml	2010-02-25 22:09:04.357651837 +0100
++++ eclipse/build.xml	2010-02-25 22:09:13.073651798 +0100
+@@ -757,6 +757,12 @@
  		<!-- eclipse binary -->
  		<mkdir dir="${destDir}${prefix}/bin" />
  		<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
diff --git a/debian/patches/series b/debian/patches/series
index 184b1c4..6871e24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 fix-shell-script-perm.patch
 codec.patch
 lucene.patch
-install-icu4j-bundles.patch
 system-jars.patch
 eclipse-manpage.patch
 pdebuild-script.patch
diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
index 4788f01..5a6ba96 100644
--- a/debian/patches/system-jars.patch
+++ b/debian/patches/system-jars.patch
@@ -4,10 +4,10 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=280688
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/453036
 Applied-Upstream: no
 
-Index: debian.git/build.xml
+Index: eclipse/build.xml
 ===================================================================
---- debian.git.orig/build.xml	2010-02-24 16:33:50.824089013 +0100
-+++ debian.git/build.xml	2010-02-24 16:33:52.994089026 +0100
+--- eclipse.orig/build.xml	2010-02-25 22:09:00.241652604 +0100
++++ eclipse/build.xml	2010-02-25 22:09:04.357651837 +0100
 @@ -30,6 +30,7 @@
  	<uptodate property="testsunpack.complete" srcfile="${basedir}/eclipse-sdktests-${buildTag}-fetched-src.tar.bz2" targetfile="testsunpack-stamp" />
  	<uptodate property="buildId.complete" srcfile="unpack-stamp" targetfile="buildId-stamp" />
@@ -42,8 +42,8 @@ Index: debian.git/build.xml
  		<echo message="build.xml:  eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}" />
  		<java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
  			<classpath>
-@@ -556,6 +574,11 @@
- 				<include name="com.ibm.icu.base*.jar" />
+@@ -550,6 +568,11 @@
+ 				<include name="org.eclipse.equinox.initializer*.jar" />
  			</fileset>
  		</copy>
 +		<exec executable="./symlink-system-jars" failonerror="true">
@@ -54,10 +54,10 @@ Index: debian.git/build.xml
  		<echo file="provision.sdk-stamp" />
  	</target>
  
-Index: debian.git/symlink-system-jars
+Index: eclipse/symlink-system-jars
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ debian.git/symlink-system-jars	2010-02-24 16:33:52.994089026 +0100
++++ eclipse/symlink-system-jars	2010-02-25 22:09:04.373652204 +0100
 @@ -0,0 +1,108 @@
 +#!/bin/sh
 +set -e
@@ -167,10 +167,10 @@ Index: debian.git/symlink-system-jars
 +if test ! -z "$JARS"; then
 +	echo "W: These jars should be deleted and symlinked to system jars:\n$JARS"
 +fi
-Index: debian.git/system-jars.csv
+Index: eclipse/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
++++ eclipse/system-jars.csv	2010-02-25 22:09:04.417651831 +0100
 @@ -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
diff --git a/symlink-system-jars b/symlink-system-jars
old mode 100755
new mode 100644


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

