This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository eclipse.
commit 3081aba6a0621a83f673d6e97edaf7ff27fdef37 Author: Jakub Adam <[email protected]> Date: Tue Sep 10 17:11:55 2013 +0200 Compile org.eclipse.osgi bundle for java 1.5 --- debian/changelog | 7 +++++++ debian/patches/osgi-target-java-1.5.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) diff --git a/debian/changelog b/debian/changelog index cd30af0..215158b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +eclipse (3.8.1-5) UNRELEASED; urgency=low + + * Compile org.eclipse.osgi bundle for java 1.5. + - Required for Tycho build with Java 7. + + -- Jakub Adam <[email protected]> Tue, 10 Sep 2013 17:11:24 +0200 + eclipse (3.8.1-4) unstable; urgency=low * Fix help webapp with tomcat-jasper.jar from libtomcat7-java 7.0.40. diff --git a/debian/patches/osgi-target-java-1.5.patch b/debian/patches/osgi-target-java-1.5.patch new file mode 100644 index 0000000..2e33ffc --- /dev/null +++ b/debian/patches/osgi-target-java-1.5.patch @@ -0,0 +1,21 @@ +From: Jakub Adam <[email protected]> +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 --git a/debian/patches/series b/debian/patches/series index ce79e40..3c61af7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -41,3 +41,4 @@ fix-gnu-kfreebsd-build.patch 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
