Description: changes in version 0.6-1.1
 * Non-maintainer upload. (Patch by Mònica Ramírez Arceda <monica@probeta.net>)
 * eggtrayicon.c, fbxkb.c: Replace deprecated gdk_display and GDK_DISPLAY()
   with gdk_x11_get_default_xdisplay().
 * Link to X11 to build with binutils-gold. (Closes: #554280)
Author: Konstantinos Margaritis <markos@debian.org>
Bug-Debian: https://bugs.debian.org/554280
--- fbxkb-0.6.orig/fbxkb.c
+++ fbxkb-0.6/fbxkb.c
@@ -456,7 +456,7 @@ init()
 
     ENTER;
     sym2pix  = g_hash_table_new(g_str_hash, (GEqualFunc) my_str_equal);
-    dpy = GDK_DISPLAY();
+    dpy = gdk_x11_get_default_xdisplay();
     a_XKB_RULES_NAMES = XInternAtom(dpy, "_XKB_RULES_NAMES", False);
     if (a_XKB_RULES_NAMES == None)
         ERR("_XKB_RULES_NAMES - can't get this atom\n");
@@ -536,7 +536,7 @@ Xerror_handler(Display * d, XErrorEvent
     char buf[256];
 
     ENTER;
-    XGetErrorText(GDK_DISPLAY(), ev->error_code, buf, 256);
+    XGetErrorText(gdk_x11_get_default_xdisplay(), ev->error_code, buf, 256);
     ERR( "fbxkb : X error: %s\n", buf);
     RET();
 }
--- fbxkb-0.6.orig/eggtrayicon.c
+++ fbxkb-0.6/eggtrayicon.c
@@ -153,7 +153,7 @@ egg_tray_icon_send_manager_message (EggT
 #if HAVE_GTK_MULTIHEAD
   display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
 #else
-  display = gdk_display;
+  display = gdk_x11_get_default_xdisplay();
 #endif
   
   gdk_error_trap_push ();
@@ -181,7 +181,7 @@ egg_tray_icon_update_manager_window (Egg
 #if HAVE_GTK_MULTIHEAD
   xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
 #else
-  xdisplay = gdk_display;
+  xdisplay = gdk_x11_get_default_xdisplay();
 #endif
   
   if (icon->manager_window != None)
@@ -300,7 +300,7 @@ egg_tray_icon_new_for_screen (GdkScreen
 EggTrayIcon*
 egg_tray_icon_new (const gchar *name)
 {
-  return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (gdk_display), name);
+  return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (gdk_x11_get_default_xdisplay()), name);
 }
 
 guint
@@ -338,7 +338,7 @@ egg_tray_icon_send_message (EggTrayIcon
 #if HAVE_GTK_MULTIHEAD
       xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
 #else
-      xdisplay = gdk_display;
+      xdisplay = gdk_x11_get_default_xdisplay();
 #endif
       
       ev.type = ClientMessage;
--- fbxkb-0.6.orig/man/Makefile
+++ fbxkb-0.6/man/Makefile
@@ -20,9 +20,8 @@ clean:
 
 
 install: all
-#	install -d  $(PREFIX)/share/man/man1
-#	install -m 644 $(TARGET) $(PREFIX)/share/man/man1
+	install -d  $(PREFIX)/share/man/man1
+	install -m 644 $(TARGET) $(PREFIX)/share/man/man1
 
 uninstall:
-#	rm -f $(PREFIX)/share/man/man1/$(TARGET)
-
+	rm -f $(PREFIX)/share/man/man1/$(TARGET)
--- fbxkb-0.6.orig/man/fbxkb.1
+++ fbxkb-0.6/man/fbxkb.1
@@ -1,70 +1,25 @@
 .\" man page originally for the Debian/GNU Linux system
-.TH FBPANEL "1" "February 2004" "fbxkb 2.2" "User Commands"
+.TH FBXKB "1" "January 2007" "fbxkb 0.6" "User Commands"
 .SH NAME
-fbxkb \- a lightweight GTK2-based panel for UNIX desktop.
+fbxkb \- a lightweight X11 keyboard switcher.
 .SH SYNOPSIS
 .B fbxkb
-[\fIOPTION\fR]
 .br
 .SH DESCRIPTION
 .PP
-fbxkb is desktop panel which provides graphical information and feedback about 
-desktop activity and allows interaction with the window manager. 
-It features:
-.HP
-\(bu taskbar \- shows a list of the managed windows (tasks)
-.HP
-\(bu pager \- thumbnailed view of the desktop.
-.HP
-\(bu launchbar \- buttons to quickly launch applications
-.HP
-\(bu show desktop \- button to iconify or shade all windows 
-.HP
-\(bu image \- display an image
-.HP
-\(bu clock \- show the current time and/or date
-.HP
-\(bu system tray \- tray for XEMBED icons (aka docklets)
-.PP
-fbxkb requires NETWM (www.freedesktop.org) compliant window manager. 
-You can run many instances of fbxkb each with its own configuration
-(see \fBOPTIONS\fR below).
+fbxkb is X11 keyboard switcher, which provides visual information 
+about current keyboard. It shows a flag of current keyboard in a 
+systray area and allows you to switch to another one.
+
+fbxkb requires NETWM (www.freedesktop.org) compliant window manager.
+It's written in C and uses the GTK+-2.4 library only (no GNOME is needed). 
 
 Most updated info about fbxkb can be found on its home page:
 http://fbxkb.sf.net/
-
 .SH OPTIONS
 .TP
-\fB\-h\fR
-\- print help message and exit.
-.TP
-\fB\-v\fR
-\- print version and exit.
-.TP
-\fB\-p <name>\fR 
-\- use the profile <name>. The profile is loaded from the file ~/.fbxkb/<name>.
-If that fails, fbxkb will load PREFIX/share/fbxkb/<name>. No \fB\-p\fR option is equivalent
-to \fB\-p default\fR 
-.SH CUSTOMIZATION
-To change default settings, copy profile file to your home directory
-.br
-      mkdir -p ~/.fbxkb
-      cp PREFIX/share/fbxkb/default ~/.fbxkb
-.br
-and edit it. Default profile file contains comments and explanation inside,
-so it should be easy. For full list of options please visit fbxkb's home page.
-
-.SH FILES
-.TP
-PREFIX/share/fbxkb
-Directory with system-wide resources and default settings
-.TP
-~/.fbxkb/
-Directory with the user's private profiles
-.TP
-~/.fbxkb/default
-The user's default profile.
+fbxkb hasn't options. It just works.
 .SH AUTHOR
 fbxkb was written by Anatoly Asviyan <aanatoly@users.sf.net>.
 This manual page was originally written for the
-Debian GNU/Linux system by Shyamal Prasad <shyamal@member.fsf.org>.
+Debian GNU/Linux system by Vadim Vatlin <vatlin@sthbel.ru>.