r45280 - in /desktop/unstable/gnome-shell/debian: changelog control control.in patches/60-Update-configure.ac-to-check-for-libsystemd.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Jun 15 19:52:11 2015
New Revision: 45280

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

Added:
    desktop/unstable/gnome-shell/debian/patches/60-Update-configure.ac-to-check-for-libsystemd.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/control
    desktop/unstable/gnome-shell/debian/control.in
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=45280&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog	[utf-8] Mon Jun 15 19:52:11 2015
@@ -11,6 +11,7 @@
     notification-daemon package.
   * Update Homepage: URL.
   * Drop obsolete Breaks/Replaces from pre-wheezy.
+  * Build against libsystemd. Closes: #779743
 
  -- Michael Biebl <biebl at debian.org>  Mon, 15 Jun 2015 21:03:07 +0200
 

Modified: desktop/unstable/gnome-shell/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/control?rev=45280&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/control	[utf-8] Mon Jun 15 19:52:11 2015
@@ -44,9 +44,7 @@
                libpulse-dev (>= 2.0),
                libsecret-1-dev,
                libstartup-notification0-dev (>= 0.11),
-               libsystemd-login-dev [linux-any],
-               libsystemd-daemon-dev [linux-any],
-               libsystemd-journal-dev [linux-any],
+               libsystemd-dev [linux-any],
                libtelepathy-glib-dev (>= 0.17.5),
                libx11-dev,
                libxfixes-dev,

Modified: desktop/unstable/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/control.in?rev=45280&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/control.in	[utf-8] Mon Jun 15 19:52:11 2015
@@ -40,9 +40,7 @@
                libpulse-dev (>= 2.0),
                libsecret-1-dev,
                libstartup-notification0-dev (>= 0.11),
-               libsystemd-login-dev [linux-any],
-               libsystemd-daemon-dev [linux-any],
-               libsystemd-journal-dev [linux-any],
+               libsystemd-dev [linux-any],
                libtelepathy-glib-dev (>= 0.17.5),
                libx11-dev,
                libxfixes-dev,

Added: desktop/unstable/gnome-shell/debian/patches/60-Update-configure.ac-to-check-for-libsystemd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/60-Update-configure.ac-to-check-for-libsystemd.patch?rev=45280&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/60-Update-configure.ac-to-check-for-libsystemd.patch	(added)
+++ desktop/unstable/gnome-shell/debian/patches/60-Update-configure.ac-to-check-for-libsystemd.patch	[utf-8] Mon Jun 15 19:52:11 2015
@@ -0,0 +1,37 @@
+From 9aaf5d5ec6183e0a077a6d83ab1f71d47dd3da0a Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Mon, 15 Jun 2015 21:48:00 +0200
+Subject: [PATCH] Update configure.ac to check for libsystemd
+
+https://bugzilla.gnome.org/show_bug.cgi?id=751016
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d8a2ee7..417e262 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,8 +63,8 @@ AC_ARG_ENABLE([systemd],
+               [enable_systemd=$enableval],
+               [enable_systemd=auto])
+ AS_IF([test x$enable_systemd != xno], [
+-  AC_MSG_CHECKING([for libsystemd-journal])
+-  PKG_CHECK_EXISTS([libsystemd-journal],
++  AC_MSG_CHECKING([for libsystemd])
++  PKG_CHECK_EXISTS([libsystemd],
+                    [have_systemd=yes
+                     AC_DEFINE([HAVE_SYSTEMD], [1], [Define if we have systemd])],
+                    [have_systemd=no])
+@@ -106,7 +106,7 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
+             polkit-agent-1 >= $POLKIT_MIN_VERSION
+             gcr-base-3 >= $GCR_MIN_VERSION"
+ if test x$have_systemd = xyes; then
+-  SHARED_PCS="${SHARED_PCS} libsystemd-journal"
++  SHARED_PCS="${SHARED_PCS} libsystemd"
+ fi
+ 
+ PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)
+-- 
+2.1.4
+

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=45280&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series	[utf-8] Mon Jun 15 19:52:11 2015
@@ -3,3 +3,4 @@
 #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
 41-handle-logind-fail.patch
 50-ShellKeyringPrompt-Strip-out-mnemonics-indicators-fr.patch
+60-Update-configure.ac-to-check-for-libsystemd.patch