r30011 - in /desktop/experimental/gnome-settings-daemon/debian: changelog control control.in patches/02_missing_format.patch patches/series

[jeansch-guest at users.alioth.debian.org]

Author: jeansch-guest
Date: Wed Oct  5 19:32:04 2011
New Revision: 30011

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30011
Log:
Added 02_missing_format.patch

Added:
    desktop/experimental/gnome-settings-daemon/debian/patches/02_missing_format.patch
Modified:
    desktop/experimental/gnome-settings-daemon/debian/changelog
    desktop/experimental/gnome-settings-daemon/debian/control
    desktop/experimental/gnome-settings-daemon/debian/control.in
    desktop/experimental/gnome-settings-daemon/debian/patches/series

Modified: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=30011&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Wed Oct  5 19:32:04 2011
@@ -4,6 +4,7 @@
   * New upstream release.
   * Removed 01_numlock.patch (b-g-o #631989 is fixed)
   * Added 01_medias_keys_dont_go_up_to_11.patch
+  * Added 02_missing_format.patch
   * debian/control.in
     - Standards-Version is 3.9.2, no changes needed.
     - Added dependencied to enable the update plugin (packagekit)

Modified: desktop/experimental/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control?rev=30011&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control [utf-8] Wed Oct  5 19:32:04 2011
@@ -34,7 +34,7 @@
                libcanberra-gtk3-dev,
                libcups2-dev,
                libpolkit-gobject-1-dev,
-               libpackagekit-glib2-14 (>= 0.6.4),
+               libpackagekit-glib2-dev (>= 0.6.4),
                libupower-glib-dev (>= 0.9.1),
                libgudev-1.0-dev
 Standards-Version: 3.9.2

Modified: desktop/experimental/gnome-settings-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control.in?rev=30011&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control.in [utf-8] Wed Oct  5 19:32:04 2011
@@ -29,7 +29,7 @@
                libcanberra-gtk3-dev,
                libcups2-dev,
                libpolkit-gobject-1-dev,
-               libpackagekit-glib2-14 (>= 0.6.4),
+               libpackagekit-glib2-dev (>= 0.6.4),
                libupower-glib-dev (>= 0.9.1),
                libgudev-1.0-dev
 Standards-Version: 3.9.2

Added: desktop/experimental/gnome-settings-daemon/debian/patches/02_missing_format.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/02_missing_format.patch?rev=30011&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/02_missing_format.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/02_missing_format.patch [utf-8] Wed Oct  5 19:32:04 2011
@@ -1,0 +1,14 @@
+Description: gcc is complaining about no format (-Werror=format-security)
+Bug: b-g-o: #661016
+diff -uNr gnome-settings-daemon-3.0.3.orig/plugins/automount/gsd-autorun.c gnome-settings-daemon-3.0.3/plugins/automount/gsd-autorun.c
+--- gnome-settings-daemon-3.0.3.orig/plugins/automount/gsd-autorun.c	2011-08-25 05:46:50.000000000 -0400
++++ gnome-settings-daemon-3.0.3/plugins/automount/gsd-autorun.c	2011-10-05 15:20:25.303752355 -0400
+@@ -503,7 +503,7 @@
+ 							 GTK_BUTTONS_OK,
+ 							 "%s",
+ 							 primary);
+-			gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), error->message);
++			gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), error->message, NULL);
+ 			
+ 			gtk_widget_show (GTK_WIDGET (dialog));
+ 			g_signal_connect (dialog, "response",

Modified: desktop/experimental/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/series?rev=30011&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] Wed Oct  5 19:32:04 2011
@@ -1,1 +1,2 @@
 01_medias_keys_dont_go_up_to_11.patch
+02_missing_format.patch