[libreoffice] 01/01: Rely on -Npackage in DEBHELPER_OPTIONS to fix debhelper error

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 5ccdc9ae824ebb6810d9b5785afce323c8b2cf47
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Fri Oct 27 20:40:21 2017 +0200

    Rely on -Npackage in DEBHELPER_OPTIONS to fix debhelper error
    
    Consistently handle those by using -N... only:
    - libreoffice-mysql-connector
    - libreoffice-sdbc-firebird
    - libreoffice-sdbc-postgresql
---
 rules | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/rules b/rules
index ff94b2c..344d29f 100755
--- a/rules
+++ b/rules
@@ -1405,6 +1405,7 @@ ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
   endif
 else
 	CONFIGURE_FLAGS += --disable-postgresql-sdbc
+	DEBHELPER_OPTIONS += -Nlibreoffice-sdbc-postgresql
 endif
 
 ifeq "$(ENABLE_RANDR)" "y"
@@ -1825,12 +1826,8 @@ endif
 ifeq "$(BUILD_KDE)" "y"
 	cat debian/control.kde.in >> debian/control
 endif
-ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
 	cat debian/control.postgresql.in >> debian/control
-endif
-ifeq "$(ENABLE_MYSQLNATIVE)" "y"
 	cat debian/control.mysql.in >> debian/control
-endif
 ifeq "$(ENABLE_EVO2)" "y"
 	cat debian/control.evolution.in >> debian/control
 endif
@@ -1842,9 +1839,7 @@ 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
 
 	cat debian/control.transitionals.in >> debian/control
 

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