[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7.1-1-15-gf2a1b55

[Jakub Adam]

The following commit has been merged in the master branch:
commit c4bd7f9c586e06f2c04c9aa74aad81c5c8640f28
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Mar 8 17:49:40 2012 +0100

    Revert "Remove org.eclipse.swt from bundles.info so that its upgrade does not break Eclipse"
    
    This reverts commit 416baed96dee7a3d67c61de7b73386455273e9d0.
    
    This doesn't work, some other way how to deal with core bundle's orbit depencency upgrades
    must be developed.

diff --git a/debian/rules b/debian/rules
index f4ced1e..6957cc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,8 +49,6 @@ override_dh_install:
 	echo 'osgi.bundlefile.limit=100' >> debian/tmp/usr/lib/eclipse/configuration/config.ini
 	# Remove the unnecessary configuration data (taken from Fedora spec)
 	find debian/tmp/usr/lib/eclipse -depth -type d -empty -delete
-	# Remove org.eclipse.swt from bundles.info so that its upgrade does not break Eclipse
-	sed -i /org.eclipse.swt/d debian/tmp/usr/lib/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 	# fix permissions of scripts
 	### FIXME - update to the new dropins layout (steal from fedora-spec file)
 	chmod +x debian/tmp/usr/lib/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_*/templates/package-build/*.sh

-- 
eclipse - Powerful IDE written in java - Debian package.