tags 577306 + patch pending
thanks
Dear maintainer,
I've prepared an NMU for xoscope (versioned as 2.0-3.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -u xoscope-2.0/debian/changelog xoscope-2.0/debian/changelog
--- xoscope-2.0/debian/changelog
+++ xoscope-2.0/debian/changelog
@@ -1,3 +1,11 @@
+xoscope (2.0-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/02-deprecated_GTK.patch:
+ - Replace deprecated GTK macro with related function (Closes: #577306).
+
+ -- Luca Falavigna <dktrkr...@debian.org> Sat, 08 May 2010 02:06:34 +0200
+
xoscope (2.0-3) unstable; urgency=low
* Upload to unstable.
diff -u xoscope-2.0/debian/patches/series xoscope-2.0/debian/patches/series
--- xoscope-2.0/debian/patches/series
+++ xoscope-2.0/debian/patches/series
@@ -1,0 +2 @@
+02-deprecated_GTK.patch
only in patch2:
unchanged:
--- xoscope-2.0.orig/debian/patches/02-deprecated_GTK.patch
+++ xoscope-2.0/debian/patches/02-deprecated_GTK.patch
@@ -0,0 +1,49 @@
+Index: xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c
+===================================================================
+--- xoscope-2.0.orig/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-05-08 02:06:19.060429808 +0200
++++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-05-08 02:06:14.624423484 +0200
+@@ -661,7 +661,7 @@
+ static void
+ gtk_databox_calculate_hcanvas (GtkDatabox *box)
+ {
+- if (!GTK_WIDGET_VISIBLE (box))
++ if (!gtk_widget_get_visible (box))
+ return;
+
+ if (box->priv->adjX->page_size == 1.0)
+@@ -698,7 +698,7 @@
+ static void
+ gtk_databox_calculate_vcanvas (GtkDatabox *box)
+ {
+- if (!GTK_WIDGET_VISIBLE (box))
++ if (!gtk_widget_get_visible (box))
+ return;
+
+ if (box->priv->adjY->page_size == 1.0)
+@@ -780,7 +780,7 @@
+ gtk_databox_draw (box, event);
+
+ gdk_draw_drawable (widget->window,
+- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
++ widget->style->fg_gc[gtk_widget_get_state (widget)],
+ box->priv->canvas.pixmap, event->area.x, event->area.y,
+ event->area.x, event->area.y, event->area.width,
+ event->area.height);
+@@ -940,7 +940,7 @@
+ GtkWidget *widget = GTK_WIDGET (box);
+
+ g_return_if_fail (GTK_IS_DATABOX (box));
+- g_return_if_fail (GTK_WIDGET_VISIBLE (widget));
++ g_return_if_fail (gtk_widget_get_visible (widget));
+
+ gdk_draw_rectangle (box->priv->canvas.pixmap, widget->style->bg_gc[0],
+ TRUE, 0, 0,
+@@ -1150,7 +1150,7 @@
+ /* Copy a part of the pixmap to the screen */
+ if (pixmapCopyRect)
+ gdk_draw_drawable (widget->window,
+- widget->style->fg_gc[GTK_WIDGET_STATE (box)],
++ widget->style->fg_gc[gtk_widget_get_state (box)],
+ box->priv->canvas.pixmap,
+ pixmapCopyRect->x,
+ pixmapCopyRect->y,
