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

Benjamin Drung bdrung-guest at alioth.debian.org
Sun Feb 28 19:54:20 UTC 2010 

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  01463c113c01538a6fae8bdcfd7cca0600cf6abc (commit)
       via  b80cf1f57dcd1ac80a3059cf7dd322613fedf249 (commit)
      from  742c7dca617c76731c54a1767c10df5a1f0f793d (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 01463c113c01538a6fae8bdcfd7cca0600cf6abc
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Feb 28 20:54:03 2010 +0100

    Drop cdbs and use dh 7.

commit b80cf1f57dcd1ac80a3059cf7dd322613fedf249
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Feb 27 11:41:08 2010 +0100

    Symlink system ant files.

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

Summary of changes:
 debian/control                            |    5 +-
 debian/patches/series                     |    1 +
 debian/patches/symlink-system-files.patch |   14 +++
 debian/rules                              |  124 +++++++++++------------------
 nonosgidependencies.properties            |    5 +
 5 files changed, 69 insertions(+), 80 deletions(-)

diff --git a/debian/control b/debian/control
index fbb0a7a..4cbad12 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,7 @@ Uploaders: Niels Thykier <niels at thykier.net>,
            Adrian Perez <adrianperez-deb at ubuntu.com>
 Build-Depends: ant (>= 1.7.1),
                ant-optional,
-               cdbs,
-               debhelper (>= 7),
+               debhelper (>= 7.0.50~),
                default-jdk,
                docbook2x,
                junit (>= 3.8.2-4),
@@ -39,7 +38,7 @@ Build-Depends: ant (>= 1.7.1),
                pkg-config,
                sat4j (>= 2.1.0),
                unzip,
-               xulrunner-dev (>= 1.9.1),
+               xulrunner-dev (>= 1.9.1.3-2),
                zip
 Standards-Version: 3.8.4
 DM-Upload-Allowed: yes
diff --git a/debian/patches/series b/debian/patches/series
index 9c7202a..9f83977 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ lucene.patch
 eclipse-manpage.patch
 pdebuild-script.patch
 pdebuild-path-copy-platform.patch
+symlink-system-files.patch
diff --git a/debian/patches/symlink-system-files.patch b/debian/patches/symlink-system-files.patch
new file mode 100644
index 0000000..af40326
--- /dev/null
+++ b/debian/patches/symlink-system-files.patch
@@ -0,0 +1,14 @@
+Description: Symlink system ant files
+Author: Benjamin Drung <bdrung at ubuntu.com>
+
+--- eclipse-3.5.2.orig/nonosgidependencies.properties
++++ eclipse-3.5.2/nonosgidependencies.properties
+@@ -18,3 +18,8 @@ org.apache.ant_1.7.1.v20090120-1145/lib/
+ org.apache.ant_1.7.1.v20090120-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-trax.jar:/usr/share/java/ant-trax.jar
+ org.junit_3.8.2.v20090203-1005/junit.jar=/usr/share/java/junit.jar
+ org.junit4/junit.jar=/usr/share/java/junit4.jar
++org.apache.ant_1.7.1.v20090120-1145/bin/ant=/usr/share/ant/bin/ant
++org.apache.ant_1.7.1.v20090120-1145/bin/antRun=/usr/share/ant/bin/antRun
++org.apache.ant_1.7.1.v20090120-1145/bin/antRun.pl=/usr/share/ant/bin/antRun.pl
++org.apache.ant_1.7.1.v20090120-1145/bin/complete-ant-cmd.pl=/usr/share/ant/bin/complete-ant-cmd.pl
++org.apache.ant_1.7.1.v20090120-1145/bin/runant.pl=/usr/share/ant/bin/runant.pl
diff --git a/debian/rules b/debian/rules
index 4e0fa6f..dd8c46d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,22 @@
 #!/usr/bin/make -f
 
-DEB_TARBALL := $(NULL)
+export JAVA_HOME=/usr/lib/jvm/default-java
+
+%:
+	dh --with xulrunner $@
+
+override_dh_auto_clean:
+	ant distclean
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+override_dh_auto_build:
+	ant -DbuildArch=$(ECLIPSE_BUILD_ARCH)
 
-DEB_ANT_CLEAN_TARGET := distclean
-DEB_ANT_BUILD_TARGET := provision.sdk
-DEB_ANT_INSTALL_TARGET := install -Dprefix=/usr -DdestDir=$(DEB_DESTDIR)
+override_dh_auto_install:
+	ant install -Dprefix=/usr -DdestDir=$(CURDIR)/debian/tmp -DbuildArch=$(ECLIPSE_BUILD_ARCH)
 
+# TODO: Turn all commands below this comment into patches and send them to eclipse-build.
+
+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
@@ -31,70 +39,29 @@ ifeq ($(ECLIPSE_BUILD_ARCH),)
 	ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH_CPU)
 endif
 
