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-3.6 has been updated
via 444d6304a71c94d22b3ac6c64de48384bf7e07e5 (commit)
from 74d2d6142e7e724b46e5fac2c8e0dddb36218c95 (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 444d6304a71c94d22b3ac6c64de48384bf7e07e5
Author: Benjamin Drung <bdr...@ubuntu.com>
Date: Fri Jul 16 23:54:58 2010 +0200
Drop disable-logging.patch and add distclean-logfiles.patch instead.
-----------------------------------------------------------------------
Summary of changes:
debian/patches/disable-logging.patch | 16 -------------
debian/patches/distclean-logfiles.patch | 37 +++++++++++++++++++++++++++++++
debian/patches/series | 2 +-
3 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/debian/patches/disable-logging.patch
b/debian/patches/disable-logging.patch
deleted file mode 100644
index 71c1b02..0000000
--- a/debian/patches/disable-logging.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Disable logging
-From: Benjamin Drung <bdr...@ubuntu.com>
-
---- a/build.xml
-+++ b/build.xml
-@@ -2,8 +2,8 @@
- <tstamp>
- <format property="timestamp" pattern="yyyyMMddHHmmss"/>
- </tstamp>
-- <record name="build_${timestamp}.log"/>
-- <echo message="Build log is available in build_${timestamp}.log" />
-+
-+
- <property name="baseBuilder" value="${basedir}/bootstrap" />
- <property name="launcher"
value="${basedir}/bootstrap/plugins/org.eclipse.equinox.launcher.jar" />
- <property name="eclipse.pdebuild.scripts"
value="${basedir}/bootstrap/plugins/org.eclipse.pde.build/scripts" />
diff --git a/debian/patches/distclean-logfiles.patch
b/debian/patches/distclean-logfiles.patch
new file mode 100644
index 0000000..97145ac
--- /dev/null
+++ b/debian/patches/distclean-logfiles.patch
@@ -0,0 +1,37 @@
+Description: Remove log files on distclean
+From: Benjamin Drung <bdr...@ubuntu.com>
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319110
+
+--- a/build.xml
++++ b/build.xml
+@@ -232,7 +232,7 @@
+ <echo file="testsunpack-stamp" />
+ </target>
+
+- <target name="clean">
++ <target name="clean-sdk">
+ <delete dir="${homeDir}" />
+ <delete dir="${baseworkspace}" />
+ <delete dir="${buildworkspace}" />
+@@ -247,7 +247,7 @@
+ </delete>
+ </target>
+
+- <target name="distclean" depends="clean">
++ <target name="clean" depends="clean-sdk">
+ <delete dir="bootstrap/configuration/org.eclipse.core.runtime"
/>
+ <delete dir="bootstrap/configuration/org.eclipse.equinox.app" />
+ <delete dir="bootstrap/configuration/org.eclipse.osgi" />
+@@ -256,6 +256,12 @@
+ <delete dir="bootstrap/workspace" />
+ </target>
+
++ <target name="distclean" depends="clean">
++ <delete>
++ <fileset dir="." includes="*.log" />
++ </delete>
++ </target>
++
+ <target name="insertBuildId" depends="unpack" unless="buildId.complete">
+ <replace dir="${buildDirectory}/plugins" value="${buildId}"
token="@build@">
+ <include name="**/about.mappings" />
diff --git a/debian/patches/series b/debian/patches/series
index cc0e10d..58775b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,8 +9,8 @@ fix-help-contents.patch
pdebuild-path-copy-platform.patch
pdebuild-script.patch
symlink-system-files.patch
-disable-logging.patch
generate-metadata-and-extract-swt-libraries.patch
remove-unnecessary-files.patch
strip-destDir.patch
clean-source.patch
+distclean-logfiles.patch
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
