This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository eclipse.
commit 2a57c1669eb223aeb419050e51638c82b9f187a8 Author: Emmanuel Bourg <[email protected]> Date: Tue Oct 18 19:57:29 2016 +0200 Fixed the build failure with dpkg-buildpackage -A (Closes: #806613) --- debian/changelog | 1 + debian/rules | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index b74293e..75458b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ eclipse (3.8.1-9) UNRELEASED; urgency=medium * Team upload. * Fixed the build failure with Java 8 (Closes: #757536) + * Fixed the build failure with dpkg-buildpackage -A (Closes: #806613) * eclipse-jdt no longer recommends sun-java6-jdk * Standards-Version updated to 3.9.8 * Use a secure Vcs-Git URL diff --git a/debian/rules b/debian/rules index c681a8a..ee50063 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,11 @@ override_dh_auto_clean: override_dh_auto_install: ant installSDKinDropins -Dprefix=/usr -DdestDir=$(CURDIR)/debian/tmp + # move jdt from /usr/lib to /usr/share + cd debian/tmp/usr && mkdir -p share/eclipse/dropins && mv lib/eclipse/dropins/jdt share/eclipse/dropins + # 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 + DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) CFG_OSGI_BUNDLES_PATH = debian/eclipse-rcp/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles JNI_SO_PATH := $(CFG_OSGI_BUNDLES_PATH)/*/1/.cp @@ -30,10 +35,6 @@ PDEBUILD_INSTALL:=debian/tmp/usr/lib/eclipse/buildscripts/pde-build PDEBUILDVERSION = $(shell ls debian/tmp/usr/lib/eclipse/dropins/sdk/plugins | grep org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//') override_dh_install-arch: - # move jdt from /usr/lib to /usr/share - cd debian/tmp/usr && mkdir -p share/eclipse/dropins && mv lib/eclipse/dropins/jdt share/eclipse/dropins - # 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 license files rm -f debian/tmp/usr/lib/eclipse/plugins/org.apache.ant_*/about_files/LICENSE* \ debian/tmp/usr/lib/eclipse/epl-v10.html \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
