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, master has been updated
via 1a3b17e751ec278be23481e2cc235f5e92f1f75b (commit)
from 6c83c1a6ac1416474e4c6af31bd3e94ca9dcd8d7 (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 1a3b17e751ec278be23481e2cc235f5e92f1f75b
Author: Niels Thykier <ni...@thykier.net>
Date: Mon Mar 15 08:37:19 2010 +0100
Revert "Added patch to compile jar-in-jar-loader.zip from source."
This reverts commit 6c83c1a6ac1416474e4c6af31bd3e94ca9dcd8d7.
-----------------------------------------------------------------------
Summary of changes:
build.xml | 17 +----------
debian/patches/compile-jarinjarloader.patch | 30 --------------------
debian/patches/series | 1 -
.../org.eclipse.jdt.ui/jar-in-jar-loader.zip | Bin 0 -> 6523 bytes
4 files changed, 1 insertions(+), 47 deletions(-)
diff --git a/build.xml b/build.xml
index 7b4d12b..a9c443b 100644
--- a/build.xml
+++ b/build.xml
@@ -334,22 +334,7 @@
<echo file="symlinks-stamp" />
</target>
- <target name="prebootstrap" depends="symlinkDeps">
- <mkdir dir="${basedir}/temp/" />
- <javac destdir="${basedir}/temp"
-
srcdir="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar in jar loader/"
- source="1.3"
- target="1.1"
- debug="true"
- optimize="true"
- fork="true"
- compiler="modern" />
- <zip
destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
- basedir="${basedir}/temp/"/>
- <delete dir="${basedir}/temp/"/>
- </target>
-
- <target name="build"
depends="applyPatches,symlinkDeps,prebootstrap,bootstrap,compilelibs"
unless="build.complete">
+ <target name="build"
depends="applyPatches,symlinkDeps,bootstrap,compilelibs"
unless="build.complete">
<echo message="build.xml: eclipse.pdebuild.scripts =
${eclipse.pdebuild.scripts}" />
<java classname="org.eclipse.equinox.launcher.Main" fork="true"
dir="${basedir}" failonerror="true">
<classpath>
diff --git a/debian/patches/compile-jarinjarloader.patch
b/debian/patches/compile-jarinjarloader.patch
deleted file mode 100644
index cbaeafa..0000000
--- a/debian/patches/compile-jarinjarloader.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Regenerates the jar-in-jar-loader.zip file from source.
-Author: Niels Thykier <ni...@thykier.net>
-Forwarded: no
-
---- a/build.xml
-+++ b/build.xml
-@@ -334,7 +334,22 @@
- <echo file="symlinks-stamp" />
- </target>
-
-- <target name="build"
depends="applyPatches,symlinkDeps,bootstrap,compilelibs"
unless="build.complete">
-+ <target name="prebootstrap" depends="symlinkDeps">
-+ <mkdir dir="${basedir}/temp/" />
-+ <javac destdir="${basedir}/temp"
-+
srcdir="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar in jar loader/"
-+ source="1.3"
-+ target="1.1"
-+ debug="true"
-+ optimize="true"
-+ fork="true"
-+ compiler="modern" />
-+ <zip
destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
-+ basedir="${basedir}/temp/"/>
-+ <delete dir="${basedir}/temp/"/>
-+ </target>
-+
-+ <target name="build"
depends="applyPatches,symlinkDeps,prebootstrap,bootstrap,compilelibs"
unless="build.complete">
- <echo message="build.xml: eclipse.pdebuild.scripts =
${eclipse.pdebuild.scripts}" />
- <java classname="org.eclipse.equinox.launcher.Main" fork="true"
dir="${basedir}" failonerror="true">
- <classpath>
diff --git a/debian/patches/series b/debian/patches/series
index 46f0db4..0519225 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ eclipse-manpage.patch
pdebuild-script.patch
pdebuild-path-copy-platform.patch
symlink-system-files.patch
-compile-jarinjarloader.patch
diff --git a/eclipse/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip
b/eclipse/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip
new file mode 100644
index 0000000..bd5cbde
Binary files /dev/null and
b/eclipse/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip differ
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
