Author: doko
Date: 2006-08-13 18:51:36 +0000 (Sun, 13 Aug 2006)
New Revision: 2332
Added:
trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/control
trunk/eclipse/debian/control.in
trunk/eclipse/debian/extra/eclipse.sh
trunk/eclipse/debian/rules
Log:
- upload to experimental
* Build-depend on java-gcj-compat-dev (>= 1.0.61).
* debian/rules: Do not apply the eclipse-libjawt patch for the experimental
build.
* debian/patches/eclipse-awt-libpath.dpatch: Set AWT_LIB_PATH.
* debian/extra/eclipse.sh: Ignore the fact, that the package doesn't work
with Mozilla; everything but the help should work.
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2006-08-03 14:58:48 UTC (rev 2331)
+++ trunk/eclipse/debian/changelog 2006-08-13 18:51:36 UTC (rev 2332)
@@ -1,4 +1,4 @@
-eclipse (3.1.2-3) UNRELEASED; urgency=low
+eclipse (3.1.2-3) experimental; urgency=low
[ Michael Koch ]
* debian/rules: Added support to build with xulrunner. Made it the default.
@@ -22,8 +22,16 @@
* debian/extra/ecj-gcj.1, debian/extra/ecj-java.1: Revised.
* debian/extra/efj.1, debian/eclipse-efj.manpages: New manpage for efj.
- -- Michael Koch <[EMAIL PROTECTED]> Sat, 29 Jul 2006 14:15:36 +0000
+ [ Matthias Klose ]
+ * Build-depend on java-gcj-compat-dev (>= 1.0.61).
+ * debian/rules: Do not apply the eclipse-libjawt patch for the experimental
+ build.
+ * debian/patches/eclipse-awt-libpath.dpatch: Set AWT_LIB_PATH.
+ * debian/extra/eclipse.sh: Ignore the fact, that the package doesn't work
+ with Mozilla; everything but the help should work.
+ -- Matthias Klose <[EMAIL PROTECTED]> Sun, 13 Aug 2006 15:22:24 +0200
+
eclipse (3.1.2-2) unstable; urgency=low
[ Michael Koch ]
Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control 2006-08-03 14:58:48 UTC (rev 2331)
+++ trunk/eclipse/debian/control 2006-08-13 18:51:36 UTC (rev 2332)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
Uploaders: Jerry Haltom <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>,
Matthias Klose <[EMAIL PROTECTED]>, Stephan Michels <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2,
sharutils, java-gcj-compat-dev (>= 1.0.54), 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, classpath-doc, pkg-config,
libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5-java, libxul-dev
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2,
sharutils, java-gcj-compat-dev (>= 1.0.61), 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, classpath-doc, pkg-config,
libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5-java, libxul-dev
Standards-Version: 3.7.2
Package: eclipse-rcp
Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in 2006-08-03 14:58:48 UTC (rev 2331)
+++ trunk/eclipse/debian/control.in 2006-08-13 18:51:36 UTC (rev 2332)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
Uploaders: Jerry Haltom <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>,
Matthias Klose <[EMAIL PROTECTED]>, Stephan Michels <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2,
sharutils, java-gcj-compat-dev (>= 1.0.54), 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, classpath-doc, pkg-config, [EMAIL
PROTECTED]@
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2,
sharutils, java-gcj-compat-dev (>= 1.0.61), 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, classpath-doc, pkg-config, [EMAIL
PROTECTED]@
Standards-Version: 3.7.2
Package: eclipse-rcp
Modified: trunk/eclipse/debian/extra/eclipse.sh
===================================================================
--- trunk/eclipse/debian/extra/eclipse.sh 2006-08-03 14:58:48 UTC (rev
2331)
+++ trunk/eclipse/debian/extra/eclipse.sh 2006-08-13 18:51:36 UTC (rev
2332)
@@ -137,13 +137,19 @@
export MOZILLA_FIVE_HOME=/usr/lib/mozilla-firefox
fi
# now forget everything ... everything besides mozilla doesn't work
-if [ "$MOZILLA_FIVE_HOME" != "/usr/lib/mozilla" ]; then
+if false && [ "$MOZILLA_FIVE_HOME" != "/usr/lib/mozilla" ]; then
$DIALOG \
--error \
--title="Could not launch Eclipse Platform" \
--text="Eclipse currently only works with the mozilla browser.
Please make sure that the package mozilla-browser is installed and
MOZILLA_FIVE_HOME is either unset or points to /usr/lib/mozilla"
exit 1
fi
+if [ "$MOZILLA_FIVE_HOME" != "/usr/lib/mozilla" ]; then
+ $DIALOG \
+ --error \
+ --title="Could not launch Eclipse Platform" \
+ --text="Eclipse currently only works with the mozilla browser.
Please make sure that the package mozilla-browser is installed and
MOZILLA_FIVE_HOME is either unset or points to /usr/lib/mozilla. Ignoring this
error for the upload to experimental"
+fi
# libraries from the mozilla choosen take precedence
LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
Added: trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch 2006-08-03
14:58:48 UTC (rev 2331)
+++ trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch 2006-08-13
18:51:36 UTC (rev 2332)
@@ -0,0 +1,43 @@
+#! /bin/sh -e
+##
+## DP: Debian specific patch, converted from eclipse-awt-libpath.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
+
[EMAIL PROTECTED]@
+--- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh~
2006-08-13 15:56:59.639482784 +0200
++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
2006-08-13 16:49:26.615069776 +0200
+@@ -52,7 +52,7 @@
+ if [ "${JAVA_HOME}" = "" ]; then
+
JAVA_HOME=/bluebird/teamswt/swt-builddir/IBMJava2-141
+ fi
+- AWT_LIB_PATH=$JAVA_HOME/jre/bin
++ AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386
+ XTEST_LIB_PATH=/usr/X11R6/lib
+ if [ "${GECKO_SDK}" = "" ]; then
+
GECKO_SDK=/mozilla/mozilla/1.4/linux_gtk2/mozilla/dist/sdk
+@@ -69,7 +69,7 @@
+ if [ "${JAVA_HOME}" = "" ]; then
+ JAVA_HOME=/opt/IBMJava2-ppc-142
+ fi
+- AWT_LIB_PATH=$JAVA_HOME/jre/bin
++ AWT_LIB_PATH=$JAVA_HOME/jre/lib/powerpc
+ XTEST_LIB_PATH=/usr/X11R6/lib
+
OUTPUT_DIR=../../../org.eclipse.swt.gtk.linux.ppc
+ makefile="make_linux.mak"
Property changes on: trunk/eclipse/debian/patches/eclipse-awt-libpath.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2006-08-03 14:58:48 UTC (rev 2331)
+++ trunk/eclipse/debian/rules 2006-08-13 18:51:36 UTC (rev 2332)
@@ -121,7 +121,6 @@
eclipse-fileinitializer \
eclipse-gnuformatterjdt \
eclipse-icon \
- eclipse-libjawt \
eclipse-libswt-cairo1.0 \
eclipse-disable-filelog \
eclipse-libswt-enableall \
@@ -141,7 +140,9 @@
eclipse-public-applypatch \
eclipse-heapstatus \
eclipse-java-home \
+ eclipse-awt-libpath \
+# eclipse-libjawt \
# eclipse-java-model-cache \
ifeq ($(with_tomcat),yes)
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
