[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-39-ga30b154
Benjamin Drung
bdrung-guest at alioth.debian.org
Tue Jun 22 10:27:35 UTC 2010
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 a30b154308ad7a6370623277250ffb3476c1d1f0 (commit)
via 5295335d61f8716426193f07fcaff6fc6352ca11 (commit)
via 3ef767550bf16f0ccefe9cc5db7018ee14680886 (commit)
via 90c8c342237b4cacc8a8cc661e3ab46daa58de56 (commit)
via 5348434cf90a1566dff28f710d50c9c537999879 (commit)
via d7372db51ce2b21521fa538ef8301886c90e9a4c (commit)
via d9b7b98c15d1fbebee3062a253c4c0af9daaa320 (commit)
via fb7c5294e19c069ddce9733797d9e3a8e56c61c6 (commit)
via 5876fba892262b971cce1816a2cab756c70eb721 (commit)
via 403a45c243fa6b45a2f01b01940374e6d492afb2 (commit)
via e726ac7fba265a578d76d25c19b23219e00357b3 (commit)
via 2bc74386eb7efebef8177f3484552dd666d4a4e6 (commit)
via b26f095889d2d62a8f767fb0642f1a9415ea9e46 (commit)
via 4f17526077987205b722ca800fc190936e9ce654 (commit)
from 98fa4c64db6db353ab0dcc89eccee6863e1cf659 (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 a30b154308ad7a6370623277250ffb3476c1d1f0
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Tue Jun 22 12:23:24 2010 +0200
Update debian/gbp.conf.
commit 5295335d61f8716426193f07fcaff6fc6352ca11
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Tue Jun 22 12:10:17 2010 +0200
Refresh patches.
commit 3ef767550bf16f0ccefe9cc5db7018ee14680886
Merge: 98fa4c64db6db353ab0dcc89eccee6863e1cf659 90c8c342237b4cacc8a8cc661e3ab46daa58de56
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Tue Jun 22 12:08:55 2010 +0200
Merge branch 'master' into master-3.6
-----------------------------------------------------------------------
Summary of changes:
build.properties | 1 -
build.xml | 25 ++++++++++
debian/changelog | 3 +
debian/gbp.conf | 4 ++
debian/patches/bashism.patch | 40 ----------------
debian/patches/build-arch.patch | 47 +++++++++++++++++++
debian/patches/compile-IPluginDescriptor.patch | 2 +-
debian/patches/compile-jarinjarloader.patch | 2 +-
debian/patches/eclipse-manpage.patch | 2 +-
debian/patches/fix-bashism.patch | 43 +++++++++++++++++
debian/patches/fix-shell-script-perm.patch | 2 +-
debian/patches/fix-tooltip-color.patch | 2 +-
debian/patches/osgi-services-symlink-javax.patch | 4 +-
debian/patches/osgi-services.patch | 4 +-
debian/patches/series | 3 +
debian/patches/swt-compile-xpt.patch | 4 +-
debian/rules | 51 ++++++++++-----------
patches/eclipse-pde.build-add-package-build.patch | 8 ++--
patches/tooltip-color.patch | 47 +++++++++++++++++++
19 files changed, 211 insertions(+), 83 deletions(-)
diff --git a/build.properties b/build.properties
index b243dfb..ec76547 100644
--- a/build.properties
+++ b/build.properties
@@ -10,7 +10,6 @@ featureToBuild=eclipse-build-feature
skipBase=true
skipFetch=true
individualSourceBundles=true
-buildArch=x86
ws=gtk
os=linux
includeLaunchers=true
diff --git a/build.xml b/build.xml
index 94eca7c..faa1e89 100644
--- a/build.xml
+++ b/build.xml
@@ -53,6 +53,30 @@
<property name="productFiles" value="${buildConfig}/productFiles" />
<property name="reposource" value="${buildDirectory}/reposource" />
+ <!-- Determine host architecture -->
+ <exec executable="uname" outputproperty="uname-m">
+ <arg line="-m" />
+ </exec>
+ <condition property="hostArch" value="arm">
+ <matches pattern="arm*" string="${uname-m}"/>
+ </condition>
+ <condition property="hostArch" value="x86">
+ <matches pattern="i[0-9]*86" string="${uname-m}"/>
+ </condition>
+ <condition property="hostArch" value="PA_RISC">
+ <matches pattern="parisc*" string="${uname-m}"/>
+ </condition>
+ <condition property="hostArch" value="sparc">
+ <matches pattern="sparcv9" string="${uname-m}"/>
+ </condition>
+ <condition property="hostArch" value="${uname-m}">
+ <not><isset property="hostArch" /></not>
+ </condition>
+ <condition property="buildArch" value="${hostArch}">
+ <not><isset property="buildArch" /></not>
+ </condition>
+ <echo message="Build on ${hostArch} for ${buildArch}."/>
+
<property name="destDir" value="" />
<property name="prefix" value="/usr/local" />
<!-- Do we want /usr/lib64 if it's a 64-bit architecture? -->
@@ -260,6 +284,7 @@
<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
<symlink link="${buildDirectory}/plugins/org.eclipse.osgi.services/src/javax" resource="../../org.eclipse.equinox.io/src/javax/" />
<patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/tooltip-color.patch" dir="${buildDirectory}" strip="1" />
<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
<!-- end eclipse-build-only patches -->
diff --git a/debian/changelog b/debian/changelog
index 922d989..5d35da8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ eclipse (3.5.2-3ubuntu1~ppa1~4.gbp4cf94f) UNRELEASED; urgency=low
#540332)
* UNRELEASED
* Backported fix for hover text visability problem.
+ * Corrected a format issue in debian/copyright.
+ * Removed depends on cvs for eclipse-plugin-cvs, it is not needed.
+ (LP: #592508)
-- Niels Thykier <niels at thykier.net> Sat, 05 Jun 2010 16:56:57 +0200
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..a966fba
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+compression=bzip2
+upstream-branch=upstream-3.6
+debian-branch=master-3.6
diff --git a/debian/patches/bashism.patch b/debian/patches/bashism.patch
deleted file mode 100644
index 5b19224..0000000
--- a/debian/patches/bashism.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: eclipse/build/eclipse-3.5.2-src/installation/plugins/org.eclipse.pde.build_3.5.2.R35x_20100114/templates/package-build/prepare-build-dir.sh
-===================================================================
---- eclipse.orig/build/eclipse-3.5.2-src/installation/plugins/org.eclipse.pde.build_3.5.2.R35x_20100114/templates/package-build/prepare-build-dir.sh 2010-06-01 18:58:25.857923592 +0200
-+++ eclipse/build/eclipse-3.5.2-src/installation/plugins/org.eclipse.pde.build_3.5.2.R35x_20100114/templates/package-build/prepare-build-dir.sh 2010-06-01 19:02:10.853929638 +0200
-@@ -44,7 +44,7 @@
- PROJECTDIR=$(dirname "$f")
- inSDK=1
- inSDK=$(echo $PROJECTDIR | grep -c $BUILDDIR)
-- if [ $inSDK == 0 ]; then
-+ if [ $inSDK = 0 ]; then
- PROJECTNAME=$(ant -Dbasedir="$PROJECTDIR" -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
- ERROR=""
- if [ -z "$PROJECTNAME" ]; then
-@@ -57,7 +57,7 @@
- fi
-
- if [ "x$ERROR" != "xyes" ]; then
-- if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
-+ if [ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]; then
- echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
- ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
- fi
-@@ -72,7 +72,7 @@
- ERROR=""
- inSDK=1
- inSDK=$(echo $dir | grep -c $BUILDDIR)
-- if [ $inSDK == 0 ]; then
-+ if [ $inSDK = 0 ]; then
- if [ -e "$dir/META-INF/MANIFEST.MF" ]; then
- PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
- elif [ -e "$dir/plugin.xml" ]; then
-@@ -91,7 +91,7 @@
- fi
-
- if [ "x$ERROR" != "xyes" ]; then
-- if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
-+ if [ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]; then
- echo " making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
- ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
- fi
diff --git a/debian/patches/build-arch.patch b/debian/patches/build-arch.patch
new file mode 100644
index 0000000..3b1e662
--- /dev/null
+++ b/debian/patches/build-arch.patch
@@ -0,0 +1,47 @@
+Description: Determine build architecture automatically
+Author: Benjamin Drung <bdrung at ubuntu.com>
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=317391
+
+--- a/build.xml
++++ b/build.xml
+@@ -53,6 +53,30 @@
+ <property name="productFiles" value="${buildConfig}/productFiles" />
+ <property name="reposource" value="${buildDirectory}/reposource" />
+
++ <!-- Determine host architecture -->
++ <exec executable="uname" outputproperty="uname-m">
++ <arg line="-m" />
++ </exec>
++ <condition property="hostArch" value="arm">
++ <matches pattern="arm*" string="${uname-m}"/>
++ </condition>
++ <condition property="hostArch" value="x86">
++ <matches pattern="i[0-9]*86" string="${uname-m}"/>
++ </condition>
++ <condition property="hostArch" value="PA_RISC">
++ <matches pattern="parisc*" string="${uname-m}"/>
++ </condition>
++ <condition property="hostArch" value="sparc">
++ <matches pattern="sparcv9" string="${uname-m}"/>
++ </condition>
++ <condition property="hostArch" value="${uname-m}">
++ <not><isset property="hostArch" /></not>
++ </condition>
++ <condition property="buildArch" value="${hostArch}">
++ <not><isset property="buildArch" /></not>
++ </condition>
++ <echo message="Build on ${hostArch} for ${buildArch}."/>
++
+ <property name="destDir" value="" />
+ <property name="prefix" value="/usr/local" />
+ <!-- Do we want /usr/lib64 if it's a 64-bit architecture? -->
+--- a/build.properties
++++ b/build.properties
+@@ -10,7 +10,6 @@
+ skipBase=true
+ skipFetch=true
+ individualSourceBundles=true
+-buildArch=x86
+ ws=gtk
+ os=linux
+ includeLaunchers=true
diff --git a/debian/patches/compile-IPluginDescriptor.patch b/debian/patches/compile-IPluginDescriptor.patch
index 5e476ad..2ac11e4 100644
--- a/debian/patches/compile-IPluginDescriptor.patch
+++ b/debian/patches/compile-IPluginDescriptor.patch
@@ -4,7 +4,7 @@ Forwarded: no
--- a/build.xml
+++ b/build.xml
-@@ -336,6 +336,32 @@
+@@ -334,6 +334,32 @@
<zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
basedir="${basedir}/temp/"/>
<delete dir="${basedir}/temp/"/>
diff --git a/debian/patches/compile-jarinjarloader.patch b/debian/patches/compile-jarinjarloader.patch
index 11ae67d..db89ac0 100644
--- a/debian/patches/compile-jarinjarloader.patch
+++ b/debian/patches/compile-jarinjarloader.patch
@@ -12,7 +12,7 @@ Forwarded: no
<uptodate property="testspatch.complete" srcfile="testsunpack-stamp" targetfile="testspatch-stamp" />
<uptodate property="compilelibs.complete" srcfile="unpack-stamp" targetfile="compilelibs-stamp" />
<uptodate property="build.complete" srcfile="patch-stamp" targetfile="build-stamp" />
-@@ -322,7 +323,24 @@
+@@ -320,7 +321,24 @@
<echo file="symlinks-stamp" />
</target>
diff --git a/debian/patches/eclipse-manpage.patch b/debian/patches/eclipse-manpage.patch
index 0ce97dd..b840289 100644
--- a/debian/patches/eclipse-manpage.patch
+++ b/debian/patches/eclipse-manpage.patch
@@ -624,7 +624,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/494065
+</refentry>
--- a/build.xml
+++ b/build.xml
-@@ -753,6 +753,12 @@
+@@ -751,6 +751,12 @@
<!-- eclipse binary -->
<mkdir dir="${destDir}${prefix}/bin" />
<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
diff --git a/debian/patches/fix-bashism.patch b/debian/patches/fix-bashism.patch
new file mode 100644
index 0000000..326f7c8
--- /dev/null
+++ b/debian/patches/fix-bashism.patch
@@ -0,0 +1,43 @@
+Author: Adnan Hodzic <adnan at foolcontrol.org>
+Subject: Fix bashisms in Eclipse (in /bin/sh scripts)
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=581099
+Last-Update: 2010-06-18
+
+--- a/patches/eclipse-pde.build-add-package-build.patch
++++ b/patches/eclipse-pde.build-add-package-build.patch
+@@ -53,7 +53,7 @@
+ + PROJECTDIR=$(dirname "$f")
+ + inSDK=1
+ + inSDK=$(echo $PROJECTDIR | grep -c $BUILDDIR)
+-+ if [ $inSDK == 0 ]; then
+++ if [ $inSDK = 0 ]; then
+ + PROJECTNAME=$(ant -Dbasedir="$PROJECTDIR" -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
+ + ERROR=""
+ + if [ -z "$PROJECTNAME" ]; then
+@@ -66,7 +66,7 @@
+ + fi
+ +
+ + if [ "x$ERROR" != "xyes" ]; then
+-+ if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
+++ if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
+ + echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
+ + ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
+ + fi
+@@ -81,7 +81,7 @@
+ + ERROR=""
+ + inSDK=1
+ + inSDK=$(echo $dir | grep -c $BUILDDIR)
+-+ if [ $inSDK == 0 ]; then
+++ if [ $inSDK = 0 ]; then
+ + if [ -e "$dir/META-INF/MANIFEST.MF" ]; then
+ + PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
+ + elif [ -e "$dir/plugin.xml" ]; then
+@@ -100,7 +100,7 @@
+ + fi
+ +
+ + if [ "x$ERROR" != "xyes" ]; then
+-+ if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
+++ if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
+ + echo " making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
+ + ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
+ + fi
diff --git a/debian/patches/fix-shell-script-perm.patch b/debian/patches/fix-shell-script-perm.patch
index 9f8158f..66de83e 100644
--- a/debian/patches/fix-shell-script-perm.patch
+++ b/debian/patches/fix-shell-script-perm.patch
@@ -5,7 +5,7 @@ Applied-Upstream: no
--- a/build.xml
+++ b/build.xml
-@@ -250,6 +250,7 @@
+@@ -249,6 +249,7 @@
<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
diff --git a/debian/patches/fix-tooltip-color.patch b/debian/patches/fix-tooltip-color.patch
index 49448d1..26b0764 100644
--- a/debian/patches/fix-tooltip-color.patch
+++ b/debian/patches/fix-tooltip-color.patch
@@ -5,7 +5,7 @@ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/light-themes/+bug/540332
--- a/build.xml
+++ b/build.xml
-@@ -262,6 +262,7 @@
+@@ -260,6 +260,7 @@
<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
<symlink link="${buildDirectory}/plugins/org.eclipse.osgi.services/src/javax" resource="../../org.eclipse.equinox.io/src/javax/" />
<patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
diff --git a/debian/patches/osgi-services-symlink-javax.patch b/debian/patches/osgi-services-symlink-javax.patch
index 0aac59b..f015a21 100644
--- a/debian/patches/osgi-services-symlink-javax.patch
+++ b/debian/patches/osgi-services-symlink-javax.patch
@@ -4,8 +4,8 @@ Forwarded: No
--- a/build.xml
+++ b/build.xml
-@@ -260,6 +260,7 @@
- <patch patchfile="${basedir}/patches/swt_webkit.patch" dir="${buildDirectory}" strip="0" />
+@@ -258,6 +258,7 @@
+ <patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
+ <symlink link="${buildDirectory}/plugins/org.eclipse.osgi.services/src/javax" resource="../../org.eclipse.equinox.io/src/javax/" />
diff --git a/debian/patches/osgi-services.patch b/debian/patches/osgi-services.patch
index e67711c..a18f385 100644
--- a/debian/patches/osgi-services.patch
+++ b/debian/patches/osgi-services.patch
@@ -5,9 +5,9 @@ Applied-Upstream: no
--- a/build.xml
+++ b/build.xml
-@@ -257,6 +257,7 @@
+@@ -255,6 +255,7 @@
+ <patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="0" />
- <patch patchfile="${basedir}/patches/swt_webkit.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
diff --git a/debian/patches/series b/debian/patches/series
index f880501..3e6a6a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,6 @@ eclipse-build-generatedScripts.patch
osgi-services-symlink-javax.patch
ecj-gccmain-java.patch
fix-help-contents.patch
+fix-tooltip-color.patch
+fix-bashism.patch
+build-arch.patch
diff --git a/debian/patches/swt-compile-xpt.patch b/debian/patches/swt-compile-xpt.patch
index 0379d2d..a06caee 100644
--- a/debian/patches/swt-compile-xpt.patch
+++ b/debian/patches/swt-compile-xpt.patch
@@ -4,8 +4,8 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=304112
--- a/build.xml
+++ b/build.xml
-@@ -260,6 +260,7 @@
- <patch patchfile="${basedir}/patches/swt_webkit.patch" dir="${buildDirectory}" strip="0" />
+@@ -258,6 +258,7 @@
+ <patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
diff --git a/debian/rules b/debian/rules
index a9ec059..a11c1c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,40 +6,14 @@ export JAVA_HOME=/usr/lib/jvm/default-java
# different behaviour than Debian's uname.
export PATH:=$(CURDIR)/debian/extra/bin:$(PATH)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU),i386 i486 i586 i686))
- ECLIPSE_BUILD_ARCH=x86
-endif
-ifneq (,$(findstring $(DEB_HOST_ARCH_CPU),arm))
- ECLIPSE_BUILD_ARCH=arm
-endif
-ifeq ($(DEB_HOST_ARCH_CPU),amd64)
- ECLIPSE_BUILD_ARCH=x86_64
-endif
-ifneq (,$(findstring $(DEB_HOST_ARCH_CPU),mips))
- ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH)
-endif
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU),parisc parisc64))
- ECLIPSE_BUILD_ARCH=PA_RISC
-endif
-ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
- ECLIPSE_BUILD_ARCH=ppc
-endif
-ifeq ($(ECLIPSE_BUILD_ARCH),)
- ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH_CPU)
-endif
-
%:
dh --with xulrunner $@
override_dh_auto_clean:
ant distclean
-override_dh_auto_build:
- ant -DbuildArch=$(ECLIPSE_BUILD_ARCH)
-
override_dh_auto_install:
- ant install -Dprefix=/usr -DdestDir=$(CURDIR)/debian/tmp -DbuildArch=$(ECLIPSE_BUILD_ARCH)
+ ant install -Dprefix=/usr -DdestDir=$(CURDIR)/debian/tmp
JNI_SO_PATH = debian/eclipse-rcp/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp
LAUNCHER_LIB = debian/eclipse-rcp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher.*/eclipse_*.so
@@ -109,6 +83,29 @@ XULRUNNER_PATH := $(shell if test -d /usr/lib/xulrunner-$(shell $(XULRUNNER) --g
then echo '/usr/lib/xulrunner-$$($(XULRUNNER) --gre-version)'; \
else pkg-config --variable=sdkdir libxul | sed "s/-devel//"; fi)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+ifneq (,$(filter $(DEB_HOST_ARCH_CPU),i386 i486 i586 i686))
+ ECLIPSE_BUILD_ARCH=x86
+endif
+ifneq (,$(findstring $(DEB_HOST_ARCH_CPU),arm))
+ ECLIPSE_BUILD_ARCH=arm
+endif
+ifeq ($(DEB_HOST_ARCH_CPU),amd64)
+ ECLIPSE_BUILD_ARCH=x86_64
+endif
+ifneq (,$(findstring $(DEB_HOST_ARCH_CPU),mips))
+ ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH)
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH_CPU),parisc parisc64))
+ ECLIPSE_BUILD_ARCH=PA_RISC
+endif
+ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
+ ECLIPSE_BUILD_ARCH=ppc
+endif
+ifeq ($(ECLIPSE_BUILD_ARCH),)
+ ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH_CPU)
+endif
+
override_dh_install:
# Turn all following commands into patches and send them to eclipse-build
# Remove some bad arguments that causes eclipse to fail
diff --git a/patches/eclipse-pde.build-add-package-build.patch b/patches/eclipse-pde.build-add-package-build.patch
index f5998ce..d141306 100644
--- a/patches/eclipse-pde.build-add-package-build.patch
+++ b/patches/eclipse-pde.build-add-package-build.patch
@@ -53,7 +53,7 @@ diff -N templates/package-build/prepare-build-dir.sh
+ PROJECTDIR=$(dirname "$f")
+ inSDK=1
+ inSDK=$(echo $PROJECTDIR | grep -c $BUILDDIR)
-+ if [ $inSDK == 0 ]; then
++ if [ $inSDK = 0 ]; then
+ PROJECTNAME=$(ant -Dbasedir="$PROJECTDIR" -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
+ ERROR=""
+ if [ -z "$PROJECTNAME" ]; then
@@ -66,7 +66,7 @@ diff -N templates/package-build/prepare-build-dir.sh
+ fi
+
+ if [ "x$ERROR" != "xyes" ]; then
-+ if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
++ if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
+ echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
+ ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
+ fi
@@ -81,7 +81,7 @@ diff -N templates/package-build/prepare-build-dir.sh
+ ERROR=""
+ inSDK=1
+ inSDK=$(echo $dir | grep -c $BUILDDIR)
-+ if [ $inSDK == 0 ]; then
++ if [ $inSDK = 0 ]; then
+ if [ -e "$dir/META-INF/MANIFEST.MF" ]; then
+ PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
+ elif [ -e "$dir/plugin.xml" ]; then
@@ -100,7 +100,7 @@ diff -N templates/package-build/prepare-build-dir.sh
+ fi
+
+ if [ "x$ERROR" != "xyes" ]; then
-+ if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
++ if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
+ echo " making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
+ ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
+ fi
diff --git a/patches/tooltip-color.patch b/patches/tooltip-color.patch
new file mode 100644
index 0000000..3edcbd4
--- /dev/null
+++ b/patches/tooltip-color.patch
@@ -0,0 +1,47 @@
+diff -u -r1.25 ToolTip.java
+--- a/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java 2 Dec 2009 15:52:39 -0000
++++ b/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java 13 May 2010 15:59:10 -0000
+@@ -48,6 +48,7 @@
+ TrayItem item;
+ int x, y, timerId;
+ int /*long*/ layoutText = 0, layoutMessage = 0;
++ Color layoutTextColor, layoutMessageColor;
+ int [] borderPolygon;
+ boolean spikeAbove, autohide;
+
+@@ -498,6 +499,9 @@
+ x += IMAGE_SIZE;
+ }
+ x += INSET;
++ if (layoutTextColor != null) {
++ OS.gdk_gc_set_foreground(gdkGC, layoutTextColor.handle);
++ }
+ OS.gdk_draw_layout (window, gdkGC, x, y, layoutText);
+ int [] w = new int [1], h = new int [1];
+ OS.pango_layout_get_size (layoutText, w, h);
+@@ -505,6 +509,9 @@
+ }
+ if (layoutMessage != 0) {
+ x = BORDER + PADDING + INSET;
++ if (layoutMessageColor != null) {
++ OS.gdk_gc_set_foreground(gdkGC, layoutMessageColor.handle);
++ }
+ OS.gdk_draw_layout (window, gdkGC, x, y, layoutMessage);
+ }
+ OS.g_object_unref (gdkGC);
+@@ -708,6 +715,7 @@
+ if (layoutMessage != 0) OS.g_object_unref (layoutMessage);
+ layoutMessage = 0;
+ if (message.length () != 0) {
++ layoutMessageColor = display.getSystemColor(SWT.COLOR_INFO_FOREGROUND);
+ byte [] buffer = Converter.wcsToMbcs (null, message, true);
+ layoutMessage = OS.gtk_widget_create_pango_layout (handle, buffer);
+ if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
+@@ -739,6 +747,7 @@
+ if (layoutText != 0) OS.g_object_unref (layoutText);
+ layoutText = 0;
+ if (text.length () != 0) {
++ layoutTextColor = display.getSystemColor(SWT.COLOR_INFO_FOREGROUND);
+ byte [] buffer = Converter.wcsToMbcs (null, text, true);
+ layoutText = OS.gtk_widget_create_pango_layout (handle, buffer);
+ if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list