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

[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  08b3309ff2893e5c7ed757760db2aa17d688bcab (commit)
       via  66a6179b3ca2830c55aff9fd4a4e6a7cc5117ea9 (commit)
       via  c59e109793d9bbe6cd01fc2542b92bcb096fd6b8 (commit)
      from  dffec708f50cb105a624df98c50447547639e2f8 (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 08b3309ff2893e5c7ed757760db2aa17d688bcab
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Jul 10 20:05:00 2010 +0200

    Drop eclipse.ini movement.

commit 66a6179b3ca2830c55aff9fd4a4e6a7cc5117ea9
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Jul 10 20:03:47 2010 +0200

    No bad arguments in eclipse.ini any more.

commit c59e109793d9bbe6cd01fc2542b92bcb096fd6b8
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Jul 10 20:03:05 2010 +0200

    Move unnecessary file deletion from debian/rules into build.xml.

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

Summary of changes:
 debian/patches/remove-unnecessary-files.patch |   22 ++++++++++++++++++++++
 debian/patches/series                         |    1 +
 debian/rules                                  |   13 -------------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/debian/patches/remove-unnecessary-files.patch b/debian/patches/remove-unnecessary-files.patch
new file mode 100644
index 0000000..ccf1ba5
--- /dev/null
+++ b/debian/patches/remove-unnecessary-files.patch
@@ -0,0 +1,22 @@
+Description: Remove unnecessary configuration data and metadata
+From: Benjamin Drung <bdrung at ubuntu.com>
+
+--- a/build.xml
++++ b/build.xml
+@@ -907,6 +907,16 @@
+ 			<arg value="-fileInitializer" /><arg value="${basedir}/extract_patterns.txt" />
+ 			<jvmarg value="-Dosgi.sharedConfiguration.area=${destDir}/${prefix}/${libDir}/eclipse/configuration"/>
+ 		</java>
++		<!-- Remove unnecessary configuration data and metadata -->
++		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/configuration/org.eclipse.core.runtime" />
++		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/configuration/org.eclipse.equinox.app" />
++		<delete includeemptydirs="true" verbose="true">
++			<fileset dir="${destDir}/${prefix}/${libDir}/eclipse/configuration" includes="*.log" />
++			<fileset dir="${destDir}/${prefix}/${libDir}/eclipse/configuration" includes="**/data/**" />
++		</delete>
++		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/binary" />
++		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/features" />
++		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/plugins" />
+ 		<!-- Move config file to /etc -->
+ 		<mkdir dir="${destDir}/etc" />
+ 		<move file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
diff --git a/debian/patches/series b/debian/patches/series
index da6de4a..d125375 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ pdebuild-script.patch
 symlink-system-files.patch
 disable-logging.patch
 generate-metadata-and-extract-swt-libraries.patch
+remove-unnecessary-files.patch
diff --git a/debian/rules b/debian/rules
index c8c8e55..1db0228 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,12 +75,6 @@ POMS := debian/poms/pom-equinox-osgi.xml debian/poms/pom-equinox-osgi.services.x
 
 override_dh_install:
 	# Turn all following commands into patches and send them to eclipse-build
-	# Remove some bad arguments that causes eclipse to fail
-	perl -i -ne 'print $$_ unless(m/^-XX/);' debian/tmp/etc/eclipse.ini
-	# Replace symlink with a copy - The absolute symlink causes eclipse to fail
-	# and some of the commands attempt to modify eclipse.ini.
-	rm -f debian/tmp/usr/lib/eclipse/eclipse.ini
-	cp -f debian/tmp/etc/eclipse.ini debian/tmp/usr/lib/eclipse/
 	# move images from /usr/lib to /usr/share
 	cd debian/tmp/usr && find lib/ -type f \( -name '*.bmp' -o -name '*.gif' -o -name '*.jpg' -o -name '*.png' \) | perl ../../../debian/extra/imagemv.pl
 	# Normalize the paths.
@@ -98,15 +92,9 @@ override_dh_install:
 	# Set a saner default file limit than "unlimited".
 	echo 'osgi.bundlefile.limit=100' >> debian/tmp/usr/lib/eclipse/configuration/config.ini
 	# Remove the unnecessary configuration data (taken from Fedora spec)
-	rm -r $(DEBIAN_PACK_LIBDIR)/configuration/org.eclipse.core.runtime
-	rm -r $(DEBIAN_PACK_LIBDIR)/configuration/org.eclipse.equinox.app
-	rm -rf $(DEBIAN_PACK_LIBDIR)/configuration/*.log
-	find $(DEBIAN_PACK_LIBDIR)/configuration -depth -type d -name data -exec rm -rf {} \;
 	find $(DEBIAN_PACK_LIBDIR) -depth -type d -empty -delete
 	# fix permissions of scripts
 	chmod +x debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.build_*/templates/package-build/*.sh
-	# Regenerate the eclipse.ini symlink.
-	ln -sf /etc/eclipse.ini debian/tmp/usr/lib/eclipse/eclipse.ini
 	@echo "*** generate-pdebuild-scripts ***"
 	mkdir -p `dirname $(COPY_PLATFORM_INSTALL)` `dirname $(PDEBUILD_INSTALL)`
 	install -m 755 pdebuild/eclipse-copy-platform.sh $(COPY_PLATFORM_INSTALL)
@@ -117,7 +105,6 @@ override_dh_install:
 	) | sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $$eclipse/\1 \1,' >> $(COPY_PLATFORM_INSTALL)
 	sed -e "s/@PDEBUILDVERSION@/$(PDEBUILDVERSION)/g" -e "s:@COPY_PLATFORM@:$(COPY_PLATFORM):g" < pdebuild/eclipse-pdebuild.sh > $(PDEBUILD_INSTALL)
 	chmod a+x $(PDEBUILD_INSTALL)
-	rm -rf debian/tmp/usr/lib/eclipse/metadata/binary debian/tmp/usr/lib/eclipse/metadata/features debian/tmp/usr/lib/eclipse/metadata/plugins
 	# Remove license files
 	rm -f debian/tmp/usr/lib/eclipse/epl-v10.html \
 		debian/tmp/usr/lib/eclipse/about_files/about_cairo.html \


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