r45228 - in /packages/libgtkdatabox/trunk/debian: ./ patches/
tille at users.alioth.debian.org
tille at users.alioth.debian.org
Wed Jul 11 13:16:33 UTC 2012
Author: tille
Date: Wed Jul 11 13:16:31 2012
New Revision: 45228
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45228
Log:
New upstream version which has some patches incorporated (unfortunately not in the examples)
Added:
packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.3-1-dev.doc-base
- copied unchanged from r44666, packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.1-1-dev.doc-base
packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.3-1-dev.links
- copied unchanged from r44666, packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.1-1-dev.links
packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.3-1-glade.install
- copied unchanged from r44666, packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.1-1-glade.install
packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.3-1-libglade.install
- copied unchanged from r44666, packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.1-1-libglade.install
Removed:
packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.1-1-dev.doc-base
packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.1-1-dev.links
packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.1-1-glade.install
packages/libgtkdatabox/trunk/debian/libgtkdatabox-0.9.1-1-libglade.install
packages/libgtkdatabox/trunk/debian/patches/02_deprecated_GTK.patch
Modified:
packages/libgtkdatabox/trunk/debian/changelog
packages/libgtkdatabox/trunk/debian/patches/01_libglage_example.patch
packages/libgtkdatabox/trunk/debian/patches/03_deprecated_GTK.patch
packages/libgtkdatabox/trunk/debian/patches/series
Modified: packages/libgtkdatabox/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/changelog?rev=45228&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/changelog (original)
+++ packages/libgtkdatabox/trunk/debian/changelog Wed Jul 11 13:16:31 2012
@@ -1,3 +1,20 @@
+libgtkdatabox (1:0.9.3-1) UNRELEASED; urgency=low
+
+ * New upstream version
+ - Refreshed remaining patches
+ - Deleted 02_deprecated_GTK.patch which was applied upstream
+ * Incorporated patch from Ubuntu version below
+ Closes: #640004
+
+ -- Andreas Tille <tille at debian.org> Wed, 11 Jul 2012 15:02:19 +0200
+
+libgtkdatabox (1:0.9.1.1-4ubuntu1) oneiric; urgency=low
+
+ * Undefined GDK_DISABLE_DEPRECATED to avoid warning: assignment makes
+ pointer from integer without a cast. Fix FTBFS on amd64. LP: #831147.
+
+ -- Matthias Klose <doko at ubuntu.com> Thu, 01 Sep 2011 13:39:05 +0200
+
libgtkdatabox (1:0.9.1.1-4) unstable; urgency=low
[Luk Claes]
Modified: packages/libgtkdatabox/trunk/debian/patches/01_libglage_example.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/patches/01_libglage_example.patch?rev=45228&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/patches/01_libglage_example.patch (original)
+++ packages/libgtkdatabox/trunk/debian/patches/01_libglage_example.patch Wed Jul 11 13:16:31 2012
@@ -1,5 +1,5 @@
---- libgtkdatabox-0.9.0.1.orig/examples/basics_libglade.c
-+++ libgtkdatabox-0.9.0.1/examples/basics_libglade.c
+--- gtkdatabox-0.9.1.3.orig/examples/basics_libglade.c
++++ gtkdatabox-0.9.1.3/examples/basics_libglade.c
@@ -29,19 +29,13 @@
#include <gtkdatabox_cross_simple.h>
#include <math.h>
Modified: packages/libgtkdatabox/trunk/debian/patches/03_deprecated_GTK.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/patches/03_deprecated_GTK.patch?rev=45228&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/patches/03_deprecated_GTK.patch (original)
+++ packages/libgtkdatabox/trunk/debian/patches/03_deprecated_GTK.patch Wed Jul 11 13:16:31 2012
@@ -1,7 +1,5 @@
-Index: libgtkdatabox-0.9.1.1/examples/addremove.c
-===================================================================
---- libgtkdatabox-0.9.1.1.orig/examples/addremove.c 2011-05-21 12:39:01.703594722 +0200
-+++ libgtkdatabox-0.9.1.1/examples/addremove.c 2011-05-21 12:36:16.739594810 +0200
+--- 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));
@@ -11,10 +9,8 @@
gtk_widget_grab_default (close_button);
gtk_widget_show_all (window);
-Index: libgtkdatabox-0.9.1.1/examples/basics.c
-===================================================================
---- libgtkdatabox-0.9.1.1.orig/examples/basics.c 2011-05-21 12:39:02.075594722 +0200
-+++ libgtkdatabox-0.9.1.1/examples/basics.c 2011-05-21 12:36:16.759594820 +0200
+--- 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));
@@ -24,10 +20,8 @@
gtk_widget_grab_default (close_button);
gtk_widget_grab_focus (close_button);
-Index: libgtkdatabox-0.9.1.1/examples/basics2.c
-===================================================================
---- libgtkdatabox-0.9.1.1.orig/examples/basics2.c 2011-05-21 12:39:01.911594722 +0200
-+++ libgtkdatabox-0.9.1.1/examples/basics2.c 2011-05-21 12:36:16.747594818 +0200
+--- 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));
@@ -37,10 +31,8 @@
gtk_widget_grab_default (close_button);
gtk_widget_grab_focus (close_button);
-Index: libgtkdatabox-0.9.1.1/examples/colors.c
-===================================================================
---- libgtkdatabox-0.9.1.1.orig/examples/colors.c 2011-05-21 12:39:02.115594722 +0200
-+++ libgtkdatabox-0.9.1.1/examples/colors.c 2011-05-21 12:36:16.763594819 +0200
+--- 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);
@@ -50,10 +42,8 @@
gtk_widget_grab_default (close_button);
-Index: libgtkdatabox-0.9.1.1/examples/enable_disable.c
-===================================================================
---- libgtkdatabox-0.9.1.1.orig/examples/enable_disable.c 2011-05-21 12:39:01.787594722 +0200
-+++ libgtkdatabox-0.9.1.1/examples/enable_disable.c 2011-05-21 12:36:16.743594812 +0200
+--- 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));
@@ -63,10 +53,8 @@
for (i = 0; i < noEnableSets; ++i)
{
GtkWidget *vbox = gtk_vbox_new (FALSE, 10);
-Index: libgtkdatabox-0.9.1.1/examples/grid.c
-===================================================================
---- libgtkdatabox-0.9.1.1.orig/examples/grid.c 2011-05-21 12:39:01.995594722 +0200
-+++ libgtkdatabox-0.9.1.1/examples/grid.c 2011-05-21 12:36:16.755594821 +0200
+--- 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));
@@ -76,10 +64,8 @@
gtk_widget_grab_default (close_button);
gtk_widget_show_all (window);
-Index: libgtkdatabox-0.9.1.1/examples/grid_array.c
-===================================================================
---- libgtkdatabox-0.9.1.1.orig/examples/grid_array.c 2011-05-21 12:39:01.951594722 +0200
-+++ libgtkdatabox-0.9.1.1/examples/grid_array.c 2011-05-21 12:36:16.751594821 +0200
+--- 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));
@@ -89,10 +75,8 @@
gtk_widget_grab_default (close_button);
gtk_widget_show_all (window);
-Index: libgtkdatabox-0.9.1.1/examples/keycontrol.c
-===================================================================
---- libgtkdatabox-0.9.1.1.orig/examples/keycontrol.c 2011-05-21 12:39:02.155594722 +0200
-+++ libgtkdatabox-0.9.1.1/examples/keycontrol.c 2011-05-21 12:37:15.211595055 +0200
+--- 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);
@@ -103,10 +87,8 @@
gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE, 0);
-Index: libgtkdatabox-0.9.1.1/examples/lissajous.c
-===================================================================
---- libgtkdatabox-0.9.1.1.orig/examples/lissajous.c 2011-05-21 12:39:02.035594722 +0200
-+++ libgtkdatabox-0.9.1.1/examples/lissajous.c 2011-05-21 12:36:16.759594820 +0200
+--- 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));
@@ -116,10 +98,8 @@
gtk_widget_grab_default (close_button);
lissajous_idle = g_idle_add ((GSourceFunc) lissajous_idle_func, box);
-Index: libgtkdatabox-0.9.1.1/examples/logarithmic.c
-===================================================================
---- libgtkdatabox-0.9.1.1.orig/examples/logarithmic.c 2011-05-21 12:39:01.827594722 +0200
-+++ libgtkdatabox-0.9.1.1/examples/logarithmic.c 2011-05-21 12:36:16.743594812 +0200
+--- 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);
@@ -129,10 +109,8 @@
gtk_widget_grab_default (close_button);
gtk_widget_grab_focus (close_button);
-Index: libgtkdatabox-0.9.1.1/examples/markers.c
-===================================================================
---- libgtkdatabox-0.9.1.1.orig/examples/markers.c 2011-05-21 12:39:01.871594722 +0200
-+++ libgtkdatabox-0.9.1.1/examples/markers.c 2011-05-21 12:36:16.747594818 +0200
+--- 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));
@@ -142,10 +120,8 @@
gtk_widget_grab_default (close_button);
gtk_widget_show_all (window);
-Index: libgtkdatabox-0.9.1.1/examples/signals.c
-===================================================================
---- libgtkdatabox-0.9.1.1.orig/examples/signals.c 2011-05-21 12:39:01.751594722 +0200
-+++ libgtkdatabox-0.9.1.1/examples/signals.c 2011-05-21 12:36:16.743594812 +0200
+--- 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));
@@ -155,11 +131,9 @@
gtk_widget_grab_default (close_button);
g_signal_connect (G_OBJECT (box), "zoomed",
-Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c
-===================================================================
---- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox.c 2011-05-21 12:39:01.583594722 +0200
-+++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c 2011-05-21 12:38:43.523595004 +0200
-@@ -453,7 +453,8 @@
+--- 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;
@@ -169,7 +143,7 @@
x = MAX (0, MIN (width - 1, x));
y = MAX (0, MIN (height - 1, y));
-@@ -587,7 +588,7 @@
+@@ -591,7 +592,7 @@
gint attributes_mask;
box = GTK_DATABOX (widget);
@@ -178,10 +152,8 @@
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;
-Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c
-===================================================================
---- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_ruler.c 2011-05-21 12:39:01.631594722 +0200
-+++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c 2011-05-21 12:38:59.963594710 +0200
+--- 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;
Modified: packages/libgtkdatabox/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/patches/series?rev=45228&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/patches/series (original)
+++ packages/libgtkdatabox/trunk/debian/patches/series Wed Jul 11 13:16:31 2012
@@ -1,3 +1,3 @@
01_libglage_example.patch
-02_deprecated_GTK.patch
03_deprecated_GTK.patch
+04_missing_includes.patch
More information about the debian-science-commits
mailing list