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

[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  d978fd53d29372c5559184693b36efd28255c6ba (commit)
      from  db0220dc1cf94f3e3400fe9f25f32dffd81e8092 (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 d978fd53d29372c5559184693b36efd28255c6ba
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Nov 18 23:29:03 2009 +0100

    Move eclipse.ini into /etc (LP: #43162)

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

Summary of changes:
 build.xml                                    |    4 ++++
 debian/TODO                                  |    1 -
 debian/changelog                             |    3 ++-
 debian/eclipse-platform.install              |    1 +
 debian/patches/move-config-file-to-etc.patch |   16 ++++++++++++++++
 debian/patches/series                        |    1 +
 6 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index f928de5..9be5c34 100644
--- a/build.xml
+++ b/build.xml
@@ -762,6 +762,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" />
+		<!-- Move config file to /etc -->
+		<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" />
diff --git a/debian/TODO b/debian/TODO
index 3178e91..97bf192 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,6 +1,5 @@
 Things needed to be fixed (discussed on 2009-10-09 on IRC; sorted by importance):
  * Update README.source describing 3.0 (quilt) layout
- * clean up eclipse.ini and install it in /etc/ (e.g. symlinked from eclipse install loc) LP: #43162
  * Use system jars rather than pre-compiled ones. (e.g. luence, ant, etc.).
    (EB: #280688, LP: #453036)
  * Update manpage EB: #30107
diff --git a/debian/changelog b/debian/changelog
index a9cabeb..6025aad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,8 +39,9 @@ eclipse (3.5.1+repack-1) UNRELEASED; urgency=low
     (Closes: #505553)
   * Rewrote symlink script to handle folders that are renamed on different
     archs/builds. (LP: #471859)
+  * Move eclipse.ini into /etc (LP: #43162)
 
- -- Benjamin Drung <bdrung at ubuntu.com>  Wed, 14 Oct 2009 01:42:49 +0200
+ -- Benjamin Drung <bdrung at ubuntu.com>  Wed, 18 Nov 2009 23:27:43 +0100
 
 eclipse (3.4.1-1) unstable; urgency=low
 
diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index b4c9273..15c9789 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -1,3 +1,4 @@
+etc
 usr/bin
 usr/lib/eclipse/.eclipseproduct
 usr/lib/eclipse/artifacts.xml
diff --git a/debian/patches/move-config-file-to-etc.patch b/debian/patches/move-config-file-to-etc.patch
new file mode 100644
index 0000000..6591128
--- /dev/null
+++ b/debian/patches/move-config-file-to-etc.patch
@@ -0,0 +1,16 @@
+Description: Move config file to /etc
+Author: Benjamin Drung <bdrung at ubuntu.com>
+
+--- eclipse-3.5.1+repack.orig/build.xml
++++ eclipse-3.5.1+repack/build.xml
+@@ -762,6 +762,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" />
++		<!-- Move config file to /etc -->
++		<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" />
diff --git a/debian/patches/series b/debian/patches/series
index 18baa0f..6a2d2ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-shell-script-perm.patch
 fix-perm.patch
 remove-eclipse-version.patch
+move-config-file-to-etc.patch


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