[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 0026304c2125c83566b0f85c1eb8f194d194911e

[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 has been updated
       via  0026304c2125c83566b0f85c1eb8f194d194911e (commit)
      from  7527cb121707450c383cd606528999e2f72915fe (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 0026304c2125c83566b0f85c1eb8f194d194911e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Nov 22 23:52:55 2009 +0100

    Symlink ant scripts.

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

Summary of changes:
 build.xml                                    |    4 ----
 debian/patches/fix-perm.patch                |   19 -------------------
 debian/patches/move-config-file-to-etc.patch |   10 +++++-----
 debian/patches/series                        |    1 -
 system-jars.csv                              |    5 +++++
 5 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/build.xml b/build.xml
index 16c8b9d..b5ebdab 100644
--- a/build.xml
+++ b/build.xml
@@ -779,10 +779,6 @@
 		<mkdir dir="${destDir}/etc" />
 		<move file="${destDir}${prefix}/lib/eclipse/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
 		<symlink link="${destDir}${prefix}/lib/eclipse/eclipse.ini" resource="/etc/eclipse.ini" />
-		<!-- fix permissions -->
-		<chmod perm="755" dir="${destDir}${prefix}/lib/eclipse/plugins" includes="org.apache.ant_*/bin/ant" />
-		<chmod perm="755" dir="${destDir}${prefix}/lib/eclipse/plugins" includes="org.apache.ant_*/bin/antRun" />
-		<chmod perm="755" dir="${destDir}${prefix}/lib/eclipse/plugins" includes="org.apache.ant_*/bin/*.pl" />
 	</target>
 
 	<target name="package.extract.swt">
diff --git a/debian/patches/fix-perm.patch b/debian/patches/fix-perm.patch
deleted file mode 100644
index 94b4075..0000000
--- a/debian/patches/fix-perm.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fix permission for ant executable files
-Author: Benjamin Drung <bdrung at ubuntu.com>
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=289017
-
-Index: b/build.xml
-===================================================================
---- a/build.xml	2009-11-22 22:42:43.125304213 +0100
-+++ b/build.xml	2009-11-22 22:43:54.113282597 +0100
-@@ -775,6 +775,10 @@
- 		<symlink link="${destDir}/${prefix}/${libDir}/eclipse/startup.jar" resource="plugins/${startupjarpath}" />
- 
- 		<echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${destDir}${prefix}/share/eclipse/dropins" />
-+		<!-- fix permissions -->
-+		<chmod perm="755" dir="${destDir}${prefix}/lib/eclipse/plugins" includes="org.apache.ant_*/bin/ant" />
-+		<chmod perm="755" dir="${destDir}${prefix}/lib/eclipse/plugins" includes="org.apache.ant_*/bin/antRun" />
-+		<chmod perm="755" dir="${destDir}${prefix}/lib/eclipse/plugins" includes="org.apache.ant_*/bin/*.pl" />
- 	</target>
- 
- 	<target name="package.extract.swt">
diff --git a/debian/patches/move-config-file-to-etc.patch b/debian/patches/move-config-file-to-etc.patch
index a8fb9b9..c1d418b 100644
--- a/debian/patches/move-config-file-to-etc.patch
+++ b/debian/patches/move-config-file-to-etc.patch
@@ -5,8 +5,8 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/43162
 
 Index: b/build.xml
 ===================================================================
---- a/build.xml	2009-11-22 22:42:54.410283038 +0100
-+++ b/build.xml	2009-11-22 22:43:49.729282747 +0100
+--- a/build.xml	2009-11-22 23:18:23.440923815 +0100
++++ b/build.xml	2009-11-22 23:19:25.620923860 +0100
 @@ -775,6 +775,10 @@
  		<symlink link="${destDir}/${prefix}/${libDir}/eclipse/startup.jar" resource="plugins/${startupjarpath}" />
  
@@ -15,6 +15,6 @@ Index: b/build.xml
 +		<mkdir dir="${destDir}/etc" />
 +		<move file="${destDir}${prefix}/lib/eclipse/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
 +		<symlink link="${destDir}${prefix}/lib/eclipse/eclipse.ini" resource="/etc/eclipse.ini" />
- 		<!-- fix permissions -->
- 		<chmod perm="755" dir="${destDir}${prefix}/lib/eclipse/plugins" includes="org.apache.ant_*/bin/ant" />
- 		<chmod perm="755" dir="${destDir}${prefix}/lib/eclipse/plugins" includes="org.apache.ant_*/bin/antRun" />
+ 	</target>
+ 
+ 	<target name="package.extract.swt">
diff --git a/debian/patches/series b/debian/patches/series
index 23f2b43..353f291 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 fix-shell-script-perm.patch
-fix-perm.patch
 remove-eclipse-version.patch
 move-config-file-to-etc.patch
 fix-directory-in-eclipse-ini.patch
diff --git a/system-jars.csv b/system-jars.csv
index 78ce2c2..b68ea9b 100644
--- a/system-jars.csv
+++ b/system-jars.csv
@@ -1,3 +1,8 @@
+plugins/org.apache.ant_*/bin/ant;/usr/share/ant/bin/ant
+plugins/org.apache.ant_*/bin/antRun;/usr/share/ant/bin/antRun
+plugins/org.apache.ant_*/bin/antRun.pl;/usr/share/ant/bin/antRun.pl
+plugins/org.apache.ant_*/bin/complete-ant-cmd.pl;/usr/share/ant/bin/complete-ant-cmd.pl
+plugins/org.apache.ant_*/bin/runant.pl;/usr/share/ant/bin/runant.pl
 plugins/org.apache.ant_*/lib/ant-antlr.jar;/usr/share/java/ant-antlr.jar
 plugins/org.apache.ant_*/lib/ant-apache-bcel.jar;/usr/share/java/ant-apache-bcel.jar
 plugins/org.apache.ant_*/lib/ant-apache-bsf.jar;/usr/share/java/ant-apache-bsf.jar


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