[libreoffice] 03/03: disable firebird

Sun Oct 9 19:40:34 UTC 2016

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit e61b4ee83db7a83b342ca0b86b5bcd648be9543f
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Oct 9 21:31:21 2016 +0200

    disable firebird
---
 changelog           |  3 ++-
 control             | 15 ---------------
 control.firebird.in | 13 +++++++++++++
 control.in          | 13 -------------
 rules               |  5 ++++-
 tests/control       |  2 +-
 6 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/changelog b/changelog
index bc2ef14..e863c2c 100644
--- a/changelog
+++ b/changelog
@@ -5,8 +5,9 @@ libreoffice (1:5.2.2-1) UNRELEASED; urgency=medium
   * debian/rules:
     - add /usr/include/libreoffice/sal/typesizes.h symlink to multiarch
       include dir to fix SDK usage e.g in the SDK examples
+    - disable firebird (as sid now got firebird-dev 3.0)
 
- -- Rene Engelhard <rene at debian.org>  Wed, 28 Sep 2016 10:42:14 +0200
+ -- Rene Engelhard <rene at debian.org>  Sun, 09 Oct 2016 15:36:43 +0200
 
 libreoffice (1:5.2.2~rc2-2) unstable; urgency=medium
 
diff --git a/control b/control
index 540114a..7e7d61c 100644
--- a/control
+++ b/control
@@ -22,7 +22,6 @@ 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],
                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>,
@@ -169,7 +168,6 @@ Build-Conflicts: amd-libopencl1,
                  ant (= 1.8.0-1) [hppa ia64 s390 sparc],
                  ant (= 1.8.0-2) [hppa ia64 s390 sparc],
                  ant (= 1.8.0-3) [hppa ia64 s390 sparc],
-                 firebird-dev (>= 3.0),
                  flex (= 2.5.34-1) [amd64],
                  g++-4.6 (= 4.6.1-10),
                  g++-4.6 (= 4.6.1-11),
@@ -879,19 +877,6 @@ Description: VLC backend for LibreOffice
  This package contains a VLC backend for LibreOffices avmedia component
  to play audio/video.
 
-Package: libreoffice-sdbc-firebird
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libreoffice-core, ${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.
-
 Package: libreoffice-sdbc-hsqldb
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libreoffice-core,
diff --git a/control.firebird.in b/control.firebird.in
new file mode 100644
index 0000000..84b04de
--- /dev/null
+++ b/control.firebird.in
@@ -0,0 +1,13 @@
+Package: libreoffice-sdbc-firebird
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-core, ${shlibs:Depends}, ${misc:Depends}
+Architecture: %OOO_LE_ARCHS%
+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/control.in b/control.in
index 5baf96c..0b46ed7 100644
--- a/control.in
+++ b/control.in
@@ -707,19 +707,6 @@ Description: VLC backend for LibreOffice
  This package contains a VLC backend for LibreOffices avmedia component
  to play audio/video.
 
-Package: libreoffice-sdbc-firebird
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libreoffice-core, ${shlibs:Depends}, ${misc:Depends}
-Architecture: %OOO_LE_ARCHS%
-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.
-
 Package: libreoffice-sdbc-hsqldb
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libreoffice-core, ${java-common-depends}, ${java:Depends}, ${java-runtime-depends}, ${shlibs:Depends}, ${misc:Depends}
diff --git a/rules b/rules
index 6b56181..937f345 100755
--- a/rules
+++ b/rules
@@ -512,7 +512,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=y
+ENABLE_FIREBIRD=n
 ifeq "$(DEB_HOST_ARCH_ENDIAN)" "big"
   ENABLE_FIREBIRD=n
 endif
@@ -1841,6 +1841,9 @@ endif
 ifeq "$(PACKAGE_LIBRELOGO)" "y"
 	cat debian/control.librelogo.in >> debian/control
 endif
+ifeq "$(ENABLE_FIREBIRD)" "y"
+	cat debian/control.firebird.in >> debian/control
+endif
 
 	perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
 	perl -pi -e "s,%OOO_BE_ARCHS%,$(OOO_BE_ARCHS),g" debian/control
diff --git a/tests/control b/tests/control
index 325e69d..9ce3278 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, libarchive-zip-perl, 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~2 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, 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~2 [...]
 
 Tests: pyuno-import
 Depends: python3-uno

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

