r1707 - in trunk/eclipse/debian: . patches
Matthias Klose
doko at costa.debian.org
Sat Jan 21 18:38:11 UTC 2006
Author: doko
Date: 2006-01-21 18:38:10 +0000 (Sat, 21 Jan 2006)
New Revision: 1707
Added:
trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/control
trunk/eclipse/debian/control.in
trunk/eclipse/debian/rules
Log:
* Add support to build using firefox-dev (turned off by default).
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2006-01-21 18:01:17 UTC (rev 1706)
+++ trunk/eclipse/debian/changelog 2006-01-21 18:38:10 UTC (rev 1707)
@@ -1,4 +1,4 @@
-eclipse (3.1.1-9) unstable; urgency=low
+eclipse (3.1.1-9) UNRELEASED; urgency=low
[ Michael Koch ]
* debian/extra/eclipse.sh: Made the -vm option working.
@@ -7,8 +7,11 @@
* debian/extra/eclipse.sh: Make the -vmargs and -install
arguments usable. Closes: #347749
- -- Stephan Michels <stephan at apache.org> Thu, 12 Jan 2006 14:44:53 +0100
+ [ Matthias Klose ]
+ * Add support to build using firefox-dev (turned off by default).
+ -- Stephan Michels <stephan at apache.org> Sat, 21 Jan 2006 19:37:24 +0100
+
eclipse (3.1.1-8) unstable; urgency=low
* debian/eclipse-platform.preinst: Make /usr/lib/eclipse/features a real
Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control 2006-01-21 18:01:17 UTC (rev 1706)
+++ trunk/eclipse/debian/control 2006-01-21 18:38:10 UTC (rev 1707)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>, Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, unzip, sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, mozilla-dev, gjdoc (>= 0.7.7), classpath-doc, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5-java
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, unzip, sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, gjdoc (>= 0.7.7), classpath-doc, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5-java, mozilla-dev
Standards-Version: 3.6.2
Package: eclipse-rcp
Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in 2006-01-21 18:01:17 UTC (rev 1706)
+++ trunk/eclipse/debian/control.in 2006-01-21 18:38:10 UTC (rev 1707)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>, Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, unzip, sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, mozilla-dev, gjdoc (>= 0.7.7), classpath-doc, libcairo2-dev at BUILD_DEPS@
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, unzip, sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, gjdoc (>= 0.7.7), classpath-doc, libcairo2-dev at BUILD_DEPS@
Standards-Version: 3.6.2
Package: eclipse-rcp
@@ -233,7 +233,7 @@
Package: libswt3.1-gtk-java
Architecture: any
-Depends: libswt3.1-gtk-jni (= ${Source-Version}), mozilla-browser (>= 2:1.7.0) | mozilla-firefox (>= 1.0.7) | firefox (>= 1.4.99), java-common
+Depends: libswt3.1-gtk-jni (= ${Source-Version}), @MOZILLA_DEP@, java-common
Replaces: libswt2.1-gtk2-java, libswt-gtk3-java
Conflicts: libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.1-java
Description: Fast and rich GUI toolkit for Java, gtk2 version
Added: trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch 2006-01-21 18:01:17 UTC (rev 1706)
+++ trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch 2006-01-21 18:38:10 UTC (rev 1707)
@@ -0,0 +1,254 @@
+#! /bin/sh -e
+##
+## DP: Debian specific patch, converted from eclipse-libswt-mozilla.patch
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch)
+ patch $patch_opts -p0 < $0;;
+ -unpatch)
+ patch $patch_opts -p0 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+exit 0
+
+ at DPATCH@
+--- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2005-03-03 10:02:42.072310342 -0500
++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2005-03-03 10:14:53.994542649 -0500
+@@ -24,6 +24,20 @@
+
+ case $OS in
+ "Linux")
++ GECKO_INCLUDES="\
++ -include mozilla-config.h \
++ -I/usr/include/mozilla-firefox \
++ -I/usr/include/mozilla-firefox/xpcom \
++ -I/usr/include/mozilla-firefox/string \
++ -I/usr/include/mozilla-firefox/nspr \
++ -I/usr/include/mozilla-firefox/embed_base \
++ -I/usr/include/mozilla-firefox/gfx"
++ GECKO_LIBS="\
++ -L/usr/lib/mozilla-firefox \
++ -L/usr/lib/mozilla-firefox/components \
++ -lgtkembedmoz -lxpcom"
++ # Set this to something to override the presets
++ GECKO_SDK="_"
+ case $MODEL in
+ "x86_64")
+ CC=gcc
+--- source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64/src/Eclipse SWT PI/gtk/library/build.sh.orig 2006-01-07 18:13:17.104814056 +0100
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64/src/Eclipse SWT PI/gtk/library/build.sh 2006-01-07 18:38:27.740162576 +0100
+@@ -25,15 +25,15 @@
+ "Linux")
+ GECKO_INCLUDES="\
+ -include mozilla-config.h \
+- -I/usr/include/mozilla \
+- -I/usr/include/mozilla/xpcom \
+- -I/usr/include/mozilla/string \
+- -I/usr/include/mozilla/nspr \
+- -I/usr/include/mozilla/embed_base \
+- -I/usr/include/mozilla/gfx"
++ -I/usr/include/mozilla-firefox \
++ -I/usr/include/mozilla-firefox/xpcom \
++ -I/usr/include/mozilla-firefox/string \
++ -I/usr/include/mozilla-firefox/nspr \
++ -I/usr/include/mozilla-firefox/embed_base \
++ -I/usr/include/mozilla-firefox/gfx"
+ GECKO_LIBS="\
+- -L/usr/lib/mozilla \
+- -L/usr/lib/mozilla/components \
++ -L/usr/lib/mozilla-firefox \
++ -L/usr/lib/mozilla-firefox/components \
+ -lgtkembedmoz -lxpcom"
+ # Set this to something to override the presets
+ GECKO_SDK="_"
+--- source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64/src/bin/library/build.sh.orig 2006-01-07 18:19:38.094894760 +0100
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.x86_64/src/bin/library/build.sh 2006-01-07 18:38:27.796154064 +0100
+@@ -25,15 +25,15 @@
+ "Linux")
+ GECKO_INCLUDES="\
+ -include mozilla-config.h \
+- -I/usr/include/mozilla \
+- -I/usr/include/mozilla/xpcom \
+- -I/usr/include/mozilla/string \
+- -I/usr/include/mozilla/nspr \
+- -I/usr/include/mozilla/embed_base \
+- -I/usr/include/mozilla/gfx"
++ -I/usr/include/mozilla-firefox \
++ -I/usr/include/mozilla-firefox/xpcom \
++ -I/usr/include/mozilla-firefox/string \
++ -I/usr/include/mozilla-firefox/nspr \
++ -I/usr/include/mozilla-firefox/embed_base \
++ -I/usr/include/mozilla-firefox/gfx"
+ GECKO_LIBS="\
+- -L/usr/lib/mozilla \
+- -L/usr/lib/mozilla/components \
++ -L/usr/lib/mozilla-firefox \
++ -L/usr/lib/mozilla-firefox/components \
+ -lgtkembedmoz -lxpcom"
+ # Set this to something to override the presets
+ GECKO_SDK="_"
+--- source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/src/Eclipse SWT PI/gtk/library/build.sh.orig 2006-01-07 18:14:25.647394000 +0100
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/src/Eclipse SWT PI/gtk/library/build.sh 2006-01-07 18:38:27.832148592 +0100
+@@ -25,15 +25,15 @@
+ "Linux")
+ GECKO_INCLUDES="\
+ -include mozilla-config.h \
+- -I/usr/include/mozilla \
+- -I/usr/include/mozilla/xpcom \
+- -I/usr/include/mozilla/string \
+- -I/usr/include/mozilla/nspr \
+- -I/usr/include/mozilla/embed_base \
+- -I/usr/include/mozilla/gfx"
++ -I/usr/include/mozilla-firefox \
++ -I/usr/include/mozilla-firefox/xpcom \
++ -I/usr/include/mozilla-firefox/string \
++ -I/usr/include/mozilla-firefox/nspr \
++ -I/usr/include/mozilla-firefox/embed_base \
++ -I/usr/include/mozilla-firefox/gfx"
+ GECKO_LIBS="\
+- -L/usr/lib/mozilla \
+- -L/usr/lib/mozilla/components \
++ -L/usr/lib/mozilla-firefox \
++ -L/usr/lib/mozilla-firefox/components \
+ -lgtkembedmoz -lxpcom"
+ # Set this to something to override the presets
+ GECKO_SDK="_"
+--- source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/src/bin/library/build.sh.orig 2006-01-07 18:19:30.367069568 +0100
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/src/bin/library/build.sh 2006-01-07 18:38:28.719013768 +0100
+@@ -25,15 +25,15 @@
+ "Linux")
+ GECKO_INCLUDES="\
+ -include mozilla-config.h \
+- -I/usr/include/mozilla \
+- -I/usr/include/mozilla/xpcom \
+- -I/usr/include/mozilla/string \
+- -I/usr/include/mozilla/nspr \
+- -I/usr/include/mozilla/embed_base \
+- -I/usr/include/mozilla/gfx"
++ -I/usr/include/mozilla-firefox \
++ -I/usr/include/mozilla-firefox/xpcom \
++ -I/usr/include/mozilla-firefox/string \
++ -I/usr/include/mozilla-firefox/nspr \
++ -I/usr/include/mozilla-firefox/embed_base \
++ -I/usr/include/mozilla-firefox/gfx"
+ GECKO_LIBS="\
+- -L/usr/lib/mozilla \
+- -L/usr/lib/mozilla/components \
++ -L/usr/lib/mozilla-firefox \
++ -L/usr/lib/mozilla-firefox/components \
+ -lgtkembedmoz -lxpcom"
+ # Set this to something to override the presets
+ GECKO_SDK="_"
+--- source-tree/plugins/org.eclipse.swt.gtk.linux.ppc/src/Eclipse SWT PI/gtk/library/build.sh.orig 2006-01-07 18:13:35.917954024 +0100
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.ppc/src/Eclipse SWT PI/gtk/library/build.sh 2006-01-07 18:38:28.753008600 +0100
+@@ -25,15 +25,15 @@
+ "Linux")
+ GECKO_INCLUDES="\
+ -include mozilla-config.h \
+- -I/usr/include/mozilla \
+- -I/usr/include/mozilla/xpcom \
+- -I/usr/include/mozilla/string \
+- -I/usr/include/mozilla/nspr \
+- -I/usr/include/mozilla/embed_base \
+- -I/usr/include/mozilla/gfx"
++ -I/usr/include/mozilla-firefox \
++ -I/usr/include/mozilla-firefox/xpcom \
++ -I/usr/include/mozilla-firefox/string \
++ -I/usr/include/mozilla-firefox/nspr \
++ -I/usr/include/mozilla-firefox/embed_base \
++ -I/usr/include/mozilla-firefox/gfx"
+ GECKO_LIBS="\
+- -L/usr/lib/mozilla \
+- -L/usr/lib/mozilla/components \
++ -L/usr/lib/mozilla-firefox \
++ -L/usr/lib/mozilla-firefox/components \
+ -lgtkembedmoz -lxpcom"
+ # Set this to something to override the presets
+ GECKO_SDK="_"
+--- source-tree/plugins/org.eclipse.swt.gtk.linux.ppc/src/bin/library/build.sh.orig 2006-01-07 18:19:47.201510344 +0100
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.ppc/src/bin/library/build.sh 2006-01-07 18:38:28.788003280 +0100
+@@ -25,15 +25,15 @@
+ "Linux")
+ GECKO_INCLUDES="\
+ -include mozilla-config.h \
+- -I/usr/include/mozilla \
+- -I/usr/include/mozilla/xpcom \
+- -I/usr/include/mozilla/string \
+- -I/usr/include/mozilla/nspr \
+- -I/usr/include/mozilla/embed_base \
+- -I/usr/include/mozilla/gfx"
++ -I/usr/include/mozilla-firefox \
++ -I/usr/include/mozilla-firefox/xpcom \
++ -I/usr/include/mozilla-firefox/string \
++ -I/usr/include/mozilla-firefox/nspr \
++ -I/usr/include/mozilla-firefox/embed_base \
++ -I/usr/include/mozilla-firefox/gfx"
+ GECKO_LIBS="\
+- -L/usr/lib/mozilla \
+- -L/usr/lib/mozilla/components \
++ -L/usr/lib/mozilla-firefox \
++ -L/usr/lib/mozilla-firefox/components \
+ -lgtkembedmoz -lxpcom"
+ # Set this to something to override the presets
+ GECKO_SDK="_"
+--- source-tree/plugins/org.eclipse.swt.gtk.linux.x86/src/Eclipse SWT PI/gtk/library/build.sh.orig 2006-01-07 18:13:57.623654256 +0100
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.x86/src/Eclipse SWT PI/gtk/library/build.sh 2006-01-07 18:38:28.822997960 +0100
+@@ -25,15 +25,15 @@
+ "Linux")
+ GECKO_INCLUDES="\
+ -include mozilla-config.h \
+- -I/usr/include/mozilla \
+- -I/usr/include/mozilla/xpcom \
+- -I/usr/include/mozilla/string \
+- -I/usr/include/mozilla/nspr \
+- -I/usr/include/mozilla/embed_base \
+- -I/usr/include/mozilla/gfx"
++ -I/usr/include/mozilla-firefox \
++ -I/usr/include/mozilla-firefox/xpcom \
++ -I/usr/include/mozilla-firefox/string \
++ -I/usr/include/mozilla-firefox/nspr \
++ -I/usr/include/mozilla-firefox/embed_base \
++ -I/usr/include/mozilla-firefox/gfx"
+ GECKO_LIBS="\
+- -L/usr/lib/mozilla \
+- -L/usr/lib/mozilla/components \
++ -L/usr/lib/mozilla-firefox \
++ -L/usr/lib/mozilla-firefox/components \
+ -lgtkembedmoz -lxpcom"
+ # Set this to something to override the presets
+ GECKO_SDK="_"
+--- source-tree/plugins/org.eclipse.swt.gtk.linux.x86/src/bin/library/build.sh.orig 2006-01-07 18:19:54.694371256 +0100
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.x86/src/bin/library/build.sh 2006-01-07 18:38:28.872990360 +0100
+@@ -25,15 +25,15 @@
+ "Linux")
+ GECKO_INCLUDES="\
+ -include mozilla-config.h \
+- -I/usr/include/mozilla \
+- -I/usr/include/mozilla/xpcom \
+- -I/usr/include/mozilla/string \
+- -I/usr/include/mozilla/nspr \
+- -I/usr/include/mozilla/embed_base \
+- -I/usr/include/mozilla/gfx"
++ -I/usr/include/mozilla-firefox \
++ -I/usr/include/mozilla-firefox/xpcom \
++ -I/usr/include/mozilla-firefox/string \
++ -I/usr/include/mozilla-firefox/nspr \
++ -I/usr/include/mozilla-firefox/embed_base \
++ -I/usr/include/mozilla-firefox/gfx"
+ GECKO_LIBS="\
+- -L/usr/lib/mozilla \
+- -L/usr/lib/mozilla/components \
++ -L/usr/lib/mozilla-firefox \
++ -L/usr/lib/mozilla-firefox/components \
+ -lgtkembedmoz -lxpcom"
+ # Set this to something to override the presets
+ GECKO_SDK="_"
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2006-01-21 18:01:17 UTC (rev 1706)
+++ trunk/eclipse/debian/rules 2006-01-21 18:38:10 UTC (rev 1707)
@@ -67,11 +67,6 @@
ANT_DEP := ant-optional (>= 1.6.5-3)
BUILD_DEPS += , ant-optional (>= 1.6.5-3)
-#ifeq ($(DISTRIBUTION),Ubuntu)
-# ANT_DEP := ant (>= 1.6.5)
-# BUILD_DEPS += , ant (>= 1.6.5)
-#endif
-
# Generic VM compilation.
JVM_CLASSPATH=
JVM_COMPILER=gcj
@@ -101,14 +96,14 @@
EXTRA=$(CURDIR)/debian/extra
with_tomcat := yes
-#ifeq ($(DISTRIBUTION),Ubuntu)
-# with_tomcat := disabled
-#endif
ifeq ($(with_tomcat),yes)
TOMCAT_DEP = libtomcat5-java
BUILD_DEPS += , libtomcat5-java
endif
+with_browser := mozilla
+#with_browser := firefox
+
with_dpatch = yes
#with_dpatch = no
@@ -127,7 +122,6 @@
eclipse-libswt-cairo1.0 \
eclipse-disable-filelog \
eclipse-libswt-enableall \
- eclipse-libswt-mozilla \
eclipse-swt-cflags \
eclipse-libupdatebuild \
eclipse-libupdatebuild2 \
@@ -151,11 +145,26 @@
eclipse-disable-tomcat
endif
+ifeq ($(with_browser),mozilla)
+ eclipse_patches += \
+ eclipse-libswt-mozilla
+ BUILD_DEPS += , mozilla-dev
+ MOZILLA_DEP = mozilla-browser (>= 2:1.7.0) | firefox (>= 1.4.99) | mozilla-firefox (>= 1.0.7)
+endif
+
+ifeq ($(with_browser),firefox)
+ eclipse_patches += \
+ eclipse-libswt-firefox
+ BUILD_DEPS += , firefox-dev
+ MOZILLA_DEP = firefox (>= 1.4.99) | mozilla-browser (>= 2:1.7.0) | mozilla-firefox (>= 1.0.7)
+endif
+
export PATCHLIST = $(eclipse_patches)
debian/control: debian/control.in debian/rules
sed -e 's/@ANT_DEP@/$(ANT_DEP)/g' \
-e 's/@TOMCAT_DEP@/$(TOMCAT_DEP)/g' \
+ -e 's/@MOZILLA_DEP@/$(MOZILLA_DEP)/g' \
-e 's/@BUILD_DEPS@/$(BUILD_DEPS)/g' \
-e 's, at SECTION_PREFIX@,$(SECTION_PREFIX),g' \
-e 's/ ,/,/g' \
More information about the pkg-java-commits
mailing list