[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 0b3c7664f0f32f8447cd2630bae0b84798abbd2b
Niels Thykier
nthykier-guest at alioth.debian.org
Tue Sep 15 19:36:01 UTC 2009
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 0b3c7664f0f32f8447cd2630bae0b84798abbd2b (commit)
from 68a7c7b2bbba9246e235d829c3d857215b10753e (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 0b3c7664f0f32f8447cd2630bae0b84798abbd2b
Author: Niels Thykier <niels at thykier.net>
Date: Tue Sep 15 21:35:55 2009 +0200
Removed the ".sh" suffix from the installed eclipse script; corrected some install files; Added notification of closed bug to changelog and made modifications to /usr/bin/eclipse to test, if works with alternatives.
-----------------------------------------------------------------------
Summary of changes:
debian/bugs | 5 +--
debian/changelog | 3 ++
debian/control | 3 +-
debian/eclipse-jdt.install | 2 +
debian/eclipse-pde.install | 3 ++
debian/eclipse-platform.install | 1 +
debian/extra/eclipse.sh | 42 +--------------------------------------
debian/rules | 1 +
8 files changed, 14 insertions(+), 46 deletions(-)
diff --git a/debian/bugs b/debian/bugs
index 5a28a43..e64b912 100644
--- a/debian/bugs
+++ b/debian/bugs
@@ -2,7 +2,7 @@ Doables/Intend To Fix:
353360, LP:36534 - Should be fixed if possible. - Respect alternatives.
358594, LP: 67858 - Should be doable. - Move eclipse bin to eclipse-platform.
-403655, LP: 120610 - Should be doable. - Missing org.eclipse.jdt.apt.core in eclipse-jdt.
+ - Alternatively sort out eclipse's depends.
LP: 81900 - Should be doable (but there might be a reason for not doing it). - "Could not create /usr/local/lib/eclipse/.eclipseextension" on startup
@@ -11,8 +11,7 @@ Fixed/Closed by new release (Debian + upstream):
LP:352968 - Fixed by new Debian release - Don't use xulrunner 1.8
LP: 123064, LP: 186634 - Fixed by new Debian release. - Pack eclipse 3.5.
507536, 538871, LP: 237826 - Fixed upstream. - Xulrunner breaks eclipse.
-LP: 316395 - Fixed by new version. - Eclipse 3.2.2 takes too long to start and crashes.
-LP: 405440 - Fixed by new version. - Eclipse 3.3 crashes at start-up.
+403655, LP: 120610 - Fixed by new Debian release - Missing org.eclipse.jdt.apt.core in eclipse-jdt.
Fixed on long term:
diff --git a/debian/changelog b/debian/changelog
index e1384f6..c79ba88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ eclipse (3.5.0-1) UNRELEASED; urgency=low
* Converted build system to use eclipse-build.
* Removed obsolete linda overrides.
* New maintainers. (Closes: #526489)
+ * Added kdebase-bin as alternative to zenity (Closes: #537605)
+ * Added missing "apt" plug-in for eclipse-jdt.
+ (Closes: #403655, LP: #120610)
-- Niels Thykier <niels at thykier.net> Sun, 23 Aug 2009 19:39:51 +0200
diff --git a/debian/control b/debian/control
index bbcc513..9f078fe 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Depends: eclipse-jdt (= ${binary:Version}),
eclipse-pde (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
-Description: Eclipse Platform and Java IDE
+Description: Extensible Tool Platform and Java IDE
The Eclipse Platform is an open and extensible platform for anything and yet
nothing in particular. It provides a foundation for constructing and running
integrated software-development tools. The Eclipse Platform allows tool
@@ -94,7 +94,6 @@ Depends: default-jre | java1-runtime | java2-runtime,
java-common (>= 0.23),
liblucene-java (>= 1.4.2),
libswt-gtk-3.5-java (= ${binary:Version}),
- openjdk-6-jre,
zenity | kdebase-bin,
${misc:Depends},
${perl:Depends}
diff --git a/debian/eclipse-jdt.install b/debian/eclipse-jdt.install
index 825d30a..528fbee 100644
--- a/debian/eclipse-jdt.install
+++ b/debian/eclipse-jdt.install
@@ -18,3 +18,5 @@ debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.ui_*.jar
debian/tmp/usr/lib/eclipse/plugins/org.hamcrest.core_*.jar
debian/tmp/usr/lib/eclipse/plugins/org.junit_*
debian/tmp/usr/lib/eclipse/plugins/org.junit4_*
+
+debian/tmp/usr/lib/eclipse/features/org.eclipse.pde_3.5.0.*
diff --git a/debian/eclipse-pde.install b/debian/eclipse-pde.install
index 9ad7302..d93f39a 100644
--- a/debian/eclipse-pde.install
+++ b/debian/eclipse-pde.install
@@ -12,3 +12,6 @@ debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.ui_*.jar
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.pde.ui.templates_*.jar
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.views.log_*.jar
debian/tmp/usr/lib/eclipse/plugins/org.objectweb.asm_*.jar
+
+debian/tmp/usr/lib/eclipse/features/org.eclipse.pde_3.5.0.*
+debian/tmp/usr/lib/eclipse/features/org.eclipse.pde.source_3.5.0.*
\ No newline at end of file
diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index c8e9bf2..65c87d1 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -2,6 +2,7 @@ debian/tmp/usr/lib/eclipse/configuration/config.ini
debian/tmp/usr/lib/eclipse/eclipse.ini
debian/tmp/usr/lib/eclipse/features/org.eclipse.platform_*
debian/tmp/usr/lib/eclipse/startup.jar
+debian/tmp/usr/lib/eclipse/metadata/
debian/tmp/usr/lib/eclipse/plugins/com.jcraft.jsch_*.jar
debian/tmp/usr/lib/eclipse/plugins/org.apache.ant_*
diff --git a/debian/extra/eclipse.sh b/debian/extra/eclipse.sh
index 4603739..f46073d 100644
--- a/debian/extra/eclipse.sh
+++ b/debian/extra/eclipse.sh
@@ -10,6 +10,7 @@ CMDLINEARGS=""
VMARGS=""
INSTALL="/usr/lib/eclipse"
STARTUP=""
+JAVACMD=`which java`
if [ -x /usr/bin/zenity ]; then
DIALOG=/usr/bin/zenity
@@ -97,26 +98,6 @@ if [ -n "${JAVA_HOME}" ]; then
fi
fi
-# If the user has not set JAVA_HOME, cycle through our list of compatible VM's
-# and pick the first one that exists.
-if [ -z "${JAVA_HOME}" -a ! -n "${JAVACMD}" ]; then
- echo "searching for compatible vm..."
- javahomelist=`cat /etc/eclipse/java_home | grep -v '^#' | grep -v '^$' | while read line ; do echo -n $line ; echo -n ":" ; done`
- OFS="$IFS"
- IFS=":"
- for JAVA_HOME in $javahomelist ; do
- echo -n " testing ${JAVA_HOME}..."
- if [ -x "${JAVA_HOME}/bin/java" ]; then
- export JAVA_HOME
- echo "found"
- break
- else
- echo "not found"
- fi
- done
- IFS="$OFS"
-fi
-
# If we don't have a JAVA_HOME yet, we're doomed.
if [ -z "${JAVA_HOME}" -a ! -n "${JAVACMD}" ]; then
$DIALOG \
@@ -131,27 +112,6 @@ if [ -n "${JAVA_HOME}" -a -z "${JAVACMD}" ]; then
JAVACMD="$JAVA_HOME/bin/java"
fi
-# Set path for the Mozilla SWT binding
-MOZILLA_FIVE_HOME=${MOZILLA_FIVE_HOME%*/}
-if false && [ -n "$MOZILLA_FIVE_HOME" -a -e $MOZILLA_FIVE_HOME/libgtkembedmoz.so ]; then
- :
-elif [ -e @MOZILLA_FIVE_HOME_DEFAULT@/libgtkembedmoz.so ]; then
- export MOZILLA_FIVE_HOME=@MOZILLA_FIVE_HOME_DEFAULT@
-elif [ -e /usr/lib/firefox/libgtkembedmoz.so ]; then
- export MOZILLA_FIVE_HOME=/usr/lib/firefox
-elif [ -e /usr/lib/xulrunner/libgtkembedmoz.so ]; then
- export MOZILLA_FIVE_HOME=/usr/lib/xulrunner
-elif [ -e /usr/lib/mozilla-firefox/libgtkembedmoz.so ]; then
- export MOZILLA_FIVE_HOME=/usr/lib/mozilla-firefox
-elif [ -e /usr/lib/mozilla/libgtkembedmoz.so ]; then
- export MOZILLA_FIVE_HOME=/usr/lib/mozilla
-else
- $DIALOGW \
- ${DIALOGTEXT}"This Eclipse build doesn't have support for the integrated browser."
- --title="Integrated browser support not working" \
- [ $? -eq 0 ] || exit 1
-fi
-
EXT=/usr/local/lib/eclipse/.eclipseextension
if [ ! -f $EXT ]; then
if ! touch $EXT 2>/dev/null; then
diff --git a/debian/rules b/debian/rules
index b21c41a..55bae64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ clean::
# move images from /usr/lib to /usr/share
$(patsubst %,binary-install/%,$(DEB_PACKAGES)):: binary-install/%:
$(if $(wildcard debian/$(cdbs_curpkg)/usr/lib),find debian/$(cdbs_curpkg)/usr/lib/ \( -name '*.bmp' -o -name '*.gif' -o -name '*.jpg' -o -name '*.png' \) -exec debian/extra/imagemv.sh $(cdbs_curpkg) '{}' \; ; dh_link -p$(cdbs_curpkg))
+ test $(cdbs_curpkg) = "eclipse" && mv -f debian/$(cdbs_curpkg)/usr/bin/eclipse.sh debian/$(cdbs_curpkg)/usr/bin/eclipse || true
build-stamp:
@echo "*** build-stamp ***"
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list