tags 554755 + pending tags 643403 + pending thanks Dear maintainer,
I've prepared an NMU for gtodo (versioned as 0.16.0~rc2-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: The Eagles: Hotel California
diff -u gtodo-0.16.0~rc2/debian/changelog gtodo-0.16.0~rc2/debian/changelog
--- gtodo-0.16.0~rc2/debian/changelog
+++ gtodo-0.16.0~rc2/debian/changelog
@@ -1,3 +1,16 @@
+gtodo (0.16.0~rc2-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "FTBFS with binutils-gold":
+ add patch 06_linker.patch from Bart Martens: add -X11 to LDADD.
+ (Closes: #554755)
+ * Fix "FTBFS: callback.c:133:4: error: format not a string literal and
+ no format arguments [-Werror=format-security]":
+ add patch 07_format-security.patch from Bart Martens that adds a format
+ argument. (Closes: #643403)
+
+ -- gregor herrmann <gre...@debian.org> Fri, 16 Dec 2011 16:37:52 +0100
+
gtodo (0.16.0~rc2-1.1) unstable; urgency=high
* Non-maintainer upload.
only in patch2:
unchanged:
--- gtodo-0.16.0~rc2.orig/debian/patches/06_linker.patch
+++ gtodo-0.16.0~rc2/debian/patches/06_linker.patch
@@ -0,0 +1,12 @@
+diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/gtodo-0.16.0~rc2/src/Makefile.in ./src/Makefile.in
+--- ../orig/gtodo-0.16.0~rc2/src/Makefile.in 2006-01-18 21:28:19.000000000 +0100
++++ ./src/Makefile.in 2011-10-04 04:24:21.000000000 +0200
+@@ -169,7 +169,7 @@
+ eggtrayicon.$(OBJEXT) tray-icon.$(OBJEXT) \
+ debug_printf.$(OBJEXT) libgl.$(OBJEXT) export.$(OBJEXT)
+ gtodo_OBJECTS = $(am_gtodo_OBJECTS)
+-gtodo_LDADD = $(LDADD)
++gtodo_LDADD = $(LDADD) -lX11
+ gtodo_DEPENDENCIES =
+ gtodo_LDFLAGS =
+
only in patch2:
unchanged:
--- gtodo-0.16.0~rc2.orig/debian/patches/07_format-security.patch
+++ gtodo-0.16.0~rc2/debian/patches/07_format-security.patch
@@ -0,0 +1,34 @@
+diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/gtodo-0.16.0~rc2/libgtodo/libgtodo.c ./libgtodo/libgtodo.c
+--- ../orig/gtodo-0.16.0~rc2/libgtodo/libgtodo.c 2006-01-18 21:31:55.000000000 +0100
++++ ./libgtodo/libgtodo.c 2011-10-04 04:22:51.000000000 +0200
+@@ -619,7 +619,7 @@
+ if(!(result == GNOME_VFS_OK || result == GNOME_VFS_ERROR_EOF))
+ {
+ g_free(read_buf);
+- g_set_error(&tmp_error,LIBGTODO_ERROR,LIBGTODO_ERROR_GNOME_VFS,gnome_vfs_result_to_string(result));
++ g_set_error(&tmp_error,LIBGTODO_ERROR,LIBGTODO_ERROR_GNOME_VFS,"%s",gnome_vfs_result_to_string(result));
+ g_propagate_error(error, tmp_error);
+ gnome_vfs_file_info_unref(info);
+ return TRUE;
+@@ -676,7 +676,7 @@
+ }
+ else{
+ /* save some more info here.. check for some logicol errors and print it. */
+- g_set_error(&tmp_error,LIBGTODO_ERROR,LIBGTODO_ERROR_GNOME_VFS,gnome_vfs_result_to_string(info_result));
++ g_set_error(&tmp_error,LIBGTODO_ERROR,LIBGTODO_ERROR_GNOME_VFS,"%s",gnome_vfs_result_to_string(info_result));
+ g_propagate_error(error, tmp_error);
+ gnome_vfs_file_info_unref(info);
+ return TRUE;
+diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/gtodo-0.16.0~rc2/src/callback.c ./src/callback.c
+--- ../orig/gtodo-0.16.0~rc2/src/callback.c 2004-08-25 11:24:19.000000000 +0200
++++ ./src/callback.c 2011-10-04 04:20:09.000000000 +0200
+@@ -129,7 +129,7 @@
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ type,
+ GTK_BUTTONS_NONE,
+- text
++ "%s", text
+ );
+ if(type == GTK_MESSAGE_WARNING)
+ {
+
signature.asc
Description: Digital signature
