Merge lp:~bkerensa/ubuntu/precise/xfce4-weather-plugin/fix-typo-strings into lp:ubuntu/precise/xfce4-weather-plugin

[Benjamin Kerensa]

Fixed Typos in weather.c strings

[Daniel Holbach (dholbach)]

Thanks for your work on this.

I noticed a few small things:

 - the patch you forwarded to https://bugzilla.xfce.org/attachment.cgi?id=4282 contains
   another hunk changing panel-plugin/weather-data.c - this one is not included below.
 - could you please use 'edit-patch' to apply the change as the package uses quilt
   to manage patches on top of the upstream source?
 - also please add information in resulting patch file like the upstream bug link
   (https://bugzilla.xfce.org/show_bug.cgi?id=8325), etc.

Thanks in advance.

review: Needs Fixing

[Benjamin Kerensa (bkerensa)]

The differences in the merge proposal and the patch I sent upstream is due to the fact that likely Debian fixed the strings in panel-plugin/weather-data.c because they simply do not exist in our local source package but they do exist upstream of Debian with the XFCE project. I reviewed the changelog and could not see any indication that the string in panel-plugin/weather-data.c was fixed but it clearly is not present.

It is possible to just wait for XFCE to apply my patch and for it to trickle down to Debian -> Ubuntu
I am unsure how long that process generally takes but notably other patches I have submitted to projects Upstream of Debian that are already applied have yet to even hit Debian let alone Ubuntu.

So perhaps months? The question is do we want to carry my fix in Ubuntu?

[Daniel Holbach (dholbach)]

Ok, not fixing a string which does not exist makes perfect sense. :-)

You never know how long it takes. The question is just if we want to get it in real quick because of 12.04 or not. If we decide to roll it just into Ubuntu we will have to live with some kind of delta. I'll leave the decision to you.

[Daniel Holbach (dholbach)]

(If we apply it, we'd better do it with the patch system uses.)

Unmerged revisions

18. By Benjamin Kerensa on 2012-03-27

Fixed Typos in weather.c string

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-18 10:48:51 +0000
+++ debian/changelog	2012-03-27 09:21:17 +0000
@@ -1,3 +1,9 @@
+xfce4-weather-plugin (0.7.4-3ubuntu1) precise; urgency=low
+
+  * Fixed Typos in weather.c string
+
+ -- Benjamin Kerensa <[e-mail]>  Tue, 27 Mar 2012 02:13:43 -0700
+
 xfce4-weather-plugin (0.7.4-3) unstable; urgency=low
 
   * Brown paper bag release.

=== modified file 'panel-plugin/weather.c'
--- panel-plugin/weather.c	2011-02-12 14:43:52 +0000
+++ panel-plugin/weather.c	2012-03-27 09:21:17 +0000
@@ -462,7 +462,7 @@
       data->location_name = g_strdup (value);
     }
 
-  if (xfce_rc_read_bool_entry (rc, "celcius", TRUE))
+  if (xfce_rc_read_bool_entry (rc, "celsius", TRUE))
     data->unit = METRIC;
   else
     data->unit = IMPERIAL;
@@ -545,7 +545,7 @@
   if (!rc)
     return;
 
-  xfce_rc_write_bool_entry (rc, "celcius", (data->unit == METRIC));
+  xfce_rc_write_bool_entry (rc, "celsius", (data->unit == METRIC));
 
   if (data->location_code)
     xfce_rc_write_entry (rc, "loc_code", data->location_code);