[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.1-1-8-gc019788
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit c019788a62736261d95975eaff79f3138ae46ec6
Author: Rene Engelhard <rene@debian.org>
Date: Thu Jul 14 15:03:42 2011 +0200
update ENABLE_OPENGL configure flags, now --enable-opengl is default upstream
diff --git a/changelog b/changelog
index 04408ba..ad960b7 100644
--- a/changelog
+++ b/changelog
@@ -10,8 +10,10 @@ libreoffice (1:3.4.1-2) UNRELEASED; urgency=low
- make new -common break old -evolution/-filter-binfilter
* debian/rules:
- also -Xlibreoffice-dbg on jh_depends... (closes: #633540)
+ - update ENABLE_OPENGL configure flags, now --enable-opengl is default
+ upstream
- -- Rene Engelhard <rene@debian.org> Mon, 11 Jul 2011 20:11:17 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 12 Jul 2011 00:18:33 +0000
libreoffice (1:3.4.1-1) experimental; urgency=low
diff --git a/rules b/rules
index 30524a2..24a082e 100755
--- a/rules
+++ b/rules
@@ -493,7 +493,9 @@ ifneq "$(OOO_OGLTRANS_ARCHS)" ""
BUILD_DEPS += , libgl1-mesa-dev$(OOO_NO_OGLTRANS_ARCHS), libglu1-mesa-dev$(OOO_NO_OGLTRANS_ARCHS)
endif
ifeq "$(ENABLE_OPENGL)" "y"
- CONFIGURE_FLAGS += --enable-opengl --with-system-mesa-headers
+ CONFIGURE_FLAGS += --with-system-mesa-headers
+else
+ CONFIGURE_FLAGS += --disable-opengl
endif
ifneq "$(PACKAGE_SDK)" "y"
--
LibreOffice packaging repository
Reply to: