r40518 - in /desktop/unstable/gnome-system-monitor/debian: changelog control control.in patches/ patches/01-fix_ftbfs_hurd.patch patches/series rules

[bigon at users.alioth.debian.org]

Author: bigon
Date: Sun Feb 16 12:07:01 2014
New Revision: 40518

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40518
Log:
* debian/patches/01-fix_ftbfs_hurd.patch: Fix FTBFS on hurd-i386
  (Closes: #738280)
* Only enable systemd-logind support on linux architectures

Added:
    desktop/unstable/gnome-system-monitor/debian/patches/
    desktop/unstable/gnome-system-monitor/debian/patches/01-fix_ftbfs_hurd.patch
    desktop/unstable/gnome-system-monitor/debian/patches/series
Modified:
    desktop/unstable/gnome-system-monitor/debian/changelog
    desktop/unstable/gnome-system-monitor/debian/control
    desktop/unstable/gnome-system-monitor/debian/control.in
    desktop/unstable/gnome-system-monitor/debian/rules

Modified: desktop/unstable/gnome-system-monitor/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/changelog?rev=40518&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-system-monitor/debian/changelog	[utf-8] Sun Feb 16 12:07:01 2014
@@ -1,8 +1,11 @@
 gnome-system-monitor (3.10.2-2) unstable; urgency=medium
 
   * Upload to unstable
-
- -- Laurent Bigonville <bigon at debian.org>  Sun, 16 Feb 2014 12:47:12 +0100
+  * debian/patches/01-fix_ftbfs_hurd.patch: Fix FTBFS on hurd-i386
+    (Closes: #738280)
+  * Only enable systemd-logind support on linux architectures
+
+ -- Laurent Bigonville <bigon at debian.org>  Sun, 16 Feb 2014 13:05:55 +0100
 
 gnome-system-monitor (3.10.2-1) experimental; urgency=low
 

Modified: desktop/unstable/gnome-system-monitor/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/control?rev=40518&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-system-monitor/debian/control	[utf-8] Sun Feb 16 12:07:01 2014
@@ -24,7 +24,7 @@
                libgtop2-dev (>= 2.28.2),
                librsvg2-dev (>= 2.35.0),
                libwnck-3-dev (>= 2.91.0),
-               libsystemd-login-dev (>= 44),
+               libsystemd-login-dev (>= 44) [linux-any],
                libxml2-dev,
                pkg-config (>= 0.19),
                yelp-tools

Modified: desktop/unstable/gnome-system-monitor/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/control.in?rev=40518&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-system-monitor/debian/control.in	[utf-8] Sun Feb 16 12:07:01 2014
@@ -19,7 +19,7 @@
                libgtop2-dev (>= 2.28.2),
                librsvg2-dev (>= 2.35.0),
                libwnck-3-dev (>= 2.91.0),
-               libsystemd-login-dev (>= 44),
+               libsystemd-login-dev (>= 44) [linux-any],
                libxml2-dev,
                pkg-config (>= 0.19),
                yelp-tools

Added: desktop/unstable/gnome-system-monitor/debian/patches/01-fix_ftbfs_hurd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/patches/01-fix_ftbfs_hurd.patch?rev=40518&op=file
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/patches/01-fix_ftbfs_hurd.patch	(added)
+++ desktop/unstable/gnome-system-monitor/debian/patches/01-fix_ftbfs_hurd.patch	[utf-8] Sun Feb 16 12:07:01 2014
@@ -0,0 +1,15 @@
+--- gnome-system-monitor-3.8.2.1/src/procproperties.cpp.original	2014-02-08 21:09:08.000000000 +0000
++++ gnome-system-monitor-3.8.2.1/src/procproperties.cpp	2014-02-08 21:12:12.000000000 +0000
+@@ -125,6 +125,12 @@
+     else
+         HZ = (cinf.stathz ? cinf.stathz : cinf.hz);
+ #endif
++#ifdef __GNU__
++    int HZ;
++    HZ = sysconf(_SC_CLK_TCK);
++    if (HZ < 0)
++        HZ = 100;
++#endif
+     proc_arg proc_props[] = {
+         { N_("Process Name"), g_strdup_printf("%s", info->name)},
+         { N_("User"), g_strdup_printf("%s (%d)", info->user.c_str(), info->uid)},

Added: desktop/unstable/gnome-system-monitor/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/patches/series?rev=40518&op=file
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/patches/series	(added)
+++ desktop/unstable/gnome-system-monitor/debian/patches/series	[utf-8] Sun Feb 16 12:07:01 2014
@@ -0,0 +1 @@
+01-fix_ftbfs_hurd.patch

Modified: desktop/unstable/gnome-system-monitor/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/rules?rev=40518&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-system-monitor/debian/rules	[utf-8] Sun Feb 16 12:07:01 2014
@@ -10,7 +10,11 @@
 -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 --enable-systemd
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-wnck
+
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+	DEB_CONFIGURE_EXTRA_FLAGS += --enable-systemd
+endif
 
 DEB_INSTALL_MANPAGES_gnome-system-monitor += debian/gnome-system-monitor.1