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

[Timo Aaltonen]

 debian/changelog                       |    8 ++++++++
 debian/patches/import-daemon-opts.diff |   11 -----------
 debian/patches/series                  |    2 +-
 debian/sssd-common.sssd.default        |    3 ++-
 4 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit c8ce06169ec113092ede3c054d9b5998ad488d41
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Jan 26 21:30:15 2017 +0200

    releasing package sssd version 1.15.0-2

diff --git a/debian/changelog b/debian/changelog
index b8b68aa..28b5a95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-sssd (1.15.0-2) UNRELEASED; urgency=medium
+sssd (1.15.0-2) unstable; urgency=medium
 
   * import-daemon-opts.diff, sssd.default: Drop the patch modifying sssd
     service file, and revert the daemon options for sysvinit.
     /etc/default/sssd is now only for the initscript (Closes: #852719)
 
- -- Timo Aaltonen <tjaalton at debian.org>  Thu, 26 Jan 2017 21:29:25 +0200
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 26 Jan 2017 21:29:58 +0200
 
 sssd (1.15.0-1) unstable; urgency=medium
 

commit 8d53a0389aada34480ff5b8c6c034ade1b8bd949
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Jan 26 21:29:55 2017 +0200

    import-daemon-opts.diff, sssd.default: Drop the patch modifying sssd service file, and revert the daemon options for sysvinit. /etc/default/sssd is now only for the initscript (Closes: #852719)

diff --git a/debian/changelog b/debian/changelog
index d3abd47..b8b68aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sssd (1.15.0-2) UNRELEASED; urgency=medium
+
+  * import-daemon-opts.diff, sssd.default: Drop the patch modifying sssd
+    service file, and revert the daemon options for sysvinit.
+    /etc/default/sssd is now only for the initscript (Closes: #852719)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 26 Jan 2017 21:29:25 +0200
+
 sssd (1.15.0-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #852450) (LP: #1566508)
diff --git a/debian/patches/import-daemon-opts.diff b/debian/patches/import-daemon-opts.diff
deleted file mode 100644
index 4da0245..0000000
--- a/debian/patches/import-daemon-opts.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/sysv/systemd/sssd.service.in
-+++ b/src/sysv/systemd/sssd.service.in
-@@ -6,7 +6,7 @@ Wants=nss-user-lookup.target
- 
- [Service]
- EnvironmentFile=- at environment_file@
--ExecStart=@sbindir@/sssd -i -f
-+ExecStart=@sbindir@/sssd $DAEMON_OPTS
- Type=notify
- NotifyAccess=main
- 
diff --git a/debian/patches/series b/debian/patches/series
index cc7844f..a82d1b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-import-daemon-opts.diff
+#placeholder
diff --git a/debian/sssd-common.sssd.default b/debian/sssd-common.sssd.default
index 87d862e..aee5563 100644
--- a/debian/sssd-common.sssd.default
+++ b/debian/sssd-common.sssd.default
@@ -1,4 +1,5 @@
 # Defaults for sssd, installed at /etc/default/sssd by the maintainer scripts
+# This is only used for /etc/init.d/sssd
 
 # Additional options that are passed to the Daemon.
-DAEMON_OPTS="-i -f"
+DAEMON_OPTS="-D -f"