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

[Benjamin Drung]

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  ba78c7f1ae97337ff64ecdcd8658a4005efb7662 (commit)
       via  b3aaea22f68681df3ea0a39ba21c7f75fb43d99e (commit)
       via  30c9ed5e47317d1726f39a298e4ba68e192620c2 (commit)
      from  d535da5865064e97798df20d6f6c57f7ff85ffca (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 ba78c7f1ae97337ff64ecdcd8658a4005efb7662
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Oct 19 20:38:57 2009 +0200

    eclipse-jdt depends on eclipse-plugin-cvs.

commit b3aaea22f68681df3ea0a39ba21c7f75fb43d99e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Oct 19 18:15:48 2009 +0200

    Add missing conflict between libequinox-osgi-java and older eclipse-rcp (LP: #455023).

commit 30c9ed5e47317d1726f39a298e4ba68e192620c2
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Oct 19 17:13:44 2009 +0200

    Install org.eclipse.update.core.linux on x86 (LP: #454819).

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

Summary of changes:
 debian/control |    6 +++---
 debian/rules   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 98f96bd..1142805 100644
--- a/debian/control
+++ b/debian/control
@@ -42,10 +42,8 @@ Homepage: http://www.eclipse.org/
 
 Package: eclipse
 Architecture: any
-Depends: default-jre | java1-runtime | java2-runtime,
-         eclipse-jdt,
+Depends: eclipse-jdt,
          eclipse-pde,
-         eclipse-plugin-cvs,
          ${misc:Depends}
 Description: Extensible Tool Platform and Java IDE
  The Eclipse Platform is an open and extensible platform for anything and yet
@@ -62,6 +60,7 @@ Architecture: any
 Depends: ant-optional,
          default-jre | java1-runtime | java2-runtime,
          eclipse-platform (= ${binary:Version}),
+         eclipse-plugin-cvs (= ${binary:Version}),
          junit (>= 3.8.2),
          junit4,
          libhamcrest-java,
@@ -204,6 +203,7 @@ Package: libequinox-osgi-java
 Architecture: any
 Depends: default-jre | java1-runtime | java2-runtime,
          ${misc:Depends}
+Conflicts: eclipse-rcp (<< 3.5.1-0ubuntu3)
 Description: Equinox 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
diff --git a/debian/rules b/debian/rules
index 587abc6..1cd2e14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,7 @@ clean::
 install/eclipse-platform::
 	@echo "*** 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)
+	$(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/libequinox-osgi-java::
 	@echo "*** binary-post-install/libequinox-osgi-java ***"


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