Bug#297906: whowatch 1.6.0-5.1 NMU

[Matej Vela]

Hello,

I'm doing an NMU of whowatch to fix #297906; diff attached.

Thanks,

Matej

diff -u whowatch-1.6.0/debian/changelog whowatch-1.6.0/debian/changelog
--- whowatch-1.6.0/debian/changelog
+++ whowatch-1.6.0/debian/changelog
@@ -1,3 +1,12 @@
+whowatch (1.6.0-5.1) unstable; urgency=medium
+
+  * NMU.
+  * src/process.c, src/subwin.c: Lvalue casts are a no-no with gcc 4.0.
+    Thanks to Andreas Jochens for the patch.  Closes: #297906.
+  * src/menu.c (submenus): Add terminating NULL.
+
+ -- Matej Vela <[EMAIL PROTECTED]>  Sun, 19 Feb 2006 11:07:10 +0100
+
 whowatch (1.6.0-5) unstable; urgency=low
 
   * Fixed ctime() prototype. (Closes: #226683)
diff -u whowatch-1.6.0/src/menu.c whowatch-1.6.0/src/menu.c
--- whowatch-1.6.0/src/menu.c
+++ whowatch-1.6.0/src/menu.c
@@ -37,7 +37,7 @@
 static unsigned short item_cursor;
 
 #define DUMMY_HEAD     {0, 0}
-static char *submenus[] = { "File", "View", "Process", "Users",  "Help" };
+static char *submenus[] = { "File", "View", "Process", "Users",  "Help", NULL 
};
 struct item_bind_t  {
        unsigned short submenu;         /* index in the submenus table */
        struct item_t item;
diff -u whowatch-1.6.0/src/process.c whowatch-1.6.0/src/process.c
--- whowatch-1.6.0/src/process.c
+++ whowatch-1.6.0/src/process.c
@@ -75,7 +75,7 @@
                memset(z, 0, sizeof *z);
                check_line(l);
                z->line = l++;
-               (struct process *) p->priv = z;
+               p->priv = z;
                z->proc = p;
                if (*current){
                        z->next = *current;
diff -u whowatch-1.6.0/src/subwin.c whowatch-1.6.0/src/subwin.c
--- whowatch-1.6.0/src/subwin.c
+++ whowatch-1.6.0/src/subwin.c
@@ -201,7 +201,7 @@
        static void *p = 0;
        static int pid;
        if(current == &users_list)
-               (char *)p = cursor_user()->name;
+               p = cursor_user()->name;
        else {
                pid = cursor_pid();
                p = &pid;