[eclipse] 03/04: Move Orbit jar symlinks mentioned in bundles.info into eclipse-platform

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository eclipse.

commit 4a4284ab0e6ccd915f81fbbeef9e103a83018176
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Jan 15 17:28:40 2014 +0100

    Move Orbit jar symlinks mentioned in bundles.info into eclipse-platform
    
    Ensures bundles.info is always consistent with bundle names in plugins/
    directory across all platforms.
    
    When buildd creates packages for additional architectures, it keeps
    only the arch-dependent debs. The ones having Architecture: all are
    discarded and the versions from the earliest finished build are used
    on all platforms.
    
    In the case of Eclipse, names of Orbit bundles could change between
    builds when some of the dependencies was updated in the meantime.
    Thus, previously built eclipse-platform-data became incompatible with
    newly built architecture dependent eclipse-platform package.
---
 debian/changelog                     |  3 +++
 debian/control                       |  6 +-----
 debian/eclipse-platform-data.install | 24 ------------------------
 debian/eclipse-platform.install      | 23 +++++++++++++++++++++++
 4 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8a492f..318e6f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ eclipse (3.8.1-5) UNRELEASED; urgency=low
   * Fix FTBFS on s390x architecture.
   * Provide convenient symlinks for jdi.jar and jdimodel.jar (Closes: #734797).
   * Add README.ports.
+  * Move Orbit jar symlinks mentioned in bundles.info from eclipse-platform-data
+    into eclipse-platform (Closes: #735096, #732244).
+    - Ensures bundles.info is always consistent with bundle names.
 
   [ Matthias Klose ]
   * Build for arm64 and ppc64el.
diff --git a/debian/control b/debian/control
index 67bed51..caa1ed3 100644
--- a/debian/control
+++ b/debian/control
@@ -125,11 +125,7 @@ Depends: ant (>= 1.8.2),
          ${perl:Depends},
          ${shlibs:Depends}
 Recommends: eclipse-pde
-Replaces: eclipse-jdt (<< 3.5.1+repack~3),
-          eclipse-platform-common,
-          eclipse-platform-gcj,
-          eclipse-source (<= 3.1.1-3),
-          libeclipse-jni
+Replaces: eclipse-platform-data (<< 3.8.1-5)
 Breaks: eclipse-source (<= 3.1.1-3)
 Conflicts: eclipse-common-nls,
            eclipse-platform-common,
diff --git a/debian/eclipse-platform-data.install b/debian/eclipse-platform-data.install
index e0a5780..2a1d685 100644
--- a/debian/eclipse-platform-data.install
+++ b/debian/eclipse-platform-data.install
@@ -5,21 +5,7 @@ usr/lib/eclipse/features/org.eclipse.equinox.p2.extras.feature_*
 usr/lib/eclipse/features/org.eclipse.equinox.p2.rcp.feature_*
 usr/lib/eclipse/features/org.eclipse.equinox.p2.user.ui_*
 usr/lib/eclipse/features/org.eclipse.help_*
-usr/lib/eclipse/plugins/com.jcraft.jsch_*.jar
-usr/lib/eclipse/plugins/javax.el_*.jar
-usr/lib/eclipse/plugins/javax.servlet_*.jar
-usr/lib/eclipse/plugins/javax.servlet.jsp_*.jar
 usr/lib/eclipse/plugins/org.apache.ant_*
-usr/lib/eclipse/plugins/org.apache.commons.codec_*.jar
-usr/lib/eclipse/plugins/org.apache.commons.httpclient_*.jar
-usr/lib/eclipse/plugins/org.apache.commons.logging_*.jar
-usr/lib/eclipse/plugins/org.apache.el_*.jar
-usr/lib/eclipse/plugins/org.apache.jasper_*.jar
-usr/lib/eclipse/plugins/org.apache.juli_*.jar
-usr/lib/eclipse/plugins/org.apache.lucene.analysis_*.jar
-usr/lib/eclipse/plugins/org.apache.lucene.core_*.jar
-usr/lib/eclipse/plugins/org.apache.tomcat.api_*.jar
-usr/lib/eclipse/plugins/org.apache.tomcat.util_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ant.core_*.jar
 usr/lib/eclipse/plugins/org.eclipse.compare_*.jar
 usr/lib/eclipse/plugins/org.eclipse.compare.core_*.jar
@@ -89,13 +75,6 @@ usr/lib/eclipse/plugins/org.eclipse.help.base_*.jar
 usr/lib/eclipse/plugins/org.eclipse.help.ui_*.jar
 usr/lib/eclipse/plugins/org.eclipse.help.webapp_*.jar
 usr/lib/eclipse/plugins/org.eclipse.jdt.core_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jetty.continuation_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jetty.http_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jetty.io_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jetty.security_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jetty.server_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jetty.servlet_*.jar
-usr/lib/eclipse/plugins/org.eclipse.jetty.util_*.jar
 usr/lib/eclipse/plugins/org.eclipse.jface.text_*.jar
 usr/lib/eclipse/plugins/org.eclipse.jsch.core_*.jar
 usr/lib/eclipse/plugins/org.eclipse.jsch.ui_*.jar
@@ -131,9 +110,6 @@ usr/lib/eclipse/plugins/org.eclipse.ui.workbench.texteditor_*.jar
 usr/lib/eclipse/plugins/org.eclipse.update.core_*.jar
 usr/lib/eclipse/plugins/org.eclipse.update.scheduler_*.jar
 usr/lib/eclipse/plugins/org.eclipse.update.ui_*.jar
-usr/lib/eclipse/plugins/org.sat4j.core_*.jar
-usr/lib/eclipse/plugins/org.sat4j.pb_*.jar
-
 usr/share/eclipse/features/org.eclipse.cvs_*
 usr/share/eclipse/features/org.eclipse.equinox.p2.core.feature_*
 usr/share/eclipse/features/org.eclipse.equinox.p2.extras.feature_*
diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index b105c2c..3bae61c 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -9,6 +9,29 @@ usr/lib/eclipse/eclipse.ini
 usr/lib/eclipse/features/org.eclipse.equinox.p2.core.feature_*
 usr/lib/eclipse/features/org.eclipse.platform_*
 usr/lib/eclipse/p2/
+usr/lib/eclipse/plugins/com.jcraft.jsch_*.jar
+usr/lib/eclipse/plugins/javax.el_*.jar
+usr/lib/eclipse/plugins/javax.servlet_*.jar
+usr/lib/eclipse/plugins/javax.servlet.jsp_*.jar
+usr/lib/eclipse/plugins/org.apache.commons.codec_*.jar
+usr/lib/eclipse/plugins/org.apache.commons.httpclient_*.jar
+usr/lib/eclipse/plugins/org.apache.commons.logging_*.jar
+usr/lib/eclipse/plugins/org.apache.el_*.jar
+usr/lib/eclipse/plugins/org.apache.jasper_*.jar
+usr/lib/eclipse/plugins/org.apache.juli_*.jar
+usr/lib/eclipse/plugins/org.apache.lucene.analysis_*.jar
+usr/lib/eclipse/plugins/org.apache.lucene.core_*.jar
+usr/lib/eclipse/plugins/org.apache.tomcat.api_*.jar
+usr/lib/eclipse/plugins/org.apache.tomcat.util_*.jar
+usr/lib/eclipse/plugins/org.eclipse.jetty.continuation_*.jar
+usr/lib/eclipse/plugins/org.eclipse.jetty.http_*.jar
+usr/lib/eclipse/plugins/org.eclipse.jetty.io_*.jar
+usr/lib/eclipse/plugins/org.eclipse.jetty.security_*.jar
+usr/lib/eclipse/plugins/org.eclipse.jetty.server_*.jar
+usr/lib/eclipse/plugins/org.eclipse.jetty.servlet_*.jar
+usr/lib/eclipse/plugins/org.eclipse.jetty.util_*.jar
+usr/lib/eclipse/plugins/org.sat4j.core_*.jar
+usr/lib/eclipse/plugins/org.sat4j.pb_*.jar
 usr/lib/eclipse/plugins/org.eclipse.core.filesystem.linux.*
 usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*
 usr/share/applications

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse.git