./packages/openofficeorg/2.4.1/unstable r1132: update ooo-build, add ENABLE_RANDR conditional
------------------------------------------------------------
revno: 1132
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-06-13 23:45:15 +0200
message:
update ooo-build, add ENABLE_RANDR conditional
modified:
changelog
control.in
rules
=== modified file 'changelog'
--- a/changelog 2008-06-12 20:41:15 +0000
+++ b/changelog 2008-06-13 21:45:15 +0000
@@ -1,15 +1,17 @@
-openoffice.org (1:2.4.1-2.3pre) unstable; urgency=medium
+openoffice.org (1:2.4.1-3) unstable; urgency=medium
* ooo-build:
- - update (r12875)
+ - update (r12885)
+ cws-cmcfixes47-sw.diff: backport fix from 3.0 to not open Word
documents read-only (closes: #477653)
+ cws-cmcfixes47-extensions.diff: fix mozilla plugin for 64-bit mozilla
API
+ + distro-configs/Common.conf.in: --disable-randr (closes: #485833)
* debian/rules:
+ reenable mozilla plugin for 64bit archs
+ + add ENABLE_RANDR conditional
- -- Rene Engelhard <rene@debian.org> Thu, 12 Jun 2008 22:33:40 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 13 Jun 2008 23:41:39 +0200
openoffice.org (1:2.4.1-2) unstable; urgency=low
=== modified file 'control.in'
--- a/control.in 2008-06-10 08:17:43 +0000
+++ b/control.in 2008-06-13 21:45:15 +0000
@@ -48,8 +48,7 @@
unixodbc-dev (>= 2.2.11),
libxml-parser-perl,
gperf,
- libpq-dev,
- libxrandr-dev
+ libpq-dev
%BUILD_DEPS%
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.7.2
=== modified file 'rules'
--- a/rules 2008-06-12 20:41:15 +0000
+++ b/rules 2008-06-13 21:45:15 +0000
@@ -160,6 +160,7 @@
PACKAGE_WRITER2LATEX=n
USE_EXTERNAL_WRITER2LATEX=y
ENABLE_SDEXT=y
+ENABLE_RANDR=n
# 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
@@ -723,6 +724,11 @@
DBG_DBG_SUGGESTS+= , kdelibs-dbg, qt-x11-free-dbg
endif
+ifeq "$(ENABLE_RANDR)" "y"
+ CONFIGURE_FLAGS += --enable-randr
+ BUILD_DEPS += , libxrandr-dev
+endif
+
ifeq "$(BUILD_BINFILTERS)" "y"
CONFIGURE_FLAGS+= --enable-binfilter
OOO_BINFILTER_DEP = openoffice.org$(VER)-filter-binfilter
Reply to: