--- fbxkb.c.orig	2006-12-18 21:47:52.000000000 +0000
+++ fbxkb.c	2008-11-08 16:25:32.000000000 +0000
@@ -378,10 +378,11 @@
             g_assert((no >= 0) && (no < ngroups));
             if (group2info[no].sym != NULL) {
                 ERR("xkb group #%d is already defined\n", no);
+            } else {
+                group2info[no].sym = g_strdup(tok);
+                group2info[no].flag = sym2flag(tok);
+                group2info[no].name = XGetAtomName(dpy, kbd_desc_ptr->names->groups[no]);           
             }
-            group2info[no].sym = g_strdup(tok);
-            group2info[no].flag = sym2flag(tok);
-            group2info[no].name = XGetAtomName(dpy, kbd_desc_ptr->names->groups[no]);           
         }
         XFree(sym_name);
     }
--- Makefile.common.orig      2004-10-15 22:18:59.000000000 +0000
+++ Makefile.common   2010-11-02 13:35:02.593908176 +0000
@@ -25,7 +25,7 @@
 endif

 # -DGTK_DISABLE_DEPRECATED does not work yet
-CFLAGS += -g -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
+CFLAGS += -g

 %.o: %.c
        $(CC) $(CFLAGS) $(INCS) -c $<