[libreoffice] 01/05: (Build-)Depend on firebird3.0-server-core instead of firebird3.0-server

[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 16b5f654f8e05af9e7aac9fea6fbd2d4020aeeec
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Sep 20 10:10:30 2016 +0200

    (Build-)Depend on firebird3.0-server-core instead of firebird3.0-server
---
 control       | 4 ++--
 rules         | 6 +++---
 tests/control | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/control b/control
index 726cb74..10e189a 100644
--- a/control
+++ b/control
@@ -22,7 +22,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                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 [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
+               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>,
@@ -874,7 +874,7 @@ Description: VLC backend for LibreOffice
 Package: libreoffice-sdbc-firebird
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libreoffice-core,
-         ${firebird-server-depends},
+         ${firebird-engine-depends},
          ${misc:Depends},
          ${shlibs:Depends}
 Architecture: alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el ppc64el
diff --git a/rules b/rules
index 9503c46..2816037 100755
--- a/rules
+++ b/rules
@@ -1255,8 +1255,8 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
   ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , firebird-dev (>= 3.0.0.32483.ds4-4)$(OOO_NO_LE_ARCHS)
 	# we need libEngine12.so
-	BUILD_DEPS += , firebird3.0-server $(OOO_NO_LE_ARCHS) <!nocheck>
-	FIREBIRD_SERVER_DEPENDS += firebird3.0-server
+	BUILD_DEPS += , firebird3.0-server-core $(OOO_NO_LE_ARCHS) <!nocheck>
+	FIREBIRD_ENGINE_DEPENDS += firebird3.0-server-core
   endif
 else
 	CONFIGURE_FLAGS += --disable-firebird-sdbc
@@ -3261,7 +3261,7 @@ endif
 		-V'opencl-sug=$(OPENCL_SUGGESTS)' \
 		-V'gnome-gtk-recommends=$(GNOME_GTK_RECOMMENDS)' \
 		-V'python-six-recommends=$(PYTHON_SIX_RECOMMENDS)' \
-		-V'firebird-server-depends=$(FIREBIRD_SERVER_DEPENDS)' \
+		-V'firebird-engine-depends=$(FIREBIRD_ENGINE_DEPENDS)' \
 		-v$(BINARY_VERSION)
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
 ifeq "$(PACKAGE_BASE)" "y"
diff --git a/tests/control b/tests/control
index 25adec4..b0b461d 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