------------------------------------------------------------
revno: 1612
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Thu 2009-07-02 08:04:58 +0200
message:
update graphite conditionals
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-07-01 08:33:44 +0000
+++ b/changelog 2009-07-02 06:04:58 +0000
@@ -1,3 +1,13 @@
+openoffice.org (1:3.1.1~ooo310m14-2) experimental; urgency=low
+
+ * ooo-build:
+ - update (99f65f2ec1a80a1a882a1d1b296e1c5774bec031)
+
+ * debian/rules:
+ - update graphite conditionals
+
+ -- Rene Engelhard <[email protected]> Wed, 01 Jul 2009 22:59:39 +0200
+
openoffice.org (1:3.1.1~ooo310m14-1) experimental; urgency=low
* OpenOffice.org 3.1.1 development milestone 14 (OOO310_m14)
=== modified file 'rules'
--- a/rules 2009-06-30 02:25:29 +0000
+++ b/rules 2009-07-02 06:04:58 +0000
@@ -323,6 +323,9 @@
ifeq "$(ARCH)" "i386"
USE_STLPORT=y
endif
+ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_STLPORT_ARCHS)))
+ USE_SYSTEM_GRAPHITE=n
+endif
ifeq "$(ENABLE_OPENGL)" "y"
# doesn't make that much sense on arm(el) and mips(el), does it? :)
@@ -468,7 +471,9 @@
ifeq "$(ENABLE_GRAPHITE)" "y"
CONFIGURE_FLAGS += --enable-graphite
ifeq "$(USE_SYSTEM_GRAPHITE)" "y"
- BUILD_DEPS += , libgraphite-dev
+ # No idea whether we actually need the versioned build-dep - but
+ # go sure
+ BUILD_DEPS += , libgraphite-dev (>= 1:2.3.1) [$(filter-out
$(OOO_STLPORT_ARCHS),$(OOO_ARCHS))]
CONFIGURE_FLAGS += --with-system-graphite
endif
endif