-ANT_ARGS := -DbuildArch=$(ECLIPSE_BUILD_ARCH)
-DEB_DH_MAKESHLIBS_ARGS_ALL := -Xjni
-
-# workaround for Debian bug #420287
-DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar
-
-export JAVA_HOME=/usr/lib/jvm/default-java
 export PATH:=$(CURDIR)/debian/extra/bin:$(PATH)
 
-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
-
-DEB_DH_SHLIBDEPS_ARGS_eclipse-rcp = \
-	$(strip $(shell pkg-config --libs-only-L libxul | sed "s/-L/-l/g")):$(JAVA_HOME)/jre/lib/$(DEB_HOST_ARCH_CPU) \
-	-- -dDepends \
-		$(JNI_SO_PATH)/libswt-gtk-*.so \
-		$(JNI_SO_PATH)/libswt-atk-gtk-*.so \
-		$(JNI_SO_PATH)/libswt-awt-gtk-*.so \
-		$(JNI_SO_PATH)/libswt-cairo-gtk-*.so \
-		$(JNI_SO_PATH)/libswt-pi-gtk-*.so \
-		$(JNI_SO_PATH)/libswt-xpcominit-gtk-*.so \
-		$(JNI_SO_PATH)/libswt-xulrunner-gtk-*.so \
-		$(shell find $(JNI_SO_PATH) -name '*.so' | grep -v libswt-) \
-		$(LAUNCHER_LIB) \
-	-dRecommends \
-		$(JNI_SO_PATH)/libswt-gnome-gtk-*.so \
-		$(JNI_SO_PATH)/libswt-glx-gtk-*.so \
-	-Tdebian/eclipse-rcp.substvars
-
-install/eclipse-platform::
-	@echo "*** install/eclipse-platform ***"
-	$(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)
-
-binary-post-install/libequinox-osgi-java::
-	@echo "*** binary-post-install/libequinox-osgi-java ***"
-	# Do the linking.
-	mkdir -p debian/libequinox-osgi-java/usr/share/java
-	cd debian/libequinox-osgi-java/usr/share/java && \
-	  for FILE in ../../lib/eclipse/plugins/* ; do \
-		ln -s $$FILE ; \
-		ln -s $$FILE `basename $$FILE | sed 's/_.*$$//g'`.jar ; \
-	  done
-	# Redo this step, just in case.
-	dh_link -plibequinox-osgi-java
-
-# 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-$(BUILD_TAG)-fetched-src
+SOURCE_DIR := $(CURDIR)/build/eclipse-$(UPSTREAM_VERSION)-src
 RESULT_DIR := $(SOURCE_DIR)/installation/
-DEBIAN_PACK_LIBDIR := $(DEB_DESTDIR)/usr/lib/eclipse
+DEBIAN_PACK_LIBDIR := $(CURDIR)/debian/tmp/usr/lib/eclipse
 PROFILE_ID := PlatformProfile
 
-common-install-impl:: debian-install-stamp generate-pdebuild-scripts
-
 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.*$$//")
 
-debian-install-stamp:
-	@echo "*** debian-install-stamp ***"
-	dh_testdir
+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
@@ -105,7 +72,7 @@ debian-install-stamp:
 	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/
 	# Generate metadata and extract the swt libraries.
-	cd $(DEB_DESTDIR) && java \
+	cd debian/tmp && java \
 			-cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$(LAUNCHERVERSION) \
 			org.eclipse.core.launcher.Main \
 			-application \
@@ -122,7 +89,7 @@ debian-install-stamp:
 			-append \
 			-artifactRepositoryName "Eclipse Platform" \
 			-metadataRepositoryName "Eclipse Platform"
-	cd $(DEB_DESTDIR) && java \
+	cd debian/tmp && java \
 			-Declipse.p2.data.area=file:$(DEBIAN_PACK_LIBDIR)/p2 \
 			-Declipse.p2.MD5Check=false \
 			-cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$(LAUNCHERVERSION) \
@@ -143,7 +110,7 @@ debian-install-stamp:
 			-artifactRepository file:$(DEBIAN_PACK_LIBDIR)/metadata/ \
 			-destination $(DEBIAN_PACK_LIBDIR) \
 			-bundlepool $(DEBIAN_PACK_LIBDIR)
-	cd $(DEB_DESTDIR) && java -Dosgi.sharedConfiguration.area=$(DEBIAN_PACK_LIBDIR)/configuration \
+	cd debian/tmp && java -Dosgi.sharedConfiguration.area=$(DEBIAN_PACK_LIBDIR)/configuration \
 			-cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$(LAUNCHERVERSION) \
 			org.eclipse.core.launcher.Main \
 			-debug -consolelog \
@@ -159,11 +126,11 @@ debian-install-stamp:
 	# remove extra licence file
 	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
+	install -m 755 debian/extra/eclipse debian/tmp/usr/bin/eclipse
 	# 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"
+	sed -i 's/SDKProfile/PlatformProfile/' debian/tmp/usr/lib/eclipse/configuration/config.ini
 	# Set a saner default file limit than "unlimited".
-	echo 'osgi.bundlefile.limit=100' >> "$(DEB_DESTDIR)usr/lib/eclipse/configuration/config.ini"
+	echo 'osgi.bundlefile.limit=100' >> debian/tmp/usr/lib/eclipse/configuration/config.ini
 	# Remove the unnecessary configuration data (taken from Fedora spec)
 	rm -r $(DEBIAN_PACK_LIBDIR)/configuration/org.eclipse.core.runtime
 	rm -r $(DEBIAN_PACK_LIBDIR)/configuration/org.eclipse.equinox.app
@@ -171,18 +138,9 @@ debian-install-stamp:
 	find $(DEBIAN_PACK_LIBDIR)/configuration -depth -type d -name data -exec rm -rf {} \;
 	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
+	chmod +x debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.build_*/templates/package-build/*.sh
 	# Regenerate the eclipse.ini symlink.
-	ln -sf /etc/eclipse.ini $(DEB_DESTDIR)usr/lib/eclipse/eclipse.ini
-	touch $@
-
-# 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
-
-generate-pdebuild-scripts: debian-install-stamp
+	ln -sf /etc/eclipse.ini debian/tmp/usr/lib/eclipse/eclipse.ini
 	@echo "*** generate-pdebuild-scripts ***"
 	mkdir -p `dirname $(COPY_PLATFORM_INSTALL)` `dirname $(PDEBUILD_INSTALL)`
 	install -m 755 pdebuild/eclipse-copy-platform.sh $(COPY_PLATFORM_INSTALL)
@@ -193,4 +151,16 @@ generate-pdebuild-scripts: debian-install-stamp
 	) | sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $$eclipse/\1 \1,' >> $(COPY_PLATFORM_INSTALL)
 	sed -e "s/@PDEBUILDVERSION@/$(PDEBUILDVERSION)/g" -e "s:@COPY_PLATFORM@:$(COPY_PLATFORM):g" < pdebuild/eclipse-pdebuild.sh > $(PDEBUILD_INSTALL)
 	chmod a+x $(PDEBUILD_INSTALL)
-
+	@echo "*** binary-post-install/libequinox-osgi-java ***"
+	# Do the linking.
+	mkdir -p debian/libequinox-osgi-java/usr/share/java
+	cd debian/libequinox-osgi-java/usr/share/java && \
+	  for FILE in ../../lib/eclipse/plugins/* ; do \
+		ln -s $$FILE ; \
+		ln -s $$FILE `basename $$FILE | sed 's/_.*$$//g'`.jar ; \
+	  done
+	dh_install
+	$(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)
+	#TODO: if ls debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar > /dev/null 2>&1; then dh_install -peclipse-platform debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar /usr/lib/eclipse/plugins; fi
+	#TODO: if ls debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux*.jar > /dev/null 2>&1; then dh_install -peclipse-platform debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux*.jar /usr/lib/eclipse/plugins; fi
diff --git a/nonosgidependencies.properties b/nonosgidependencies.properties
index 9d15526..2a28ce9 100644
--- a/nonosgidependencies.properties
+++ b/nonosgidependencies.properties
@@ -18,3 +18,8 @@ org.apache.ant_1.7.1.v20090120-1145/lib/ant-swing.jar=/usr/share/java/ant/ant-sw
 org.apache.ant_1.7.1.v20090120-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-trax.jar:/usr/share/java/ant-trax.jar
 org.junit_3.8.2.v20090203-1005/junit.jar=/usr/share/java/junit.jar
 org.junit4/junit.jar=/usr/share/java/junit4.jar
+org.apache.ant_1.7.1.v20090120-1145/bin/ant=/usr/share/ant/bin/ant
+org.apache.ant_1.7.1.v20090120-1145/bin/antRun=/usr/share/ant/bin/antRun
+org.apache.ant_1.7.1.v20090120-1145/bin/antRun.pl=/usr/share/ant/bin/antRun.pl
+org.apache.ant_1.7.1.v20090120-1145/bin/complete-ant-cmd.pl=/usr/share/ant/bin/complete-ant-cmd.pl
+org.apache.ant_1.7.1.v20090120-1145/bin/runant.pl=/usr/share/ant/bin/runant.pl


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

More information about the pkg-java-commits mailing list