------------------------------------------------------------
revno: 1058
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-04-27 01:17:58 +0200
message:
- support default-jdk-builddep, begin support of openjdk-6-jdk for
building, still default to java-gcj-compat-dev
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-04-26 23:02:50 +0000
+++ b/changelog 2008-04-26 23:17:58 +0000
@@ -4,7 +4,7 @@
- Base now doesn't quit anymore on "recently used files" in the wizard
when those got deleted/moved (closes: #452810)
* ooo-build:
- - update (r12321)
+ - update (r12336)
* debian/template.desktop.in: move to ..
* debian/startcenter.desktop.in: .. this and run ooffice now, which
will bring us to the new StartCenter. Reuse writers icon.
@@ -19,6 +19,8 @@
extension
- remove scsolver conditionals, not disableabe in Suns version.
Remove obsolete mvs
+ - support default-jdk-builddep, begin support of openjdk-6-jdk for
+ building, still default to java-gcj-compat-dev
* debian/rules, debian/control.in:
- split emailmerge out into an own package. Don't make -writer depend on
python-uno anymore so that -writer (and openoffice.org) still can be
@@ -39,7 +41,7 @@
* debian/copyright: LGPL v3
* debian/scripts/vars.*: add PLATFORMID (not kfreebsd-* yet...)
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 24 Apr 2008 18:02:28 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 27 Apr 2008 00:46:02 +0200
openoffice.org (1:2.4.0-5.6pre) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-04-26 23:02:50 +0000
+++ b/rules 2008-04-26 23:17:58 +0000
@@ -91,6 +91,7 @@
BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
+JDK=java-gcj-compat-dev
ENABLE_MONO=y
MONO_MINVER= (>= 1.2.3)
USE_SYSTEM_HUNSPELL=y
@@ -532,9 +533,19 @@
endif
ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(JDK)" "default"
+ JAVA_HOME=/usr/lib/jvm/default-java
+ BUILD_DEPS += , default-jdk-builddep [$(OOO_JAVA_ARCHS)]
+ endif
+ ifeq "$(JDK)" "java-gcj-compat"
JAVA_HOME=/usr/lib/jvm/java-gcj
+ endif
+ ifeq "$(JDK)" "openjdk"
+ BUILD_DEPS += , openjdk-6-jdk [$(OOO_JAVA_ARCHS)]
+ JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+ endif
+ ifeq "$(BUILD_JARS_NATIVE)" "y"
CONFIGURE_FLAGS += --enable-gcjaot
- ifeq "$(BUILD_JARS_NATIVE)" "y"
ifneq "$(ETCH_BACKPORT)" "y"
BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.76-7) [$(OOO_JAVA_ARCHS)],
libgcj-bc [$(OOO_JAVA_ARCHS)]
else
