Merge lp:~noskcaj/gnome-system-monitor/3.16 into lp:~ubuntu-desktop/gnome-system-monitor/ubuntu

[Jackson Doak]

Merge from debian

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-16 10:02:43 +0000
+++ debian/changelog	2015-06-02 20:01:02 +0000
@@ -1,3 +1,18 @@
+gnome-system-monitor (3.16.0-1ubuntu1) wily; urgency=medium
+
+  * Merge from debian. Remaining changes:
+    - Change appdata-tools b-dep to appstream-util
+
+ -- Jackson Doak <[e-mail]>  Wed, 03 Jun 2015 05:57:14 +1000
+
+gnome-system-monitor (3.16.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Drop obsolete --disable-scrollkeeper configure switch.
+  * Build against libsystemd. (Closes: #779753)
+
+ -- Michael Biebl <[e-mail]>  Tue, 19 May 2015 00:06:46 +0200
+
 gnome-system-monitor (3.15.91-0ubuntu1) vivid; urgency=medium
 
   * New upstream bugfix release.
 
=== modified file 'debian/control'
--- debian/control	2015-03-16 10:02:43 +0000
+++ debian/control	2015-06-02 20:01:02 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Laurent Bigonville <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Laurent Bigonville <[e-mail]>, Michael Biebl <[e-mail]>
 Build-Depends: appstream-util,
                cdbs,
                debhelper (>= 8),
@@ -25,7 +25,7 @@
                libgtop2-dev (>= 2.28.2),
                librsvg2-dev (>= 2.35.0),
                libwnck-3-dev (>= 2.91.0),
-               libsystemd-login-dev (>= 44) [linux-any],
+               libsystemd-dev [linux-any],
                libxml2-dev,
                pkg-config (>= 0.19),
                yelp-tools
 
=== modified file 'debian/control.in'
--- debian/control.in	2015-03-16 10:02:43 +0000
+++ debian/control.in	2015-06-02 20:01:02 +0000
@@ -21,7 +21,7 @@
                libgtop2-dev (>= 2.28.2),
                librsvg2-dev (>= 2.35.0),
                libwnck-3-dev (>= 2.91.0),
-               libsystemd-login-dev (>= 44) [linux-any],
+               libsystemd-dev [linux-any],
                libxml2-dev,
                pkg-config (>= 0.19),
                yelp-tools
 
=== added file 'debian/patches/0001-Add-support-for-libsystemd.patch'
--- debian/patches/0001-Add-support-for-libsystemd.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-Add-support-for-libsystemd.patch	2015-06-02 20:01:02 +0000
@@ -0,0 +1,54 @@
+From: Michael Biebl <[e-mail]>
+Date: Mon, 18 May 2015 23:49:50 +0200
+Subject: [PATCH] Add support for libsystemd
+
+In systemd v209 the various libsystemd-* libraries were merged into a
+single libsystemd library. So first check for this library and fall back
+to libsystemd-login if not found.
+While at it, simplify the check by bumping the minimum required version
+to v44.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=749560
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779753
+
+---
+ configure.ac | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 522c232..a89aa72 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,9 +37,7 @@ GIOMM_REQUIRED=2.27
+ GLIBMM_REQUIRED=2.27
+ LIBXML_REQUIRED=2.0
+ RSVG_REQUIRED=2.35
+-SYSTEMD_REQUIRED=38
+-# systemd v43 used the C++ keyword 'class' as a function parameter. This breaks the build for C++ programs.
+-SYSTEMD_EXCLUDED=43
++SYSTEMD_REQUIRED=44
+ 
+ PKG_CHECK_MODULES(GSM,
+   glib-2.0 >= $GLIB_REQUIRED
+@@ -68,13 +66,13 @@ PKG_CHECK_MODULES(SCRIPTS, glib-2.0 >= $GLIB_REQUIRED)
+ have_systemd=no
+ AC_ARG_ENABLE(systemd, AS_HELP_STRING([--disable-systemd], [disable systemd support]),,enable_systemd=no)
+ if test "x$enable_systemd" != "xno"; then
+-        PKG_CHECK_MODULES(SYSTEMD, [ libsystemd-login >= $SYSTEMD_REQUIRED ],
+-                                   [ PKG_CHECK_MODULES(SYSTEMD_EX, [ libsystemd-login = $SYSTEMD_EXCLUDED ],
+-                                                                   AC_MSG_ERROR([*** systemd v43 found but it has a bug in its header files (uses C++ keyword)]), # Can't use systemd v43 
+-                                                                   [AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is available]) have_systemd=yes])],
+-                                   have_systemd=no)
++        PKG_CHECK_MODULES(SYSTEMD, [libsystemd], [have_systemd=yes],
++                                   [PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login >= $SYSTEMD_REQUIRED],
++                                   [have_systemd=yes])])
+         if test "x$have_systemd" = xno; then
+                 AC_MSG_ERROR([*** systemd support requested but libraries not found])
++        else
++                AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is available])
+         fi
+ fi
+ AM_CONDITIONAL(HAVE_SYSTEMD, [test "$have_systemd" = "yes"])
+-- 
+2.1.4
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2015-03-16 10:02:43 +0000
+++ debian/patches/series	2015-06-02 20:01:02 +0000
@@ -0,0 +1,1 @@
+0001-Add-support-for-libsystemd.patch
 
=== modified file 'debian/rules'
--- debian/rules	2014-10-25 17:20:48 +0000
+++ debian/rules	2015-06-02 20:01:02 +0000
@@ -10,7 +10,7 @@
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-wnck
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-wnck
 
 ifeq (linux,$(DEB_HOST_ARCH_OS))
 	DEB_CONFIGURE_EXTRA_FLAGS += --enable-systemd
@@ -26,4 +26,3 @@
 	-rm -f debian/gnome-system-monitor.1
 	-rm -f intltool-extract intltool-merge intltool-update
 	-rm -f po/.intltool-merge-cache
-	-find help -name '*omf.out' -exec rm -f '{}' \;