[SCM] eclipse - Powerful IDE written in java - Debian package. branch, ubuntu, updated. 1f467d613f874eb10f7d22228d4f19e129148f88

[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, ubuntu has been updated
       via  1f467d613f874eb10f7d22228d4f19e129148f88 (commit)
       via  348ce4ca9e18c304d42e916f4fbfdc82f0009179 (commit)
       via  2c8290e55fa541b4f994a166f400d6025091051f (commit)
       via  9d64a98b35e3ca5d5e889ffe535f1f55612c3d3a (commit)
      from  b6b0db2da1de6f764963f6414061322f6ef3bf2b (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 1f467d613f874eb10f7d22228d4f19e129148f88
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Oct 19 18:19:34 2009 +0200

    Release 3.5.1-0ubuntu7 to ubuntu/karmic.

commit 348ce4ca9e18c304d42e916f4fbfdc82f0009179
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Oct 19 18:17:55 2009 +0200

    eclipse-jdt depends on eclipse-plugin-cvs.

commit 2c8290e55fa541b4f994a166f400d6025091051f
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 9d64a98b35e3ca5d5e889ffe535f1f55612c3d3a
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/changelog |    9 +++++++++
 debian/control   |    6 +++---
 debian/rules     |    2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d7e7997..44cdf95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+eclipse (3.5.1-0ubuntu7) karmic; urgency=low
+
+  * Install org.eclipse.update.core.linux on x86 (LP: #454819).
+  * Add missing conflict between libequinox-osgi-java and older
+    eclipse-rcp (LP: #455023).
+  * eclipse-jdt depends on eclipse-plugin-cvs.
+
+ -- Benjamin Drung <bdrung at ubuntu.com>  Mon, 19 Oct 2009 18:18:42 +0200
+
 eclipse (3.5.1-0ubuntu6) karmic; urgency=low
 
   * Correct misspelt package in debian/rules, too (LP: #454616).
diff --git a/debian/control b/debian/control
index 23a1dd6..9f7d7c6 100644
--- a/debian/control
+++ b/debian/control
@@ -35,10 +35,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
@@ -55,6 +53,7 @@ Architecture: any
 Depends: ant-optional,
          default-jre | java1-runtime | java2-runtime,
          eclipse-platform (= ${binary:Version}),
+         eclipse-plugin-cvs (= ${binary:Version}),
          ${misc:Depends}
 Suggests: eclipse
 Description: Eclipse Java Development Tools (JDT)
@@ -188,6 +187,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 8ac7fbc..ed7e507 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.