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

Tue Oct 13 18:18:37 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  39442632e482657e851fd8eae2fabeb751653684 (commit)
      from  ba14c901cb9a314f6cfd304df0c3a3ca39a16148 (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 39442632e482657e851fd8eae2fabeb751653684
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Oct 13 20:18:32 2009 +0200

    Create an osgi package.

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

Summary of changes:
 debian/changelog                    |    2 +
 debian/control                      |   36 ++++++++++++++++++++++++++++------
 debian/eclipse-platform.install     |    1 -
 debian/eclipse-rcp.install          |    2 -
 debian/libequniox-osgi-java.install |    3 ++
 debian/rules                        |   11 ++++++++++
 6 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db23cb7..1551803 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ eclipse (3.5.1-1) UNRELEASED; urgency=low
     (Closes: #353360)
   * Moved the executable to eclipse-platform from eclipse.
     (Closes: #358594)
+  * Put the osgi jar-files into its own separate package.
+    (Closes: LP: #102717)
 
  -- Benjamin Drung <bdrung at ubuntu.com>  Thu, 01 Oct 2009 13:29:24 +0200
 
diff --git a/debian/control b/debian/control
index ed609ef..aad37dd 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,8 @@ Homepage: http://www.eclipse.org/
 
 Package: eclipse
 Architecture: any
-Depends: eclipse-jdt,
+Depends: default-jre | java1-runtime | java2-runtime,
+         eclipse-jdt,
          eclipse-pde,
          eclipse-plugin-cvs,
          ${misc:Depends}
@@ -59,6 +60,7 @@ Description: Extensible Tool Platform and Java IDE
 Package: eclipse-jdt
 Architecture: any
 Depends: ant-optional,
+         default-jre | java1-runtime | java2-runtime,
          eclipse-platform (= ${binary:Version}),
          junit (>= 3.8.2),
          junit4,
@@ -79,7 +81,8 @@ Description: Eclipse Java Development Tools (JDT)
 
 Package: eclipse-pde
 Architecture: any
-Depends: eclipse-jdt (= ${binary:Version}),
+Depends: default-jre | java1-runtime | java2-runtime,
+         eclipse-jdt (= ${binary:Version}),
          eclipse-platform (= ${binary:Version}),
          ${misc:Depends}
 Suggests: eclipse
@@ -156,8 +159,9 @@ Description: Eclipse platform without plug-ins to develop any language (data)
  This package contains the architecture-independent data files.
 
 Package: eclipse-plugin-cvs
-Depends: eclipse-platform (= ${binary:Version}),
-         cvs (>= 1.12.13-8),
+Depends: cvs (>= 1.12.13-8),
+         default-jre | java1-runtime | java2-runtime,
+         eclipse-platform (= ${binary:Version}),
          ${misc:Depends}
 Architecture: any
 Description: Eclipse Team Integration (CVS support)
@@ -172,7 +176,9 @@ Description: Eclipse Team Integration (CVS support)
 
 Package: eclipse-rcp
 Architecture: any
-Depends: libswt-gtk-3.5-java (= ${binary:Version}),
+Depends: default-jre | java1-runtime | java2-runtime,
+         libequniox-osgi-java (= ${binary:Version}),
+         libswt-gtk-3.5-java (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Suggests: eclipse
@@ -193,9 +199,24 @@ Description: Eclipse Rich Client Platform (RCP)
  .
  This package is the basis for all Eclipse applications.
 
+Package: libequniox-osgi-java
+Architecture: any
+Depends: default-jre | java1-runtime | java2-runtime,
+         ${misc:Depends}
+Description: Equniox OSGi framework
+ 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 includes only the Eclipse Equniox OSGi framework, which can
+ be used outside Eclipse.
+
 Package: libswt-gtk-3.5-java
 Architecture: any
-Depends: java-common (>= 0.23),
+Depends: default-jre | java1-runtime | java2-runtime,
+         java-common (>= 0.23),
          libswt-gtk-3.5-jni (= ${binary:Version}),
          ${misc:Depends}
 Conflicts: libswt3.2-java
@@ -220,7 +241,8 @@ Description: Standard Widget Toolkit for Java, GTK+ version
 
 Package: libswt-gtk-3.5-jni
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: default-jre | java1-runtime | java2-runtime,
+         ${shlibs:Depends},
          ${misc:Depends}
 Recommends: ${shlibs:Recommends}
 Conflicts: libswt3.2-jni
diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index 1abb5e3..88ac2b8 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -87,7 +87,6 @@ usr/lib/eclipse/plugins/org.eclipse.jsch.core_*.jar
 usr/lib/eclipse/plugins/org.eclipse.jsch.ui_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ltk.core.refactoring_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ltk.ui.refactoring_*.jar
-usr/lib/eclipse/plugins/org.eclipse.osgi.util_*.jar
 usr/lib/eclipse/plugins/org.eclipse.platform.doc.isv_*.jar
 usr/lib/eclipse/plugins/org.eclipse.platform.doc.user_*.jar
 usr/lib/eclipse/plugins/org.eclipse.platform_*
diff --git a/debian/eclipse-rcp.install b/debian/eclipse-rcp.install
index 9a0142a..3a61434 100644
--- a/debian/eclipse-rcp.install
+++ b/debian/eclipse-rcp.install
@@ -23,8 +23,6 @@ usr/lib/eclipse/plugins/org.eclipse.equinox.simpleconfigurator_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.util_*.jar
 usr/lib/eclipse/plugins/org.eclipse.jface.databinding_*.jar
 usr/lib/eclipse/plugins/org.eclipse.jface_*.jar
-usr/lib/eclipse/plugins/org.eclipse.osgi.services_*.jar
-usr/lib/eclipse/plugins/org.eclipse.osgi_*.jar
 usr/lib/eclipse/plugins/org.eclipse.rcp_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ui.workbench_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ui_*.jar
diff --git a/debian/libequniox-osgi-java.install b/debian/libequniox-osgi-java.install
new file mode 100644
index 0000000..ab23147
--- /dev/null
+++ b/debian/libequniox-osgi-java.install
@@ -0,0 +1,3 @@
+usr/lib/eclipse/plugins/org.eclipse.osgi.services_*.jar
+usr/lib/eclipse/plugins/org.eclipse.osgi.util_*.jar
+usr/lib/eclipse/plugins/org.eclipse.osgi_*.jar
diff --git a/debian/rules b/debian/rules
index d1849d9..88c2344 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,17 @@ install/eclipse-platform::
 	$(if $(wildcard debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar),dh_install -peclipse-platform debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar /usr/lib/eclipse/plugins)
 	$(if $(wildcard debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux.*.jar),dh_install -peclipse-platform debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux.*.jar /usr/lib/eclipse/plugins)
 
+binary-post-install/libequniox-osgi-java::
+	# Do the linking.
+	mkdir -p debian/libequniox-osgi-java/usr/share/java
+	cd debian/libequniox-osgi-java/usr/share/java && \
+	  for FILE in ../../lib/eclipse/plugins/* ; do \
+		ln -s $$FILE
+		ln -s $$FILE `echo $$FILE | sed 's/_.*$//g'`.jar
+	  done
+	# Redo this step, just in case.
+	dh_link -plibequniox-osgi-java
+
 binary-post-install/eclipse-rcp::
 	# This script is stored in a patch, so the exec bit is not set the first time.
 	test -x swt_bundle.sh || chmod a+x swt_bundle.sh


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

