[Pkg-sssd-devel] sssd: Changes to 'master'

[Timo Aaltonen]

 debian/changelog           |    7 +++++++
 debian/rules               |    8 +++-----
 debian/sssd-common.install |    2 ++
 3 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 6eaef1f23147bfa983b2618e1b7831776e14848e
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Mon Dec 25 21:38:34 2017 +0200

    releasing package sssd version 1.16.0-2

diff --git a/debian/changelog b/debian/changelog
index f930ced..d1bcd2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-sssd (1.16.0-2) UNRELEASED; urgency=medium
+sssd (1.16.0-2) unstable; urgency=medium
 
   * Enable default config. (Closes: #858968)
   * Enable files domain.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Mon, 25 Dec 2017 21:23:00 +0200
+ -- Timo Aaltonen <tjaalton at debian.org>  Mon, 25 Dec 2017 21:38:26 +0200
 
 sssd (1.16.0-1) unstable; urgency=medium
 

commit 039d8677861782652075c0cbc07b4ebc989c20e3
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Mon Dec 25 21:28:10 2017 +0200

    Enable files domain.

diff --git a/debian/changelog b/debian/changelog
index 8eb75a3..f930ced 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sssd (1.16.0-2) UNRELEASED; urgency=medium
 
   * Enable default config. (Closes: #858968)
+  * Enable files domain.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Mon, 25 Dec 2017 21:23:00 +0200
 
diff --git a/debian/rules b/debian/rules
index 6cfb4a5..d7c7cd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,7 @@ override_dh_auto_configure:
 	--with-ssh \
 	--with-initscript=systemd \
 	--with-systemdunitdir=/lib/systemd/system \
+	--enable-files-domain \
 	--with-sudo
 
 override_dh_auto_test:

commit 74ffb6b975cc3d650479d25d4709dae6d7c80b61
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Mon Dec 25 21:25:49 2017 +0200

    Enable default config. (Closes: #858968)

diff --git a/debian/changelog b/debian/changelog
index 4671da4..8eb75a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sssd (1.16.0-2) UNRELEASED; urgency=medium
+
+  * Enable default config. (Closes: #858968)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Mon, 25 Dec 2017 21:23:00 +0200
+
 sssd (1.16.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index 8cd7fb8..6cfb4a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,8 @@ override_dh_auto_configure:
 	--disable-rpath \
 	--with-autofs \
 	--with-ssh \
-	--with-initscript=systemd --with-systemdunitdir=/lib/systemd/system \
+	--with-initscript=systemd \
+	--with-systemdunitdir=/lib/systemd/system \
 	--with-sudo
 
 override_dh_auto_test:
@@ -66,10 +67,6 @@ override_dh_install:
 	find $(CURDIR)/debian/tmp/ -name '*.egg-info' -exec rm '{}' ';'
 	rm -f $(CURDIR)/debian/tmp/etc/rc.d/init.d/sssd
 
-	# we don't need a default config, yet anyway
-	rm -f $(CURDIR)/debian/tmp/usr/lib/*/sssd/conf/sssd.conf
-	rm -f $(CURDIR)/debian/tmp/etc/pam.d/sssd-shadowutils
-
 	# match nn/nn/nnnn, replace with the date from changelog
 	sed -i 's/[0-1][0-9]\/[0-3][0-9]\/[0-9][0-9][0-9][0-9]/${PKGDATE}/g' $(CURDIR)/debian/tmp/usr/share/man/man*/*
 
diff --git a/debian/sssd-common.install b/debian/sssd-common.install
index 40f2874..e1cac15 100644
--- a/debian/sssd-common.install
+++ b/debian/sssd-common.install
@@ -1,3 +1,4 @@
+etc/pam.d/sssd-shadowutils
 lib/systemd/system/sssd.service
 lib/systemd/system/sssd-secrets.service
 lib/systemd/system/sssd-secrets.socket
@@ -20,6 +21,7 @@ usr/lib/*/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
 usr/lib/*/ldb/modules/ldb/memberof.so
 usr/lib/*/libnfsidmap/sss.so
 usr/lib/*/samba/idmap/sss.so
+usr/lib/*/sssd/conf/sssd.conf
 usr/lib/*/sssd/libsss_cert.so
 usr/lib/*/sssd/libsss_child.so
 usr/lib/*/sssd/libsss_crypt.so