Dear Release Team,
I've upload gnotime 2.2.2-10 to sid a few days ago with the intention of
getting it into Etch. I've now realised it won't be possible to migrate
it into Etch through Sid because one of its dependencies (libqof1) is a
newer upstream version in Sid. So I'm here asking permission to upload a
rebuild of this revision against Etch libraries into
testing-proposed-updates so that it can be released with Etch.
Here are the changelog entries form 2.2.2-7 to 2.2.2-10 (complete
debdiff against 2.2.2-7 is attached):
gnotime (2.2.2-10) unstable; urgency=low
* gnotime.desktop*: removed the X-GNOME-Bugzilla* fields, so we won't
have bugs sent to GNOME's bugzilla.
* src/query.c: Fixed a bug in the century day calculation that would
cause the daily report to show worked time in the wrong day for
projects which had worked time in 2006 and 2007.
-- Goedson Teixeira Paixao <goedson@debian.org> Mon, 29 Jan 2007
00:59:22 -0200
gnotime (2.2.2-9) unstable; urgency=low
* debian/control: updated Neil Williams email address
* src/app.c: fixed the display of day total worked time on the status
bar
* debian/watch: added.
* src/*.{c,h}: make sure the only qof-realted file included is qof.h.
-- Goedson Teixeira Paixao <goedson@debian.org> Wed, 27 Dec 2006
17:29:18 -0200
gnotime (2.2.2-8) unstable; urgency=low
* src/idle-dialog.c: Fix crash when displaying the idle dialog and
the active project has no description (Closes: #397690).
* debian/control: Added ${misc:Depends} to handle dependency on
gconf2.
-- Goedson Teixeira Paixao <goedson@debian.org> Tue, 19 Dec 2006
11:17:12 -0200
Best Regards,
--
Goedson Teixeira Paixao http://mundolivre.wordpress.com/
Debian Project http://www.debian.org/
Jabber ID: goedson@jabber.org http://www.jabber.org/
diff -u gnotime-2.2.2/debian/control gnotime-2.2.2/debian/control
--- gnotime-2.2.2/debian/control
+++ gnotime-2.2.2/debian/control
@@ -2,13 +2,13 @@
Section: gnome
Priority: optional
Maintainer: Debian QOF packaging team <pkg-qof-maintainers@lists.alioth.debian.org>
-Uploaders: Goedson Teixeira Paixao <goedson@debian.org>, Neil Williams <linux@codehelp.co.uk>
+Uploaders: Goedson Teixeira Paixao <goedson@debian.org>, Neil Williams <codehelp@debian.org>
Build-Depends: debhelper (>= 4.2.13), libgtkhtml3.8-dev, scrollkeeper (>= 0.3.8), libgnomeui-dev (>= 2.4.0.1-5), autotools-dev, guile-1.6-dev, cdbs, libgail-dev, libqof-dev (>= 0.6.0-1), libxt-dev, libgcrypt11-dev, libgnutls-dev, libxml-parser-perl, libgda2-dev
Standards-Version: 3.7.2
Package: gnotime
Architecture: any
-Depends: scrollkeeper, ${shlibs:Depends}
+Depends: scrollkeeper, ${shlibs:Depends}, ${misc:Depends}
Description: utility for tracking and invoicing time spent on projects
GnoTime is the GNOME Time Tracker, a program which allows you to track the
time you spend on any number of tasks and projects. GnoTime also allows you
diff -u gnotime-2.2.2/debian/changelog gnotime-2.2.2/debian/changelog
--- gnotime-2.2.2/debian/changelog
+++ gnotime-2.2.2/debian/changelog
@@ -1,3 +1,30 @@
+gnotime (2.2.2-10) unstable; urgency=low
+
+ * gnotime.desktop*: removed the X-GNOME-Bugzilla* fields, so we won't
+ have bugs sent to GNOME's bugzilla.
+ * src/query.c: Fixed a bug in the century day calculation that would
+ cause the daily report to show worked time in the wrong day for
+ projects which had worked time in 2006 and 2007.
+
+ -- Goedson Teixeira Paixao <goedson@debian.org> Mon, 29 Jan 2007 00:59:22 -0200
+
+gnotime (2.2.2-9) unstable; urgency=low
+
+ * debian/control: updated Neil Williams email address
+ * src/app.c: fixed the display of day total worked time on the status bar
+ * debian/watch: added.
+ * src/*.{c,h}: make sure the only qof-realted file included is qof.h.
+
+ -- Goedson Teixeira Paixao <goedson@debian.org> Wed, 27 Dec 2006 17:29:18 -0200
+
+gnotime (2.2.2-8) unstable; urgency=low
+
+ * src/idle-dialog.c: Fix crash when displaying the idle dialog and the
+ active project has no description (Closes: #397690).
+ * debian/control: Added ${misc:Depends} to handle dependency on gconf2.
+
+ -- Goedson Teixeira Paixao <goedson@debian.org> Tue, 19 Dec 2006 11:17:12 -0200
+
gnotime (2.2.2-7) unstable; urgency=low
* Prepare gnotime to not FTBFS when qof 0.7.0 is uploaded:
diff -u gnotime-2.2.2/src/app.c gnotime-2.2.2/src/app.c
--- gnotime-2.2.2/src/app.c
+++ gnotime-2.2.2/src/app.c
@@ -57,8 +57,8 @@
GtkWidget *app_window = NULL;
GtkWidget *status_bar = NULL;
-static GtkStatusbar *status_project = NULL;
-static GtkStatusbar *status_day_time = NULL;
+static GtkLabel *status_project = NULL;
+static GtkLabel *status_day_time = NULL;
static GtkWidget *status_timer = NULL;
char *config_shell_start = NULL;
@@ -75,66 +75,48 @@
void
update_status_bar(void)
{
- char day_total_str[25];
- static char *old_day_time = NULL;
- static char *old_project = NULL;
- char *s;
-
- if (!status_bar) return;
-
- /* Make the little clock item appear/disappear
- * when the project is started/stopped */
- if (status_timer)
- {
- if (timer_is_running())
- gtk_widget_show(status_timer);
- else
- gtk_widget_hide(status_timer);
- }
+ char day_total_str[25];
+ char *s;
+
+ if (!status_bar) return;
+
+ /* Make the little clock item appear/disappear
+ * when the project is started/stopped */
+ if (status_timer)
+ {
+ if (timer_is_running())
+ gtk_widget_show(status_timer);
+ else
+ gtk_widget_hide(status_timer);
+ }
- if (!old_day_time) old_day_time = g_strdup("");
- if (!old_project) old_project = g_strdup("");
-
/* update timestamp */
- qof_print_hours_elapsed_buff (day_total_str, 25,
- gtt_project_list_total_secs_day(), config_show_secs);
+ qof_print_hours_elapsed_buff (day_total_str, 25,
+ gtt_project_list_total_secs_day(),
+ config_show_secs);
+
+ if (0 != strcmp(day_total_str, gtk_label_get_text(status_day_time)))
+ {
+ gtk_label_set_text(status_day_time, day_total_str);
+ }
- s = g_strdup(day_total_str);
- if (0 != strcmp(s, old_day_time))
- {
- gtk_statusbar_pop(status_day_time, 0);
- gtk_statusbar_push(status_day_time, 0, s);
- g_free(old_day_time);
- old_day_time = s;
- }
- else
- {
- g_free(s);
- }
-
/* Display the project title */
- if (cur_proj)
+ if (cur_proj)
{
- s = g_strdup_printf ("%s - %s",
- gtt_project_get_title(cur_proj),
- gtt_project_get_desc(cur_proj));
- }
- else
+ s = g_strdup_printf ("%s - %s",
+ gtt_project_get_title(cur_proj),
+ gtt_project_get_desc(cur_proj));
+ }
+ else
{
s = g_strdup(_("Timer is not running"));
}
- if (0 != strcmp(s, old_project))
- {
- gtk_statusbar_pop(status_project, 0);
- gtk_statusbar_push(status_project, 0, s);
- g_free(old_project);
- old_project = s;
- }
- else
+ if (0 != strcmp(s, gtk_label_get_text(status_project)))
{
- g_free(s);
+ gtk_label_set_text(status_project, s);
}
+ g_free(s);
}
@@ -268,10 +250,15 @@
GtkWidget *vbox;
GtkWidget *widget;
GtkWidget *vpane;
+ GtkWidget *separator;
+ GtkLabel *filler;
+ GtkHBox *labels;
+ GtkVBox *status_vbox;
+ GtkStatusbar *grip;
app_window = gnome_app_new(GTT_APP_NAME, GTT_APP_TITLE " " VERSION);
gtk_window_set_wmclass(GTK_WINDOW(app_window),
- GTT_APP_NAME, GTT_APP_PROPER_NAME);
+ GTT_APP_NAME, GTT_APP_PROPER_NAME);
/* 485 x 272 seems to be a good size to default to */
gtk_window_set_default_size(GTK_WINDOW(app_window), 485, 272);
@@ -287,41 +274,52 @@
/* container holds status bar, main ctree widget */
vbox = gtk_vbox_new(FALSE, 0);
-
+
/* build statusbar */
+
+ status_vbox = GTK_VBOX(gtk_vbox_new(FALSE, 0));
+ gtk_widget_show(GTK_WIDGET(status_vbox));
+
+ labels = GTK_HBOX(gtk_hbox_new(FALSE, 0));
+ gtk_widget_show(GTK_WIDGET(labels));
+
status_bar = gtk_hbox_new(FALSE, 0);
- gtk_box_set_homogeneous (GTK_BOX(status_bar), FALSE);
gtk_widget_show(status_bar);
- gtk_box_pack_end(GTK_BOX(vbox), status_bar, FALSE, FALSE, 2);
-
+ separator = gtk_hseparator_new();
+ gtk_widget_show(separator);
+ gtk_box_pack_start(GTK_BOX(status_vbox), separator, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(status_vbox), labels, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(status_bar), status_vbox, TRUE, TRUE, 0);
+
+ grip = GTK_STATUSBAR(gtk_statusbar_new());
+ gtk_statusbar_set_has_resize_grip(grip, TRUE);
+ gtk_widget_show(GTK_WIDGET(grip));
+ gtk_box_pack_start(GTK_BOX(status_bar), GTK_WIDGET(grip), FALSE, FALSE, 0);
+
/* put elapsed time into statusbar */
- status_day_time = GTK_STATUSBAR(gtk_statusbar_new());
- gtk_statusbar_set_has_resize_grip (status_day_time, FALSE);
+ status_day_time = GTK_LABEL(gtk_label_new(_("00:00")));
gtk_widget_show(GTK_WIDGET(status_day_time));
- gtk_statusbar_push(status_day_time, 0, _("00:00"));
- /* XXX hack alert: the timer box is not being correctly sized;
- * I suspect this is either a gtk bug or a usage bug.
- * So instead I set the width to 50 pixels, and hope the
- * font size can live with this. */
- gtk_widget_set_size_request (GTK_WIDGET(status_day_time), 50, -1);
- gtk_box_pack_start(GTK_BOX(status_bar), GTK_WIDGET(status_day_time),
- FALSE, TRUE, 1);
+ gtk_box_pack_start(GTK_BOX(labels), GTK_WIDGET(status_day_time),
+ FALSE, TRUE, 0);
/* put project name into statusbar */
- status_project = GTK_STATUSBAR(gtk_statusbar_new());
+ status_project = GTK_LABEL(gtk_label_new( _("Timer is not running")));
gtk_widget_show(GTK_WIDGET(status_project));
- gtk_statusbar_push(status_project, 0, _("Timer is not running"));
- gtk_box_pack_start(GTK_BOX(status_bar), GTK_WIDGET(status_project),
- TRUE, TRUE, 1);
+ gtk_box_pack_start(GTK_BOX(labels), GTK_WIDGET(status_project),
+ FALSE, TRUE, 10);
+
+ filler = GTK_LABEL(gtk_label_new(""));
+ gtk_widget_show(GTK_WIDGET(filler));
+ gtk_box_pack_start(GTK_BOX(labels), GTK_WIDGET(filler), TRUE, TRUE, 1);
/* put timer icon into statusbar */
- status_timer = gtk_image_new_from_stock (GNOME_STOCK_TIMER,
- GTK_ICON_SIZE_MENU);
+ status_timer = gtk_image_new_from_stock (GNOME_STOCK_TIMER,
+ GTK_ICON_SIZE_MENU);
gtk_widget_show(status_timer);
gtk_box_pack_end(GTK_BOX(status_bar), GTK_WIDGET(status_timer),
- FALSE, FALSE, 1);
+ FALSE, FALSE, 1);
/* create the main columned tree for showing projects */
global_ptw = ctree_new();
@@ -337,10 +335,11 @@
*/
gtk_widget_ref (vpane);
gtk_container_remove(GTK_CONTAINER(vpane->parent), vpane);
- // gtk_box_pack_end(GTK_BOX(vbox), vpane, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), vpane, TRUE, TRUE, 0);
gtk_widget_unref (vpane);
+ gtk_box_pack_end(GTK_BOX(vbox), status_bar, FALSE, FALSE, 2);
+
notes_area_add_ctree (global_na, ctree);
diff -u gnotime-2.2.2/src/ghtml.c gnotime-2.2.2/src/ghtml.c
--- gnotime-2.2.2/src/ghtml.c
+++ gnotime-2.2.2/src/ghtml.c
@@ -27,7 +27,7 @@
#include <string.h>
#include <libgnomevfs/gnome-vfs.h>
-#include <qof/qof.h>
+#include <qof.h>
#include "app.h"
#include "ctree.h"
diff -u gnotime-2.2.2/src/idle-dialog.c gnotime-2.2.2/src/idle-dialog.c
--- gnotime-2.2.2/src/idle-dialog.c
+++ gnotime-2.2.2/src/idle-dialog.c
@@ -122,6 +122,8 @@
char * p;
char * ret;
+ if (str == NULL) return g_strdup("");
+
p = strchr (str, '&');
if (!p) return g_strdup (str);
diff -u gnotime-2.2.2/src/prefs.c gnotime-2.2.2/src/prefs.c
--- gnotime-2.2.2/src/prefs.c
+++ gnotime-2.2.2/src/prefs.c
@@ -21,7 +21,7 @@
#include <glade/glade.h>
#include <gnome.h>
-#include <qof/qof.h>
+#include <qof.h>
#include <string.h>
#include "app.h"
only in patch2:
unchanged:
--- gnotime-2.2.2.orig/debian/watch
+++ gnotime-2.2.2/debian/watch
@@ -0,0 +1,4 @@
+#format
+version=3
+# watch control file for uscan
+http://sf.net/gttr/gnotime-(.*)\.tar\.gz
only in patch2:
unchanged:
--- gnotime-2.2.2.orig/src/journal.c
+++ gnotime-2.2.2/src/journal.c
@@ -28,8 +28,7 @@
#include <string.h>
#include <sched.h>
-#include <qof/kvp_frame.h>
-#include <qof/qof.h>
+#include <qof.h>
#include "app.h"
#include "ctree.h"
only in patch2:
unchanged:
--- gnotime-2.2.2.orig/src/ghtml.h
+++ gnotime-2.2.2/src/ghtml.h
@@ -19,7 +19,7 @@
#ifndef __GTT_GHTML_H__
#define __GTT_GHTML_H__
-#include <qof/qof.h>
+#include <qof.h>
#include "proj.h"
only in patch2:
unchanged:
--- gnotime-2.2.2.orig/src/proj.h
+++ gnotime-2.2.2/src/proj.h
@@ -21,7 +21,7 @@
#define __GTT_PROJ_H__
#include <glib.h>
-#include <qof/qof.h>
+#include <qof.h>
/* The data structures for GnoTime are written in a quasi-object-oriented
* style. All data is encapsulated in opaque structs, and can be accessed
only in patch2:
unchanged:
--- gnotime-2.2.2.orig/src/proj.c
+++ gnotime-2.2.2/src/proj.c
@@ -26,8 +26,7 @@
#include <stdio.h>
#include <string.h>
-#include <qof/qof.h>
-#include <qof/qofid-p.h>
+#include <qof.h>
#include "err-throw.h"
#include "log.h"
only in patch2:
unchanged:
--- gnotime-2.2.2.orig/src/query.c
+++ gnotime-2.2.2/src/query.c
@@ -40,8 +40,8 @@
yearday_to_centuryday (int yday, int year)
{
int cd;
- cd = 365*year + (year+1)/4 + yday;
- if (100 <= year) cd --;
+ cd = 365*year + (year-1)/4 + yday;
+ cd -= (year - 1)/100; /* year that are multiple of 100 are not leap years */
return cd;
}
only in patch2:
unchanged:
--- gnotime-2.2.2.orig/src/xml-write.c
+++ gnotime-2.2.2/src/xml-write.c
@@ -19,7 +19,7 @@
#include "config.h"
#include <libxml/tree.h>
-#include <qof/qof.h>
+#include <qof.h>
#include <stdio.h>
#include "cur-proj.h"
only in patch2:
unchanged:
--- gnotime-2.2.2.orig/src/proj_p.h
+++ gnotime-2.2.2/src/proj_p.h
@@ -22,7 +22,7 @@
#include "config.h"
#include <glib.h>
-#include <qof/qofinstance-p.h> /* XXX this is wrong, must use public API */
+#include <qof.h>
#include "proj.h"
#include "timer.h"
only in patch2:
unchanged:
--- gnotime-2.2.2.orig/src/main.c
+++ gnotime-2.2.2/src/main.c
@@ -36,7 +36,7 @@
#include <sys/wait.h>
#endif
-#include <qof/qof.h>
+#include <qof.h>
#include "app.h"
#include "ctree.h"
only in patch2:
unchanged:
--- gnotime-2.2.2.orig/gnotime.desktop
+++ gnotime-2.2.2/gnotime.desktop
@@ -10,6 +10,3 @@
Type=Application
Categories=Application;Office;ProjectManagement;GNOME;
StartupNotify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-utils
-X-GNOME-Bugzilla-Component=gtt
only in patch2:
unchanged:
--- gnotime-2.2.2.orig/gnotime.desktop.in
+++ gnotime-2.2.2/gnotime.desktop.in
@@ -8,6 +8,3 @@
Type=Application
Categories=Application;Office;ProjectManagement;GNOME;
StartupNotify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-utils
-X-GNOME-Bugzilla-Component=gtt
Attachment:
signature.asc
Description: Esta =?ISO-8859-1?Q?=E9?= uma parte de mensagem assinada digitalmente