[jhbuild] 3.20: remove dependencies on libsystemd-{login,daemon}

[Frederic Peters <fpeters src gnome org>]

commit b3357b128250bf61b70acc029b1279fe58314ee4
Author: Frédéric Péters <fpeters 0d be>
Date:   Sun May 1 11:15:42 2016 +0200

    3.20: remove dependencies on libsystemd-{login,daemon}
    
    In systemd v209 the various libraries were merged into a single
    libsystemd library.

 modulesets/gnome-suites-core-3.20.modules |   13 ++-----------
 modulesets/gnome-sysdeps-3.20.modules     |   15 ---------------
 2 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.20.modules b/modulesets/gnome-suites-core-3.20.modules
index b49c9eb..1ce4c67 100644
--- a/modulesets/gnome-suites-core-3.20.modules
+++ b/modulesets/gnome-suites-core-3.20.modules
@@ -131,9 +131,7 @@
         <dep package="plymouth"/>
       </if>
       <if condition-set="systemd">
-        <dep package="libsystemd-daemon"/>
-        <dep package="libsystemd-login"/>
-        <dep package="libsystemd-journal"/>
+        <dep package="libsystemd"/>
       </if>
     </dependencies>
     <suggests>
@@ -324,9 +322,7 @@
       <dep package="sm"/>
       <dep package="xtrans"/>
       <if condition-set="systemd">
-        <dep package="libsystemd-daemon"/>
-        <dep package="libsystemd-journal"/>
-        <dep package="libsystemd-login"/>
+        <dep package="libsystemd"/>
       </if>
     </dependencies>
   </autotools>
@@ -585,9 +581,6 @@
       </if>
       <if condition-set="systemd">
         <dep package="libsystemd"/>
-        <dep package="libsystemd-daemon"/>
-        <dep package="libsystemd-journal"/>
-        <dep package="libsystemd-login"/>
       </if>
     </dependencies>
   </autotools>
@@ -1216,8 +1209,6 @@
       <dep package="m4-common"/>
       <if condition-set="systemd">
         <dep package="libsystemd"/>
-        <dep package="libsystemd-daemon"/>
-        <dep package="libsystemd-login"/>
       </if>
     </dependencies>
   </autotools>
diff --git a/modulesets/gnome-sysdeps-3.20.modules b/modulesets/gnome-sysdeps-3.20.modules
index 17734a0..2a13e9e 100644
--- a/modulesets/gnome-sysdeps-3.20.modules
+++ b/modulesets/gnome-sysdeps-3.20.modules
@@ -707,21 +707,6 @@
             version="210"/>
   </systemmodule>
 
-  <systemmodule id="libsystemd-daemon">
-    <pkg-config>libsystemd-daemon.pc</pkg-config>
-    <branch repo="system" version="210"/>
-  </systemmodule>
-
-  <systemmodule id="libsystemd-journal">
-    <pkg-config>libsystemd-journal.pc</pkg-config>
-    <branch repo="system" version="201"/>
-  </systemmodule>
-
-  <systemmodule id="libsystemd-login">
-    <pkg-config>libsystemd-login.pc</pkg-config>
-    <branch repo="system" version="210"/>
-  </systemmodule>
-
   <systemmodule id="libtasn1">
     <pkg-config>libtasn1.pc</pkg-config>
     <branch repo="system"