r43873 - in /desktop/unstable/gnome-panel/debian: changelog control control.in patches/fix_clock_crash.patch patches/series

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

Author: mitya57-guest
Date: Mon Nov 17 10:17:44 2014
New Revision: 43873

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43873
Log:
* Fix crash when clicking on clock applet (closes: #769882).
* Require gweather 3.10.1 (where BGO #708586 was fixed).

Added:
    desktop/unstable/gnome-panel/debian/patches/fix_clock_crash.patch
Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/control
    desktop/unstable/gnome-panel/debian/control.in
    desktop/unstable/gnome-panel/debian/patches/series

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=43873&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog	[utf-8] Mon Nov 17 10:17:44 2014
@@ -1,3 +1,10 @@
+gnome-panel (3.8.1-7) UNRELEASED; urgency=medium
+
+  * Fix crash when clicking on clock applet (closes: #769882).
+  * Require gweather 3.10.1 (where BGO #708586 was fixed).
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 17 Nov 2014 12:42:35 +0300
+
 gnome-panel (3.8.1-6) unstable; urgency=medium
 
   * Build-depend on gobject-introspection 1.41.4-1~ as this is

Modified: desktop/unstable/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control?rev=43873&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control	[utf-8] Mon Nov 17 10:17:44 2014
@@ -6,7 +6,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Dmitry Shachnev <mitya57 at debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Dmitry Shachnev <mitya57 at debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>
 Standards-Version: 3.9.5
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 9),
@@ -27,7 +27,7 @@
                libgnome-desktop-3-dev (>= 2.91.0),
                libgnome-menu-3-dev (>= 3.7.90),
                libgtk-3-dev (>= 3.3.8),
-               libgweather-3-dev (>= 3.10),
+               libgweather-3-dev (>= 3.10.1),
                libice-dev,
                libpango1.0-dev (>= 1.15.4),
                libpolkit-gobject-1-dev,

Modified: desktop/unstable/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control.in?rev=43873&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control.in	[utf-8] Mon Nov 17 10:17:44 2014
@@ -23,7 +23,7 @@
                libgnome-desktop-3-dev (>= 2.91.0),
                libgnome-menu-3-dev (>= 3.7.90),
                libgtk-3-dev (>= 3.3.8),
-               libgweather-3-dev (>= 3.10),
+               libgweather-3-dev (>= 3.10.1),
                libice-dev,
                libpango1.0-dev (>= 1.15.4),
                libpolkit-gobject-1-dev,

Added: desktop/unstable/gnome-panel/debian/patches/fix_clock_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/fix_clock_crash.patch?rev=43873&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/fix_clock_crash.patch	(added)
+++ desktop/unstable/gnome-panel/debian/patches/fix_clock_crash.patch	[utf-8] Mon Nov 17 10:17:44 2014
@@ -0,0 +1,28 @@
+Description: fix crash when clicking on clock applet
+Bug-Debian: https://bugs.debian.org/769882
+Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=737575
+Origin: upstream
+ https://git.gnome.org/browse/gnome-panel/commit/?id=6ca0e5dee4142d79
+ https://git.gnome.org/browse/gnome-panel/commit/?id=3c8387188a699c79
+Last-Update: 2014-11-17
+
+--- a/applets/clock/clock.c
++++ b/applets/clock/clock.c
+@@ -1218,7 +1218,6 @@
+ 	if (cd->map_widget)
+ 		clock_map_refresh (CLOCK_MAP (cd->map_widget));
+         update_location_tiles (cd);
+-	save_cities_store (cd);	
+ }
+ 
+ static void
+@@ -1622,8 +1621,7 @@
+         GtkWidget *lon_combo = _clock_get_widget (cd, "edit-location-longitude-combo");
+ 
+         /* clear out the old data */
+-        /* TODO: reinstate after bumping to gweather >= 3.10.1 */
+-        //gweather_location_entry_set_location (cd->location_entry, NULL);
++        gweather_location_entry_set_location (cd->location_entry, NULL);
+         gweather_timezone_menu_set_tzid (cd->zone_combo, NULL);
+ 
+         gtk_entry_set_text (GTK_ENTRY (lat_entry), "");

Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=43873&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/series	[utf-8] Mon Nov 17 10:17:44 2014
@@ -5,3 +5,4 @@
 end_session_async.patch
 add_css_file.patch
 no_compiz_session.patch
+fix_clock_crash.patch