------------------------------------------------------------
revno: 990
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-01-06 19:11:02 +0100
message:
ooo-build update; minor merge from 2.4 and Ubuntu
added:
openoffice.org-base-core.overrides.lintian
modified:
changelog
rules
=== added file 'openoffice.org-base-core.overrides.lintian'
--- a/openoffice.org-base-core.overrides.lintian 1970-01-01 00:00:00
+0000
+++ b/openoffice.org-base-core.overrides.lintian 2008-01-06 18:11:02
+0000
@@ -0,0 +1,1 @@
+openoffice.org-base-core: binary-or-shlib-defines-rpath
=== modified file 'changelog'
--- a/changelog 2008-01-04 23:44:13 +0000
+++ b/changelog 2008-01-06 18:11:02 +0000
@@ -1,3 +1,17 @@
+openoffice.org (1:2.3.1-3.4pre) unstable; urgency=low
+
+ * ooo-build:
+ - update (r11201)
+ + enable jawt-check.cleanup.diff again (closes: #441202)
+ * debian/openoffice.org-base-core.overrides.lintian:
+ - override RPATH warning
+ * merge from Ubuntu:
+ - debian/ruleS:
+ + make -gcj depend on libhsqldb-java-gcj
+ + some minor parallel build conditional improvements
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 06 Jan 2008 19:00:03 +0100
+
openoffice.org (1:2.3.1-3) unstable; urgency=low
* debian/control.in:
=== modified file 'rules'
--- a/rules 2007-12-28 14:06:31 +0000
+++ b/rules 2008-01-06 18:11:02 +0000
@@ -644,6 +644,9 @@
BUILD_DEPS += , libhsqldb-java (>= 1.8.0.9-1) [$(OOO_JAVA_ARCHS)]
BASE_HSQLDB_DEPENDS = libhsqldb-java (>= 1.8.0.9-1)
CONFIGURE_FLAGS+= --with-system-hsqldb
+ ifneq "$(ETCH_BACKPORT)" "y"
+ JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj
+ endif
endif
ifeq "$(USE_SYSTEM_BSH)" "y"
BUILD_DEPS += , bsh (>= 2.0b4-1) [$(OOO_JAVA_ARCHS)]
@@ -722,14 +725,13 @@
# Build n projects in parallel?
# DEB_BUILD_OPTIONS=parallel=<n>
NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n
's/^\(.*,\)\?parallel=\([0-9]\+\).*$$/\2/p')
+AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
ifeq "$(NUM_CPUS)" ""
NUM_CPUS := 1
ifeq "$(PARALLEL_BUILD)" "y"
- AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
# according to Pavel Janik, build -P<number of cores> -- -P2
# is ideal. This sets the first -P according to the number
# of CPUs (where dual-core CPUS report 2, too)
- # Default to 2 on 1-processor machines anyway
ifneq ($(AVAIL_CPUS),1)
NUM_CPUS := $(shell expr $(AVAIL_CPUS))
endif
