This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.
commit 6b089ccc6e55a2af660c0adcdc6b3a318a26ffc9
Author: Rene Engelhard <r...@debian.org>
Date: Tue Jun 7 18:48:37 2016 +0200
fb_config is fixed, revert manual settings
This reverts 669a9489af1f0611d46cea71157fca96dbaec728
---
rules | 5 -----
1 file changed, 5 deletions(-)
diff --git a/rules b/rules
index f4a4a1e..aca5acd 100755
--- a/rules
+++ b/rules
@@ -1313,12 +1313,7 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
endif
ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
BUILD_DEPS += , firebird-dev (>= 2.5.2.26540.ds4-2)$(OOO_NO_LE_ARCHS)
- # override the firebird-related variables for firebird 3 as
- # fb_config --embedlibs gives -lfbembed which is gone..
ifeq "$(shell dpkg --compare-versions `fb_config --version` ge 3 && echo
true)" "true"
-export FIREBIRD_VERSION=$(shell fb_config --version)
-export FIREBIRD_LIBS=-lfbclient
-export FIREBIRD_CFLAGS="-I/usr/include/firebird"
# we need libEngine12.so
BUILD_DEPS += , firebird$(shell echo $(FIREBIRD_VERSION) | cut -d.
-f1,2)-server
FIREBIRD_SERVER_DEPENDS += firebird$(shell echo $(FIREBIRD_VERSION) |
cut -d. -f1,2)-server
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
