[Pkg-sssd-devel] sssd: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog   |    6 +++++-
 debian/control     |    2 +-
 debian/sssd.postrm |    4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 349a9cae97919e1d9e83987954ce2ef9e6ca32e8
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Fri Mar 30 12:47:45 2012 +0300

    sssd.postrm: Try to remove /etc/sssd only if it exists. (Closes: #666226)

diff --git a/debian/changelog b/debian/changelog
index 249ad56..f1782ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ sssd (1.8.1-2) UNRELEASED; urgency=low
     libsasl2-modules-gssapi-mit as an option for the Recommends.
   * libpam-sss.pam-auth-update: Drop the dependency to 128, since pam_sss
     should always be below pam_unix.
+  * sssd.postrm: Try to remove /etc/sssd only if it exists.
+    (Closes: #666226)
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Tue, 27 Mar 2012 15:12:06 +0300
 
diff --git a/debian/sssd.postrm b/debian/sssd.postrm
index 53a1372..2d2b00e 100644
--- a/debian/sssd.postrm
+++ b/debian/sssd.postrm
@@ -22,7 +22,9 @@ set -e
 case "$1" in
     purge)
         rm -f /etc/sssd/sssd.conf
-	rmdir --ignore-fail-on-non-empty /etc/sssd/
+	if [ -d /etc/sssd ]; then
+		rmdir --ignore-fail-on-non-empty /etc/sssd/
+	fi
 	rm -rf /var/log/sssd/
     ;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

commit d80b84c26313ef6b3644642b6cb3fa1e330e03ae
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Thu Mar 29 10:21:18 2012 +0300

    control: Move the dependency of libsasl2-modules-gssapi-mit to Recommends

diff --git a/debian/changelog b/debian/changelog
index 0d9cb98..249ad56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 sssd (1.8.1-2) UNRELEASED; urgency=low
 
+  * control: Move the dependency of libsasl2-modules-gssapi-mit to
+    Recommends.
   * control: sssd works with Heimdal gssapi modules too, add
-    libsasl2-modules-gssapi-mit as an option for the Depends.
+    libsasl2-modules-gssapi-mit as an option for the Recommends.
   * libpam-sss.pam-auth-update: Drop the dependency to 128, since pam_sss
     should always be below pam_unix.
 
diff --git a/debian/control b/debian/control
index fda6041..abab392 100644
--- a/debian/control
+++ b/debian/control
@@ -43,12 +43,12 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python,
  python-sss,
  libipa-hbac0 (= ${binary:Version}),
- libsasl2-modules-gssapi-mit | libsasl2-modules-gssapi-heimdal,
 Pre-Depends: ${misc:Pre-Depends}
 Recommends: ldap-utils,
  bind9-host,
  libnss-sss,
  libpam-sss,
+ libsasl2-modules-gssapi-mit | libsasl2-modules-gssapi-heimdal,
  libsasl2-modules-ldap,
 Suggests:
  sssd-tools,