summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2017-10-27 18:40:21 (GMT)
committerRico Tzschichholz <ricotz@ubuntu.com>2017-10-28 17:19:20 (GMT)
commit91b98436ca90dad3bb11a5944be70b39c057e8ec (patch)
treec927f79c92b6d2696018b92b38665a4e74c7ae8d
parent7a0c69382108f44f23598943092fdca784af2def (diff)
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
-rwxr-xr-xrules7
1 files changed, 1 insertions, 6 deletions
diff --git a/rules b/rules
index a1d8db6..e779318 100755
--- a/rules
+++ b/rules
@@ -1417,6 +1417,7 @@ ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
endif
else
CONFIGURE_FLAGS += --disable-postgresql-sdbc
+ DEBHELPER_OPTIONS += -Nlibreoffice-sdbc-postgresql
endif
ifeq "$(ENABLE_RANDR)" "y"
@@ -1736,12 +1737,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
@@ -1753,9 +1750,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