------------------------------------------------------------
revno: 1004
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-02-06 15:47:58 +0100
message:
fix typos; close #464304; update ooo-build
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-02-04 17:37:45 +0000
+++ b/changelog 2008-02-06 14:47:58 +0000
@@ -1,10 +1,12 @@
openoffice.org (1:2.3.1-3.4pre) unstable; urgency=medium
* ooo-build:
- - update (r11495)
+ - update (r11500)
+ enable jawt-check.cleanup.diff again (closes: #441202)
+ fixes fontconfig integration to ignore unavailable default fonts
like Albany MT/Tahoma MT
+ + fix jawt lib check to use the right compiler for the test
+ (closes: #464304)
* debian/openoffice.org-base-core.overrides.lintian:
- override RPATH warning
* debian/rules:
@@ -28,7 +30,7 @@
+ some minor parallel build conditional improvements
+ Use java-runtime-depends variable for java dependencies.
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 04 Feb 2008 14:12:12 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 05 Feb 2008 10:04:05 +0100
openoffice.org (1:2.3.1-3) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-02-04 17:37:45 +0000
+++ b/rules 2008-02-06 14:47:58 +0000
@@ -478,7 +478,7 @@
REPORT_BUILDER_BUILD_DEPS += , libjcommon-java (>= 1.0.10)
[$(OOO_JAVA_ARCHS)], libsac-java [$(OOO_JAVA_ARCHS)], libxml-java
[$(OOO_JAVA_ARCHS)], libflute-1.3-jfree-java [$(OOO_JAVA_ARCHS)],
libjfreereport-java (>= 0.9.0-05) [$(OOO_JAVA_ARCHS)], liblayout-java
[$(OOO_JAVA_ARCHS)], libloader-java [$(OOO_JAVA_ARCHS)], libformula-java
[$(OOO_JAVA_ARCHS)], librepository-java [$(OOO_JAVA_ARCHS)], libfonts-java (>=
0.2.6) [$(OOO_JAVA_ARCHS)], libjcommon-serializer-java [$(OOO_JAVA_ARCHS)]
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-java=/usr/share/java/libxml.jar
--with-flute-jar=/usr/share/java/flute-1.3-jfree.jar
--with-jfreereport-jar=/usr/share/java/jfreereport.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
+ 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/jfreereport.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
else
CONFIGURE_FLAGS += --disable-reportdesign
endif
