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

Proposed by Jackson Doak on 2015-06-02
Status: Merged
Merged at revision: 66
Proposed branch: lp:~noskcaj/gnome-system-monitor/3.16
Merge into: lp:~ubuntu-desktop/gnome-system-monitor/ubuntu
Diff against target: 140 lines (+74/-5)
6 files modified
debian/changelog (+15/-0)
debian/control (+2/-2)
debian/control.in (+1/-1)
debian/patches/0001-Add-support-for-libsystemd.patch (+54/-0)
debian/patches/series (+1/-0)
debian/rules (+1/-2)
To merge this branch: bzr merge lp:~noskcaj/gnome-system-monitor/3.16
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2015-06-02 Pending
Review via email: mp+260880@code.launchpad.net

Description of the change

Merge from debian

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-03-16 10:02:43 +0000
3+++ debian/changelog 2015-06-02 20:01:02 +0000
4@@ -1,3 +1,18 @@
5+gnome-system-monitor (3.16.0-1ubuntu1) wily; urgency=medium
6+
7+ * Merge from debian. Remaining changes:
8+ - Change appdata-tools b-dep to appstream-util
9+
10+ -- Jackson Doak <noskcaj@ubuntu.com> Wed, 03 Jun 2015 05:57:14 +1000
11+
12+gnome-system-monitor (3.16.0-1) unstable; urgency=medium
13+
14+ * New upstream release.
15+ * Drop obsolete --disable-scrollkeeper configure switch.
16+ * Build against libsystemd. (Closes: #779753)
17+
18+ -- Michael Biebl <biebl@debian.org> Tue, 19 May 2015 00:06:46 +0200
19+
20 gnome-system-monitor (3.15.91-0ubuntu1) vivid; urgency=medium
21
22 * New upstream bugfix release.
23
24=== modified file 'debian/control'
25--- debian/control 2015-03-16 10:02:43 +0000
26+++ debian/control 2015-06-02 20:01:02 +0000
27@@ -7,7 +7,7 @@
28 Priority: optional
29 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
30 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
31-Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Laurent Bigonville <bigon@debian.org>
32+Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
33 Build-Depends: appstream-util,
34 cdbs,
35 debhelper (>= 8),
36@@ -25,7 +25,7 @@
37 libgtop2-dev (>= 2.28.2),
38 librsvg2-dev (>= 2.35.0),
39 libwnck-3-dev (>= 2.91.0),
40- libsystemd-login-dev (>= 44) [linux-any],
41+ libsystemd-dev [linux-any],
42 libxml2-dev,
43 pkg-config (>= 0.19),
44 yelp-tools
45
46=== modified file 'debian/control.in'
47--- debian/control.in 2015-03-16 10:02:43 +0000
48+++ debian/control.in 2015-06-02 20:01:02 +0000
49@@ -21,7 +21,7 @@
50 libgtop2-dev (>= 2.28.2),
51 librsvg2-dev (>= 2.35.0),
52 libwnck-3-dev (>= 2.91.0),
53- libsystemd-login-dev (>= 44) [linux-any],
54+ libsystemd-dev [linux-any],
55 libxml2-dev,
56 pkg-config (>= 0.19),
57 yelp-tools
58
59=== added file 'debian/patches/0001-Add-support-for-libsystemd.patch'
60--- debian/patches/0001-Add-support-for-libsystemd.patch 1970-01-01 00:00:00 +0000
61+++ debian/patches/0001-Add-support-for-libsystemd.patch 2015-06-02 20:01:02 +0000
62@@ -0,0 +1,54 @@
63+From: Michael Biebl <biebl@debian.org>
64+Date: Mon, 18 May 2015 23:49:50 +0200
65+Subject: [PATCH] Add support for libsystemd
66+
67+In systemd v209 the various libsystemd-* libraries were merged into a
68+single libsystemd library. So first check for this library and fall back
69+to libsystemd-login if not found.
70+While at it, simplify the check by bumping the minimum required version
71+to v44.
72+
73+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=749560
74+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779753
75+
76+---
77+ configure.ac | 14 ++++++--------
78+ 1 file changed, 6 insertions(+), 8 deletions(-)
79+
80+diff --git a/configure.ac b/configure.ac
81+index 522c232..a89aa72 100644
82+--- a/configure.ac
83++++ b/configure.ac
84+@@ -37,9 +37,7 @@ GIOMM_REQUIRED=2.27
85+ GLIBMM_REQUIRED=2.27
86+ LIBXML_REQUIRED=2.0
87+ RSVG_REQUIRED=2.35
88+-SYSTEMD_REQUIRED=38
89+-# systemd v43 used the C++ keyword 'class' as a function parameter. This breaks the build for C++ programs.
90+-SYSTEMD_EXCLUDED=43
91++SYSTEMD_REQUIRED=44
92+
93+ PKG_CHECK_MODULES(GSM,
94+ glib-2.0 >= $GLIB_REQUIRED
95+@@ -68,13 +66,13 @@ PKG_CHECK_MODULES(SCRIPTS, glib-2.0 >= $GLIB_REQUIRED)
96+ have_systemd=no
97+ AC_ARG_ENABLE(systemd, AS_HELP_STRING([--disable-systemd], [disable systemd support]),,enable_systemd=no)
98+ if test "x$enable_systemd" != "xno"; then
99+- PKG_CHECK_MODULES(SYSTEMD, [ libsystemd-login >= $SYSTEMD_REQUIRED ],
100+- [ PKG_CHECK_MODULES(SYSTEMD_EX, [ libsystemd-login = $SYSTEMD_EXCLUDED ],
101+- AC_MSG_ERROR([*** systemd v43 found but it has a bug in its header files (uses C++ keyword)]), # Can't use systemd v43
102+- [AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is available]) have_systemd=yes])],
103+- have_systemd=no)
104++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd], [have_systemd=yes],
105++ [PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login >= $SYSTEMD_REQUIRED],
106++ [have_systemd=yes])])
107+ if test "x$have_systemd" = xno; then
108+ AC_MSG_ERROR([*** systemd support requested but libraries not found])
109++ else
110++ AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is available])
111+ fi
112+ fi
113+ AM_CONDITIONAL(HAVE_SYSTEMD, [test "$have_systemd" = "yes"])
114+--
115+2.1.4
116+
117
118=== modified file 'debian/patches/series'
119--- debian/patches/series 2015-03-16 10:02:43 +0000
120+++ debian/patches/series 2015-06-02 20:01:02 +0000
121@@ -0,0 +1,1 @@
122+0001-Add-support-for-libsystemd.patch
123
124=== modified file 'debian/rules'
125--- debian/rules 2014-10-25 17:20:48 +0000
126+++ debian/rules 2015-06-02 20:01:02 +0000
127@@ -10,7 +10,7 @@
128 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
129
130 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
131-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-wnck
132+DEB_CONFIGURE_EXTRA_FLAGS += --enable-wnck
133
134 ifeq (linux,$(DEB_HOST_ARCH_OS))
135 DEB_CONFIGURE_EXTRA_FLAGS += --enable-systemd
136@@ -26,4 +26,3 @@
137 -rm -f debian/gnome-system-monitor.1
138 -rm -f intltool-extract intltool-merge intltool-update
139 -rm -f po/.intltool-merge-cache
140- -find help -name '*omf.out' -exec rm -f '{}' \;

Subscribers

People subscribed via source and target branches