[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.8.0_rc3-2-9-g1f5249e

[Jakub Adam]

The following commit has been merged in the master-3.8 branch:
commit d3962b191df9d78d109cdf0010c8acb9d7e4fd4b
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Jun 17 15:50:22 2012 +0200

    Move jdt to /usr/share

diff --git a/debian/eclipse-jdt.install b/debian/eclipse-jdt.install
index 7343423..848f114 100644
--- a/debian/eclipse-jdt.install
+++ b/debian/eclipse-jdt.install
@@ -1,22 +1,22 @@
 usr/*/eclipse/dropins/jdt/features/org.eclipse.jdt_*
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.ant.launching_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.ant.ui_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.apt.core_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.apt.pluggable.core_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.apt.ui_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.compiler.apt_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.compiler.tool_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core.manipulation_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug_*
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.doc.user_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit.core_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit.runtime_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit4.runtime_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.launching_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.ui_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.hamcrest.core_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.junit4_*
-usr/lib/eclipse/dropins/jdt/plugins/org.junit_*.dist
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.ant.launching_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.ant.ui_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.apt.core_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.apt.pluggable.core_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.apt.ui_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.compiler.apt_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.compiler.tool_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core.manipulation_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug_*
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.doc.user_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit.core_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit.runtime_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit4.runtime_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.launching_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.ui_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.hamcrest.core_*.jar
+usr/share/eclipse/dropins/jdt/plugins/org.junit4_*
+usr/share/eclipse/dropins/jdt/plugins/org.junit_*.dist
diff --git a/debian/rules b/debian/rules
index d316a6e..42ce245 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,8 @@ 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:
+	# 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 licence file
@@ -64,11 +66,18 @@ override_dh_install:
 	) | sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $$eclipse/\1 \1,' >> $(COPY_PLATFORM_INSTALL)
 	( \
 	  cd debian/tmp/usr/lib/eclipse; \
-	  for p in $$(ls -d dropins/jdt/plugins/* dropins/sdk/plugins/*) ; do \
+	  for p in $$(ls -d dropins/sdk/plugins/*) ; do \
 		plugin=$$(basename $$p); \
 		echo $$p | sed -e"s,^\(.*\),[ ! -e plugins/$$plugin ] \&\& ln -s \$$eclipse/\1 plugins/$$plugin,"; \
 	  done \
 	) >> $(COPY_PLATFORM_INSTALL)
+	( \
+	  cd debian/tmp/usr/share/eclipse; \
+	  for p in $$(ls -d dropins/jdt/plugins/*) ; do \
+		plugin=$$(basename $$p); \
+		echo $$p | sed -e"s,^\(.*\),[ ! -e plugins/$$plugin ] \&\& ln -s \$$datadir/\1 plugins/$$plugin,"; \
+	  done \
+	) >> $(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)
 	dh_install --list-missing

-- 
eclipse - Powerful IDE written in java - Debian package.