[SCM] eclipse - Powerful IDE written in java - Debian package. branch, ubuntu, updated. 6a5c84f3fd5506f6451ce65beb39a337b8bcd9e0

[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, ubuntu has been updated
       via  6a5c84f3fd5506f6451ce65beb39a337b8bcd9e0 (commit)
       via  76cf3d14f2db64c1105a5ced44d460dabf93a4d2 (commit)
      from  92aeeecf7062d6fa716ad10639427ee48d5cb6a3 (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 6a5c84f3fd5506f6451ce65beb39a337b8bcd9e0
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Oct 17 02:41:39 2009 +0200

    Run debian-install-stamp directly after ant install.

commit 76cf3d14f2db64c1105a5ced44d460dabf93a4d2
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Oct 17 01:39:14 2009 +0200

    Split long command list into single commands.

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

Summary of changes:
 debian/rules |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 252537b..06808c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,7 +86,9 @@ RESULT_DIR := $(SOURCE_DIR)/installation/
 DEBIAN_PACK_LIBDIR := $(DEB_DESTDIR)/usr/lib/eclipse
 PROFILE_ID := PlatformProfile
 
-common-install-arch:: debian-install-stamp
+common-install-impl:: debian-install-stamp
+
+LAUNCHERVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 
 ## This target does not work yet.
 debian-install-stamp:
@@ -96,9 +98,8 @@ debian-install-stamp:
 	find debian/tmp/usr/lib/ -type f \( -name '*.bmp' -o -name '*.gif' -o -name '*.jpg' -o -name '*.png' \) -exec sh debian/extra/imagemv.sh '{}' \;
 	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_//') && \
-		cd $(DEB_DESTDIR) && java \
-			-cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$$LAUNCHERVERSION \
+	cd $(DEB_DESTDIR) && java \
+			-cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$(LAUNCHERVERSION) \
 			org.eclipse.core.launcher.Main \
 			-application \
 			org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
@@ -113,11 +114,11 @@ debian-install-stamp:
 			-data $(CURDIR)/workspace \
 			-append \
 			-artifactRepositoryName "Eclipse Platform" \
-			-metadataRepositoryName "Eclipse Platform" && \
-		java \
+			-metadataRepositoryName "Eclipse Platform"
+	cd $(DEB_DESTDIR) && java \
 			-Declipse.p2.data.area=file:$(DEBIAN_PACK_LIBDIR)/p2 \
 			-Declipse.p2.MD5Check=false \
-			-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 \
 			-application \
 			org.eclipse.equinox.p2.director \
@@ -134,9 +135,9 @@ debian-install-stamp:
 			-metadataRepository file:$(DEBIAN_PACK_LIBDIR)/metadata/ \
 			-artifactRepository file:$(DEBIAN_PACK_LIBDIR)/metadata/ \
 			-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 \
+			-bundlepool $(DEBIAN_PACK_LIBDIR)
+	cd $(DEB_DESTDIR) && java -Dosgi.sharedConfiguration.area=$(DEBIAN_PACK_LIBDIR)/configuration \
+			-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.