[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-21-gbbe6013

[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-3.6 has been updated
       via  bbe601372cb9b2ad20ad787b8ab170ec2a7487ed (commit)
      from  ee171d0e04741db886ea4b7ccea79765929845c4 (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 bbe601372cb9b2ad20ad787b8ab170ec2a7487ed
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Fri Jun 11 02:39:23 2010 +0200

    Drop backported patch.

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

Summary of changes:
 build.xml                   |    1 -
 debian/patches/series       |    1 -
 patches/tooltip-color.patch |   47 -------------------------------------------
 3 files changed, 0 insertions(+), 49 deletions(-)

diff --git a/build.xml b/build.xml
index 4cd7fc3..9c73555 100644
--- a/build.xml
+++ b/build.xml
@@ -262,7 +262,6 @@
 		<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
 		<symlink link="${buildDirectory}/plugins/org.eclipse.osgi.services/src/javax" resource="../../org.eclipse.equinox.io/src/javax/" />
 		<patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
-		<patch patchfile="${basedir}/patches/tooltip-color.patch" dir="${buildDirectory}" strip="1" />
 		<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
 		<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
 		<!-- end eclipse-build-only patches -->
diff --git a/debian/patches/series b/debian/patches/series
index a0428ff..f880501 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,3 @@ eclipse-build-generatedScripts.patch
 osgi-services-symlink-javax.patch
 ecj-gccmain-java.patch
 fix-help-contents.patch
-fix-tooltip-color.patch
diff --git a/patches/tooltip-color.patch b/patches/tooltip-color.patch
deleted file mode 100644
index 3edcbd4..0000000
--- a/patches/tooltip-color.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -u -r1.25 ToolTip.java
---- a/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java	2 Dec 2009 15:52:39 -0000
-+++ b/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java	13 May 2010 15:59:10 -0000
-@@ -48,6 +48,7 @@
- 	TrayItem item;
- 	int x, y, timerId;
- 	int /*long*/ layoutText = 0, layoutMessage = 0;
-+	Color layoutTextColor, layoutMessageColor;
- 	int [] borderPolygon;
- 	boolean spikeAbove, autohide;
- 	
-@@ -498,6 +499,9 @@
- 			x += IMAGE_SIZE;
- 		}
- 		x += INSET;
-+		if (layoutTextColor != null) {
-+			OS.gdk_gc_set_foreground(gdkGC, layoutTextColor.handle);
-+		}
- 		OS.gdk_draw_layout (window, gdkGC, x, y, layoutText);
- 		int [] w = new int [1], h = new int [1];
- 		OS.pango_layout_get_size (layoutText, w, h);
-@@ -505,6 +509,9 @@
- 	}
- 	if (layoutMessage != 0) {
- 		x = BORDER + PADDING + INSET;
-+		if (layoutMessageColor != null) {
-+			OS.gdk_gc_set_foreground(gdkGC, layoutMessageColor.handle);
-+		}
- 		OS.gdk_draw_layout (window, gdkGC, x, y, layoutMessage);
- 	}
- 	OS.g_object_unref (gdkGC);
-@@ -708,6 +715,7 @@
- 	if (layoutMessage != 0) OS.g_object_unref (layoutMessage);
- 	layoutMessage = 0;
- 	if (message.length () != 0) {
-+		layoutMessageColor = display.getSystemColor(SWT.COLOR_INFO_FOREGROUND);
- 		byte [] buffer = Converter.wcsToMbcs (null, message, true);
- 		layoutMessage = OS.gtk_widget_create_pango_layout (handle, buffer);
- 		if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
-@@ -739,6 +747,7 @@
- 	if (layoutText != 0) OS.g_object_unref (layoutText);
- 	layoutText = 0;
- 	if (text.length () != 0) {
-+		layoutTextColor = display.getSystemColor(SWT.COLOR_INFO_FOREGROUND);
- 		byte [] buffer = Converter.wcsToMbcs (null, text, true);
- 		layoutText = OS.gtk_widget_create_pango_layout (handle, buffer);
- 		if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {


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