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

[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  decd3a1274ca2ef76b1e505a51122b12cf8ae63c (commit)
      from  8a129fd12a2906700b71bb45cf6fcccf70269a2c (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 decd3a1274ca2ef76b1e505a51122b12cf8ae63c
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Feb 20 17:01:19 2010 +0100

    Work around the eclipse.ini issue.

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

Summary of changes:
 debian/rules |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/debian/rules b/debian/rules
index faeb3f7..d45c115 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,6 +95,11 @@ UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed "s/+repack.*$$//"
 debian-install-stamp:
 	@echo "*** debian-install-stamp ***"
 	dh_testdir
+	# Remove some bad arguments that causes eclipse to fail
+	perl -i -ne 'print $$_ unless(m/^-XX/);' debian/tmp/etc/eclipse.ini
+	# Replace symlink with a copy - The absolute symlink causes eclipse to fail
+	# and some of the commands attempt to modify eclipse.ini.
+	cp -f debian/tmp/etc/eclipse.ini debian/tmp/usr/lib/eclipse/
 	# move images from /usr/lib to /usr/share
 	cd debian/tmp/usr && find lib/ -type f \( -name '*.bmp' -o -name '*.gif' -o -name '*.jpg' -o -name '*.png' \) | perl ../../../debian/extra/imagemv.pl
 	rm -fr $(DEBIAN_PACK_LIBDIR)/p2/
@@ -166,7 +171,7 @@ debian-install-stamp:
 	find $(DEBIAN_PACK_LIBDIR) -depth -type d -empty -delete
 	# fix permissions of scripts
 	chmod +x $(DEB_DESTDIR)usr/lib/eclipse/plugins/org.eclipse.pde.build_*/templates/package-build/*.sh
-	# Regenerate the eclipse.ini symlink - one of the eclipse runs above trashes it.
+	# Regenerate the eclipse.ini symlink.
 	ln -sf /etc/eclipse.ini $(DEB_DESTDIR)usr/lib/eclipse/eclipse.ini
 	touch $@
 


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