------------------------------------------------------------
revno: 1275
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-10-08 15:29:31 +0200
message:
update ooo-build
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-10-06 13:02:04 +0000
+++ b/changelog 2008-10-08 13:29:31 +0000
@@ -1,3 +1,12 @@
+openoffice.org (1:3.0.0~rc4-1.2pre) experimental; urgency=low
+
+ * ooo-build
+ - update (r14245)
+ * debin/rules:
+ - remove now obsolete ADDITIONAL_SECTIONS="DebianBaseSystem*"
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 08 Oct 2008 15:27:51 +0200
+
openoffice.org (1:3.0.0~rc4-1) experimental; urgency=low
* OpenOffice.org 3.0 release candidate 4 (OOO300_m9)
=== modified file 'rules'
--- a/rules 2008-10-07 22:27:17 +0000
+++ b/rules 2008-10-08 13:29:31 +0000
@@ -621,7 +621,6 @@
BUILD_DEPS += $(MEDIAWIKI_BUILD_DEPS)
CONFIGURE_FLAGS += --with-system-apache-commons
--with-commons-codec-jar=/usr/share/java/commons-codec.jar
--with-commons-lang-jar=/usr/share/java/commons-lang.jar
--with-commons-httpclient-jar=/usr/share/java/commons-httpclient.jar
--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$$)
- ADDITIONAL_SECTIONS += DebianBaseSystemApacheCommons
endif
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
@@ -631,7 +630,6 @@
REPORT_BUILDER_JAR_DEPENDS := $(REPORT_BUILDER_BUILD_DEPS)
BUILD_DEPS += $(REPORT_BUILDER_BUILD_DEPS)
CONFIGURE_FLAGS += --with-system-jfreereport
--with-jcommon-jar=/usr/share/java/jcommon.jar
--with-libxml-jar=/usr/share/java/libxml.jar
--with-flute-jar=/usr/share/java/flute-1.3-jfree.jar
--with-jfreereport-jar=/usr/share/java/pentaho-reporting-flow-engine.jar
--with-liblayout-jar=/usr/share/java/liblayout.jar
--with-libloader-jar=/usr/share/java/libloader.jar
--with-libformula-jar=/usr/share/java/libformula.jar
--with-librepository-jar=/usr/share/java/librepository.jar
--with-libfonts-jar=/usr/share/java/libfonts.jar
--with-jcommon-serializer-jar=/usr/share/java/jcommon-serializer.jar
- ADDITIONAL_SECTIONS += DebianBaseSystemJFreeReport
CONFIGURE_FLAGS += --enable-report-builder
endif
endif
@@ -847,7 +845,6 @@
BUILD_DEPS += , liblucene2-java (>= 2.3.2) [$(OOO_JAVA_ARCHS)]
LUCENE_DEPENDS = liblucene2-java (>= 2.3.2)
CONFIGURE_FLAGS += --with-system-lucene
--with-lucene-core-jar=/usr/share/java/lucene-core.jar
--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar
- ADDITIONAL_SECTIONS += DebianBaseSystemLucene
endif
ifeq "$(USE_SYSTEM_HSQLDB)" "y"
BUILD_DEPS += , libhsqldb-java (>= 1.8.0.9-1) [$(OOO_JAVA_ARCHS)]
