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

[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  dc933aeae6300bb347d9d522559afe1825ffe65f (commit)
      from  8a49b7dd0821f19851b4c4524f77373b2b27eb28 (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 dc933aeae6300bb347d9d522559afe1825ffe65f
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Oct 5 15:08:11 2009 +0200

    Install libs into correct directory in debian/tmp

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

Summary of changes:
 debian/libswt-gtk-3.5-java.install |    2 +-
 debian/libswt-gtk-3.5-jni.install  |    2 +-
 debian/rules                       |    8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/libswt-gtk-3.5-java.install b/debian/libswt-gtk-3.5-java.install
index e48d287..a7e1677 100644
--- a/debian/libswt-gtk-3.5-java.install
+++ b/debian/libswt-gtk-3.5-java.install
@@ -1 +1 @@
-swt-gtk-3.5.jar usr/lib/java/
+usr/lib/java/swt-gtk-3.5.jar
diff --git a/debian/libswt-gtk-3.5-jni.install b/debian/libswt-gtk-3.5-jni.install
index 472623a..4c5140e 100644
--- a/debian/libswt-gtk-3.5-jni.install
+++ b/debian/libswt-gtk-3.5-jni.install
@@ -1 +1 @@
-debian/tmp/libswt-*[0-9].so usr/lib/jni
+usr/lib/jni/libswt-*[0-9].so
diff --git a/debian/rules b/debian/rules
index 7c4d107..e32453d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -142,11 +142,13 @@ debian-install-stamp: debian-build-stamp
 			-application org.eclipse.equinox.initializer.configInitializer \
 			-fileInitializer $(CURDIR)/debian/patterns.txt
 	# Copy SWT *.so files
-	cp $(SOURCE_DIR)/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_BUILD_ARCH)/*.so \
-		 $(DEB_DESTDIR) && rm $(DEB_DESTDIR)/libswt-mozilla-gcc*
+	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 $(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)/swt-gtk-3.5.jar
+		$(DEB_DESTDIR)usr/lib/java/swt-gtk-3.5.jar
 	# Die friend of the old ages.
 	rm -f debian/*/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp/libswt-mozilla-gcc3-gtk-*.so
 	# Normalize the paths.


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