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

[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  c7792c3d3a25f865cd32f090d4f9d18c5e6cdbd4 (commit)
      from  d3424c71940bc3ed1c6cdaed6a5431067630fa5c (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 c7792c3d3a25f865cd32f090d4f9d18c5e6cdbd4
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Jun 29 20:51:37 2010 +0200

    Move operations on arch:all packages to its own make target. Fixes
    FTBFS on all buildds.

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

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

diff --git a/debian/rules b/debian/rules
index 2ac4713..77b18fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -205,10 +205,15 @@ override_dh_install:
 	dh_install
 	# Fix some weird exec permission
 	chmod a-x debian/eclipse-rcp/usr/lib/eclipse/about_files/IJG_README
-	# mv arch-indep plugins from lib to share
-	[ ! -d debian/eclipse-platform-data ] || (cd debian/eclipse-platform-data/usr && find lib/ -type f -path '*lib/eclipse/plugins/*' | perl ../../../debian/extra/imagemv.pl)
 	$(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)
+	# Check if we are doing a -B build
+	[ ! -d debian/eclipse-platform-data ] || debian/rules override_dh_install_indep
+
+# Operations on arch: all packages - not invoked if building with -B
+override_dh_install_indep:
+	# mv arch-indep plugins from lib to share
+	cd debian/eclipse-platform-data/usr && find lib/ -type f -path '*lib/eclipse/plugins/*' | perl ../../../debian/extra/imagemv.pl
 	# Expose osgi jars
 	mkdir -p debian/libequinox-osgi-java/usr/share/java
 	cd debian/libequinox-osgi-java/usr/share/java && \
@@ -222,3 +227,4 @@ override_dh_install:
 		SUFFIX=`basename $$pom .xml | sed 's/pom-equinox-//'`; \
 		mh_installjar -v -plibequinox-osgi-java  $$pom debian/libequinox-osgi-java/usr/share/java/org.eclipse.$$SUFFIX.jar; \
 	 done
+


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