Merge lp:~vibhavp/ubuntu/raring/thoggen/fix-format-string-warning into lp:ubuntu/raring/thoggen

[Vibhav Pant]

[Marc Deslauriers (mdeslaur)]

NACK on the merge request. The thoggen package in Raring using a patch system. Please resubmit this change as a proper patch, instead of doing the change inline.

Thanks!

review: Needs Fixing

[Martin Pitt (pitti)]

Looks good now, thanks!

review: Approve

[Martin Pitt (pitti)]

Please send the debdiff to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646468

[Martin Pitt (pitti)]

Actually, applying the patch inline is wrong (as this isn't using quilt), and the patch doesn't apply as it's not -p1 and doesn't even specify a path. Please test this with an actual package build first.

review: Needs Fixing

[Martin Pitt (pitti)]

When you are done, please set back the status to "needs review". Thanks!

[Martin Pitt (pitti)]

For the record, I removed thoggen from raring:

Comment: does not build against current glib, hal, and dbus, dead upstream, uses old gstreamer, removed from Debian testing, long-standing RC bugs

If you ever manage to get this to actually build, we can reintroduce it into Ubuntu.

Unmerged revisions

14. By Vibhav Pant on 2013-03-21

Add correct patch

13. By Vibhav Pant on 2013-03-21

* debian/patches/02_fomat_string.patch
  - Fix format string warning leading to FTBFS.

12. By Vibhav Pant on 2013-02-28

* src/th-app-window.c:
  - Fix compiler warning due to incorrect usage of format string.

=== modified file 'debian/changelog'
--- debian/changelog	2009-02-19 12:09:33 +0000
+++ debian/changelog	2013-03-21 16:13:27 +0000
@@ -1,3 +1,10 @@
+thoggen (0.7.1-1ubuntu2) raring; urgency=low
+
+  * debian/patches/02_fomat_string.patch
+    - Fix format string warning leading to FTBFS.
+
+ -- Vibhav Pant <[e-mail]>  Thu, 28 Feb 2013 14:07:41 +0530
+
 thoggen (0.7.1-1ubuntu1) jaunty; urgency=low
 
   * No change rebuild to build with latest libdvdread. (LP: #330684)
 
=== added file 'debian/patches/02_format_string.patch'
--- debian/patches/02_format_string.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_format_string.patch	2013-03-21 16:13:27 +0000
@@ -0,0 +1,10 @@
+--- th-app-window.c.old	2013-03-21 21:38:34.701211644 +0530
++++ th-app-window.c	2013-03-21 21:39:23.249211183 +0530
+@@ -1137,6 +1137,7 @@
+ 	                                          GTK_DIALOG_MODAL,
+ 	                                          GTK_MESSAGE_WARNING,
+ 	                                          GTK_BUTTONS_YES_NO,
++						  "%s"
+ 	                                          errmsg->str);
+ 
+ 	gtk_window_set_title (GTK_WINDOW (dlg), _("Not enough disk space - continue anyway?"));
 
=== modified file 'src/th-app-window.c'
--- src/th-app-window.c	2008-06-13 12:09:15 +0000
+++ src/th-app-window.c	2013-03-21 16:13:27 +0000
@@ -1137,6 +1137,7 @@
 	                                          GTK_DIALOG_MODAL,
 	                                          GTK_MESSAGE_WARNING,
 	                                          GTK_BUTTONS_YES_NO,
+						  "%s"
 	                                          errmsg->str);
 
 	gtk_window_set_title (GTK_WINDOW (dlg), _("Not enough disk space - continue anyway?"));