This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository eclipse.
commit b8014e69ac8850969127dc41f22cd92ebed8d0e9 Author: Markus Koschany <[email protected]> Date: Mon Nov 24 02:28:48 2014 +0100 Install all arch-dependent files into eclipse-rcp. Closes: #770457 Fix wrong override for dh_install-indep and move jh_classpath commands to the appropriate override target. --- debian/rules | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/debian/rules b/debian/rules index 8fcf686..c681a8a 100755 --- a/debian/rules +++ b/debian/rules @@ -29,7 +29,7 @@ COPY_PLATFORM_INSTALL:=debian/tmp$(COPY_PLATFORM) 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: +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 @@ -88,11 +88,21 @@ override_dh_install: usr/lib/$(DEB_HOST_MULTIARCH)/jni find $(CFG_OSGI_BUNDLES_PATH) -depth -type d -a -empty -delete # Check if we are doing a -B build - [ ! -d debian/eclipse-platform-data ] || debian/rules override_dh_install_indep + [ ! -d debian/eclipse-platform-data ] || debian/rules override_dh_install-indep chmod 0644 debian/eclipse-rcp/usr/lib/eclipse/about_files/IJG_README + # Expose org.eclipse.jface and its dependencies + mkdir -p debian/eclipse-rcp/usr/share/java + cd debian/eclipse-rcp/usr/share/java; \ + ln -s ../../lib/eclipse/plugins/org.eclipse.jface_*.jar; \ + ln -s org.eclipse.jface_*.jar org.eclipse.jface.jar; \ + ln -s ../../lib/eclipse/plugins/org.eclipse.core.commands_*.jar; \ + ln -s org.eclipse.core.commands_*.jar org.eclipse.core.commands.jar; \ + ln -s ../../lib/eclipse/plugins/org.eclipse.equinox.common_*.jar; \ + ln -s org.eclipse.equinox.common_*.jar org.eclipse.equinox.common.jar # Operations on arch: all packages - not invoked if building with -B -override_dh_install_indep: +override_dh_install-indep: + dh_install --indep # mv arch-indep plugins from lib to share cd debian/eclipse-platform-data/usr && find lib/ -type f -path '*lib/eclipse/*' | perl ../../../debian/extra/imagemv.pl # Expose osgi jars @@ -114,17 +124,8 @@ override_dh_install_indep: mh_installjar -v -plibequinox-osgi-java $$pom debian/libequinox-osgi-java/usr/share/java/org.eclipse.$$SUFFIX.jar; \ done - # Expose org.eclipse.jface and its dependencies - - mkdir -p debian/eclipse-rcp/usr/share/java - cd debian/eclipse-rcp/usr/share/java; \ - ln -s ../../lib/eclipse/plugins/org.eclipse.jface_*.jar; \ - ln -s org.eclipse.jface_*.jar org.eclipse.jface.jar; \ - ln -s ../../lib/eclipse/plugins/org.eclipse.core.commands_*.jar; \ - ln -s org.eclipse.core.commands_*.jar org.eclipse.core.commands.jar; \ - ln -s ../../lib/eclipse/plugins/org.eclipse.equinox.common_*.jar; \ - ln -s org.eclipse.equinox.common_*.jar org.eclipse.equinox.common.jar - +override_jh_classpath: + jh_classpath jh_classpath -c"org.eclipse.core.commands.jar org.eclipse.equinox.common.jar" \ debian/eclipse-rcp/usr/share/java/org.eclipse.jface.jar jh_classpath -c"org.eclipse.equinox.common.jar" \ -- 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
