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

[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-3.6 has been updated
       via  9ab6b5b0727dcdf45250e2b0f11354c6bef80f62 (commit)
       via  d1d779898181e8501315d58082dd3296544c4c91 (commit)
       via  e33e4ad0ec056fe58071ef5f35163ae9d984e1e5 (commit)
      from  b245e3e1965867f96e9f8cef703b89fe0943dc71 (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 9ab6b5b0727dcdf45250e2b0f11354c6bef80f62
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Jul 11 18:32:41 2010 +0200

    Remove TODO from debian/rules.

commit d1d779898181e8501315d58082dd3296544c4c91
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Jul 11 18:26:55 2010 +0200

    Drop rarely used variable from debian/rules.

commit e33e4ad0ec056fe58071ef5f35163ae9d984e1e5
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Jul 11 17:21:09 2010 +0200

    Make debian/rules shorter.

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

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

diff --git a/debian/rules b/debian/rules
index 1208559..7ea5ed1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,16 +33,12 @@ override_dh_shlibdeps:
 			$(JNI_SO_PATH)/libswt-glx-gtk-*.so
 	dh_shlibdeps --remaining-packages
 
-# TODO: Turn all commands below this comment into patches and send them to eclipse-build.
-
 # This has to go in an arch package, as some of the version numbers
 # depend on which arch it was build one.
 COPY_PLATFORM:=/usr/lib/eclipse/buildscripts/copy-platform
 COPY_PLATFORM_INSTALL:=debian/tmp$(COPY_PLATFORM)
 PDEBUILD_INSTALL:=debian/tmp/usr/lib/eclipse/buildscripts/pde-build
-
-DEBIAN_PACK_LIBDIR := $(CURDIR)/debian/tmp/usr/lib/eclipse
-PDEBUILDVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//')
+PDEBUILDVERSION = $(shell ls debian/tmp/usr/lib/eclipse/plugins | grep org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//')
 
 XULVERSION := $(shell pkg-config --modversion libxul)
 XULVERSION_STRIP1 := $(shell echo $(XULVERSION) | sed "s/\.[^\.]*$$//")
@@ -54,10 +50,7 @@ XULRUNNER_PATH := $(shell if test -d /usr/lib/xulrunner-$(shell $(XULRUNNER) --g
 	then echo '/usr/lib/xulrunner-$$($(XULRUNNER) --gre-version)'; \
 	else pkg-config --variable=sdkdir libxul | sed "s/-devel//"; fi)
 
-POMS := debian/poms/pom-equinox-osgi.xml debian/poms/pom-equinox-osgi.services.xml debian/poms/pom-equinox-osgi.util.xml
-
 override_dh_install:
-	# Turn all following commands into patches and send them to eclipse-build
 	# 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
 	# remove extra licence file
@@ -78,14 +71,14 @@ override_dh_install:
 	# Set a saner default file limit than "unlimited".
 	echo 'osgi.bundlefile.limit=100' >> debian/tmp/usr/lib/eclipse/configuration/config.ini
 	# Remove the unnecessary configuration data (taken from Fedora spec)
-	find $(DEBIAN_PACK_LIBDIR) -depth -type d -empty -delete
+	find debian/tmp/usr/lib/eclipse -depth -type d -empty -delete
 	# fix permissions of scripts
 	chmod +x debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.build_*/templates/package-build/*.sh
 	@echo "*** generate-pdebuild-scripts ***"
 	mkdir -p `dirname $(COPY_PLATFORM_INSTALL)` `dirname $(PDEBUILD_INSTALL)`
 	install -m 755 pdebuild/eclipse-copy-platform.sh $(COPY_PLATFORM_INSTALL)
 	( \
-	  cd $(DEBIAN_PACK_LIBDIR) ; \
+	  cd debian/tmp/usr/lib/eclipse; \
 	  ls -d * | egrep -v '^(plugins|features|about_files|dropins|buildscripts)$$' ; \
 	  ls -d * plugins/* features/* ; \
 	) | sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $$eclipse/\1 \1,' >> $(COPY_PLATFORM_INSTALL)
@@ -109,7 +102,7 @@ override_dh_install_indep:
 		ln -s $$FILE `basename $$FILE | sed 's/_.*$$//g'`.jar ; \
 	  done
 	# Install poms and jars into Maven repo
-	 for pom in $(POMS); do \
+	 for pom in $(wildcard debian/poms/*.xml); do \
 		mh_installpom -v -plibequinox-osgi-java $$pom; \
 		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; \


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