aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules20
2 files changed, 13 insertions, 9 deletions
diff --git a/debian/control b/debian/control
index 33698fae..35540813 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Sam Hartman <hartmans@debian.org>
Uploaders: Steve Langasek <vorlon@debian.org>
Standards-Version: 4.6.2
-Build-Depends: debhelper-compat (= 13), dh-exec, flex, libcrypt-dev, libdb-dev, libselinux1-dev [linux-any], libsystemd-dev [linux-any] <!stage1>, po-debconf, autopoint, libaudit-dev [linux-any] <!stage1>, pkg-config, libfl-dev, libfl-dev:native, docbook-xsl-ns, docbook5-xml, xsltproc, libxml2-utils, w3m
+Build-Depends: debhelper-compat (= 13), dh-exec, flex, libcrypt-dev, libdb-dev, libselinux1-dev [linux-any], libsystemd-dev [linux-any] <!stage1>, po-debconf, meson, libaudit-dev [linux-any] <!stage1>, pkg-config, libfl-dev, libfl-dev:native, docbook-xsl-ns, docbook5-xml, xsltproc, libxml2-utils, w3m
Build-Conflicts-Indep: fop
Build-Conflicts: libdb4.2-dev, libxcrypt-dev
Vcs-Browser: https://salsa.debian.org/vorlon/pam
diff --git a/debian/rules b/debian/rules
index 008c4de9..177a7517 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,21 +23,25 @@ dl = $(d)/local
# avoid libaudit-dev when bootstrapping
ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
- CONFIGURE_OPTS += --disable-audit
+ meson_OPTS += -Daudit=disabled
+else
+meson_opts += -Daudit=enabled
endif
-CONFIGURE_OPTS += --enable-logind
+meson_opts += -Dlogind=enabled
+
override_dh_auto_configure:
# Explicitly set libdir, sbindir to avoid upstream's override logic.
- dh_auto_configure -- --enable-static --enable-shared \
+ dh_auto_configure -- \
+--default-library=both \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--sbindir=/usr/sbin \
- --enable-isadir=/usr/lib/security \
- --with-systemdunitdir=/usr/lib/systemd/system \
- --disable-nis \
- --enable-usergroups \
- $(CONFIGURE_OPTS)
+ -Disadir=/usr/lib/security \
+ -Dsystemdunitdir=/usr/lib/systemd/system \
+ -Dnis=disabled \
+ -Dusergroups=true \
+ $(meson_OPTS)
# .install files don't have "except for" handling, so we need to exclude
# our module that doesn't match right here