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

Mon Sep 21 12:10:21 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  699923eaf3104223efc24794ddff42e1c4f7d5fc (commit)
      from  76239c164abf753ca1fe793a204adc4bf708f6f7 (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 699923eaf3104223efc24794ddff42e1c4f7d5fc
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Sep 21 14:09:09 2009 +0200

    add eclipse-platform-data package and run imagemv on debian/tmp

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

Summary of changes:
 debian/control                       |   22 ++++++++++++++++++++++
 debian/eclipse-jdt.install           |    2 +-
 debian/eclipse-pde.install           |    4 ++--
 debian/eclipse-platform-data.install |   11 +++++++++++
 debian/eclipse-platform.install      |    3 ---
 debian/eclipse-rcp.install           |    2 +-
 debian/extra/imagemv.sh              |   14 +++++++-------
 debian/rules                         |    4 ++--
 8 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index 4e4bdb8..d2071ec 100644
--- a/debian/control
+++ b/debian/control
@@ -91,6 +91,7 @@ Description: Eclipse Plug-in Development Environment (PDE)
 Package: eclipse-platform
 Architecture: any
 Depends: default-jre | java1-runtime | java2-runtime,
+         eclipse-platform-data (= ${source:Version}),
          java-common (>= 0.23),
          liblucene-java (>= 1.4.2),
          libswt-gtk-3.5-java (= ${binary:Version}),
@@ -124,6 +125,27 @@ Description: Eclipse platform without plug-ins to develop any language
  .
  This package is the base for all eclipse plug-ins.
 
+Package: eclipse-platform-data
+Architecture: all
+Depends: ${misc:Depends}
+Description: Eclipse platform without plug-ins to develop any language (data)
+ The Eclipse Platform is an open and extensible platform for anything and yet
+ nothing in particular. It provides a foundation for constructing and running
+ integrated software-development tools. The Eclipse Platform allows tool
+ builders to independently develop tools that integrate with other people's
+ tools so seamlessly you can't tell where one tool ends and another starts.
+ .
+ This package provides only the Eclipse Platform. It does not include any
+ development plug-ins. These are available in different packages:
+ .
+  * eclipse-jdt Java Development Tools
+  * eclipse-pde Plug-in Development Tools
+  * eclipse Complete development environment
+ .
+ This package is the base for all eclipse plug-ins.
+ .
+ This package contains the architecture-independent data files.
+
 Package: eclipse-rcp
 Architecture: any
 Depends: libswt-gtk-3.5-java (= ${binary:Version}),
diff --git a/debian/eclipse-jdt.install b/debian/eclipse-jdt.install
index 14b0cb0..387b4b9 100644
--- a/debian/eclipse-jdt.install
+++ b/debian/eclipse-jdt.install
@@ -19,4 +19,4 @@ debian/tmp/usr/lib/eclipse/plugins/org.hamcrest.core_*.jar
 debian/tmp/usr/lib/eclipse/plugins/org.junit_*
 debian/tmp/usr/lib/eclipse/plugins/org.junit4_*
 
-debian/tmp/usr/lib/eclipse/features/org.eclipse.jdt_3.5.0.*
+debian/tmp/usr/*/eclipse/features/org.eclipse.jdt_3.5.0.*
diff --git a/debian/eclipse-pde.install b/debian/eclipse-pde.install
index d93f39a..37931b2 100644
--- a/debian/eclipse-pde.install
+++ b/debian/eclipse-pde.install
@@ -13,5 +13,5 @@ debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.ui.templates_*.jar
 debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.views.log_*.jar
 debian/tmp/usr/lib/eclipse/plugins/org.objectweb.asm_*.jar
 
-debian/tmp/usr/lib/eclipse/features/org.eclipse.pde_3.5.0.*
-debian/tmp/usr/lib/eclipse/features/org.eclipse.pde.source_3.5.0.*
\ No newline at end of file
+debian/tmp/usr/*/eclipse/features/org.eclipse.pde_3.5.0.*
+debian/tmp/usr/*/eclipse/features/org.eclipse.pde.source_3.5.0.*
diff --git a/debian/eclipse-platform-data.install b/debian/eclipse-platform-data.install
new file mode 100644
index 0000000..dd229e5
--- /dev/null
+++ b/debian/eclipse-platform-data.install
@@ -0,0 +1,11 @@
+debian/extra/eclipse usr/bin/
+debian/extra/eclipse.1 usr/share/man/man1
+
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/icons
+
+debian/tmp/usr/share/eclipse/features/org.eclipse.platform_*
+debian/tmp/usr/share/eclipse/features/org.eclipse.sdk_*
+debian/tmp/usr/share/eclipse/plugins/org.eclipse.platform_*
+debian/tmp/usr/share/eclipse/plugins/org.eclipse.sdk_*
+debian/tmp/usr/share/eclipse/plugins/org.eclipse.ui.intro.universal_*
diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index 0eb74d9..3d84b4f 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -1,6 +1,3 @@
-debian/extra/eclipse usr/bin/
-debian/extra/eclipse.1 usr/share/man/man1
-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/eclipse-rcp.install b/debian/eclipse-rcp.install
index fe31cab..5da6e80 100644
--- a/debian/eclipse-rcp.install
+++ b/debian/eclipse-rcp.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/eclipse/features/org.eclipse.rcp_*
+debian/tmp/usr/*/eclipse/features/org.eclipse.rcp_*
 
 debian/tmp/usr/lib/eclipse/plugins/com.ibm.icu_*.jar
 debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.commands_*.jar
diff --git a/debian/extra/imagemv.sh b/debian/extra/imagemv.sh
index 177ae14..b75dc18 100755
--- a/debian/extra/imagemv.sh
+++ b/debian/extra/imagemv.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 set -e
 
-PACKAGE=$1
-LINK_NAME=`echo $2 | sed "s at debian/${PACKAGE}/@@g"`
-IMAGE_NAME=`echo ${LINK_NAME} | sed "s at usr/lib/@usr/share/@g"`
+DESTDIR=debian/tmp
+LINK_NAME=`echo $1 | sed "s@${DESTDIR}@@g"`
+IMAGE_NAME=`echo ${LINK_NAME} | sed "s@/usr/lib/@/usr/share/@g"`
 IMAGE_DIR=`dirname ${IMAGE_NAME}`
 
-mkdir -p "debian/${PACKAGE}/${IMAGE_DIR}"
-rm -f "debian/${PACKAGE}/${IMAGE_NAME}"
-mv -vf "debian/${PACKAGE}/${LINK_NAME}" "debian/${PACKAGE}/${IMAGE_NAME}"
-ln -sf "/${IMAGE_NAME}" "debian/${PACKAGE}/${LINK_NAME}"
+mkdir -p "${DESTDIR}${IMAGE_DIR}"
+rm -f "${DESTDIR}${IMAGE_NAME}"
+mv -vf "${DESTDIR}${LINK_NAME}" "${DESTDIR}${IMAGE_NAME}"
+ln -sf "${IMAGE_NAME}" "${DESTDIR}${LINK_NAME}"
diff --git a/debian/rules b/debian/rules
index fb3c46b..34560e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,8 +53,8 @@ clean::
 	rm -f *.cdbs-config_list
 
 # move images from /usr/lib to /usr/share
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)):: binary-install/%:
-	$(if $(wildcard debian/$(cdbs_curpkg)/usr/lib),find debian/$(cdbs_curpkg)/usr/lib/ \( -name '*.bmp' -o -name '*.gif' -o -name '*.jpg' -o -name '*.png' \) -exec debian/extra/imagemv.sh $(cdbs_curpkg) '{}' \; ; dh_link -p$(cdbs_curpkg))
+common-install-indep::
+	find debian/tmp/usr/lib/ -type f \( -name '*.bmp' -o -name '*.gif' -o -name '*.jpg' -o -name '*.png' \) -exec debian/extra/imagemv.sh '{}' \;
 
 # TODO: Turn all commands below this comment into patches and send them to eclipse-build.
 


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

