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

[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  7b2ec1c67869b5980477cca6f566fbc764b39921 (commit)
       via  1fd3f3446c12abc6fc854dce1972318000d5263c (commit)
      from  65e07887fde0bd367495f3c938915a79f3deb4a5 (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 7b2ec1c67869b5980477cca6f566fbc764b39921
Merge: 1fd3f3446c12abc6fc854dce1972318000d5263c 65e07887fde0bd367495f3c938915a79f3deb4a5
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Oct 25 07:43:46 2009 +0100

    Merge branch 'master' of ssh://nthykier-guest@git.debian.org/git/pkg-java/eclipse

commit 1fd3f3446c12abc6fc854dce1972318000d5263c
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Oct 25 07:43:25 2009 +0100

    Removed the sys-jar code and fixed symlinks.

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

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

diff --git a/debian/rules b/debian/rules
index 7446286..4a66884 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,7 @@ binary-post-install/libequinox-osgi-java::
 	cd debian/libequinox-osgi-java/usr/share/java && \
 	  for FILE in ../../lib/eclipse/plugins/* ; do \
 		ln -s $$FILE ; \
-		ln -s $$FILE `echo $$FILE | sed 's/_.*$$//g'`.jar ; \
+		ln -s $$FILE `basename $$FILE | sed 's/_.*$$//g'`.jar ; \
 	  done
 	# Redo this step, just in case.
 	dh_link -plibequinox-osgi-java
@@ -158,12 +158,6 @@ debian-install-stamp:
 	rm -f debian/tmp/usr/lib/eclipse/plugins/org.apache.ant_*/about_files/LICENSE.sax.txt
 	# wrapper script for setting LD_LIBRARY_PATH
 	install -m 755 debian/extra/eclipse $(DEB_DESTDIR)usr/bin/eclipse
-	# Use system libraries for the installed eclipse.
-	for LINE in `grep -v '#' debian/sys-jars` ; do \
-		if [ "X$$LINE" != X ] ; then \
-			sh debian/extra/plugin-linker.sh "$(DEB_DESTDIR)usr/lib/eclipse/" `echo $$LINE | sed 's/:/ /g'` ; \
-		fi ;\
-	done
 	# Correct the profile in config.ini - else eclipse will refuse to open the update/install menus.
 	sed -i 's/SDKProfile/PlatformProfile/' "$(DEB_DESTDIR)usr/lib/eclipse/configuration/config.ini"
 	# Remove the unnecessary configuration data (taken from Fedora spec)


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