[libreoffice] 02/02: Revert "emove -sdbc-firebird Recommends: in -base-drivers and the mentioning from the Desciption"

[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 58162a44acbc53103a8cae4b182a82cb34280f44
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 1 06:53:58 2016 +0100

    Revert "emove -sdbc-firebird Recommends: in -base-drivers and the mentioning from the Desciption"
    
    This reverts commit 427fb369e4dde6bcaca9ed10f99d8e6cb1d0d31a.
    
    Conflicts:
    	changelog
    	control
---
 control    | 4 +++-
 control.in | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/control b/control
index 21c58fc..bea2002 100644
--- a/control
+++ b/control
@@ -898,7 +898,8 @@ Suggests: libjtds-java,
           libreoffice-mysql-connector | libmyodbc | libmysql-java,
           libreoffice-sdbc-postgresql | odbc-postgresql | libpg-java,
           libsqliteodbc | tdsodbc | mdbtools
-Recommends: libreoffice-sdbc-hsqldb [alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386]
+Recommends: libreoffice-sdbc-firebird,
+            libreoffice-sdbc-hsqldb [alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386]
 Replaces: libreoffice-base (<< 1:4.3.0-3), libreoffice-core (<< 1:4.2~)
 Breaks: libreoffice-base (<< 1:4.3.0-3)
 Description: Database connectivity drivers for LibreOffice
@@ -930,6 +931,7 @@ Description: Database connectivity drivers for LibreOffice
     - PostgreSQL
     - MS SQL Server and Sybase
   * libreoffice-sdbc-hsqldb: embedded HSQLDB SDBC Driver
+  * libreoffice-sdbc-firebird: Firebird SDBC Driver
   * libreoffice-sdbc-postgresql: PostgreSQL SDBC Driver
   * libreoffice-mysql-connector: "native" MySQL Connector
  
diff --git a/control.in b/control.in
index fb17322..4a969c5 100644
--- a/control.in
+++ b/control.in
@@ -727,7 +727,7 @@ Suggests: libreoffice-sdbc-postgresql | odbc-postgresql | libpg-java,
           libreoffice-mysql-connector | libmyodbc | libmysql-java,
           libsqliteodbc | tdsodbc | mdbtools,
           libjtds-java,
-Recommends: libreoffice-sdbc-hsqldb [%OOO_JAVA_ARCHS%]
+Recommends: libreoffice-sdbc-hsqldb [%OOO_JAVA_ARCHS%], libreoffice-sdbc-firebird
 Replaces: libreoffice-core (<< 1:4.2~), libreoffice-base (<< 1:4.3.0-3)
 Breaks: libreoffice-base (<< 1:4.3.0-3)
 Description: Database connectivity drivers for LibreOffice
@@ -759,6 +759,7 @@ Description: Database connectivity drivers for LibreOffice
     - PostgreSQL
     - MS SQL Server and Sybase
   * libreoffice-sdbc-hsqldb: embedded HSQLDB SDBC Driver
+  * libreoffice-sdbc-firebird: Firebird SDBC Driver
   * libreoffice-sdbc-postgresql: PostgreSQL SDBC Driver
   * libreoffice-mysql-connector: "native" MySQL Connector
  

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