tags 490313 patch thanks Patch for this bug: diff -u cournol-0.5/debian/control cournol-0.5/debian/control --- cournol-0.5/debian/control +++ cournol-0.5/debian/control @@ -2,7 +2,7 @@ Section: utils Priority: extra Maintainer: Alejandro Garrido Mota <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5), autotools-dev, libgtk2.0-dev (>= 2.10.12-2), libgtkdatabox-0.8.2-2, libgtkdatabox-0.8.2-dev +Build-Depends: debhelper (>= 5), autotools-dev, libgtk2.0-dev (>= 2.10.12-2), libgtkdatabox-0.9.0-0-dev Standards-Version: 3.7.3 Homepage: http://k-2007.de/cournol/ diff -u cournol-0.5/debian/changelog cournol-0.5/debian/changelog --- cournol-0.5/debian/changelog +++ cournol-0.5/debian/changelog @@ -1,3 +1,11 @@ +cournol (0.5-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Update libgtkdatabox build dependency (Closes: #490313) + and change code for the marker -> markers rename. + + -- Frank Lichtenheld <[EMAIL PROTECTED]> Thu, 31 Jul 2008 21:41:28 +0200 + cournol (0.5-1) unstable; urgency=low * New upstream version only in patch2: unchanged: --- cournol-0.5.orig/configure +++ cournol-0.5/configure @@ -4561,7 +4561,7 @@ -for ac_header in gtkdatabox.h gtkdatabox_lines.h gtkdatabox_marker.h +for ac_header in gtkdatabox.h gtkdatabox_lines.h gtkdatabox_markers.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_header" >&5 only in patch2: unchanged: --- cournol-0.5.orig/configure.ac +++ cournol-0.5/configure.ac @@ -30,7 +30,7 @@ [AC_MSG_ERROR([GtkDatabox library not found. Install libgtkdatabox first.])]) dnl Look for GtkDatabox headers -AC_CHECK_HEADERS([gtkdatabox.h gtkdatabox_lines.h gtkdatabox_marker.h],, +AC_CHECK_HEADERS([gtkdatabox.h gtkdatabox_lines.h gtkdatabox_markers.h],, [AC_MSG_ERROR([GtkDatabox headers not found. Install libgtkdatabox-dev.])], [#if HAVE_GTKDATABOX_H # include <gtkdatabox.h> only in patch2: unchanged: --- cournol-0.5.orig/src/output.c +++ cournol-0.5/src/output.c @@ -20,7 +20,7 @@ #include <glib/gi18n.h> #include <gtkdatabox.h> #include <gtkdatabox_lines.h> -#include <gtkdatabox_marker.h> +#include <gtkdatabox_markers.h> #include "output.h" #include "main.h" @@ -143,11 +143,11 @@ gtk_databox_graph_add(GTK_DATABOX(appl->darea_1), graph); graph = - gtk_databox_marker_new(val->points_cost, val->x_cost, val->y_cost, + gtk_databox_markers_new(val->points_cost, val->x_cost, val->y_cost, &color, MARKER_SIZE, - GTK_DATABOX_MARKER_NONE); - gtk_databox_marker_set_label(GTK_DATABOX_MARKER(graph), - val->points_cost - 1, GTK_DATABOX_TEXT_SW, + GTK_DATABOX_MARKERS_NONE); + gtk_databox_markers_set_label(GTK_DATABOX_MARKERS(graph), + val->points_cost - 1, GTK_DATABOX_MARKERS_TEXT_SW, _("C(x)"), FALSE); gtk_databox_graph_add(GTK_DATABOX(appl->darea_1), graph); @@ -158,11 +158,11 @@ gtk_databox_graph_add(GTK_DATABOX(appl->darea_2), graph); graph = - gtk_databox_marker_new(val->points_cost_, val->x_cost_, + gtk_databox_markers_new(val->points_cost_, val->x_cost_, val->y_cost_, &color, MARKER_SIZE, - GTK_DATABOX_MARKER_NONE); - gtk_databox_marker_set_label(GTK_DATABOX_MARKER(graph), - val->points_cost_ - 1, GTK_DATABOX_TEXT_SW, + GTK_DATABOX_MARKERS_NONE); + gtk_databox_markers_set_label(GTK_DATABOX_MARKERS(graph), + val->points_cost_ - 1, GTK_DATABOX_MARKERS_TEXT_SW, _("C\'(x)"), FALSE); gtk_databox_graph_add(GTK_DATABOX(appl->darea_2), graph); @@ -182,12 +182,12 @@ gtk_databox_graph_add(GTK_DATABOX(appl->darea_2), graph); graph = - gtk_databox_marker_new(val->points_costu, val->x_costu, + gtk_databox_markers_new(val->points_costu, val->x_costu, val->y_costu, &color, MARKER_SIZE, - GTK_DATABOX_MARKER_NONE); - gtk_databox_marker_set_label(GTK_DATABOX_MARKER(graph), + GTK_DATABOX_MARKERS_NONE); + gtk_databox_markers_set_label(GTK_DATABOX_MARKERS(graph), 0, - GTK_DATABOX_TEXT_SE, _("c(x)"), + GTK_DATABOX_MARKERS_TEXT_SE, _("c(x)"), FALSE); gtk_databox_graph_add(GTK_DATABOX(appl->darea_2), graph); @@ -202,12 +202,12 @@ gtk_databox_graph_add(GTK_DATABOX(appl->darea_2), graph); graph = - gtk_databox_marker_new(val->points_costuv, val->x_costuv, + gtk_databox_markers_new(val->points_costuv, val->x_costuv, val->y_costuv, &color, MARKER_SIZE, - GTK_DATABOX_MARKER_NONE); - gtk_databox_marker_set_label(GTK_DATABOX_MARKER(graph), + GTK_DATABOX_MARKERS_NONE); + gtk_databox_markers_set_label(GTK_DATABOX_MARKERS(graph), 0, - GTK_DATABOX_TEXT_NE, _("cv(x)"), + GTK_DATABOX_MARKERS_TEXT_NE, _("cv(x)"), FALSE); gtk_databox_graph_add(GTK_DATABOX(appl->darea_2), graph); break; @@ -228,12 +228,12 @@ gtk_databox_graph_add(GTK_DATABOX(appl->darea_2), graph); graph = - gtk_databox_marker_new(2, val->x_price_sales, + gtk_databox_markers_new(2, val->x_price_sales, val->y_price_sales, &color, MARKER_SIZE, - GTK_DATABOX_MARKER_NONE); - gtk_databox_marker_set_label(GTK_DATABOX_MARKER(graph), 1, - GTK_DATABOX_TEXT_NW, _("p(x)"), + GTK_DATABOX_MARKERS_NONE); + gtk_databox_markers_set_label(GTK_DATABOX_MARKERS(graph), 1, + GTK_DATABOX_MARKERS_TEXT_NW, _("p(x)"), FALSE); gtk_databox_graph_add(GTK_DATABOX(appl->darea_1), graph); gtk_databox_graph_add(GTK_DATABOX(appl->darea_2), graph); @@ -251,15 +251,15 @@ gtk_databox_graph_add(GTK_DATABOX(appl->darea_1), graph); graph = - gtk_databox_marker_new(val->points_revenue, val->x_revenue, + gtk_databox_markers_new(val->points_revenue, val->x_revenue, val->y_revenue, &color, MARKER_SIZE, - GTK_DATABOX_MARKER_NONE); + GTK_DATABOX_MARKERS_NONE); switch (val->type) { case 1: case 2: case 3: - gtk_databox_marker_set_label(GTK_DATABOX_MARKER(graph), 1, - GTK_DATABOX_TEXT_SW, _("R(x)"), + gtk_databox_markers_set_label(GTK_DATABOX_MARKERS(graph), 1, + GTK_DATABOX_MARKERS_TEXT_SW, _("R(x)"), FALSE); break; @@ -267,9 +267,9 @@ case 5: case 6: default: - gtk_databox_marker_set_label(GTK_DATABOX_MARKER(graph), + gtk_databox_markers_set_label(GTK_DATABOX_MARKERS(graph), (POINTS - 1) / 2, - GTK_DATABOX_TEXT_N, _("R(x)"), + GTK_DATABOX_MARKERS_TEXT_N, _("R(x)"), FALSE); break; } @@ -282,14 +282,14 @@ gtk_databox_graph_add(GTK_DATABOX(appl->darea_2), graph); graph = - gtk_databox_marker_new(2, val->x_revenue_, val->y_revenue_, &color, - MARKER_SIZE, GTK_DATABOX_MARKER_NONE); + gtk_databox_markers_new(2, val->x_revenue_, val->y_revenue_, &color, + MARKER_SIZE, GTK_DATABOX_MARKERS_NONE); switch (val->type) { case 1: case 2: case 3: - gtk_databox_marker_set_label(GTK_DATABOX_MARKER(graph), 1, - GTK_DATABOX_TEXT_SW, _("R\'(x)"), + gtk_databox_markers_set_label(GTK_DATABOX_MARKERS(graph), 1, + GTK_DATABOX_MARKERS_TEXT_SW, _("R\'(x)"), FALSE); break; @@ -297,8 +297,8 @@ case 5: case 6: default: - gtk_databox_marker_set_label(GTK_DATABOX_MARKER(graph), 1, - GTK_DATABOX_TEXT_NE, _("R\'(x)"), + gtk_databox_markers_set_label(GTK_DATABOX_MARKERS(graph), 1, + GTK_DATABOX_MARKERS_TEXT_NE, _("R\'(x)"), FALSE); break; } @@ -311,11 +311,11 @@ color.blue = 0; graph = - gtk_databox_marker_new(1, &(val->quantity), &(val->price), + gtk_databox_markers_new(1, &(val->quantity), &(val->price), &color, MARKER_SIZE, - GTK_DATABOX_MARKER_TRIANGLE); - gtk_databox_marker_set_label(GTK_DATABOX_MARKER(graph), 0, - GTK_DATABOX_TEXT_N, + GTK_DATABOX_MARKERS_TRIANGLE); + gtk_databox_markers_set_label(GTK_DATABOX_MARKERS(graph), 0, + GTK_DATABOX_MARKERS_TEXT_N, _("Cournot point"), FALSE); gtk_databox_graph_add(GTK_DATABOX(appl->darea_1), graph); gtk_databox_graph_add(GTK_DATABOX(appl->darea_2), graph);
Gruesse, -- Frank Lichtenheld <[EMAIL PROTECTED]> www: http://www.djpig.de/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
