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

Sat Sep 19 19:40:15 UTC 2009

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  094c0d61b38cf25437dc568944292ae4decdb2d7 (commit)
      from  627484a82ab12f85c1615f642413806ceba1f090 (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 094c0d61b38cf25437dc568944292ae4decdb2d7
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Sep 19 21:39:49 2009 +0200

    write install target

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

Summary of changes:
 debian/eclipse-platform.install     |    3 +-
 debian/eclipsebuild-vars.mk         |    1 -
 debian/extra/eclipse.desktop        |    8 -----
 debian/patches/install-target.patch |   49 +++++++++++++++++++++++++++++++++++
 debian/rules                        |   18 +++---------
 5 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index 3b69f73..a7fffb0 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -1,6 +1,5 @@
-debian/extra/eclipse.desktop usr/share/applications/
 debian/extra/eclipse usr/bin/
-debian/tmp/usr/share/icons/
+debian/tmp/usr/share/
 debian/tmp/usr/lib/eclipse/eclipse
 debian/tmp/usr/lib/eclipse/features/org.eclipse.sdk_*
 debian/tmp/usr/lib/eclipse/plugins/org.eclipse.sdk_*
diff --git a/debian/eclipsebuild-vars.mk b/debian/eclipsebuild-vars.mk
index d9caf1d..342b34a 100644
--- a/debian/eclipsebuild-vars.mk
+++ b/debian/eclipsebuild-vars.mk
@@ -4,7 +4,6 @@ SOURCE_DIR=$(CURDIR)/build/eclipse-$(BUILD_ID)-fetched-src
 RESULT_DIR=$(SOURCE_DIR)/installation/
 
 DEBIAN_PACK_LIBDIR=$(DEB_DESTDIR)/usr/lib/eclipse
-DEBIAN_PACK_DATADIR=$(DEB_DESTDIR)/usr/share/eclipse
 
 PROFILE_ID=PlatformProfile
 
diff --git a/debian/extra/eclipse.desktop b/debian/extra/eclipse.desktop
deleted file mode 100644
index 0494169..0000000
--- a/debian/extra/eclipse.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Eclipse
-Comment=Develop applications in a variety of different programming languages
-Icon=eclipse
-Exec=eclipse
-Terminal=false
-Categories=Development;IDE;Java;
diff --git a/debian/patches/install-target.patch b/debian/patches/install-target.patch
new file mode 100644
index 0000000..a4a3851
--- /dev/null
+++ b/debian/patches/install-target.patch
@@ -0,0 +1,49 @@
+diff -pruN debian.git/build.xml debian.new/build.xml
+--- build.xml	2009-09-19 21:20:26.257565801 +0200
++++ build.xml	2009-09-19 21:05:49.993565000 +0200
+@@ -24,6 +24,9 @@
+ 	<property name="productFiles" value="${buildConfig}/productFiles" />
+ 	<property name="reposource" value="${buildDirectory}/reposource" />
+ 
++	<property name="destDir" value="" />
++	<property name="prefix" value="/usr/local" />
++
+ 	<target name="bootstrap" unless="bootstrapped">
+ 		<ant inheritall="false" antfile="pdebuild.xml">
+ 			<property name="buildId" value="${buildId}"/>
+@@ -385,4 +388,23 @@
+ 		<move file="${baseBuilderConfig}.bak" tofile="${baseBuilderConfig}" />
+ 	</target>
+ 
++	<target name="install" depends="provision.sdk">
++		<mkdir dir="${destDir}${prefix}/lib/eclipse"/>
++		<exec executable="cp">
++			<arg value="-rf"/>
++			<arg value="--no-target-directory" />
++			<arg value="${buildDirectory}/installation" />
++			<arg value="${destDir}${prefix}/lib/eclipse" />
++		</exec>
++		<!-- install desktop file -->
++		<copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" />
++		<!-- install icons -->
++		<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse.png"
++			tofile="${destDir}${prefix}/share/icons/hicolor/16x16/apps/eclipse.png" />
++		<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png"
++			tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png" />
++		<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png"
++			tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/eclipse.png" />
++	</target>
++
+ </project>
+diff -pruN debian.git/eclipse.desktop debian.new/eclipse.desktop
+--- eclipse.desktop	1970-01-01 01:00:00.000000000 +0100
++++ eclipse.desktop	2009-09-19 12:32:50.841566000 +0200
+@@ -0,0 +1,8 @@
++[Desktop Entry]
++Type=Application
++Name=Eclipse
++Comment=Develop applications in a variety of different programming languages
++Icon=eclipse
++Exec=eclipse
++Terminal=false
++Categories=Development;IDE;Java;
diff --git a/debian/rules b/debian/rules
index e1647d9..6e9769e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,11 +2,12 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include debian/eclipsebuild-vars.mk
 
-DEB_ANT_BUILD_TARGET := provision.sdk
 DEB_ANT_CLEAN_TARGET := distclean
+DEB_ANT_BUILD_TARGET := provision.sdk
+DEB_ANT_INSTALL_TARGET := install -Dprefix=/usr -DdestDir=$(DEB_DESTDIR)
 
 ANT_ARGS := -DbuildArch=$(ECLIPSE_BUILD_ARCH)
 DEB_DH_MAKESHLIBS_ARGS_ALL := -Xjni
@@ -62,18 +63,9 @@ debian-install-stamp: debian-build-stamp
 	dh_testdir
 
 	# dirty hack - integrate following two commands into eclipse-build
-	cp build/eclipse-I20090611-1540-fetched-src/buildRepo/plugins/org.eclipse.core.net.linux*.jar build/eclipse-I20090611-1540-fetched-src/installation/plugins
-	cp build/eclipse-I20090611-1540-fetched-src/buildRepo/plugins/org.eclipse.update.core.linux_*.jar build/eclipse-I20090611-1540-fetched-src/installation/plugins
-
-	# install icons
-	install -D $(RESULT_DIR)/plugins/org.eclipse.platform_*/eclipse.png $(DEB_DESTDIR)/usr/share/icons/hicolor/16x16/apps/eclipse.png
-	install -D $(RESULT_DIR)/plugins/org.eclipse.platform_*/eclipse32.png $(DEB_DESTDIR)/usr/share/icons/hicolor/32x32/apps/eclipse.png
-	install -D $(RESULT_DIR)/plugins/org.eclipse.platform_*/eclipse48.png $(DEB_DESTDIR)/usr/share/icons/hicolor/48x48/apps/eclipse.png
-
-	mkdir -p $(DEBIAN_PACK_LIBDIR)/plugins $(DEBIAN_PACK_LIBDIR)/features
-	mkdir -p $(DEBIAN_PACK_DATADIR)/dropins
-	cp -fr $(RESULT_DIR)/* $(DEBIAN_PACK_LIBDIR)/
-	rm -fr $(DEBIAN_PACK_LIBDIR)/p2/
+	cp build/eclipse-I20090611-1540-fetched-src/buildRepo/plugins/org.eclipse.core.net.linux*.jar $(DEBIAN_PACK_LIBDIR)/plugins
+	cp build/eclipse-I20090611-1540-fetched-src/buildRepo/plugins/org.eclipse.update.core.linux_*.jar $(DEBIAN_PACK_LIBDIR)/plugins
+
 	# Make a link callde "startup.jar" for backwards compatibility.
 	cd $(DEBIAN_PACK_LIBDIR) && \
 		eval LAUNCHERNAME=$$(ls plugins | grep equinox.launcher_) && \


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

