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

[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  3bfcdcccbb38af987a244dbf057c77a2da53a658 (commit)
      from  ed9d303069da7b405e4964a85b77c2e046cc2bb6 (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 3bfcdcccbb38af987a244dbf057c77a2da53a658
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Oct 10 17:42:24 2009 +0200

    Install ogsi-bundles.

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

Summary of changes:
 debian/eclipse-rcp.install        |    1 +
 debian/libswt-gtk-3.5-jni.install |    1 -
 debian/rules                      |   16 +++++++++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/eclipse-rcp.install b/debian/eclipse-rcp.install
index 4f0ca00..df334fd 100644
--- a/debian/eclipse-rcp.install
+++ b/debian/eclipse-rcp.install
@@ -1,4 +1,5 @@
 usr/*/eclipse/features/org.eclipse.rcp_*
+usr/lib/eclipse/configuration/org.eclipse.osgi/
 usr/lib/eclipse/plugins/com.ibm.icu_*.jar
 usr/lib/eclipse/plugins/org.eclipse.core.commands_*.jar
 usr/lib/eclipse/plugins/org.eclipse.core.contenttype_*.jar
diff --git a/debian/libswt-gtk-3.5-jni.install b/debian/libswt-gtk-3.5-jni.install
deleted file mode 100644
index 4c5140e..0000000
--- a/debian/libswt-gtk-3.5-jni.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/jni/libswt-*[0-9].so
diff --git a/debian/rules b/debian/rules
index df02a44..89e849b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,17 @@ 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)
 
+binary-post-install/eclipse-rcp::
+	# This script is stored in a patch, so the exec bit is not set the first time.
+	test -x swt_bundle.sh || chmod a+x swt_bundle.sh
+	# Extract swt's bundle from eclipse-rcp where all the other bundles are installed.
+	$(DEB_ANT_INVOKE) -Dprefix=usr/ -Dlibdir=lib/ -Declipse.rcp.package.root=debian/eclipse-rcp/ \
+	    -Declipse.swt.package.root=debian/libswt-gtk-3.5-jni package.extract.swt
+	# Remove outdated libraries or else shlibdeps will fail later.
+	rm -f debian/libswt-gtk-3.5-jni/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp/libswt-mozilla-gcc*
+	mkdir -p debian/libswt-gtk-3.5-jni/usr/lib/jni
+	cd debian/libswt-gtk-3.5-jni/usr/lib/jni && find ../eclipse/configuration/ -name '*.so' -exec ln -s {} . \;
+
 # TODO: Turn all commands below this comment into patches and send them to eclipse-build.
 
 # move images from /usr/lib to /usr/share
@@ -120,15 +131,10 @@ debian-install-stamp:
 			-artifactRepository file:$(DEBIAN_PACK_LIBDIR)/metadata \
 			-application org.eclipse.equinox.initializer.configInitializer \
 			-fileInitializer $(CURDIR)/debian/extract_patterns.txt
-	# Copy SWT *.so files
-	mkdir -p $(DEB_DESTDIR)usr/lib/jni
-	cp $(SOURCE_DIR)/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_BUILD_ARCH)/*.so $(DEB_DESTDIR)usr/lib/jni
-	rm -f $(DEB_DESTDIR)usr/lib/jni/libswt-mozilla-gcc*
 	# Copy SWT jar file
 	mkdir -p $(DEB_DESTDIR)usr/lib/java
 	cp $(SOURCE_DIR)/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_BUILD_ARCH)/swt.jar \
 		$(DEB_DESTDIR)usr/lib/java/swt-gtk-3.5.jar
-	rm -f debian/*/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp/libswt-mozilla-gcc3-gtk-*.so
 	# Normalize the paths.
 	grep --exclude-from=debian/exclude_patterns.txt -l -I -r debian/tmp debian/tmp/ | xargs sed -i s@$(CURDIR)/debian/tmp@@g
 	TO_CORRECT=`echo $(CURDIR)/debian/tmp | sed s@/@_ at g` ; grep --exclude-from=debian/exclude_patterns.txt \


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