[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-207-gb4c9881
Andres Mejia
ceros-guest at alioth.debian.org
Mon May 9 02:09:10 UTC 2011
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 b4c9881e977b67aefc2cf7e0ec917cd5098959ac (commit)
via 5ed4451eb0e427abb2f74fd67bc4f321bab78dde (commit)
via 3be277a2dc3782ba18b07b8159e33a8ddf8aa9d7 (commit)
via 5be0ea49e099ddade64e6706b8293573ea412705 (commit)
from 1cfb61901577e6b6631061a5aefcd562cd7bfb27 (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 b4c9881e977b67aefc2cf7e0ec917cd5098959ac
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sun May 8 22:08:35 2011 -0400
Update changelog.
commit 5ed4451eb0e427abb2f74fd67bc4f321bab78dde
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sun May 8 22:04:43 2011 -0400
Fix generation of metadata needed to be able to install third party plugins.
commit 3be277a2dc3782ba18b07b8159e33a8ddf8aa9d7
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sun May 8 22:02:46 2011 -0400
Update eclipse script for new upstream release.
Also provide better way to file *.prefs files.
commit 5be0ea49e099ddade64e6706b8293573ea412705
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sun May 8 22:01:44 2011 -0400
Include needed dependency on libswt-gtk-3.6-jni for eclipse-rcp.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 ++++-
debian/control | 2 +
debian/eclipse-platform.install | 1 +
debian/extra/eclipse | 19 ++++++++------
...nerate-metadata-and-extract-swt-libraries.patch | 25 ++++++-------------
debian/patches/series | 1 +
debian/rules | 2 -
7 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6aff593..09ab23e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,8 +38,12 @@ eclipse (3.6.2-1) UNRELEASED; urgency=low
* Install swt*.jar symlinks in eclipse-platform package.
* Add myself as Uploader.
* Bump to Standards-Version 3.9.2.
+ * Include needed dependency on libswt-gtk-3.6-jni for eclipse-rcp.
+ * Update eclipse script for new upstream release.
+ * Update script to implement better search for *.prefs files.
+ * Fix generation of metadata needed to be able to install third party plugins.
- -- Andres Mejia <mcitadel at gmail.com> Sun, 08 May 2011 11:47:43 -0400
+ -- Andres Mejia <mcitadel at gmail.com> Sun, 08 May 2011 22:06:51 -0400
eclipse (3.5.2-5) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 4018ea8..d71a0e4 100644
--- a/debian/control
+++ b/debian/control
@@ -211,6 +211,8 @@ Architecture: any
Depends: default-jre | java5-runtime | java6-runtime,
libequinox-osgi-java (= ${source:Version}),
libicu4j-4.2-java (>= 4.2),
+ libswt-gtk-3.6-jni (>= 3.6.2),
+ libswt-gtk-3.6-jni (<< 3.6.2+1~),
${misc:Depends},
${shlibs:Depends}
Recommends: ${shlibs:Recommends}
diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index 8cbc994..308707f 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -16,6 +16,7 @@ usr/lib/eclipse/features/org.eclipse.help_*
usr/lib/eclipse/features/org.eclipse.platform.source_*
usr/lib/eclipse/features/org.eclipse.platform_*
usr/lib/eclipse/features/org.eclipse.sdk_*
+usr/lib/eclipse/metadata/*.xml
usr/lib/eclipse/p2/
usr/lib/eclipse/plugins/com.jcraft.jsch_*.jar
usr/lib/eclipse/plugins/javax.servlet.jsp_*.jar
diff --git a/debian/extra/eclipse b/debian/extra/eclipse
index 9b20395..a5bcc8a 100644
--- a/debian/extra/eclipse
+++ b/debian/extra/eclipse
@@ -15,10 +15,10 @@ inject_update_site(){
return 1
fi
cat - >>"$1" <<EOF
-repositories/http\:__download.eclipse.org_releases_galileo/enabled=true
-repositories/http\:__download.eclipse.org_releases_galileo/isSystem=false
-repositories/http\:__download.eclipse.org_releases_galileo/nickname=Galileo Update Site
-repositories/http\:__download.eclipse.org_releases_galileo/uri=http\://download.eclipse.org/releases/galileo/
+repositories/http\:__download.eclipse.org_releases_helios/enabled=true
+repositories/http\:__download.eclipse.org_releases_helios/isSystem=false
+repositories/http\:__download.eclipse.org_releases_helios/nickname=Helios Update Site
+repositories/http\:__download.eclipse.org_releases_helios/uri=http\://download.eclipse.org/releases/helios/
EOF
}
@@ -26,12 +26,15 @@ EOF
if [ ! -d ~/.eclipse/ ] ; then
$ECLIPSE -clean -initialize || exit $?
- settings=`echo ~/.eclipse/org.eclipse.platform_*/p2/org.eclipse.equinox.p2.engine/profileRegistry/PlatformProfile.profile/.data/.settings/`
- if [ ! -d "$settings" ] ; then
+ artifact=$(find ~/.eclipse \
+ -name org.eclipse.equinox.p2.artifact.repository.prefs)
+ metadata=$(find ~/.eclipse \
+ -name org.eclipse.equinox.p2.metadata.repository.prefs)
+ if [ -z "$artifact" ] || [ -z "$metadata" ]; then
echo "W: Cannot inject update-sites, cannot find the correct config." 2>&1
else
- ( inject_update_site "$settings/org.eclipse.equinox.p2.metadata.repository.prefs" && \
- inject_update_site "$settings/org.eclipse.equinox.p2.artifact.repository.prefs" && \
+ ( inject_update_site "$artifact" && \
+ inject_update_site "$metadata" && \
echo "I: Injected update sites" ) || echo "W: Could not inject update sites." 2>&1
fi
fi
diff --git a/debian/patches/generate-metadata-and-extract-swt-libraries.patch b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
index c79de8b..46bb56c 100644
--- a/debian/patches/generate-metadata-and-extract-swt-libraries.patch
+++ b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
@@ -6,23 +6,7 @@ From: Benjamin Drung <bdrung at ubuntu.com>
--- a/build.xml
+++ b/build.xml
-@@ -919,7 +919,6 @@
- <arg line="-destination ${p2.director.install.path}" />
- <arg line="-bundlepool ${p2.director.install.path}" />
- <arg line="-vmargs" />
-- <arg line="-Declipse.p2.data.area=${p2.director.install.path}/p2" />
- <arg line="-Declipse.p2.MD5Check=false" />
- <arg line="-Declipse.p2.profile=@none" />
- <arg line="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=" />
-@@ -929,7 +928,6 @@
- <jvmarg value="-Xmx2048M" />
- <jvmarg value="-XX:MaxPermSize=512M" />
- -->
-- <jvmarg value="-Declipse.p2.data.area=${p2.director.install.path}/p2" />
- <jvmarg value="-Xmx512M" />
- </java>
- </target>
-@@ -1003,6 +1001,54 @@
+@@ -1007,6 +1007,61 @@
<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
@@ -49,6 +33,10 @@ From: Benjamin Drung <bdrung at ubuntu.com>
+ <arg value="-artifactRepositoryName" /><arg value="Eclipse Platform" />
+ <arg value="-metadataRepositoryName" /><arg value="Eclipse Platform" />
+ </java>
++
++ <!-- Backup eclipse.ini before running the next program, then restore -->
++ <move file="${installationDir}/eclipse.ini" tofile="${installationDir}/eclipse.ini.bak"
++ force="true" />
+ <java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}">
+ <classpath>
+ <fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins">
@@ -71,8 +59,11 @@ From: Benjamin Drung <bdrung at ubuntu.com>
+ <arg value="-profileProperties" /><arg value="org.eclipse.update.install.features=true" />
+ <arg value="-destination" /><arg value="${destDir}/${prefix}/${libDir}/eclipse" />
+ <arg value="-bundlepool" /><arg value="${destDir}/${prefix}/${libDir}/eclipse" />
++ <arg value="-shared" /><arg value="file:${destDir}/${prefix}/${libDir}/eclipse/p2"/>
+ <jvmarg value="-Declipse.p2.MD5Check=false"/>
+ </java>
++ <move file="${installationDir}/eclipse.ini.bak" tofile="${installationDir}/eclipse.ini"
++ force="true" />
+
<!-- Extract SWT JNI .so files -->
<java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}">
diff --git a/debian/patches/series b/debian/patches/series
index 5f084ba..1597783 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ osgi-services.patch
osgi-services-symlink-javax.patch
use-ant-1.8.2.patch
eclipse-build-generatedScripts.patch
+generate-metadata-and-extract-swt-libraries.patch
diff --git a/debian/rules b/debian/rules
index ed8af6e..4501ff3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,8 +76,6 @@ override_dh_install:
rm -f debian/tmp/usr/bin/eclipse
sed 's|@XULRUNNER_PATH@|$(XULRUNNER_PATH)|' debian/extra/eclipse > debian/tmp/usr/bin/eclipse
chmod 755 debian/tmp/usr/bin/eclipse
- # Correct the profile in config.ini - else eclipse will refuse to open the update/install menus.
- sed -i 's/SDKProfile/PlatformProfile/' debian/tmp/usr/lib/eclipse/configuration/config.ini
# 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)
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list