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

[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  953bc75c0035085c5a73ade0ce6b7d149ed55d8e (commit)
      from  614455d4182d66f4b3142fa18dad92ba7bd2b564 (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 953bc75c0035085c5a73ade0ce6b7d149ed55d8e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Oct 8 23:59:50 2009 +0200

    Install org.eclipse.core.net.linux.*.jar and org.eclipse.update.core.linux.*.jar on x86 only.

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

Summary of changes:
 debian/eclipse-platform.install |    2 --
 debian/rules                    |   15 +++++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index b86d8be..0328341 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -22,7 +22,6 @@ usr/lib/eclipse/plugins/org.eclipse.core.boot_*.jar
 usr/lib/eclipse/plugins/org.eclipse.core.filebuffers_*.jar
 usr/lib/eclipse/plugins/org.eclipse.core.filesystem.linux.*
 usr/lib/eclipse/plugins/org.eclipse.core.filesystem_*.jar
-usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*
 usr/lib/eclipse/plugins/org.eclipse.core.net_*.jar
 usr/lib/eclipse/plugins/org.eclipse.core.resources.compatibility_*
 usr/lib/eclipse/plugins/org.eclipse.core.resources_*.jar
@@ -114,7 +113,6 @@ usr/lib/eclipse/plugins/org.eclipse.ui.views.properties.tabbed_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ui.views_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ui.workbench.compatibility_*
 usr/lib/eclipse/plugins/org.eclipse.ui.workbench.texteditor_*.jar
-usr/lib/eclipse/plugins/org.eclipse.update.core.linux_*.jar
 usr/lib/eclipse/plugins/org.eclipse.update.core_*.jar
 usr/lib/eclipse/plugins/org.eclipse.update.scheduler_*.jar
 usr/lib/eclipse/plugins/org.eclipse.update.ui_*.jar
diff --git a/debian/rules b/debian/rules
index aa11636..6bc802b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,12 +49,16 @@ DEB_DH_SHLIBDEPS_ARGS_libswt-gtk-3.5-jni := \
 clean::
 	rm -f *.cdbs-config_list
 
+install/eclipse-platform::
+	$(if $(wildcard debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar),dh_install -peclipse-platform debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar /usr/lib/eclipse/plugins)
+	$(if $(wildcard debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux.*.jar),dh_install -peclipse-platform debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux.*.jar /usr/lib/eclipse/plugins)
+
+# TODO: Turn all commands below this comment into patches and send them to eclipse-build.
+
 # move images from /usr/lib to /usr/share
 common-install-indep::
 	find debian/tmp/usr/lib/ -type f \( -name '*.bmp' -o -name '*.gif' -o -name '*.jpg' -o -name '*.png' \) -exec sh debian/extra/imagemv.sh '{}' \;
 
-# TODO: Turn all commands below this comment into patches and send them to eclipse-build.
-
 BUILD_TAG := $(shell grep ^buildTag= build.properties | sed "s/^buildTag=//")
 SOURCE_DIR := $(CURDIR)/build/eclipse-$(BUILD_TAG)-fetched-src
 RESULT_DIR := $(SOURCE_DIR)/installation/
@@ -67,11 +71,6 @@ common-install-arch:: debian-install-stamp
 debian-install-stamp:
 	@echo "*** debian-install-stamp ***"
 	dh_testdir
-
-	# dirty hack - integrate following two commands into eclipse-build
-	cp $(SOURCE_DIR)/buildRepo/plugins/org.eclipse.core.net.linux*.jar $(DEBIAN_PACK_LIBDIR)/plugins
-	cp $(SOURCE_DIR)/buildRepo/plugins/org.eclipse.update.core.linux_*.jar $(DEBIAN_PACK_LIBDIR)/plugins
-
 	rm -fr $(DEBIAN_PACK_LIBDIR)/p2/
 	# Generate metadata and extract the swt libraries.
 	eval LAUNCHERVERSION=$$(ls $(DEBIAN_PACK_LIBDIR)/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//') && \
@@ -113,7 +112,7 @@ debian-install-stamp:
 			-destination $(DEBIAN_PACK_LIBDIR) \
 			-bundlepool $(DEBIAN_PACK_LIBDIR) && \
 		java -Dosgi.sharedConfiguration.area=$(DEBIAN_PACK_LIBDIR)/configuration \
-			-cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$$LAUNCHERVERSION
+			-cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$$LAUNCHERVERSION \
 			org.eclipse.core.launcher.Main \
 			-debug -consolelog \
 			-data $(CURDIR)/workspace \


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