Bug#554280: fbxkb: diff for NMU version 0.6-1.1

[Konstantinos Margaritis]

tags 554280 + pending
thanks

Dear maintainer,

I've prepared an NMU for fbxkb (versioned as 0.6-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

Konstantinos

diff -u fbxkb-0.6/debian/changelog fbxkb-0.6/debian/changelog
--- fbxkb-0.6/debian/changelog
+++ fbxkb-0.6/debian/changelog
@@ -1,3 +1,12 @@
+fbxkb (0.6-1.1) unstable; urgency=low
+
+  * Non-maintainer upload. (Patch by Mònica Ramírez Arceda <mon...@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)
+
+ -- Konstantinos Margaritis <mar...@debian.org>  Fri, 31 Jan 2012 13:46:19 +0200
+
 fbxkb (0.6-1) unstable; urgency=low
 
   * Initial Release.
diff -u fbxkb-0.6/debian/rules fbxkb-0.6/debian/rules
--- fbxkb-0.6/debian/rules
+++ fbxkb-0.6/debian/rules
@@ -10,6 +10,7 @@
 #export DH_VERBOSE=1
 
 CFLAGS = -Wall -g
+LDFLAGS = -lX11
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -26,7 +27,7 @@
 build-stamp:  config.status
 	dh_testdir
 
-	$(MAKE)
+	LDFLAGS="$(LDFLAGS)" $(MAKE)
 	touch $@
 
 clean:
only in patch2:
unchanged:
--- fbxkb-0.6.orig/eggtrayicon.c
+++ fbxkb-0.6/eggtrayicon.c
@@ -153,7 +153,7 @@
 #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 @@
 #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 @@
 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 @@
 #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;
only in patch2:
unchanged:
--- fbxkb-0.6.orig/fbxkb.c
+++ fbxkb-0.6/fbxkb.c
@@ -456,7 +456,7 @@
 
     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 @@
     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();
 }