Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Dear Release Team: Please consider unblocking package eclipse. The upload of 3.8.1-7 resolves the following bugs: #763994 [grave] eclipse: no java or c++ project available in file>new #770457 [serious] eclipse-rcp does not install org.eclipse.jface.jar #769248 [serious] androidsdk-tools FTBFS The debdiff between 3.8.1-5.1 and 3.8.1-7 is attached. Please let me know if you have any questions or concerns about these changes with respect to Jessie. Thank you, tony unblock eclipse/3.8.1-7
diff -Nru eclipse-3.8.1/debian/changelog eclipse-3.8.1/debian/changelog
--- eclipse-3.8.1/debian/changelog 2014-01-16 20:52:34.000000000 -0800
+++ eclipse-3.8.1/debian/changelog 2014-11-28 11:43:45.000000000 -0800
@@ -1,3 +1,26 @@
+eclipse (3.8.1-7) unstable; urgency=medium
+
+ * Team upload.
+ * Install all arch-dependent files into eclipse-rcp correctly by renaming
+ override_dh_install to override_dh_install-arch.
+ Fix wrong override for dh_install-indep and move jh_classpath commands to the
+ appropriate override target. (Closes: #770457, #763994)
+
+ -- Markus Koschany <apo@gambaru.de> Mon, 24 Nov 2014 02:31:41 +0100
+
+eclipse (3.8.1-6) unstable; urgency=medium
+
+ [ Emmanuel Bourg ]
+ * Team upload.
+ * Replaced the jsr14 compilation target with 1.5 to compile with Java 8
+
+ [ Jakub Adam ]
+ * Refreshed d/eclipse-build-generatedScripts.tar.bz2 (Closes: #759847).
+ * Override needless-suggest-recommend-libservlet-java lintian warning
+ - follows from an optional OSGi dependency on javax.servlet.
+
+ -- Jakub Adam <jakub.adam@ktknet.cz> Sun, 14 Sep 2014 13:52:58 +0200
+
eclipse (3.8.1-5.1) unstable; urgency=low
[ Jakub Adam ]
Binary files /tmp/M9ZZ5FVFvM/eclipse-3.8.1/debian/eclipse-build-generatedScripts.tar.bz2 and /tmp/v4Rz5r5m56/eclipse-3.8.1/debian/eclipse-build-generatedScripts.tar.bz2 differ
diff -Nru eclipse-3.8.1/debian/libequinox-osgi-java.lintian-overrides eclipse-3.8.1/debian/libequinox-osgi-java.lintian-overrides
--- eclipse-3.8.1/debian/libequinox-osgi-java.lintian-overrides 2014-01-16 20:52:34.000000000 -0800
+++ eclipse-3.8.1/debian/libequinox-osgi-java.lintian-overrides 2014-11-28 11:43:45.000000000 -0800
@@ -1 +1,3 @@
jar-not-in-usr-share
+# Follows from an optional OSGi dependency on javax.servlet
+needless-suggest-recommend-libservlet-java
diff -Nru eclipse-3.8.1/debian/patches/osgi-target-java-1.5.patch eclipse-3.8.1/debian/patches/osgi-target-java-1.5.patch
--- eclipse-3.8.1/debian/patches/osgi-target-java-1.5.patch 2014-01-16 20:52:34.000000000 -0800
+++ eclipse-3.8.1/debian/patches/osgi-target-java-1.5.patch 1969-12-31 16:00:00.000000000 -0800
@@ -1,21 +0,0 @@
-From: Jakub Adam <jakub.adam@ktknet.cz>
-Date: Tue, 10 Sep 2013 17:08:50 +0200
-Subject: osgi-target-java-1.5
-
----
- eclipse/plugins/org.eclipse.osgi/build.properties | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/eclipse/plugins/org.eclipse.osgi/build.properties b/eclipse/plugins/org.eclipse.osgi/build.properties
-index deea927..c1f7a2a 100644
---- a/eclipse/plugins/org.eclipse.osgi/build.properties
-+++ b/eclipse/plugins/org.eclipse.osgi/build.properties
-@@ -36,7 +36,7 @@ jre.compilation.profile = J2SE-1.5
- # bootClasspath=osgi/exceptions.jar;osgi/xmlParserAPIs.jar;${CDC-1.1/Foundation-1.1}
-
- javacSource=1.5
--javacTarget=jsr14
-+javacTarget=1.5
-
- # To enable building the framework using projects from OSGi repo uncomment customBuildCallbacks
- # and add the following to the beginning of source..
diff -Nru eclipse-3.8.1/debian/patches/series eclipse-3.8.1/debian/patches/series
--- eclipse-3.8.1/debian/patches/series 2014-01-16 20:52:34.000000000 -0800
+++ eclipse-3.8.1/debian/patches/series 2014-11-28 11:43:45.000000000 -0800
@@ -41,6 +41,6 @@
gnomeproxy-glib-2.32-compat.patch
eclipse-add-archs-filesystem.patch
equinox-jsp-jasper-tomcat-7.0.40.patch
-osgi-target-java-1.5.patch
eclipse-add-aarch64-ppc64el.patch
fix-s390-s390x-build.patch
+target-java-1.5.patch
diff -Nru eclipse-3.8.1/debian/patches/target-java-1.5.patch eclipse-3.8.1/debian/patches/target-java-1.5.patch
--- eclipse-3.8.1/debian/patches/target-java-1.5.patch 1969-12-31 16:00:00.000000000 -0800
+++ eclipse-3.8.1/debian/patches/target-java-1.5.patch 2014-11-28 11:43:45.000000000 -0800
@@ -0,0 +1,106 @@
+From: Jakub Adam <jakub.adam@ktknet.cz>
+Date: Tue, 10 Sep 2013 17:08:50 +0200
+Subject: target-java-1.5
+
+---
+ eclipse/plugins/org.eclipse.equinox.event/build.properties | 2 +-
+ eclipse/plugins/org.eclipse.equinox.p2.core/build.properties | 2 +-
+ eclipse/plugins/org.eclipse.equinox.p2.metadata/build.properties | 2 +-
+ .../plugins/org.eclipse.equinox.p2.publisher.eclipse/build.properties | 2 +-
+ eclipse/plugins/org.eclipse.equinox.p2.publisher/build.properties | 2 +-
+ .../plugins/org.eclipse.equinox.p2.repository.tools/build.properties | 2 +-
+ eclipse/plugins/org.eclipse.equinox.p2.repository/build.properties | 2 +-
+ eclipse/plugins/org.eclipse.osgi/build.properties | 2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/eclipse/plugins/org.eclipse.equinox.event/build.properties b/eclipse/plugins/org.eclipse.equinox.event/build.properties
+index a373285..7cab565 100644
+--- a/eclipse/plugins/org.eclipse.equinox.event/build.properties
++++ b/eclipse/plugins/org.eclipse.equinox.event/build.properties
+@@ -20,4 +20,4 @@ source.. = src/
+ jre.compilation.profile = J2SE-1.5
+
+ javacSource=1.5
+-javacTarget=jsr14
+\ No newline at end of file
++javacTarget=1.5
+diff --git a/eclipse/plugins/org.eclipse.equinox.p2.core/build.properties b/eclipse/plugins/org.eclipse.equinox.p2.core/build.properties
+index 26802d4..435999d 100644
+--- a/eclipse/plugins/org.eclipse.equinox.p2.core/build.properties
++++ b/eclipse/plugins/org.eclipse.equinox.p2.core/build.properties
+@@ -16,5 +16,5 @@ bin.includes = META-INF/,\
+ OSGI-INF/
+ src.includes = about.html
+ source.. = src/
+-javacTarget=jsr14
++javacTarget=1.5
+ javacSource=1.5
+diff --git a/eclipse/plugins/org.eclipse.equinox.p2.metadata/build.properties b/eclipse/plugins/org.eclipse.equinox.p2.metadata/build.properties
+index 4cccd09..ea8fbc1 100644
+--- a/eclipse/plugins/org.eclipse.equinox.p2.metadata/build.properties
++++ b/eclipse/plugins/org.eclipse.equinox.p2.metadata/build.properties
+@@ -17,5 +17,5 @@ bin.includes = META-INF/,\
+ OSGI-INF/
+ src.includes = about.html,\
+ OSGI-INF/
+-javacTarget=jsr14
++javacTarget=1.5
+ javacSource=1.5
+diff --git a/eclipse/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.properties b/eclipse/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.properties
+index db6efe3..b4ff226 100644
+--- a/eclipse/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.properties
++++ b/eclipse/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.properties
+@@ -21,6 +21,6 @@ source.ant_tasks/pdepublishing-ant.jar = src_ant/
+ output.ant_tasks/pdepublishing-ant.jar = bin_ant/
+ extra.ant_tasks/pdepublishing-ant.jar = platform:/plugin/org.apache.ant
+ jars.extra.classpath = platform:/plugin/org.apache.ant/lib/ant.jar
+-javacTarget=jsr14
++javacTarget=1.5
+ javacSource=1.5
+ src.includes = about.html
+diff --git a/eclipse/plugins/org.eclipse.equinox.p2.publisher/build.properties b/eclipse/plugins/org.eclipse.equinox.p2.publisher/build.properties
+index 719d06a..586bdd1 100644
+--- a/eclipse/plugins/org.eclipse.equinox.p2.publisher/build.properties
++++ b/eclipse/plugins/org.eclipse.equinox.p2.publisher/build.properties
+@@ -19,5 +19,5 @@ bin.includes = META-INF/,\
+ plugin.properties
+ src.includes = about.html
+ javacWarnings..=+unusedThrown
+-javacTarget=jsr14
++javacTarget=1.5
+ javacSource=1.5
+diff --git a/eclipse/plugins/org.eclipse.equinox.p2.repository.tools/build.properties b/eclipse/plugins/org.eclipse.equinox.p2.repository.tools/build.properties
+index 12ada42..78ca610 100644
+--- a/eclipse/plugins/org.eclipse.equinox.p2.repository.tools/build.properties
++++ b/eclipse/plugins/org.eclipse.equinox.p2.repository.tools/build.properties
+@@ -23,5 +23,5 @@ output.lib/repository-tools-ant.jar = bin_ant/
+ jars.extra.classpath=platform:/plugin/org.apache.ant/lib/ant.jar,\
+ platform:/plugin/org.eclipse.equinox.p2.jarprocessor/lib/jarprocessor-ant.jar
+ src.includes = about.html
+-javacTarget=jsr14
++javacTarget=1.5
+ javacSource=1.5
+diff --git a/eclipse/plugins/org.eclipse.equinox.p2.repository/build.properties b/eclipse/plugins/org.eclipse.equinox.p2.repository/build.properties
+index 3da448f..3fed160 100644
+--- a/eclipse/plugins/org.eclipse.equinox.p2.repository/build.properties
++++ b/eclipse/plugins/org.eclipse.equinox.p2.repository/build.properties
+@@ -16,5 +16,5 @@ bin.includes = META-INF/,\
+ OSGI-INF/cacheManager.xml
+ src.includes = about.html
+ javacSource = 1.5
+-javacTarget = jsr14
++javacTarget = 1.5
+ source.. = src/
+diff --git a/eclipse/plugins/org.eclipse.osgi/build.properties b/eclipse/plugins/org.eclipse.osgi/build.properties
+index deea927..f2c14df 100644
+--- a/eclipse/plugins/org.eclipse.osgi/build.properties
++++ b/eclipse/plugins/org.eclipse.osgi/build.properties
+@@ -36,7 +36,7 @@ jre.compilation.profile = J2SE-1.5
+ # bootClasspath=osgi/exceptions.jar;osgi/xmlParserAPIs.jar;${CDC-1.1/Foundation-1.1}
+
+ javacSource=1.5
+-javacTarget=jsr14
++javacTarget=1.5
+
+ # To enable building the framework using projects from OSGi repo uncomment customBuildCallbacks
+ # and add the following to the beginning of source..
diff -Nru eclipse-3.8.1/debian/rules eclipse-3.8.1/debian/rules
--- eclipse-3.8.1/debian/rules 2014-01-16 20:52:34.000000000 -0800
+++ eclipse-3.8.1/debian/rules 2014-11-28 11:43:45.000000000 -0800
@@ -29,7 +29,7 @@
PDEBUILD_INSTALL:=debian/tmp/usr/lib/eclipse/buildscripts/pde-build
PDEBUILDVERSION = $(shell ls debian/tmp/usr/lib/eclipse/dropins/sdk/plugins | grep org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//')
-override_dh_install:
+override_dh_install-arch:
# move jdt from /usr/lib to /usr/share
cd debian/tmp/usr && mkdir -p share/eclipse/dropins && mv lib/eclipse/dropins/jdt share/eclipse/dropins
# move images from /usr/lib to /usr/share
@@ -88,11 +88,21 @@
usr/lib/$(DEB_HOST_MULTIARCH)/jni
find $(CFG_OSGI_BUNDLES_PATH) -depth -type d -a -empty -delete
# Check if we are doing a -B build
- [ ! -d debian/eclipse-platform-data ] || debian/rules override_dh_install_indep
+ [ ! -d debian/eclipse-platform-data ] || debian/rules override_dh_install-indep
chmod 0644 debian/eclipse-rcp/usr/lib/eclipse/about_files/IJG_README
+ # Expose org.eclipse.jface and its dependencies
+ mkdir -p debian/eclipse-rcp/usr/share/java
+ cd debian/eclipse-rcp/usr/share/java; \
+ ln -s ../../lib/eclipse/plugins/org.eclipse.jface_*.jar; \
+ ln -s org.eclipse.jface_*.jar org.eclipse.jface.jar; \
+ ln -s ../../lib/eclipse/plugins/org.eclipse.core.commands_*.jar; \
+ ln -s org.eclipse.core.commands_*.jar org.eclipse.core.commands.jar; \
+ ln -s ../../lib/eclipse/plugins/org.eclipse.equinox.common_*.jar; \
+ ln -s org.eclipse.equinox.common_*.jar org.eclipse.equinox.common.jar
# Operations on arch: all packages - not invoked if building with -B
-override_dh_install_indep:
+override_dh_install-indep:
+ dh_install --indep
# mv arch-indep plugins from lib to share
cd debian/eclipse-platform-data/usr && find lib/ -type f -path '*lib/eclipse/*' | perl ../../../debian/extra/imagemv.pl
# Expose osgi jars
@@ -114,17 +124,8 @@
mh_installjar -v -plibequinox-osgi-java $$pom debian/libequinox-osgi-java/usr/share/java/org.eclipse.$$SUFFIX.jar; \
done
- # Expose org.eclipse.jface and its dependencies
-
- mkdir -p debian/eclipse-rcp/usr/share/java
- cd debian/eclipse-rcp/usr/share/java; \
- ln -s ../../lib/eclipse/plugins/org.eclipse.jface_*.jar; \
- ln -s org.eclipse.jface_*.jar org.eclipse.jface.jar; \
- ln -s ../../lib/eclipse/plugins/org.eclipse.core.commands_*.jar; \
- ln -s org.eclipse.core.commands_*.jar org.eclipse.core.commands.jar; \
- ln -s ../../lib/eclipse/plugins/org.eclipse.equinox.common_*.jar; \
- ln -s org.eclipse.equinox.common_*.jar org.eclipse.equinox.common.jar
-
+override_jh_classpath:
+ jh_classpath
jh_classpath -c"org.eclipse.core.commands.jar org.eclipse.equinox.common.jar" \
debian/eclipse-rcp/usr/share/java/org.eclipse.jface.jar
jh_classpath -c"org.eclipse.equinox.common.jar" \
Attachment:
signature.asc
Description: Digital signature