r45521 - in /desktop/unstable/gdm3/debian: changelog control control.in patches/95_libsystemd.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jul  9 11:24:10 2015
New Revision: 45521

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45521
Log:
Build against libsystemd. (Closes: #779769)

Added:
    desktop/unstable/gdm3/debian/patches/95_libsystemd.patch
Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/control
    desktop/unstable/gdm3/debian/control.in
    desktop/unstable/gdm3/debian/patches/series

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=45521&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog	[utf-8] Thu Jul  9 11:24:10 2015
@@ -4,6 +4,7 @@
   * Refresh patches, drop patches which were merged upstream.
   * Systemd has been fixed in v222 to no longer kill services on reload if
     BusName is set, so drop that part from 92_systemd_unit.patch.
+  * Build against libsystemd. (Closes: #779769)
 
  -- Michael Biebl <biebl at debian.org>  Thu, 09 Jul 2015 13:05:28 +0200
 

Modified: desktop/unstable/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/control?rev=45521&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/control	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/control	[utf-8] Thu Jul  9 11:24:10 2015
@@ -6,7 +6,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>
+Uploaders: Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: gnome-pkg-tools (>= 0.16.3),
                debhelper (>= 8.1.3),
                cdbs (>= 0.4.122~),
@@ -47,9 +47,7 @@
                libaudit-dev [linux-any],
                docbook-xml,
                gsettings-desktop-schemas,
-               libsystemd-login-dev (>= 186) [linux-any],
-               libsystemd-daemon-dev (>= 186) [linux-any],
-               libsystemd-journal-dev [linux-any]
+               libsystemd-dev [linux-any]
 Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gdm3/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gdm3/

Modified: desktop/unstable/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/control.in?rev=45521&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/control.in	[utf-8] Thu Jul  9 11:24:10 2015
@@ -43,9 +43,7 @@
                libaudit-dev [linux-any],
                docbook-xml,
                gsettings-desktop-schemas,
-               libsystemd-login-dev (>= 186) [linux-any],
-               libsystemd-daemon-dev (>= 186) [linux-any],
-               libsystemd-journal-dev [linux-any]
+               libsystemd-dev [linux-any]
 Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gdm3/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gdm3/

Added: desktop/unstable/gdm3/debian/patches/95_libsystemd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/95_libsystemd.patch?rev=45521&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/95_libsystemd.patch	(added)
+++ desktop/unstable/gdm3/debian/patches/95_libsystemd.patch	[utf-8] Thu Jul  9 11:24:10 2015
@@ -0,0 +1,35 @@
+From 6dc19f45dd9758d1c395e57b5d8f2d507d66a7de Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Thu, 9 Jul 2015 13:01:22 +0200
+Subject: [PATCH] build: transition to libsystemd
+
+In systemd v209 the various libraries were merged into a single
+libsystemd library. So update configure checks to use the new name.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=752164
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: gdm-3.14.2/configure.ac
+===================================================================
+--- gdm-3.14.2.orig/configure.ac	2015-07-09 13:21:39.938669483 +0200
++++ gdm-3.14.2/configure.ac	2015-07-09 13:21:39.938669483 +0200
+@@ -893,7 +893,7 @@
+ dnl ---------------------------------------------------------------------------
+ 
+ PKG_CHECK_MODULES(SYSTEMD,
+-                  [libsystemd-login >= 186 libsystemd-daemon],
++                  [libsystemd],
+                   [have_systemd=yes], [have_systemd=no])
+ 
+ if test "x$with_systemd" = "xauto" ; then
+@@ -917,7 +917,7 @@
+ AC_SUBST(SYSTEMD_LIBS)
+ 
+ PKG_CHECK_MODULES(JOURNALD,
+-                  [libsystemd-journal],
++                  [libsystemd],
+                   [have_journald=yes], [have_journald=no])
+ 
+ if test "x$enable_systemd_journal" = "xauto" ; then

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=45521&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series	[utf-8] Thu Jul  9 11:24:10 2015
@@ -10,3 +10,4 @@
 92_systemd_unit.patch
 93_disable_gvfs.patch
 94_retain_xorg_log.patch
+95_libsystemd.patch