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

[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 has been updated
       via  43b156fb1961755680694598d5d048702e136e73 (commit)
       via  28ddb5a9a8a00ae3f0a386057bc7e530b8c704df (commit)
      from  0aada9a1d097ef4bc8f893645d7484988e6846a4 (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 43b156fb1961755680694598d5d048702e136e73
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Mar 13 17:15:23 2010 +0100

    Restructured d/rules (in a conservative way) to ensure variables are set before they are used.

commit 28ddb5a9a8a00ae3f0a386057bc7e530b8c704df
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Mar 13 17:09:21 2010 +0100

    Revert "Restructured d/rules to ensure variables are set before they are used."
    
    This reverts commit 0aada9a1d097ef4bc8f893645d7484988e6846a4.

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

Summary of changes:
 debian/rules |   49 +++++++++++++++++++++++--------------------------
 1 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/debian/rules b/debian/rules
index 988ea5b..06cb57e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,35 +1,12 @@
 #!/usr/bin/make -f
 
-# **** VARIABLES **** #
-
 export JAVA_HOME=/usr/lib/jvm/default-java
 
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-JNI_SO_PATH = debian/eclipse-rcp/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp
-LAUNCHER_LIB = debian/eclipse-rcp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher.*/eclipse_*.so
 # We need this for overriding uname, upstream expects a slightly
 # different behaviour than Debian's uname.
 export PATH:=$(CURDIR)/debian/extra/bin:$(PATH)
 
-# 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
-
-DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
-BUILD_TAG := $(shell grep ^buildTag= build.properties | sed "s/^buildTag=//")
-SOURCE_DIR := $(CURDIR)/build/eclipse-$(UPSTREAM_VERSION)-src
-RESULT_DIR := $(SOURCE_DIR)/installation/
-DEBIAN_PACK_LIBDIR := $(CURDIR)/debian/tmp/usr/lib/eclipse
-PROFILE_ID := PlatformProfile
-
-LAUNCHERVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
-PDEBUILDVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//')
-UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed "s/+repack.*$$//")
-
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 ifneq (,$(filter $(DEB_HOST_ARCH_CPU),i386 i486 i586 i686))
 	ECLIPSE_BUILD_ARCH=x86
 endif
@@ -52,8 +29,6 @@ ifeq ($(ECLIPSE_BUILD_ARCH),)
 	ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH_CPU)
 endif
 
-# **** TARGETS **** #
-
 %:
 	dh --with xulrunner $@
 
@@ -66,6 +41,8 @@ override_dh_auto_build:
 override_dh_auto_install:
 	ant install -Dprefix=/usr -DdestDir=$(CURDIR)/debian/tmp -DbuildArch=$(ECLIPSE_BUILD_ARCH)
 
+JNI_SO_PATH = debian/eclipse-rcp/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp
+LAUNCHER_LIB = debian/eclipse-rcp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher.*/eclipse_*.so
 
 override_dh_shlibdeps:
 	dh_shlibdeps -peclipse-rcp -l$(JAVA_HOME)/jre/lib/$(DEB_HOST_ARCH_CPU) \
@@ -103,7 +80,27 @@ refresh-patches: unapply-patches
 
 # 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
+
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+BUILD_TAG := $(shell grep ^buildTag= build.properties | sed "s/^buildTag=//")
+SOURCE_DIR := $(CURDIR)/build/eclipse-$(UPSTREAM_VERSION)-src
+RESULT_DIR := $(SOURCE_DIR)/installation/
+DEBIAN_PACK_LIBDIR := $(CURDIR)/debian/tmp/usr/lib/eclipse
+PROFILE_ID := PlatformProfile
+
+LAUNCHERVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
+PDEBUILDVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//')
+UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed "s/+repack.*$$//")
+
 override_dh_install:
+	# Turn all following commands into patches and send them to eclipse-build
 	# 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


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