[SCM] Gtk+ library to display large amounts of numerical data branch, master, updated. upstream/0.9.1.3-11-g3c3e4e8
Andreas Tille
tille at debian.org
Fri May 10 07:00:42 UTC 2013
The following commit has been merged in the master branch:
commit 3c3e4e88aa4a3d946aef7cbb445a569477869c20
Author: Andreas Tille <tille at debian.org>
Date: Fri May 10 08:55:19 2013 +0200
Remove unneeded patches and refresh remaining ones
diff --git a/debian/changelog b/debian/changelog
index af2367d..2919fe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
libgtkdatabox (1:0.9.2.0-1) UNRELEASED; urgency=low
* New upstream version
+ Removed unneeded patche: 03_deprecated_GTK.patch
+ Refreshed remaining patches
* Reflect move to Git by changing Vcs fields
* debian/control:
- Remove DM-Upload-Allowed
diff --git a/debian/patches/01_libglage_example.patch b/debian/patches/01_libglage_example.patch
index 355a82c..06ec76e 100644
--- a/debian/patches/01_libglage_example.patch
+++ b/debian/patches/01_libglage_example.patch
@@ -1,5 +1,5 @@
---- gtkdatabox-0.9.1.3.orig/examples/basics_libglade.c
-+++ gtkdatabox-0.9.1.3/examples/basics_libglade.c
+--- libgtkdatabox.orig/examples/basics_libglade.c
++++ libgtkdatabox/examples/basics_libglade.c
@@ -29,19 +29,13 @@
#include <gtkdatabox_cross_simple.h>
#include <math.h>
diff --git a/debian/patches/03_deprecated_GTK.patch b/debian/patches/03_deprecated_GTK.patch
deleted file mode 100644
index bb3e74d..0000000
--- a/debian/patches/03_deprecated_GTK.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- gtkdatabox-0.9.1.3.orig/examples/addremove.c
-+++ gtkdatabox-0.9.1.3/examples/addremove.c
-@@ -203,7 +203,7 @@
- g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked",
- G_CALLBACK (gtk_main_quit), GTK_OBJECT (box));
- gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
-- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
-+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
- gtk_widget_grab_default (close_button);
-
- gtk_widget_show_all (window);
---- gtkdatabox-0.9.1.3.orig/examples/basics.c
-+++ gtkdatabox-0.9.1.3/examples/basics.c
-@@ -113,7 +113,7 @@
- g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked",
- G_CALLBACK (gtk_main_quit), GTK_OBJECT (box));
- gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0);
-- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
-+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
- gtk_widget_grab_default (close_button);
- gtk_widget_grab_focus (close_button);
-
---- gtkdatabox-0.9.1.3.orig/examples/basics2.c
-+++ gtkdatabox-0.9.1.3/examples/basics2.c
-@@ -225,7 +225,7 @@
- g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked",
- G_CALLBACK (gtk_main_quit), GTK_OBJECT (box));
- gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0);
-- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
-+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
- gtk_widget_grab_default (close_button);
- gtk_widget_grab_focus (close_button);
-
---- gtkdatabox-0.9.1.3.orig/examples/colors.c
-+++ gtkdatabox-0.9.1.3/examples/colors.c
-@@ -194,7 +194,7 @@
- g_signal_connect (G_OBJECT (close_button), "clicked",
- G_CALLBACK (gtk_main_quit), (gpointer) NULL);
- gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
-- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
-+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
- gtk_widget_grab_default (close_button);
-
-
---- gtkdatabox-0.9.1.3.orig/examples/enable_disable.c
-+++ gtkdatabox-0.9.1.3/examples/enable_disable.c
-@@ -145,7 +145,7 @@
- g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked",
- G_CALLBACK (gtk_main_quit), GTK_OBJECT (box));
- gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
-- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
-+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
- for (i = 0; i < noEnableSets; ++i)
- {
- GtkWidget *vbox = gtk_vbox_new (FALSE, 10);
---- gtkdatabox-0.9.1.3.orig/examples/grid.c
-+++ gtkdatabox-0.9.1.3/examples/grid.c
-@@ -133,7 +133,7 @@
- G_CALLBACK (gtk_main_quit),
- GTK_OBJECT (box));
- gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
-- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
-+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
- gtk_widget_grab_default (close_button);
-
- gtk_widget_show_all (window);
---- gtkdatabox-0.9.1.3.orig/examples/grid_array.c
-+++ gtkdatabox-0.9.1.3/examples/grid_array.c
-@@ -134,7 +134,7 @@
- G_CALLBACK (gtk_main_quit),
- GTK_OBJECT (box));
- gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
-- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
-+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
- gtk_widget_grab_default (close_button);
-
- gtk_widget_show_all (window);
---- gtkdatabox-0.9.1.3.orig/examples/keycontrol.c
-+++ gtkdatabox-0.9.1.3/examples/keycontrol.c
-@@ -133,7 +133,8 @@
- gtk_databox_create_box_with_scrollbars_and_rulers (&box, &table,
- TRUE, TRUE, TRUE, TRUE);
- gtk_widget_add_events (box, GDK_KEY_PRESS_MASK);
-- GTK_WIDGET_SET_FLAGS (box, GTK_CAN_FOCUS | GTK_CAN_DEFAULT);
-+ gtk_widget_set_can_focus(box, GTK_CAN_FOCUS);
-+ gtk_widget_set_can_default(box, GTK_CAN_DEFAULT);
-
- gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE, 0);
-
---- gtkdatabox-0.9.1.3.orig/examples/lissajous.c
-+++ gtkdatabox-0.9.1.3/examples/lissajous.c
-@@ -154,7 +154,7 @@
- G_CALLBACK (gtk_main_quit), G_OBJECT (box));
-
- gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
-- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
-+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
- gtk_widget_grab_default (close_button);
- lissajous_idle = g_idle_add ((GSourceFunc) lissajous_idle_func, box);
-
---- gtkdatabox-0.9.1.3.orig/examples/logarithmic.c
-+++ gtkdatabox-0.9.1.3/examples/logarithmic.c
-@@ -207,7 +207,7 @@
- g_signal_connect (GTK_OBJECT (close_button), "clicked",
- G_CALLBACK (gtk_main_quit), NULL);
- gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0);
-- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
-+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
- gtk_widget_grab_default (close_button);
- gtk_widget_grab_focus (close_button);
-
---- gtkdatabox-0.9.1.3.orig/examples/markers.c
-+++ gtkdatabox-0.9.1.3/examples/markers.c
-@@ -220,7 +220,7 @@
- g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked",
- G_CALLBACK (gtk_main_quit), GTK_OBJECT (box));
- gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
-- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
-+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
- gtk_widget_grab_default (close_button);
-
- gtk_widget_show_all (window);
---- gtkdatabox-0.9.1.3.orig/examples/signals.c
-+++ gtkdatabox-0.9.1.3/examples/signals.c
-@@ -287,7 +287,7 @@
- g_signal_connect_swapped (G_OBJECT (close_button), "clicked",
- G_CALLBACK (gtk_main_quit), G_OBJECT (box));
- gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
-- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
-+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
- gtk_widget_grab_default (close_button);
-
- g_signal_connect (G_OBJECT (box), "zoomed",
---- gtkdatabox-0.9.1.3.orig/gtk/gtkdatabox.c
-+++ gtkdatabox-0.9.1.3/gtk/gtkdatabox.c
-@@ -457,7 +457,8 @@
- gint width;
- gint height;
-
-- gdk_drawable_get_size (widget->window, &width, &height);
-+ width = gdk_window_get_width(widget->window);
-+ height = gdk_window_get_height(widget->window);
- x = MAX (0, MIN (width - 1, x));
- y = MAX (0, MIN (height - 1, y));
-
-@@ -591,7 +592,7 @@
- gint attributes_mask;
-
- box = GTK_DATABOX (widget);
-- GTK_WIDGET_SET_FLAGS (box, GTK_REALIZED);
-+ gtk_widget_set_realized(box, GTK_REALIZED);
-
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.x = widget->allocation.x;
---- gtkdatabox-0.9.1.3.orig/gtk/gtkdatabox_ruler.c
-+++ gtkdatabox-0.9.1.3/gtk/gtkdatabox_ruler.c
-@@ -842,7 +842,7 @@
- gint attributes_mask;
-
- ruler = GTK_DATABOX_RULER (widget);
-- GTK_WIDGET_SET_FLAGS (ruler, GTK_REALIZED);
-+ gtk_widget_set_realized(ruler, GTK_REALIZED);
-
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.x = widget->allocation.x;
diff --git a/debian/patches/04_missing_includes.patch b/debian/patches/04_missing_includes.patch
index 4163fbc..e8c526f 100644
--- a/debian/patches/04_missing_includes.patch
+++ b/debian/patches/04_missing_includes.patch
@@ -3,8 +3,8 @@ Date: Thu, 1 Sep 2011 13:03:19 UTC
Bug-Debian: http://bugs.debian.org/640004
Description: Add missing function prototype definition
---- gtkdatabox-0.9.1.3.orig/gtk/gtkdatabox_graph.c
-+++ gtkdatabox-0.9.1.3/gtk/gtkdatabox_graph.c
+--- libgtkdatabox.orig/gtk/gtkdatabox_graph.c
++++ libgtkdatabox/gtk/gtkdatabox_graph.c
@@ -17,6 +17,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
@@ -16,8 +16,8 @@ Description: Add missing function prototype definition
#include <gtkdatabox_graph.h>
#include <gtk/gtkstyle.h>
#include <gtk/gtkgc.h>
---- gtkdatabox-0.9.1.3.orig/gtk/gtkdatabox_markers.c
-+++ gtkdatabox-0.9.1.3/gtk/gtkdatabox_markers.c
+--- libgtkdatabox.orig/gtk/gtkdatabox_markers.c
++++ libgtkdatabox/gtk/gtkdatabox_markers.c
@@ -17,6 +17,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
diff --git a/debian/patches/series b/debian/patches/series
index 98845e1..6a26855 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
01_libglage_example.patch
-03_deprecated_GTK.patch
04_missing_includes.patch
--
Gtk+ library to display large amounts of numerical data
More information about the debian-science-commits
mailing list