[libreoffice] 01/01: fix merge; re-enable firebird (3.0)

[Rene Engelhard]

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 3bdba3174b50417254afd63a06c063fe927d923b
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Oct 9 22:20:45 2016 +0200

    fix merge; re-enable firebird (3.0)
---
 control       | 18 ++++++++++++++++++
 rules         |  2 +-
 tests/control |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/control b/control
index 6decd09..e2086d3 100644
--- a/control
+++ b/control
@@ -21,6 +21,8 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                dh-python,
                dpkg-dev (>= 1.18.2~),
                fastjar,
+               firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64],
+               firebird3.0-server-core [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                flex (>= 2.3.35),
                fontconfig [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
                fonts-crosextra-carlito [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
@@ -4610,3 +4612,19 @@ Description: Logo-like progamming language for LibreOffice
   - Python data structures (list, tuple, set, dictionary) and other Python
     features
 
+Package: libreoffice-sdbc-firebird
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-core,
+         ${firebird-server-depends},
+         ${misc:Depends},
+         ${shlibs:Depends}
+Architecture: alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el ppc64el
+Section: database
+Enhances: libreoffice-base-drivers
+Description: Firebird SDBC driver for LibreOffice
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The Firebird SDBC Driver allows one to use the Firebird database from
+ LibreOffice without any wrapper layer such as ODBC or JDBC.
+
diff --git a/rules b/rules
index f8e2c1e..1aeab7b 100755
--- a/rules
+++ b/rules
@@ -505,7 +505,7 @@ USE_OPENCL=y
 #10:16 < Safa_[A_boy]> Hello. About converting dialogs to .ui files, What about 
 #                      wizards?
 #10:17 < ahunt> _rene_: yes, unfortunately.
-ENABLE_FIREBIRD=n
+ENABLE_FIREBIRD=y
 ifeq "$(DEB_HOST_ARCH_ENDIAN)" "big"
   ENABLE_FIREBIRD=n
 endif
diff --git a/tests/control b/tests/control
index 57b60f7..c6cdf3b 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
 Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1 [...]
 
 Tests: pyuno-import
 Depends: python3-uno

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git