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

[Timo Aaltonen]

 debian/changelog               |    6 ++++--
 debian/control                 |    2 +-
 debian/patches/libsystemd.diff |   32 ++++++++++++++++++++++++++++++++
 debian/patches/series          |    1 +
 4 files changed, 38 insertions(+), 3 deletions(-)

New commits:
commit 4918b212bd25b918f0549829264c4d5421e668da
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Jul 21 15:04:38 2015 +0300

    releasing package sssd version 1.12.5-2

diff --git a/debian/changelog b/debian/changelog
index 9ae3517..7c86114 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-sssd (1.12.5-2) UNRELEASED; urgency=medium
+sssd (1.12.5-2) unstable; urgency=medium
 
   * sssd-common.postinst: Remove duplicate logrotate file on update.
     (LP: #1249772)
   * control, libsystemd.diff: Transition to libsystemd, thanks Michael
     Biebl! (Closes: #791909)
 
- -- Timo Aaltonen <tjaalton at debian.org>  Fri, 12 Jun 2015 22:54:01 +0300
+ -- Timo Aaltonen <tjaalton at debian.org>  Tue, 21 Jul 2015 15:04:25 +0300
 
 sssd (1.12.5-1) unstable; urgency=medium
 

commit f2eac0be84aef2e2326df5c4ed4afd137baf677c
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Jul 21 15:04:12 2015 +0300

    control, libsystemd.diff: Transition to libsystemd, thanks Michael Biebl! (Closes: #791909)

diff --git a/debian/changelog b/debian/changelog
index b518c98..9ae3517 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ sssd (1.12.5-2) UNRELEASED; urgency=medium
 
   * sssd-common.postinst: Remove duplicate logrotate file on update.
     (LP: #1249772)
+  * control, libsystemd.diff: Transition to libsystemd, thanks Michael
+    Biebl! (Closes: #791909)
 
  -- Timo Aaltonen <tjaalton at debian.org>  Fri, 12 Jun 2015 22:54:01 +0300
 
diff --git a/debian/control b/debian/control
index 37ce1d6..a484889 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,7 @@ Build-Depends:
  libselinux1-dev [linux-any],
  libsemanage1-dev [linux-any],
  libsmbclient-dev,
- libsystemd-login-dev,
+ libsystemd-dev [linux-any],
  libtalloc-dev,
  libtdb-dev,
  libtevent-dev,
diff --git a/debian/patches/libsystemd.diff b/debian/patches/libsystemd.diff
new file mode 100644
index 0000000..790daed
--- /dev/null
+++ b/debian/patches/libsystemd.diff
@@ -0,0 +1,32 @@
+diff --git a/src/external/systemd.m4 b/src/external/systemd.m4
+index dbced0d..92b9c99 100644
+--- a/src/external/systemd.m4
++++ b/src/external/systemd.m4
+@@ -8,16 +8,21 @@ AC_DEFUN([AM_CHECK_SYSTEMD],
+ ])
+ 
+ AM_COND_IF([HAVE_SYSTEMD],
+-           [PKG_CHECK_MODULES([SYSTEMD_LOGIN], [libsystemd-login],
+-            [AC_DEFINE_UNQUOTED(HAVE_SYSTEMD_LOGIN, 1, [Build with libsystemdlogin support])],
+-            [AC_MSG_NOTICE([Build without libsystemd-login support])])])
++           [PKG_CHECK_MODULES([SYSTEMD_LOGIN], [libsystemd],
++            [AC_DEFINE_UNQUOTED(HAVE_SYSTEMD_LOGIN, 1, [Build with libsystemd login support])],
++            [PKG_CHECK_MODULES([SYSTEMD_LOGIN], [libsystemd-login],
++             [AC_DEFINE_UNQUOTED(HAVE_SYSTEMD_LOGIN, 1, [Build with libsystemd login support])],
++             [AC_MSG_NOTICE([Build without libsystemd-login support])])])])
+ 
+ dnl A macro to check presence of journald on the system
+ AC_DEFUN([AM_CHECK_JOURNALD],
+ [
+-       PKG_CHECK_MODULES(JOURNALD,
+-                         libsystemd-journal,
+-                         [AC_DEFINE_UNQUOTED([WITH_JOURNALD], 1, [journald is available])])
++       PKG_CHECK_MODULES([JOURNALD],
++                         [libsystemd],
++                         [AC_DEFINE_UNQUOTED([WITH_JOURNALD], 1, [journald is available])]
++                         [PKG_CHECK_MODULES([JOURNALD],
++                                            [libsystemd-journal],
++                                            [AC_DEFINE_UNQUOTED([WITH_JOURNALD], 1, [journald is available])])])
+        dnl Some older versions of pkg-config might not set these automatically
+        dnl while setting CFLAGS and LIBS manually twice doesn't hurt.
+        AC_SUBST([JOURNALD_CFLAGS])
diff --git a/debian/patches/series b/debian/patches/series
index 9e41f28..82d02dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-obsolete-target.diff
+libsystemd.diff