[SCM] collaborative maintenance of the dopewars package branch, master, updated. debian/1.5.12-12-14-g4aa0cfe

[Dean Evans]

The following commit has been merged in the master branch:
commit 0ae21bf9b1da88bd7b2b0795ff68b2b16c7ee0cd
Author: Dean Evans <dean at codemonkies.net>
Date:   Wed Mar 7 23:53:03 2012 +1300

    Add patches to fix two -Werror=format-security errors.

diff --git a/debian/patches/series b/debian/patches/series
index 459832a..edadde0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@ po_de.po.patch
 po_fr_CA.po.patch
 src_dopewars.patch
 acinclude.m4.patch
+src_gtkport_gtkport.c_format.patch
+src_sound.c_format.patch
diff --git a/debian/patches/src_gtkport_gtkport.c_format.patch b/debian/patches/src_gtkport_gtkport.c_format.patch
new file mode 100644
index 0000000..78ce336
--- /dev/null
+++ b/debian/patches/src_gtkport_gtkport.c_format.patch
@@ -0,0 +1,13 @@
+Description: Fix formatting so it can build cleanly with -Werror=format-security set.                                                                                                                         Author: Julian Taylor
+
+--- a/src/gtkport/gtkport.c
++++ b/src/gtkport/gtkport.c
+@@ -5636,7 +5636,7 @@
+ 
+   dialog = gtk_message_dialog_new(GTK_WINDOW(parent),
+                                   GTK_DIALOG_MODAL,
+-                                  type, buttons, Text);
++                                  type, buttons, "%s", Text);
+   if (Title) gtk_window_set_title(GTK_WINDOW(dialog), Title);
+ 
+   retval = gtk_dialog_run(GTK_DIALOG(dialog));
diff --git a/debian/patches/src_sound.c_format.patch b/debian/patches/src_sound.c_format.patch
new file mode 100644
index 0000000..45b6217
--- /dev/null
+++ b/debian/patches/src_sound.c_format.patch
@@ -0,0 +1,14 @@
+Description: Fix formatting so it can build cleanly with -Werror=format-security set.
+Author: Julian Taylor
+
+--- a/src/sound.c
++++ b/src/sound.c
+@@ -190,7 +190,7 @@
+       err = g_strdup_printf(_("Invalid plugin \"%s\" selected.\n"
+                               "(%s available; now using \"%s\".)"),
+                             drivername, plugins, NOPLUGIN);
+-      g_log(NULL, G_LOG_LEVEL_CRITICAL, err);
++      g_log(NULL, G_LOG_LEVEL_CRITICAL, "%s", err);
+       g_free(plugins);
+       g_free(err);
+     }

-- 
collaborative maintenance of the dopewars package