[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-110-gaebb1cf

[Benjamin Drung]

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  aebb1cfed9645583c6711734c1f6ea2f791dcfb1 (commit)
       via  952996fa515c22af55e23eb4187e70bfaab875a5 (commit)
      from  86453f336af5185e252c18a8e5dd105f4d64c58e (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 aebb1cfed9645583c6711734c1f6ea2f791dcfb1
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Jul 8 13:31:40 2010 +0200

    Disable logging.

commit 952996fa515c22af55e23eb4187e70bfaab875a5
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Jul 8 13:29:39 2010 +0200

    Drop fix-shell-script-perm.patch. It doesn't produce lintian warning any more.

-----------------------------------------------------------------------

Summary of changes:
 debian/patches/disable-logging.patch       |   16 ++++++++++++++++
 debian/patches/fix-shell-script-perm.patch |   15 ---------------
 debian/patches/series                      |    2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/debian/patches/disable-logging.patch b/debian/patches/disable-logging.patch
new file mode 100644
index 0000000..9c7a387
--- /dev/null
+++ b/debian/patches/disable-logging.patch
@@ -0,0 +1,16 @@
+Description: Disable logging
+Author: Benjamin Drung <bdrung at ubuntu.com>
+
+diff --git a/build.xml b/build.xml
+index 18657e6..c902b00 100644
+--- a/build.xml
++++ b/build.xml
+@@ -2,7 +2,7 @@
+ 	<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" />
diff --git a/debian/patches/fix-shell-script-perm.patch b/debian/patches/fix-shell-script-perm.patch
deleted file mode 100644
index d6fc1af..0000000
--- a/debian/patches/fix-shell-script-perm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: correct permission after applying patch
-Author: Benjamin Drung <bdrung at ubuntu.com>
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=295526
-Applied-Upstream: no
-
---- a/build.xml
-+++ b/build.xml
-@@ -278,6 +278,7 @@
- 		<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="1" />
- 		<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="1" />
- 		<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}" strip="1" />
-+		<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
- 		<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
- 		<patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch" dir="${buildDirectory}" strip="1" />
- 		<patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="1" />
diff --git a/debian/patches/series b/debian/patches/series
index d16f00a..1172c73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,7 @@ add-o.e.equinox.concurrent.patch
 ecj-gccmain-java.patch
 eclipse-build-generatedScripts.patch
 fix-help-contents.patch
-fix-shell-script-perm.patch
 pdebuild-path-copy-platform.patch
 pdebuild-script.patch
 symlink-system-files.patch
+disable-logging.patch


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.