Releasing NMU (version 0.1.4-3.1).
authorPeter Michael Green <plugwash@debian.org>
Tue, 7 May 2013 23:03:27 +0000 (23:03 +0000)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Mon, 15 Sep 2014 22:30:35 +0000 (01:30 +0300)
debian/changelog
debian/control
debian/patches/02-use-nprocs.patch [new file with mode: 0644]
debian/patches/series

index 24c9849..214b8ee 100644 (file)
@@ -1,3 +1,12 @@
+lxtask (0.1.4-3.1) unstable; urgency=low
+
+  * Use nprocs function instead of trying to parse /proc/cpuinfo 
+    (closes: #705506)
+  * Remove Daniel Baumann from uploaders at his own request.
+    (closes: #704350)
+
+ -- Peter Michael Green <plugwash@debian.org>  Tue, 07 May 2013 23:03:27 +0000
+
 lxtask (0.1.4-3) unstable; urgency=low
 
   * Correcting spelling of lxtask in package long description.
index 8c228df..1c803f9 100644 (file)
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian LXDE Maintainers <lxde-debian@lists.lxde.org>
 Uploaders:
  Andrew Lee (李健秋) <ajqlee@debian.org>,
- Nikolas Poniros <edhunter@sidux.com>, Daniel Baumann <daniel@debian.org>
+ Nikolas Poniros <edhunter@sidux.com>
 Build-Depends:
  debhelper (>= 9), autotools-dev, intltool, libglib2.0-dev, libgtk2.0-dev
 Standards-Version: 3.9.3
diff --git a/debian/patches/02-use-nprocs.patch b/debian/patches/02-use-nprocs.patch
new file mode 100644 (file)
index 0000000..2ebdf2e
--- /dev/null
@@ -0,0 +1,39 @@
+Description: use nprocs() function instead of /proc/cpuinfo
+ /proc/cpuinfo varies a lot between architectures leading to the code 
+ identifying zero CPUs on some systems and hence ending up reporting a cpu
+ usage of -1
+
+Author: Peter Michael Green <plugwash@debian.org>
+Bug-Raspbian: https://bugs.launchpad.net/raspbian/+bug/1128012
+Bug-Debian: http://bugs.debian.org/705506
+
+--- lxtask-0.1.4.orig/src/xfce-taskmanager-linux.c
++++ lxtask-0.1.4/src/xfce-taskmanager-linux.c
+@@ -28,7 +28,7 @@
+ #include <glib/gi18n.h>
+ #include <glib/gprintf.h>
+ #include "xfce-taskmanager-linux.h"
+-
++#include <sys/sysinfo.h>
+ #if 1
+ void get_task_details(gint pid,struct task *task)
+@@ -378,17 +378,7 @@ gboolean get_system_status (system_statu
+     if(!cpu_count)
+     {
+-        file = fopen ("/proc/cpuinfo", "r");
+-        if(!file) return FALSE;
+-        while (fgets (buffer, 100, file) != NULL)
+-        {
+-            if(buffer[0]!='p') continue;
+-            if(!strncmp(buffer,"processor",9))
+-            {
+-                cpu_count++;
+-            }
+-        }
+-        fclose (file);
++        cpu_count=get_nprocs();
+     }
+     sys_stat->cpu_count=cpu_count;
+     return TRUE;
index 783b194..ab84673 100644 (file)
@@ -1 +1,2 @@
 01-kfreebsd.patch
+02-use-nprocs.patch