r44249 - in /desktop/unstable/gnome-session/debian: changelog control patches/0001-configure.ac-Add-support-for-new-versions-of-systemd.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Apr 28 17:55:00 2015
New Revision: 44249

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44249
Log:
Cherry-pick upstream patch which allows to build against libsystemd and
update Build-Depends accordingly. (Closes: #779752)

Added:
    desktop/unstable/gnome-session/debian/patches/0001-configure.ac-Add-support-for-new-versions-of-systemd.patch
Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/control
    desktop/unstable/gnome-session/debian/patches/series

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=44249&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog	[utf-8] Tue Apr 28 17:55:00 2015
@@ -1,3 +1,10 @@
+gnome-session (3.14.0-2) UNRELEASED; urgency=medium
+
+  * Cherry-pick upstream patch which allows to build against libsystemd and
+    update Build-Depends accordingly. (Closes: #779752)
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 28 Apr 2015 19:53:13 +0200
+
 gnome-session (3.14.0-2) unstable; urgency=medium
 
   * Update debian/defaults.list to catch up with times:

Modified: desktop/unstable/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control?rev=44249&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control	[utf-8] Tue Apr 28 17:55:00 2015
@@ -32,9 +32,7 @@
                xmlto,
                xsltproc,
                xtrans-dev,
-               libsystemd-login-dev (>= 183) [linux-any],
-               libsystemd-daemon-dev [linux-any],
-               libsystemd-journal-dev [linux-any]
+               libsystemd-dev (>= 209) [linux-any]
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-session
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-session
 

Added: desktop/unstable/gnome-session/debian/patches/0001-configure.ac-Add-support-for-new-versions-of-systemd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/0001-configure.ac-Add-support-for-new-versions-of-systemd.patch?rev=44249&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/0001-configure.ac-Add-support-for-new-versions-of-systemd.patch	(added)
+++ desktop/unstable/gnome-session/debian/patches/0001-configure.ac-Add-support-for-new-versions-of-systemd.patch	[utf-8] Tue Apr 28 17:55:00 2015
@@ -0,0 +1,31 @@
+From a9d7b5dc95c5fa52453fe7c2fe1be2163e4d93ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon at gnome.org>
+Date: Tue, 10 Feb 2015 16:34:38 +0000
+Subject: [PATCH] configure.ac: Add support for new versions of systemd
+
+(cherry picked from commit 3474df12baedcdf09743cdff60e59b4b78539601)
+---
+ configure.ac | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6485d57..9b95b26 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -121,8 +121,11 @@ AC_ARG_ENABLE([systemd],
+               [enable_systemd=auto])
+ 
+ PKG_CHECK_MODULES(SYSTEMD,
+-                  [gio-unix-2.0 libsystemd-login >= 183 libsystemd-daemon libsystemd-journal],
+-                  [have_systemd=yes], [have_systemd=no])
++                  [gio-unix-2.0 libsystemd >= 209],
++                  [have_systemd=yes],
++                  [PKG_CHECK_MODULES([SYSTEMD],
++                                     [gio-unix-2.0 libsystemd-login >= 183 libsystemd-daemon libsystemd-journal],
++                                     [have_systemd=yes],[have_systemd=no])])
+ 
+ AC_MSG_CHECKING([whether to use systemd])
+ 
+-- 
+2.1.4
+

Modified: desktop/unstable/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/series?rev=44249&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/series	[utf-8] Tue Apr 28 17:55:00 2015
@@ -1 +1 @@
-
+0001-configure.ac-Add-support-for-new-versions-of-systemd.patch