[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7_exp-5-32-g12ae363

[Jakub Adam]

The following commit has been merged in the master branch:
commit ef5d5c74cb404e111a16168853eb14815d1c4092
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Dec 27 02:30:51 2011 +0100

    Fix FTBFS with libjasper-java 5.5.33-2
    
    Since 5.5.33-2 libjasper-java OSGi bundle depends on JDT core (jar
    from Orbit has parts of it bundled inside and Debian package missed
    this dependency).
    
    Consequently, to resolve the dependencies during eclipse build, p2
    installs org.eclipse.jdt.core as a part of org.eclipse.platform.ide IU
    so that it ends in usr/lib/eclipse/plugins instead of JDT's dropins
    directory.
    
    This was something that dh_install didn't expect and failed later in the
    build process.
    
    I changed d/*.install files so that org.eclipse.jdt.core_*.jar is found
    in its new location and packaged inside eclipse-platform instead of
    eclipse-jdt.

diff --git a/debian/changelog b/debian/changelog
index 61a60d0..a6fa36e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+eclipse (3.7.0-2) unstable; urgency=low
+
+  * Fix FTBFS with libjasper-java 5.5.33-2
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 27 Dec 2011 01:04:14 +0100
+
 eclipse (3.7.0-1) unstable; urgency=low
 
   [ Benjamin Drung ]
diff --git a/debian/eclipse-jdt.install b/debian/eclipse-jdt.install
index d07ae31..4bf814a 100644
--- a/debian/eclipse-jdt.install
+++ b/debian/eclipse-jdt.install
@@ -8,7 +8,6 @@ usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.apt.ui_*.jar
 usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.compiler.apt_*.jar
 usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.compiler.tool_*.jar
 usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core.manipulation_*.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar
 usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*.jar
 usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug_*
 usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.doc.user_*.jar
diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index 964e3b3..05ffac1 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -38,6 +38,7 @@ usr/lib/eclipse/plugins/org.eclipse.equinox.p2.publisher.eclipse_*
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.publisher_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.p2.repository.tools_*.jar
 usr/lib/eclipse/plugins/org.eclipse.help.base_*.jar
+usr/lib/eclipse/plugins/org.eclipse.jdt.core_*.jar
 usr/lib/eclipse/plugins/org.eclipse.platform.doc.user_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ui.navigator_*.jar
 usr/lib/eclipse/plugins/org.mortbay.jetty.server_*.jar

-- 
eclipse - Powerful IDE written in java - Debian package.