Merge lp:~debfx/aisleriot/format-security into lp:~ubuntu-desktop/aisleriot/ubuntu

[Felix Geyer]

Fix FTBFS with -Werror=format-security.

[lp:~debfx/aisleriot/format-security]

7. By Felix Geyer on 2011-11-15

Add upstream bug url.

8. By Felix Geyer on 2011-11-15

Close launchpad bug.

[Jeremy Bícha (jbicha)]

Thanks for finding this and fixing it!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-17 19:00:37 +0000
+++ debian/changelog	2011-11-15 22:27:23 +0000
@@ -1,3 +1,10 @@
+aisleriot (1:3.2.1-0ubuntu2) precise; urgency=low
+
+  * Fix FTBFS with -Werror=format-security. (LP: #890889)
+    - Add 03_format-security.patch.
+
+ -- Felix Geyer <[e-mail]>  Sun, 13 Nov 2011 16:44:35 +0100
+
 aisleriot (1:3.2.1-0ubuntu1) oneiric-proposed; urgency=low
 
   * New upstream bugfix & translations release.
 
=== added file 'debian/patches/03_format-security.patch'
--- debian/patches/03_format-security.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03_format-security.patch	2011-11-15 22:27:23 +0000
@@ -0,0 +1,14 @@
+Description: Fix FTBFS with -Werror=format-security.
+Author: Felix Geyer <[e-mail]>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=664151
+
+--- aisleriot-3.2.1.orig/src/game.c
++++ aisleriot-3.2.1/src/game.c
+@@ -408,6 +408,7 @@ game_scm_pre_unwind_handler (void *user_
+   g_set_error (error,
+                AISLERIOT_GAME_ERROR,
+                GAME_ERROR_EXCEPTION,
++               "%s",
+                message ? message
+                        : "A scheme exception occurred, but there was no exception info");
+   return SCM_UNDEFINED;
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-09-26 16:54:18 +0000
+++ debian/patches/series	2011-11-15 22:27:23 +0000
@@ -1,2 +1,3 @@
 01_lpi.patch
 02_desktop-path.patch
+03_format-security.patch