Removing all the patches since they are included by upstream.
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Tue, 16 Sep 2014 13:00:03 +0000 (16:00 +0300)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Tue, 16 Sep 2014 13:00:03 +0000 (16:00 +0300)
debian/patches/01-kfreebsd.patch [deleted file]
debian/patches/02-use-nprocs.patch [deleted file]
debian/patches/series [deleted file]

diff --git a/debian/patches/01-kfreebsd.patch b/debian/patches/01-kfreebsd.patch
deleted file mode 100644 (file)
index 5e77272..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-Author: Cyril Brulebois <kibi@debian.org>
-Description: Fixing FTBFS on kfreebsd (Closes: #585969).
-
-diff -Naurp lxtask.orig/src/main.c lxtask/src/main.c
---- lxtask.orig/src/main.c     2012-04-15 09:07:42.237134013 +0000
-+++ lxtask/src/main.c  2012-04-15 09:20:15.854195792 +0000
-@@ -56,7 +56,7 @@ guint win_height;
- guint refresh_interval;
- guint rID;
--int PAGE_SIZE;
-+int page_size;
- int main (int argc, char *argv[])
- {
-@@ -72,7 +72,7 @@ int main (int argc, char *argv[])
- #endif
-     gtk_init (&argc, &argv);
--    PAGE_SIZE=sysconf(_SC_PAGESIZE)>>10;
-+    page_size=sysconf(_SC_PAGESIZE)>>10;
-     own_uid = getuid();
-     config_file = g_build_filename(g_get_user_config_dir(), "lxtask.conf", NULL);
-diff -Naurp lxtask.orig/src/types.h lxtask/src/types.h
---- lxtask.orig/src/types.h    2012-04-15 09:07:42.237134013 +0000
-+++ lxtask/src/types.h 2012-04-15 09:20:15.846195723 +0000
-@@ -79,6 +79,6 @@ extern guint win_height;
- const gchar *custom_signal_0;
- const gchar *custom_signal_1;
--extern int PAGE_SIZE;
-+extern int page_size;
- #endif
-diff -Naurp lxtask.orig/src/xfce-taskmanager-linux.c lxtask/src/xfce-taskmanager-linux.c
---- lxtask.orig/src/xfce-taskmanager-linux.c   2012-04-15 09:07:42.237134013 +0000
-+++ lxtask/src/xfce-taskmanager-linux.c        2012-04-15 09:20:15.846195723 +0000
-@@ -47,8 +47,8 @@ void get_task_details(gint pid,struct ta
-         sscanf(line,"%d %d",&task->size,&task->rss);
-         close(fd);
-         if(!task->size) return;
--      task->size*=PAGE_SIZE;
--      task->rss*=PAGE_SIZE;
-+      task->size*=page_size;
-+      task->rss*=page_size;
-       sprintf(line,"/proc/%d/stat",pid);
-       fd=open(line,O_RDONLY);
diff --git a/debian/patches/02-use-nprocs.patch b/debian/patches/02-use-nprocs.patch
deleted file mode 100644 (file)
index 2ebdf2e..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-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;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644 (file)
index ab84673..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-01-kfreebsd.patch
-02-use-nprocs.patch