diff -Nru planner-0.14.6/debian/changelog planner-0.14.6/debian/changelog --- planner-0.14.6/debian/changelog 2020-01-27 01:42:24.000000000 +0000 +++ planner-0.14.6/debian/changelog 2020-03-10 11:25:31.000000000 +0000 @@ -1,14 +1,9 @@ -planner (0.14.6-8ubuntu2) focal; urgency=medium +planner (0.14.6-9) unstable; urgency=medium - * Fix build with Python3.8. + * QA upload + * Fix build with Python 3.8 - -- Matthias Klose Mon, 27 Jan 2020 02:42:24 +0100 - -planner (0.14.6-8build1) focal; urgency=medium - - * No-change rebuild to build with python3.8. - - -- Matthias Klose Sat, 25 Jan 2020 05:43:05 +0000 + -- Graham Inggs Tue, 10 Mar 2020 11:25:31 +0000 planner (0.14.6-8) unstable; urgency=medium diff -Nru planner-0.14.6/debian/patches/python3.patch planner-0.14.6/debian/patches/python3.patch --- planner-0.14.6/debian/patches/python3.patch 2020-01-27 01:42:24.000000000 +0000 +++ planner-0.14.6/debian/patches/python3.patch 2020-03-10 11:25:31.000000000 +0000 @@ -5,13 +5,11 @@ Author: Yavor Doganov Bug-Debian: https://bugs.debian.org/937299 Forwarded: no -Last-Update: 2019-10-06 +Last-Update: 2020-03-10 --- -Index: b/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am +--- planner-0.14.6.orig/Makefile.am ++++ planner-0.14.6/Makefile.am @@ -3,10 +3,6 @@ #endif dotnet_DIR = @@ -23,7 +21,7 @@ if HAVE_EDS_BACKEND eds_backend_DIR = eds-backend endif -@@ -41,6 +37,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ +@@ -41,6 +37,7 @@ --disable-dotnet \ --enable-python \ --disable-scrollkeeper \ @@ -31,10 +29,8 @@ --disable-update-mimedb # Workaround broken scrollkeeper that doesn't remove its files on -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in +--- planner-0.14.6.orig/configure.in ++++ planner-0.14.6/configure.in @@ -2,8 +2,8 @@ # require autoconf 2.54 AC_PREREQ(2.54) @@ -46,7 +42,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AM_CONFIG_HEADER(config.h) -@@ -24,6 +24,8 @@ if test -z "$PKG_CONFIG"; then +@@ -24,6 +24,8 @@ AC_MSG_ERROR([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/]) fi @@ -55,7 +51,7 @@ # Just run true if these don't exist AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, true) AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, true) -@@ -157,37 +159,13 @@ dnl ------------------------------------ +@@ -157,37 +159,13 @@ dnl -------------- dnl | Python setup |-------------------------------------------- dnl -------------- @@ -98,7 +94,7 @@ dnl ----------------------------------------------------------- dnl -------------- -@@ -307,7 +285,6 @@ data/dtd/Makefile +@@ -307,7 +285,6 @@ data/stylesheets/Makefile data/mime/Makefile data/sql/Makefile @@ -106,7 +102,7 @@ eds-backend/Makefile eds-backend/planner-source/Makefile eds-backend/utils/Makefile -@@ -321,7 +298,6 @@ data/planner.desktop.in +@@ -321,7 +298,6 @@ echo echo "Planner prefix : $prefix" echo "Build API docs : $enable_gtk_doc" @@ -114,11 +110,9 @@ echo "Python plugin : $enable_python_plugin" #echo "Dotnet bindings : $have_dotnet" echo "Simple priority scheduling : $use_simple_priority_scheduling" -Index: b/libplanner/Makefile.am -=================================================================== ---- a/libplanner/Makefile.am -+++ b/libplanner/Makefile.am -@@ -137,3 +137,27 @@ $(libplanner_1_la_OBJECTS): $(built_sour +--- planner-0.14.6.orig/libplanner/Makefile.am ++++ planner-0.14.6/libplanner/Makefile.am +@@ -137,3 +137,27 @@ EXTRA_DIST = mrp-marshal.list CLEANFILES = $(built_sources) @@ -146,11 +140,9 @@ + +CLEANFILES += $(gir_DATA) $(typelib_DATA) +endif -Index: b/src/Makefile.am -=================================================================== ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -11,7 +11,7 @@ INCLUDES = \ +--- planner-0.14.6.orig/src/Makefile.am ++++ planner-0.14.6/src/Makefile.am +@@ -11,7 +11,7 @@ -DDATADIR=\""$(datadir)"\" if HAVE_PYTHON_PLUGIN @@ -159,7 +151,7 @@ endif bin_PROGRAMS = planner -@@ -19,13 +19,12 @@ planner_SOURCES = \ +@@ -19,13 +19,12 @@ planner-main.c planner_LDFLAGS = -export-dynamic planner_LDADD = \ @@ -176,7 +168,7 @@ libplannerapp_la_SOURCES = \ $(built_sources) \ -@@ -184,8 +183,7 @@ if HAVE_PYTHON_PLUGIN +@@ -184,8 +183,7 @@ python_plugin = libpython-plugin.la libpython_plugin_la_SOURCES = planner-python-plugin.c libpython_plugin_la_LDFLAGS = -avoid-version -module @@ -186,7 +178,7 @@ endif if HAVE_EDS_PLUGIN -@@ -233,3 +231,30 @@ EXTRA_DIST = planner-marshal.list \ +@@ -233,3 +231,30 @@ planner-util-win32.c CLEANFILES = $(built_sources) @@ -217,11 +209,9 @@ + +CLEANFILES += $(gir_DATA) $(typelib_DATA) +endif -Index: b/src/planner-python-plugin.c -=================================================================== ---- a/src/planner-python-plugin.c -+++ b/src/planner-python-plugin.c -@@ -84,21 +84,21 @@ python_plugin_execute (const gchar *fi +--- planner-0.14.6.orig/src/planner-python-plugin.c ++++ planner-0.14.6/src/planner-python-plugin.c +@@ -84,21 +84,21 @@ env = planner_python_env_new (filename); @@ -254,11 +244,9 @@ return; } -Index: b/acinclude.m4 -=================================================================== ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -66,8 +66,8 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS], +--- planner-0.14.6.orig/acinclude.m4 ++++ planner-0.14.6/acinclude.m4 +@@ -66,8 +66,8 @@ [AC_REQUIRE([AM_PATH_PYTHON]) AC_MSG_CHECKING(for headers required to compile python extensions) dnl deduce PYTHON_INCLUDES @@ -269,7 +257,7 @@ PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" if test "$py_prefix" != "$py_exec_prefix"; then PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" -@@ -84,18 +84,8 @@ $2]) +@@ -84,18 +84,8 @@ CPPFLAGS="$save_CPPFLAGS" # Check for Python library path @@ -292,11 +280,9 @@ + [AC_MSG_ERROR([Python library not found.])]) + AC_SUBST([PYTHON_LIB],["-l${python_lib}"]) ]) -Index: b/src/planner-window.h -=================================================================== ---- a/src/planner-window.h -+++ b/src/planner-window.h -@@ -58,13 +58,33 @@ gboolean planner_window_open +--- planner-0.14.6.orig/src/planner-window.h ++++ planner-0.14.6/src/planner-window.h +@@ -58,13 +58,33 @@ gboolean planner_window_open_in_existing_or_new (PlannerWindow *window, const gchar *uri, gboolean internal); @@ -330,11 +316,9 @@ PlannerCmdManager * planner_window_get_cmd_manager (PlannerWindow *window); void planner_window_set_status (PlannerWindow *window, const gchar *message); -Index: b/libplanner/mrp-project.h -=================================================================== ---- a/libplanner/mrp-project.h -+++ b/libplanner/mrp-project.h -@@ -43,7 +43,7 @@ typedef struct _MrpProjectPriv MrpProjec +--- planner-0.14.6.orig/libplanner/mrp-project.h ++++ planner-0.14.6/libplanner/mrp-project.h +@@ -43,7 +43,7 @@ #include #include @@ -343,11 +327,9 @@ struct _MrpProject { MrpObject parent; -Index: b/libplanner/mrp-task.h -=================================================================== ---- a/libplanner/mrp-task.h -+++ b/libplanner/mrp-task.h -@@ -84,7 +84,6 @@ struct _MrpTaskClass +--- planner-0.14.6.orig/libplanner/mrp-task.h ++++ planner-0.14.6/libplanner/mrp-task.h +@@ -84,7 +84,6 @@ GType mrp_task_get_type (void) G_GNUC_CONST; GType mrp_constraint_get_type (void) G_GNUC_CONST; @@ -355,11 +337,9 @@ MrpTask *mrp_task_new (void); const gchar *mrp_task_get_name (MrpTask *task); void mrp_task_set_name (MrpTask *task, -Index: b/libplanner/mrp-task.c -=================================================================== ---- a/libplanner/mrp-task.c -+++ b/libplanner/mrp-task.c -@@ -1040,7 +1040,8 @@ mrp_task_has_relation (MrpTask *task) +--- planner-0.14.6.orig/libplanner/mrp-task.c ++++ planner-0.14.6/libplanner/mrp-task.c +@@ -1040,7 +1040,8 @@ * must be started or finished before task can be started or finished, * with an optional lag/lead time. * @@ -369,7 +349,7 @@ **/ MrpRelation * mrp_task_add_predecessor (MrpTask *task, -@@ -1191,8 +1192,9 @@ mrp_task_remove_predecessor (MrpTask *ta +@@ -1191,8 +1192,9 @@ * * Fetches a relation between two tasks if it exists. * @@ -381,7 +361,7 @@ **/ MrpRelation * mrp_task_get_relation (MrpTask *task_a, MrpTask *task_b) -@@ -1217,7 +1219,8 @@ mrp_task_get_relation (MrpTask *task_a, +@@ -1217,7 +1219,8 @@ * * Fetches a predecessor relation between task and it's predecessor. * @@ -391,7 +371,7 @@ **/ MrpRelation * mrp_task_get_predecessor_relation (MrpTask *task, MrpTask *predecessor) -@@ -1235,7 +1238,8 @@ mrp_task_get_predecessor_relation (MrpTa +@@ -1235,7 +1238,8 @@ * * Fetches a successor relation between task and it's successor. * @@ -401,7 +381,7 @@ **/ MrpRelation * mrp_task_get_successor_relation (MrpTask *task, MrpTask *successor) -@@ -1255,7 +1259,8 @@ mrp_task_get_successor_relation (MrpTask +@@ -1255,7 +1259,8 @@ * * Fetches a list of predecessor relations to @task. * @@ -411,7 +391,7 @@ **/ GList * mrp_task_get_predecessor_relations (MrpTask *task) -@@ -1271,7 +1276,8 @@ mrp_task_get_predecessor_relations (MrpT +@@ -1271,7 +1276,8 @@ * * Fetches a list of successor relations to @task. * @@ -421,7 +401,7 @@ **/ GList * mrp_task_get_successor_relations (MrpTask *task) -@@ -1287,7 +1293,8 @@ mrp_task_get_successor_relations (MrpTas +@@ -1287,7 +1293,8 @@ * * Fetches the parent of @task. * @@ -431,7 +411,7 @@ **/ MrpTask * mrp_task_get_parent (MrpTask *task) -@@ -1306,7 +1313,8 @@ mrp_task_get_parent (MrpTask *task) +@@ -1306,7 +1313,8 @@ * * Fetches the first child of @task. * @@ -441,7 +421,7 @@ **/ MrpTask * mrp_task_get_first_child (MrpTask *task) -@@ -1325,8 +1333,8 @@ mrp_task_get_first_child (MrpTask *task) +@@ -1325,8 +1333,8 @@ * * Fetches the next sibling of @task. * @@ -452,7 +432,7 @@ **/ MrpTask * mrp_task_get_next_sibling (MrpTask *task) -@@ -1345,7 +1353,8 @@ mrp_task_get_next_sibling (MrpTask *task +@@ -1345,7 +1353,8 @@ * * Fetches the previous sibling of @task. * @@ -462,7 +442,7 @@ **/ MrpTask * mrp_task_get_prev_sibling (MrpTask *task) -@@ -1381,7 +1390,8 @@ mrp_task_get_n_children (MrpTask *task) +@@ -1381,7 +1390,8 @@ * * Fetches the nth child of @task. * @@ -472,7 +452,7 @@ **/ MrpTask * mrp_task_get_nth_child (MrpTask *task, guint n) -@@ -1648,7 +1658,8 @@ mrp_task_set_unit_ivals (MrpTask *task, +@@ -1648,7 +1658,8 @@ * * Fetches a list of #MrpAssignment. * @@ -482,7 +462,7 @@ **/ GList * mrp_task_get_assignments (MrpTask *task) -@@ -1688,7 +1699,8 @@ gint mrp_task_get_nres (MrpTask *task) +@@ -1688,7 +1699,8 @@ * retrieves the #MrpAssignment associated with @task and @resource if the * resource is assigned to @task, or %NULL if there is no such assignment. * @@ -492,7 +472,7 @@ **/ MrpAssignment * mrp_task_get_assignment (MrpTask *task, MrpResource *resource) -@@ -1716,7 +1728,8 @@ mrp_task_get_assignment (MrpTask *task, +@@ -1716,7 +1728,8 @@ * Fetches a list of resources assigned to @task. The list needs to be freed * with g_list_free() by caller. * @@ -502,11 +482,9 @@ **/ GList * mrp_task_get_assigned_resources (MrpTask *task) -Index: b/libplanner/mrp-project.c -=================================================================== ---- a/libplanner/mrp-project.c -+++ b/libplanner/mrp-project.c -@@ -1151,7 +1151,7 @@ imrp_project_get_task_manager (MrpProjec +--- planner-0.14.6.orig/libplanner/mrp-project.c ++++ planner-0.14.6/libplanner/mrp-project.c +@@ -1151,7 +1151,7 @@ * * Retrieves the first resource in the list that match the name. * @@ -515,7 +493,7 @@ **/ MrpResource * mrp_project_get_resource_by_name (MrpProject *project, const gchar *name) -@@ -1183,7 +1183,8 @@ mrp_project_get_resource_by_name (MrpPro +@@ -1183,7 +1183,8 @@ * Fetches the list of resources in @project. This list should not be freed and * if caller needs to manipulate it, a copy needs to be made first. * @@ -525,7 +503,7 @@ **/ GList * mrp_project_get_resources (MrpProject *project) -@@ -1281,7 +1282,7 @@ mrp_project_remove_resource (MrpProject +@@ -1281,7 +1282,7 @@ * * Retrieves the first group with name that matches @name * @@ -534,7 +512,7 @@ **/ MrpGroup * mrp_project_get_group_by_name (MrpProject *project, const gchar *name) -@@ -1311,7 +1312,8 @@ mrp_project_get_group_by_name (MrpProjec +@@ -1311,7 +1312,8 @@ * Fetches the list of groups in @project. The list should not be freed and if * caller needs to manipulate it, a copy needs to be made first. * @@ -544,7 +522,7 @@ **/ GList * mrp_project_get_groups (MrpProject *project) -@@ -1720,7 +1722,7 @@ find_task_by_name_traverse_func (MrpTask +@@ -1720,7 +1722,7 @@ * * Retrieves the first task with name matching @name. Uses task_traverse to traverse all tasks. * @@ -553,7 +531,7 @@ **/ MrpTask * mrp_project_get_task_by_name (MrpProject *project, const gchar *name) -@@ -1750,7 +1752,8 @@ mrp_project_get_task_by_name (MrpProject +@@ -1750,7 +1752,8 @@ * Returns a new list of the tasks in @project. The caller needs to free the * list with g_list_free(), but not the values in it. * @@ -563,7 +541,7 @@ **/ GList * mrp_project_get_all_tasks (MrpProject *project) -@@ -1763,7 +1766,7 @@ mrp_project_get_all_tasks (MrpProject *p +@@ -1763,7 +1766,7 @@ /** * mrp_project_insert_task: * @project: an #MrpProject @@ -572,7 +550,7 @@ * @position: position among children to insert task * @task: #MrpTask to insert * -@@ -1868,7 +1871,7 @@ imrp_project_task_moved (MrpProject *pro +@@ -1868,7 +1871,7 @@ * * Fetches the root task from @project. * @@ -581,7 +559,7 @@ **/ MrpTask * mrp_project_get_root_task (MrpProject *project) -@@ -1882,7 +1885,7 @@ mrp_project_get_root_task (MrpProject *p +@@ -1882,7 +1885,7 @@ * mrp_project_task_traverse: * @project: an #MrpProject * @root: #MrpTask indicates where traversing will begin. @@ -590,7 +568,7 @@ * @user_data: user data passed to the function * * Calls @func on each task under @root in the task tree. @user_data is passed -@@ -2010,7 +2013,7 @@ project_dump_task_tree (MrpProject *proj +@@ -2010,7 +2013,7 @@ * Fetches an #MrpProperty that corresponds to @name and @object_type. This is * mainly for language bindings and should not be used for other cases. * @@ -599,7 +577,7 @@ **/ MrpProperty * mrp_project_get_property (MrpProject *project, -@@ -2066,7 +2069,8 @@ imrp_project_property_changed (MrpProjec +@@ -2066,7 +2069,8 @@ * @object_type. The list should not be freed and needs to be copied before * modified. * @@ -609,7 +587,7 @@ **/ GList * mrp_project_get_properties_from_type (MrpProject *project, GType object_type) -@@ -2209,7 +2213,7 @@ mrp_project_has_property (MrpProject *p +@@ -2209,7 +2213,7 @@ * * Fetches the root calendar of @project. * @@ -618,7 +596,7 @@ **/ MrpCalendar * mrp_project_get_root_calendar (MrpProject *project) -@@ -2229,7 +2233,7 @@ mrp_project_get_root_calendar (MrpProjec +@@ -2229,7 +2233,7 @@ * * Fetches the calendar used by @project. * @@ -627,11 +605,9 @@ **/ MrpCalendar * mrp_project_get_calendar (MrpProject *project) -Index: b/libplanner/mrp-calendar.c -=================================================================== ---- a/libplanner/mrp-calendar.c -+++ b/libplanner/mrp-calendar.c -@@ -407,8 +407,6 @@ foreach_copy_days (gpointer key, +--- planner-0.14.6.orig/libplanner/mrp-calendar.c ++++ planner-0.14.6/libplanner/mrp-calendar.c +@@ -407,8 +407,6 @@ * @parent: a #MrpCalendar to inherit from * * Add @calendar to the project @@ -640,7 +616,7 @@ **/ void mrp_calendar_add (MrpCalendar *calendar, MrpCalendar *parent) -@@ -427,7 +425,8 @@ mrp_calendar_add (MrpCalendar *calendar, +@@ -427,7 +425,8 @@ * Copies @calendar, making the new calendar a base calendar, that does not have * a parent. * @@ -650,7 +626,7 @@ **/ MrpCalendar * mrp_calendar_copy (const gchar *name, MrpCalendar *calendar) -@@ -465,7 +464,8 @@ mrp_calendar_copy (const gchar *name, Mr +@@ -465,7 +464,8 @@ * properties from @parent, so if no days are overridden, the calendars will be * identical. * @@ -660,7 +636,7 @@ **/ MrpCalendar * mrp_calendar_derive (const gchar *name, MrpCalendar *parent) -@@ -661,7 +661,8 @@ mrp_calendar_set_name (MrpCalendar *cale +@@ -661,7 +661,8 @@ * mrp_calendar_day_set_intervals: * @calendar: an #MrpCalendar * @day: an #MrpDay @@ -670,7 +646,7 @@ * * Overrides the working time for the day type @day when used in @calendar. * -@@ -706,7 +707,8 @@ mrp_calendar_day_set_intervals (MrpCalen +@@ -706,7 +707,8 @@ * the returned list will be empty if there is no explicit working time set for * @calendar. * @@ -680,7 +656,7 @@ **/ GList * mrp_calendar_day_get_intervals (MrpCalendar *calendar, -@@ -885,7 +887,7 @@ mrp_calendar_set_days (MrpCalendar *cale +@@ -885,7 +887,7 @@ * Retrieves the parent calendar of @calendar. The parent is the calendar that a * calendar falls back to if a date or day type is not overridden. * @@ -689,7 +665,7 @@ **/ MrpCalendar * mrp_calendar_get_parent (MrpCalendar *calendar) -@@ -902,7 +904,8 @@ mrp_calendar_get_parent (MrpCalendar *ca +@@ -902,7 +904,8 @@ * Retreives a list of the children, i.e. the calenderas that are immediately * derived from @calendar. * @@ -699,7 +675,7 @@ **/ GList * mrp_calendar_get_children (MrpCalendar *calendar) -@@ -1100,8 +1103,9 @@ foreach_day_interval_add_to_list (MrpDay +@@ -1100,8 +1103,9 @@ * Retrieves the days that are overridden in this calendar, and the intervals * that they are overriden with. This is mainly used when saving calendar data. * @@ -711,7 +687,7 @@ **/ GList * mrp_calendar_get_overridden_days (MrpCalendar *calendar) -@@ -1137,8 +1141,9 @@ foreach_day_add_to_list (gpointer key, M +@@ -1137,8 +1141,9 @@ * Retrieves the overridden dates of @calendar, i.e. the specific dates that * differ from the parent calendar. * @@ -723,11 +699,9 @@ **/ GList * mrp_calendar_get_all_overridden_dates (MrpCalendar *calendar) -Index: b/libplanner/mrp-property.c -=================================================================== ---- a/libplanner/mrp-property.c -+++ b/libplanner/mrp-property.c -@@ -71,7 +71,7 @@ imrp_property_set_project (MrpProperty * +--- planner-0.14.6.orig/libplanner/mrp-property.c ++++ planner-0.14.6/libplanner/mrp-property.c +@@ -71,7 +71,7 @@ * @user_defined specifies if the property was created by a user or a plugin * or Planner itself. * @@ -736,7 +710,7 @@ **/ MrpProperty * mrp_property_new (const gchar *name, -@@ -323,7 +323,7 @@ mrp_property_get_user_defined (MrpProper +@@ -323,7 +323,7 @@ * Add a reference to @property. User should call this when storing a reference * to @property. * @@ -745,11 +719,9 @@ **/ MrpProperty * mrp_property_ref (MrpProperty *property) -Index: b/libplanner/mrp-resource.c -=================================================================== ---- a/libplanner/mrp-resource.c -+++ b/libplanner/mrp-resource.c -@@ -676,15 +676,16 @@ mrp_resource_get_short_name (MrpResource +--- planner-0.14.6.orig/libplanner/mrp-resource.c ++++ planner-0.14.6/libplanner/mrp-resource.c +@@ -676,15 +676,16 @@ /** * mrp_resource_set_short_name: * @resource: an #MrpResource @@ -769,7 +741,7 @@ } /** -@@ -726,7 +727,8 @@ mrp_resource_assign (MrpResource *resour +@@ -726,7 +727,8 @@ * Retrieves the assignments that this resource has. If caller needs to * manipulate the returned list, a copy of it needs to be made. * @@ -779,7 +751,7 @@ **/ GList * mrp_resource_get_assignments (MrpResource *resource) -@@ -743,8 +745,9 @@ mrp_resource_get_assignments (MrpResourc +@@ -743,8 +745,9 @@ * Retrieves a list of all the tasks that this resource is assigned to. It is * basically a convenience wrapper around mrp_resource_get_assignments(). * @@ -791,7 +763,7 @@ **/ GList * mrp_resource_get_assigned_tasks (MrpResource *resource) -@@ -793,7 +796,8 @@ mrp_resource_compare (gconstpointer a, g +@@ -793,7 +796,8 @@ * Retrieves the calendar that is used for @resource. If no calendar is set, * %NULL is returned, which means the project default calendar. * @@ -801,11 +773,9 @@ **/ MrpCalendar * mrp_resource_get_calendar (MrpResource *resource) -Index: b/libplanner/mrp-time.c -=================================================================== ---- a/libplanner/mrp-time.c -+++ b/libplanner/mrp-time.c -@@ -408,7 +408,7 @@ mrp_time_week_number (mrptime t) +--- planner-0.14.6.orig/libplanner/mrp-time.c ++++ planner-0.14.6/libplanner/mrp-time.c +@@ -408,7 +408,7 @@ * * Convenience function for creating a #GParamSpec carrying an #mrptime value. * @@ -814,11 +784,9 @@ **/ GParamSpec * mrp_param_spec_time (const gchar *name, -Index: b/libplanner/mrp-day.c -=================================================================== ---- a/libplanner/mrp-day.c -+++ b/libplanner/mrp-day.c -@@ -103,7 +103,8 @@ mrp_day_add (MrpProject *project, const +--- planner-0.14.6.orig/libplanner/mrp-day.c ++++ planner-0.14.6/libplanner/mrp-day.c +@@ -103,7 +103,8 @@ * * Fetches a list of all available day types in @project. * @@ -828,11 +796,9 @@ **/ GList * mrp_day_get_all (MrpProject *project) -Index: b/libplanner/mrp-application.c -=================================================================== ---- a/libplanner/mrp-application.c -+++ b/libplanner/mrp-application.c -@@ -276,7 +276,7 @@ mrp_application_id_get_data (guint objec +--- planner-0.14.6.orig/libplanner/mrp-application.c ++++ planner-0.14.6/libplanner/mrp-application.c +@@ -276,7 +276,7 @@ } /** @@ -841,11 +807,9 @@ * * Get the object reference in the list of MrpObjects * using the object_id as locator -Index: b/libplanner/mrp-types.h -=================================================================== ---- a/libplanner/mrp-types.h -+++ b/libplanner/mrp-types.h -@@ -77,8 +77,18 @@ GType mrp_task_sched_get_type (void +--- planner-0.14.6.orig/libplanner/mrp-types.h ++++ planner-0.14.6/libplanner/mrp-types.h +@@ -77,8 +77,18 @@ GType mrp_property_type_get_type (void) G_GNUC_CONST; @@ -864,11 +828,9 @@ void mrp_string_list_free (GList *list); #endif /* __MRP_TYPES_H__ */ -Index: b/libplanner/mrp-assignment.c -=================================================================== ---- a/libplanner/mrp-assignment.c -+++ b/libplanner/mrp-assignment.c -@@ -250,8 +250,9 @@ mrp_assignment_new (void) +--- planner-0.14.6.orig/libplanner/mrp-assignment.c ++++ planner-0.14.6/libplanner/mrp-assignment.c +@@ -250,8 +250,9 @@ * * Retrieves the #MrpTask associated with @assignment. * @@ -880,7 +842,7 @@ **/ MrpTask * mrp_assignment_get_task (MrpAssignment *assignment) -@@ -267,8 +268,9 @@ mrp_assignment_get_task (MrpAssignment * +@@ -267,8 +268,9 @@ * * Retrieves the #MrpResource associated with @assignment. * @@ -892,11 +854,9 @@ **/ MrpResource * mrp_assignment_get_resource (MrpAssignment *assignment) -Index: b/libplanner/mrp-object.c -=================================================================== ---- a/libplanner/mrp-object.c -+++ b/libplanner/mrp-object.c -@@ -599,7 +599,8 @@ mrp_object_get_valist (MrpObject *obje +--- planner-0.14.6.orig/libplanner/mrp-object.c ++++ planner-0.14.6/libplanner/mrp-object.c +@@ -599,7 +599,8 @@ * * Retrieves the list of custom properties for the type of @object. * @@ -906,11 +866,9 @@ **/ GList * mrp_object_get_properties (MrpObject *object) -Index: b/libplanner/mrp-relation.c -=================================================================== ---- a/libplanner/mrp-relation.c -+++ b/libplanner/mrp-relation.c -@@ -277,7 +277,7 @@ relation_get_property (GObject *objec +--- planner-0.14.6.orig/libplanner/mrp-relation.c ++++ planner-0.14.6/libplanner/mrp-relation.c +@@ -277,7 +277,7 @@ * * Retrieves the predecessor of @relation. * @@ -919,7 +877,7 @@ **/ MrpTask * mrp_relation_get_predecessor (MrpRelation *relation) -@@ -293,7 +293,7 @@ mrp_relation_get_predecessor (MrpRelatio +@@ -293,7 +293,7 @@ * * Retrieves the successor of @relation. * @@ -928,10 +886,8 @@ **/ MrpTask * mrp_relation_get_successor (MrpRelation *relation) -Index: b/libplanner/mrp-time.h -=================================================================== ---- a/libplanner/mrp-time.h -+++ b/libplanner/mrp-time.h +--- planner-0.14.6.orig/libplanner/mrp-time.h ++++ planner-0.14.6/libplanner/mrp-time.h @@ -29,6 +29,7 @@ #include #include @@ -940,11 +896,9 @@ typedef long mrptime; #define MRP_TIME_INVALID 0 -Index: b/src/planner-application.h -=================================================================== ---- a/src/planner-application.h -+++ b/src/planner-application.h -@@ -52,8 +52,18 @@ struct _PlannerApplicationClass +--- planner-0.14.6.orig/src/planner-application.h ++++ planner-0.14.6/src/planner-application.h +@@ -52,8 +52,18 @@ GType planner_application_get_type (void) G_GNUC_CONST; PlannerApplication *planner_application_new (void);