[28861] in Source-Commits
nsswitch-config commit: Update nsswitch.conf source path for bionic
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Mon May 7 17:56:12 2018
Date: Mon, 7 May 2018 17:56:06 -0400
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201805072156.w47Lu6MN023120@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/nsswitch-config/commit/37377fbbc45a0d4185728351c11ab95480cf577a
commit 37377fbbc45a0d4185728351c11ab95480cf577a
Author: Anders Kaseorg <andersk@mit.edu>
Date: Sat May 5 17:11:21 2018 -0400
Update nsswitch.conf source path for bionic
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
debian/changelog | 3 ++-
debian/rules | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9155450..f4c24e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-debathena-nsswitch-config (1.16) UNRELEASED; urgency=medium
+debathena-nsswitch-config (1.16) unstable; urgency=medium
* Try to configure all installed nss modules, not just libnss-mdns.
* Find postinst paths with dpkg-query --control-path. (Trac: #1050)
+ * Update nsswitch.conf source path for bionic.
-- Anders Kaseorg <andersk@mit.edu> Sat, 05 May 2018 17:08:24 -0400
diff --git a/debian/rules b/debian/rules
index f0f9330..d09c2a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,10 @@
DEB_DIVERT_EXTENSION = .debathena
DEB_TRANSFORM_FILES_debathena-nsswitch-config += \
/etc/nsswitch.conf.debathena
-ifneq ($(wildcard /usr/share/base-files/nsswitch.conf),)
+ifneq ($(wildcard /usr/share/libc-bin/nsswitch.conf),)
+ DEB_CHECK_FILES_SOURCE_/etc/nsswitch.conf.debathena = \
+ /usr/share/libc-bin/nsswitch.conf
+else ifneq ($(wildcard /usr/share/base-files/nsswitch.conf),)
DEB_CHECK_FILES_SOURCE_/etc/nsswitch.conf.debathena = \
/usr/share/base-files/nsswitch.conf
endif
