This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch debian-experimental-4.3 in repository libreoffice.
commit 1f555fcbdf1686fc93bfd19cfa60c4aac0a077a6 Author: Rene Engelhard <[email protected]> Date: Wed Aug 6 00:05:36 2014 +0200 add conditional for system-coinmp Conflicts: changelog --- changelog | 7 +++++++ rules | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/changelog b/changelog index 0a5b868..b87610a 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,10 @@ +libreoffice (1:4.3.0-2) UNRELEASED; urgency=low + + * debian/rules: + - add conditional for system-coinmp, don't enable yet + + -- Rene Engelhard <[email protected]> Mon, 26 May 2014 21:44:13 +0200 + libreoffice (1:4.3.0-1) experimental; urgency=low * LibreOffice 4.3.0 release diff --git a/rules b/rules index b8e7ad3..a455367 100755 --- a/rules +++ b/rules @@ -253,10 +253,8 @@ endif SYSTEM_STUFF += lpsolve USE_SHARED_LPSOLVE=y LPSOLVE_MIN_VERSION= (>= 5.5.0.13-5+b1) -# fails to build with -Werror=format-security.... ENABLE_COINMP=n -# not implemented.. -#SYSTEM_STUFF += coinmp +SYSTEM_STUFF += coinmp USE_DBUS=y ifeq "$(USE_DBUS)" "y" ifneq (,$(findstring kfreebsd,$(DEB_HOST_ARCH))) @@ -758,6 +756,8 @@ endif ifneq ($(ENABLE_COINMP),y) CONFIGURE_FLAGS += --disable-coinmp +else + BUILD_DEPS += , coinor-libcoinmp-dev endif ifneq (,$(filter openssl, $(SYSTEM_STUFF))) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
