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

[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  d5e3a11fa7b986e29fa9c71ac72fae121e87446e (commit)
       via  a4a3cccf39b635350c06d7522b31dd454cb1088f (commit)
      from  1f467d613f874eb10f7d22228d4f19e129148f88 (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 d5e3a11fa7b986e29fa9c71ac72fae121e87446e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Oct 20 00:20:14 2009 +0200

    Add Replaces for moved files.

commit a4a3cccf39b635350c06d7522b31dd454cb1088f
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Oct 20 00:13:36 2009 +0200

    Move images from eclipse-platform to eclipse-platform-data.

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

Summary of changes:
 debian/control                       |    3 ++-
 debian/eclipse-platform-data.install |    2 ++
 debian/eclipse-platform.install      |    2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 9f7d7c6..410b77e 100644
--- a/debian/control
+++ b/debian/control
@@ -122,6 +122,7 @@ Description: Eclipse platform without plug-ins to develop any language
  This package is the base for all eclipse plug-ins.
 
 Package: eclipse-platform-data
+Replaces: eclipse-platform (<< 3.5.1-0ubuntu8)
 Architecture: all
 Depends: ${misc:Depends}
 Description: Eclipse platform without plug-ins to develop any language (data)
@@ -187,7 +188,7 @@ Package: libequinox-osgi-java
 Architecture: any
 Depends: default-jre | java1-runtime | java2-runtime,
          ${misc:Depends}
-Conflicts: eclipse-rcp (<< 3.5.1-0ubuntu3)
+Replaces: 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/eclipse-platform-data.install b/debian/eclipse-platform-data.install
index 8a9238e..d263cc6 100644
--- a/debian/eclipse-platform-data.install
+++ b/debian/eclipse-platform-data.install
@@ -1,5 +1,7 @@
 usr/share/eclipse/features/org.eclipse.equinox.p2.user.ui.source_*
 usr/share/eclipse/features/org.eclipse.equinox.p2.user.ui_*
+usr/share/eclipse/features/org.eclipse.help.source_*
+usr/share/eclipse/features/org.eclipse.help_*
 usr/share/eclipse/features/org.eclipse.platform.source_*
 usr/share/eclipse/features/org.eclipse.platform_*
 usr/share/eclipse/features/org.eclipse.sdk_*
diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index 1031b95..fca87ab 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -236,5 +236,3 @@ usr/lib/eclipse/plugins/org.sat4j.core_*.jar
 usr/lib/eclipse/plugins/org.sat4j.pb_*.jar
 usr/lib/eclipse/startup.jar
 usr/share/applications
-usr/share/eclipse/features/org.eclipse.help.source_*
-usr/share/eclipse/features/org.eclipse.help_*


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