[libreoffice] 04/05: official bundled firebird is now 3.0
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 9e0d20bb90efd841b8042a37c1c6c3a3f1239045
Author: Rene Engelhard <rene@debian.org>
Date: Wed Aug 17 15:18:58 2016 +0200
official bundled firebird is now 3.0
---
changelog | 2 +-
control | 3 ++-
rules | 12 +++++++-----
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/changelog b/changelog
index 6218210..df544ad 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.3.0~alpha0~git20160811-1) UNRELEASED; urgency=medium
+libreoffice (1:5.3.0~alpha0~git20160817-1) UNRELEASED; urgency=medium
* New upstream snapshot
diff --git a/control b/control
index 68cd962..63dbf7c 100644
--- a/control
+++ b/control
@@ -22,7 +22,8 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
dh-python,
dpkg-dev (>= 1.18.2~),
fastjar,
- firebird-dev (>= 2.5.2.26540.ds4-2) [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64],
+ firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64],
+ firebird3.0-server [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64],
flex (>= 2.3.35),
fontconfig [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc !sparc64] <!nocheck>,
fonts-crosextra-carlito [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc !sparc64] <!nocheck>,
diff --git a/rules b/rules
index cb65ab0..25e2428 100755
--- a/rules
+++ b/rules
@@ -517,6 +517,7 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
SYSTEM_STUFF += firebird
ifeq (,$(filter firebird, $(SYSTEM_STUFF)))
SYSTEM_STUFF += libatomic-ops
+ SYSTEM_STUFF += tommath
endif
endif
ENABLE_EOT=y
@@ -1295,13 +1296,14 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
ifneq (,$(filter libatomic-ops, $(SYSTEM_STUFF)))
BUILD_DEPS += , libatomic-ops-dev (>= 7.3~alpha1+git20110913-1)$(OOO_NO_BE_ARCHS)
endif
+ ifneq (,$(filter tommath, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libtommath-dev$(OOO_NO_BE_ARCHS)
+ endif
ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
- BUILD_DEPS += , firebird-dev (>= 2.5.2.26540.ds4-2)$(OOO_NO_LE_ARCHS)
- ifeq "$(shell dpkg --compare-versions `fb_config --version` ge 3 && echo true)" "true"
+ BUILD_DEPS += , firebird-dev (>= 3.0.0.32483.ds4-4)$(OOO_NO_LE_ARCHS)
# 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
- endif
+ BUILD_DEPS += , firebird3.0-server $(OOO_NO_LE_ARCHS)
+ FIREBIRD_SERVER_DEPENDS += firebird3.0-server
endif
else
CONFIGURE_FLAGS += --disable-firebird-sdbc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: