./packages/openofficeorg/3.1/experimental r1450: m6; add libcommons-logging-java also to REPORT_BUILDER_JAR_DEPENDS explicitely, build with system alloc again
------------------------------------------------------------
revno: 1450
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Wed 2009-03-18 00:22:22 +0100
message:
m6; add libcommons-logging-java also to REPORT_BUILDER_JAR_DEPENDS explicitely, build with system alloc again
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-03-17 12:06:39 +0000
+++ b/changelog 2009-03-17 23:22:22 +0000
@@ -1,6 +1,6 @@
-openoffice.org (1:3.1.0~ooo310m5-1) experimental; urgency=low
+openoffice.org (1:3.1.0~ooo310m6-1) UNRELEASED; urgency=low
- * OpenOffice.org 3.1.0 development snapshot OOO310_m5
+ * OpenOffice.org 3.1.0 development snapshot OOO310_m6
- build without -march=armv5te for arm (closes: #501957)
- lbnames.h supports gcc 4.4 (closes: #505669)
- now has overline supports for word (closes: #228392)
@@ -43,8 +43,6 @@
(closes: #517335)r
- update pentaho libs (build-)depends to the -OOo31 versions
- enable ca and fi help
- - when enabling the report builder, temporarily build with internal
- allocator until issue 100219 is fixed
* debian/control*in:
- update for new sections:
- -dbg -> debug, -l10n-* -> localization, -officebean -> java,
@@ -66,7 +64,7 @@
- update
- migrate to http://wiki.debian.org/Proposals/CopyrightFormat format
- -- Rene Engelhard <rene@debian.org> Tue, 17 Mar 2009 10:49:46 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 17 Mar 2009 15:25:34 +0100
openoffice.org (1:3.0.1-6) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2009-03-17 09:50:40 +0000
+++ b/rules 2009-03-17 23:22:22 +0000
@@ -20,8 +20,8 @@
BINARY_VERSION=$(SOURCE_VERSION)
#BINARY_VERSION=1:2.4.0-$(shell dpkg-parsechangelog | grep urgency \
| awk '{print $$2}' | sed -e s/"("// -e s/")"// | cut -d"-" -f2)
-HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
-#HELP_L10N_VIRTUAL_VERSION:=3.1
+#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
+HELP_L10N_VIRTUAL_VERSION:=3.1
#VER:=3
OOVER:=3.1
@@ -221,10 +221,6 @@
ENABLE_GRAPHITE=n
USE_SYSTEM_GRAPHITE=y
ALLOC=system
-# until issue 100219 is fixed
-ifeq "$(ENABLE_REPORTDESIGN)" "y"
- ALLOC=internal
-endif
# when we have a package we want to have to be installed on older things with some older
# C++ ABI (like it was the case with openoffice.org2), we need to set this. Don't touch
@@ -676,6 +672,7 @@
endif
ifeq "$(USE_SYSTEM_APACHE_COMMONS)" "y"
REPORT_BUILDER_BUILD_DEPS += , libcommons-logging-java [$(OOO_JAVA_ARCHS)]
+ REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java [$(OOO_JAVA_ARCHS)]
CONFIGURE_FLAGS += --with-commons-logging-jar=/usr/share/java/commons-logging.jar
CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java | grep Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
endif
@@ -1642,13 +1639,11 @@
cd $(SOURCE_TREE)/smoketestoo_native && \
. $(CURDIR)/$(SOURCE_TREE)/*.sh; \
export PATH=$(BUILD_PATH); \
- export TEMP=`mktemp -q -d`; \
if [ -n "$$DISPLAY" ]; then \
../solenv/bin/build.pl; \
else \
xvfb-run -a ../solenv/bin/build.pl; \
- fi && \
- rm -rf $$TEMP
+ fi
endif
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(RUN_API_TESTS)" "y"
Reply to: