Bug#689943: unblock: plasma-widget-cwp/1.6.5-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear release team,
Please unblock package plasma-widget-cwp version 1.6.5-1.
Only data files were changed in this release: XML files with rules for
parsing weather forecast sites.
Thanks
diff -Nru plasma-widget-cwp-1.6.4/ChangeLog plasma-widget-cwp-1.6.5/ChangeLog
--- plasma-widget-cwp-1.6.4/ChangeLog 2012-09-24 21:13:16.000000000 +0300
+++ plasma-widget-cwp-1.6.5/ChangeLog 2012-10-07 18:16:51.000000000 +0300
@@ -1,3 +1,9 @@
+1.6.5
+=====
+- xml: gismeteo.com: fixed (thanks to Dreid)
+- xml: accuweather.com (US): fixed forecast
+- xml: accuweather.com (world): fixed forecast
+
1.6.4
=====
- xml: ilmeteo.it: fixed apostrophe character in location names
diff -Nru plasma-widget-cwp-1.6.4/data/br_weather_com.xml plasma-widget-cwp-1.6.5/data/br_weather_com.xml
--- plasma-widget-cwp-1.6.4/data/br_weather_com.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/br_weather_com.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="br.weather.com" search_page="http://br.weather.com"; example_zip="BRXX0043" unit="C" />
+ <xml_file_version type="cwp" version="2012-10-07" name="br.weather.com" search_page="http://br.weather.com"; example_zip="BRXX0043" unit="C" />
<locale_settings locale="pt" encoding="latin1" />
diff -Nru plasma-widget-cwp-1.6.4/data/de_weather_com.xml plasma-widget-cwp-1.6.5/data/de_weather_com.xml
--- plasma-widget-cwp-1.6.4/data/de_weather_com.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/de_weather_com.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="de.weather.com" search_page="http://de.weather.com"; example_zip="80331" unit="C" />
+ <xml_file_version type="cwp" version="2012-10-07" name="de.weather.com" search_page="http://de.weather.com"; example_zip="80331" unit="C" />
<locale_settings locale="de" encoding="latin1" />
diff -Nru plasma-widget-cwp-1.6.4/data/espanol_weather_com.xml plasma-widget-cwp-1.6.5/data/espanol_weather_com.xml
--- plasma-widget-cwp-1.6.4/data/espanol_weather_com.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/espanol_weather_com.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="espanol.weather.com" search_page="http://espanol.weather.com"; example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" />
+ <xml_file_version type="cwp" version="2012-10-07" name="espanol.weather.com" search_page="http://espanol.weather.com"; example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.4/data/freemeteo_com_celsius.xml plasma-widget-cwp-1.6.5/data/freemeteo_com_celsius.xml
--- plasma-widget-cwp-1.6.4/data/freemeteo_com_celsius.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/freemeteo_com_celsius.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="C" />
+ <xml_file_version type="cwp" version="2012-10-07" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="C" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.4/data/freemeteo_com_fahrenheit.xml plasma-widget-cwp-1.6.5/data/freemeteo_com_fahrenheit.xml
--- plasma-widget-cwp-1.6.4/data/freemeteo_com_fahrenheit.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/freemeteo_com_fahrenheit.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="F" />
+ <xml_file_version type="cwp" version="2012-10-07" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="F" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.4/data/fr_weather_com.xml plasma-widget-cwp-1.6.5/data/fr_weather_com.xml
--- plasma-widget-cwp-1.6.4/data/fr_weather_com.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/fr_weather_com.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="fr.weather.com" search_page="http://fr.weather.com"; example_zip="Paris-FRXX0076" unit="C" />
+ <xml_file_version type="cwp" version="2012-10-07" name="fr.weather.com" search_page="http://fr.weather.com"; example_zip="Paris-FRXX0076" unit="C" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.4/data/ilmeteo_it.xml plasma-widget-cwp-1.6.5/data/ilmeteo_it.xml
--- plasma-widget-cwp-1.6.4/data/ilmeteo_it.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/ilmeteo_it.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="ilmeteo.it" search_page="http://www.ilmeteo.it"; example_zip="Roma" unit="C" />
+ <xml_file_version type="cwp" version="2012-10-07" name="ilmeteo.it" search_page="http://www.ilmeteo.it"; example_zip="Roma" unit="C" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.4/data/in_weather_com.xml plasma-widget-cwp-1.6.5/data/in_weather_com.xml
--- plasma-widget-cwp-1.6.4/data/in_weather_com.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/in_weather_com.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="in.weather.com" search_page="http://in.weather.com"; example_zip="New-Delhi-INXX0096" unit="C" />
+ <xml_file_version type="cwp" version="2012-10-07" name="in.weather.com" search_page="http://in.weather.com"; example_zip="New-Delhi-INXX0096" unit="C" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.4/data/myforecast_com_celsius.xml plasma-widget-cwp-1.6.5/data/myforecast_com_celsius.xml
--- plasma-widget-cwp-1.6.4/data/myforecast_com_celsius.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/myforecast_com_celsius.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="C" />
+ <xml_file_version type="cwp" version="2012-10-07" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="C" />
<locale_settings locale="en" encoding="latin1" />
diff -Nru plasma-widget-cwp-1.6.4/data/myforecast_com_fahrenheit.xml plasma-widget-cwp-1.6.5/data/myforecast_com_fahrenheit.xml
--- plasma-widget-cwp-1.6.4/data/myforecast_com_fahrenheit.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/myforecast_com_fahrenheit.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="F" />
+ <xml_file_version type="cwp" version="2012-10-07" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="F" />
<locale_settings locale="en" encoding="latin1" />
diff -Nru plasma-widget-cwp-1.6.4/data/pogodynka_pl.xml plasma-widget-cwp-1.6.5/data/pogodynka_pl.xml
--- plasma-widget-cwp-1.6.4/data/pogodynka_pl.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/pogodynka_pl.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="pogodynka.pl" search_page="http://www.pogodynka.pl"; example_zip="polska/warszawa_warszawa" unit="C" />
+ <xml_file_version type="cwp" version="2012-10-07" name="pogodynka.pl" search_page="http://www.pogodynka.pl"; example_zip="polska/warszawa_warszawa" unit="C" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.4/data/satellite_images.xml plasma-widget-cwp-1.6.5/data/satellite_images.xml
--- plasma-widget-cwp-1.6.4/data/satellite_images.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/satellite_images.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp_satellite_images" version="2012-09-24" />
+ <xml_file_version type="cwp_satellite_images" version="2012-10-07" />
<!--Global-->
<image name="- - Global - -" url="" />
diff -Nru plasma-widget-cwp-1.6.4/data/uk_weather_com.xml plasma-widget-cwp-1.6.5/data/uk_weather_com.xml
--- plasma-widget-cwp-1.6.4/data/uk_weather_com.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/uk_weather_com.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="uk.weather.com" search_page="http://uk.weather.com"; example_zip="London-UKXX0085" unit="C" />
+ <xml_file_version type="cwp" version="2012-10-07" name="uk.weather.com" search_page="http://uk.weather.com"; example_zip="London-UKXX0085" unit="C" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.4/data/wetter_com.xml plasma-widget-cwp-1.6.5/data/wetter_com.xml
--- plasma-widget-cwp-1.6.4/data/wetter_com.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/wetter_com.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="www.wetter.com" search_page="http://www.wetter.com"; example_zip="DE0006515" unit="C" />
+ <xml_file_version type="cwp" version="2012-10-07" name="www.wetter.com" search_page="http://www.wetter.com"; example_zip="DE0006515" unit="C" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.4/data/www_accuweather_com_us_celsius.xml plasma-widget-cwp-1.6.5/data/www_accuweather_com_us_celsius.xml
--- plasma-widget-cwp-1.6.4/data/www_accuweather_com_us_celsius.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/www_accuweather_com_us_celsius.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="85001" unit="C" />
+ <xml_file_version type="cwp" version="2012-10-07" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="85001" unit="C" />
<locale_settings locale="utf-8" encoding="utf8" />
@@ -13,9 +13,9 @@
<url3 url3_prefix="http://www.accuweather.com/us/"; url3_suffix="/city-weather-forecast.asp" url3_follow="grep current-weather | tail -n 1 | sed -e "s/.*href=\"\([^\"]*\)\".*/\1?unit=c/"" />
- <url4 url4_prefix="" url4_suffix="" url4_follow="" />
+ <url4 url4_prefix="http://www.accuweather.com/us/"; url4_suffix="/city-weather-forecast.asp" url4_follow="grep daily-weather-forecast | head -n 1 | sed -e "s/.*action-uri=\([^;]*\);.*/\1?day=4\&unit=c/"" />
- <url5 url5_prefix="" url5_suffix="" url5_follow="" />
+ <url5 url5_prefix="http://www.accuweather.com/us/"; url5_suffix="/city-weather-forecast.asp" url5_follow="grep daily-weather-forecast | head -n 1 | sed -e "s/.*action-uri=\([^;]*\);.*/\1?day=5\&unit=c/"" />
<url6 url6_prefix="" url6_suffix="" url6_follow="" />
@@ -59,66 +59,66 @@
/>
<data_day1 url="url1"
- name="grep -A 16 day\ current | grep href=\"#\" | sed -e "s/<[^>]*>//g""
- temperature_low="grep -A 16 day\ current | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
- temperature_high="grep -A 16 day\ current | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
- icon="grep -A 16 day\ current | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-\2\/\3-m.png/""
- icon_code="grep -A 16 day\ current | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/\2_\3/""
- icon_text="grep -A 16 day\ current | grep cond | sed -e "s/<[^>]*>//g""
+ name="grep -A 13 day=1\' | grep href=\"#\" | sed -e "s/<[^>]*>//g""
+ temperature_low="grep -A 13 day=1\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
+ temperature_high="grep -A 13 day=1\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
+ icon="grep -A 13 day=1\' | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-\2\/\3-m.png/""
+ icon_code="grep -A 13 day=1\' | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/\2_\3/""
+ icon_text="grep -A 13 day=1\' | grep cond | sed -e "s/<[^>]*>//g""
/>
<data_day2 url="url1"
- name="grep -B 16 day=2\" | grep href=\"#\" | sed -e "s/<[^>]*>//g""
- temperature_low="grep -B 16 day=2\" | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
- temperature_high="grep -B 16 day=2\" | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
- icon="grep -B 16 day=2\" | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
- icon_code="grep -B 16 day=2\" | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
- icon_text="grep -B 16 day=2\" | grep cond | sed -e "s/<[^>]*>//g""
+ name="grep -A 13 day=2\' | grep href=\"#\" | sed -e "s/<[^>]*>//g""
+ temperature_low="grep -A 13 day=2\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
+ temperature_high="grep -A 13 day=2\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
+ icon="grep -A 13 day=2\' | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
+ icon_code="grep -A 13 day=2\' | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
+ icon_text="grep -A 13 day=2\' | grep cond | sed -e "s/<[^>]*>//g""
/>
<data_day3 url="url1"
- name="grep -B 16 day=3\" | grep href=\"#\" | sed -e "s/<[^>]*>//g""
- temperature_low="grep -B 16 day=3\" | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
- temperature_high="grep -B 16 day=3\" | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
- icon="grep -B 16 day=3\" | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
- icon_code="grep -B 16 day=3\" | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
- icon_text="grep -B 16 day=3\" | grep cond | sed -e "s/<[^>]*>//g""
- />
-
- <data_day4 url="url1"
- name="grep -B 16 day=4\" | grep href=\"#\" | sed -e "s/<[^>]*>//g""
- temperature_low="grep -B 16 day=4\" | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
- temperature_high="grep -B 16 day=4\" | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
- icon="grep -B 16 day=4\" | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
- icon_code="grep -B 16 day=4\" | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
- icon_text="grep -B 16 day=4\" | grep cond | sed -e "s/<[^>]*>//g""
- />
-
- <data_day5 url="url1"
- name="grep -B 16 day=5\" | grep href=\"#\" | sed -e "s/<[^>]*>//g""
- temperature_low="grep -B 16 day=5\" | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
- temperature_high="grep -B 16 day=5\" | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
- icon="grep -B 16 day=5\" | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
- icon_code="grep -B 16 day=5\" | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
- icon_text="grep -B 16 day=5\" | grep cond | sed -e "s/<[^>]*>//g""
+ name="grep -A 13 day=3\' | grep href=\"#\" | sed -e "s/<[^>]*>//g""
+ temperature_low="grep -A 13 day=3\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
+ temperature_high="grep -A 13 day=3\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
+ icon="grep -A 13 day=3\' | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
+ icon_code="grep -A 13 day=3\' | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
+ icon_text="grep -A 13 day=3\' | grep cond | sed -e "s/<[^>]*>//g""
+ />
+
+ <data_day4 url="url4"
+ name="grep -A 13 day=4\' | grep href=\"#\" | sed -e "s/<[^>]*>//g""
+ temperature_low="grep -A 13 day=4\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
+ temperature_high="grep -A 13 day=4\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
+ icon="grep -A 13 day=4\' | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
+ icon_code="grep -A 13 day=4\' | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
+ icon_text="grep -A 13 day=4\' | grep cond | sed -e "s/<[^>]*>//g""
+ />
+
+ <data_day5 url="url5"
+ name="grep -A 13 day=5\' | grep href=\"#\" | sed -e "s/<[^>]*>//g""
+ temperature_low="grep -A 13 day=5\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
+ temperature_high="grep -A 13 day=5\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
+ icon="grep -A 13 day=5\' | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
+ icon_code="grep -A 13 day=5\' | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
+ icon_text="grep -A 13 day=5\' | grep cond | sed -e "s/<[^>]*>//g""
/>
<data_day6 url="url2"
- name="grep -A 16 current\ first | grep href=\"#\" | sed -e "s/<[^>]*>//g""
- temperature_low="grep -A 16 current\ first | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
- temperature_high="grep -A 16 current\ first | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
- icon="grep -A 16 current\ first | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
- icon_code="grep -A 16 current\ first | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
- icon_text="grep -A 16 current\ first | grep cond | sed -e "s/<[^>]*>//g""
+ name="grep -A 13 day=6\' | grep href=\"#\" | sed -e "s/<[^>]*>//g""
+ temperature_low="grep -A 13 day=6\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
+ temperature_high="grep -A 13 day=6\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
+ icon="grep -A 13 day=6\' | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
+ icon_code="grep -A 13 day=6\' | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
+ icon_text="grep -A 13 day=6\' | grep cond | sed -e "s/<[^>]*>//g""
/>
<data_day7 url="url2"
- name="grep -B 16 day=7\" | grep href=\"#\" | sed -e "s/<[^>]*>//g""
- temperature_low="grep -B 16 day=7\" | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
- temperature_high="grep -B 16 day=7\" | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
- icon="grep -B 16 day=7\" | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
- icon_code="grep -B 16 day=7\" | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
- icon_text="grep -B 16 day=7\" | grep cond | sed -e "s/<[^>]*>//g""
+ name="grep -A 13 day=7\' | grep href=\"#\" | sed -e "s/<[^>]*>//g""
+ temperature_low="grep -A 13 day=7\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
+ temperature_high="grep -A 13 day=7\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
+ icon="grep -A 13 day=7\' | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
+ icon_code="grep -A 13 day=7\' | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
+ icon_text="grep -A 13 day=7\' | grep cond | sed -e "s/<[^>]*>//g""
/>
<icon_transform
diff -Nru plasma-widget-cwp-1.6.4/data/www_accuweather_com_us_fahrenheit.xml plasma-widget-cwp-1.6.5/data/www_accuweather_com_us_fahrenheit.xml
--- plasma-widget-cwp-1.6.4/data/www_accuweather_com_us_fahrenheit.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/www_accuweather_com_us_fahrenheit.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="85001" unit="F" />
+ <xml_file_version type="cwp" version="2012-10-07" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="85001" unit="F" />
<locale_settings locale="utf-8" encoding="utf8" />
@@ -13,9 +13,9 @@
<url3 url3_prefix="http://www.accuweather.com/us/"; url3_suffix="/city-weather-forecast.asp" url3_follow="grep current-weather | tail -n 1 | sed -e "s/.*href=\"\([^\"]*\)\".*/\1?unit=f/"" />
- <url4 url4_prefix="" url4_suffix="" url4_follow="" />
+ <url4 url4_prefix="http://www.accuweather.com/us/"; url4_suffix="/city-weather-forecast.asp" url4_follow="grep daily-weather-forecast | head -n 1 | sed -e "s/.*action-uri=\([^;]*\);.*/\1?day=4\&unit=f/"" />
- <url5 url5_prefix="" url5_suffix="" url5_follow="" />
+ <url5 url5_prefix="http://www.accuweather.com/us/"; url5_suffix="/city-weather-forecast.asp" url5_follow="grep daily-weather-forecast | head -n 1 | sed -e "s/.*action-uri=\([^;]*\);.*/\1?day=5\&unit=f/"" />
<url6 url6_prefix="" url6_suffix="" url6_follow="" />
@@ -59,66 +59,66 @@
/>
<data_day1 url="url1"
- name="grep -A 16 day\ current | grep href=\"#\" | sed -e "s/<[^>]*>//g""
- temperature_low="grep -A 16 day\ current | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
- temperature_high="grep -A 16 day\ current | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
- icon="grep -A 16 day\ current | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-\2\/\3-m.png/""
- icon_code="grep -A 16 day\ current | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/\2_\3/""
- icon_text="grep -A 16 day\ current | grep cond | sed -e "s/<[^>]*>//g""
+ name="grep -A 13 day=1\' | grep href=\"#\" | sed -e "s/<[^>]*>//g""
+ temperature_low="grep -A 13 day=1\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
+ temperature_high="grep -A 13 day=1\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
+ icon="grep -A 13 day=1\' | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-\2\/\3-m.png/""
+ icon_code="grep -A 13 day=1\' | grep -A 3 href=\"#\" | tr -d '\r' | tr -d '\n' | awk '{print}' | sed -e "s/.*href=\"#\">\(To\|Over\)\([^&<]*\).*icon i-\([^\" ]*\).*/\2_\3/""
+ icon_text="grep -A 13 day=1\' | grep cond | sed -e "s/<[^>]*>//g""
/>
<data_day2 url="url1"
- name="grep -B 16 day=2\" | grep href=\"#\" | sed -e "s/<[^>]*>//g""
- temperature_low="grep -B 16 day=2\" | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
- temperature_high="grep -B 16 day=2\" | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
- icon="grep -B 16 day=2\" | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
- icon_code="grep -B 16 day=2\" | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
- icon_text="grep -B 16 day=2\" | grep cond | sed -e "s/<[^>]*>//g""
+ name="grep -A 13 day=2\' | grep href=\"#\" | sed -e "s/<[^>]*>//g""
+ temperature_low="grep -A 13 day=2\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
+ temperature_high="grep -A 13 day=2\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
+ icon="grep -A 13 day=2\' | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
+ icon_code="grep -A 13 day=2\' | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
+ icon_text="grep -A 13 day=2\' | grep cond | sed -e "s/<[^>]*>//g""
/>
<data_day3 url="url1"
- name="grep -B 16 day=3\" | grep href=\"#\" | sed -e "s/<[^>]*>//g""
- temperature_low="grep -B 16 day=3\" | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
- temperature_high="grep -B 16 day=3\" | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
- icon="grep -B 16 day=3\" | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
- icon_code="grep -B 16 day=3\" | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
- icon_text="grep -B 16 day=3\" | grep cond | sed -e "s/<[^>]*>//g""
- />
-
- <data_day4 url="url1"
- name="grep -B 16 day=4\" | grep href=\"#\" | sed -e "s/<[^>]*>//g""
- temperature_low="grep -B 16 day=4\" | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
- temperature_high="grep -B 16 day=4\" | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
- icon="grep -B 16 day=4\" | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
- icon_code="grep -B 16 day=4\" | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
- icon_text="grep -B 16 day=4\" | grep cond | sed -e "s/<[^>]*>//g""
- />
-
- <data_day5 url="url1"
- name="grep -B 16 day=5\" | grep href=\"#\" | sed -e "s/<[^>]*>//g""
- temperature_low="grep -B 16 day=5\" | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
- temperature_high="grep -B 16 day=5\" | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
- icon="grep -B 16 day=5\" | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
- icon_code="grep -B 16 day=5\" | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
- icon_text="grep -B 16 day=5\" | grep cond | sed -e "s/<[^>]*>//g""
+ name="grep -A 13 day=3\' | grep href=\"#\" | sed -e "s/<[^>]*>//g""
+ temperature_low="grep -A 13 day=3\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
+ temperature_high="grep -A 13 day=3\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
+ icon="grep -A 13 day=3\' | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
+ icon_code="grep -A 13 day=3\' | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
+ icon_text="grep -A 13 day=3\' | grep cond | sed -e "s/<[^>]*>//g""
+ />
+
+ <data_day4 url="url4"
+ name="grep -A 13 day=4\' | grep href=\"#\" | sed -e "s/<[^>]*>//g""
+ temperature_low="grep -A 13 day=4\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
+ temperature_high="grep -A 13 day=4\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
+ icon="grep -A 13 day=4\' | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
+ icon_code="grep -A 13 day=4\' | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
+ icon_text="grep -A 13 day=4\' | grep cond | sed -e "s/<[^>]*>//g""
+ />
+
+ <data_day5 url="url5"
+ name="grep -A 13 day=5\' | grep href=\"#\" | sed -e "s/<[^>]*>//g""
+ temperature_low="grep -A 13 day=5\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
+ temperature_high="grep -A 13 day=5\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
+ icon="grep -A 13 day=5\' | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
+ icon_code="grep -A 13 day=5\' | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
+ icon_text="grep -A 13 day=5\' | grep cond | sed -e "s/<[^>]*>//g""
/>
<data_day6 url="url2"
- name="grep -A 16 current\ first | grep href=\"#\" | sed -e "s/<[^>]*>//g""
- temperature_low="grep -A 16 current\ first | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
- temperature_high="grep -A 16 current\ first | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
- icon="grep -A 16 current\ first | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
- icon_code="grep -A 16 current\ first | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
- icon_text="grep -A 16 current\ first | grep cond | sed -e "s/<[^>]*>//g""
+ name="grep -A 13 day=6\' | grep href=\"#\" | sed -e "s/<[^>]*>//g""
+ temperature_low="grep -A 13 day=6\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
+ temperature_high="grep -A 13 day=6\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
+ icon="grep -A 13 day=6\' | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
+ icon_code="grep -A 13 day=6\' | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
+ icon_text="grep -A 13 day=6\' | grep cond | sed -e "s/<[^>]*>//g""
/>
<data_day7 url="url2"
- name="grep -B 16 day=7\" | grep href=\"#\" | sed -e "s/<[^>]*>//g""
- temperature_low="grep -B 16 day=7\" | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
- temperature_high="grep -B 16 day=7\" | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
- icon="grep -B 16 day=7\" | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
- icon_code="grep -B 16 day=7\" | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
- icon_text="grep -B 16 day=7\" | grep cond | sed -e "s/<[^>]*>//g""
+ name="grep -A 13 day=7\' | grep href=\"#\" | sed -e "s/<[^>]*>//g""
+ temperature_low="grep -A 13 day=7\' | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
+ temperature_high="grep -A 13 day=7\' | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
+ icon="grep -A 13 day=7\' | grep icon | sed -e "s/.*icon i-\([^\" ]*\).*/http:\/\/www.accuweather.com\/adc2010\/images\/icons-day\/\1-m.png/""
+ icon_code="grep -A 13 day=7\' | grep icon | sed -e "s/.*class=\"icon i-\([^\" ]*\).*/day_\1/""
+ icon_text="grep -A 13 day=7\' | grep cond | sed -e "s/<[^>]*>//g""
/>
<icon_transform
diff -Nru plasma-widget-cwp-1.6.4/data/www_accuweather_com_world_celsius.xml plasma-widget-cwp-1.6.5/data/www_accuweather_com_world_celsius.xml
--- plasma-widget-cwp-1.6.4/data/www_accuweather_com_world_celsius.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/www_accuweather_com_world_celsius.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="www.accuweather.com World" search_page="http://www.accuweather.com/en/world-weather"; example_zip="305448" unit="C" />
+ <xml_file_version type="cwp" version="2012-10-07" name="www.accuweather.com World" search_page="http://www.accuweather.com/en/world-weather"; example_zip="305448" unit="C" />
<locale_settings locale="utf-8" encoding="utf8" />
@@ -13,9 +13,9 @@
<url3 url3_prefix="http://www.accuweather.com/en/za/johannesburg/305448/current-weather/"; url3_suffix="" url3_follow="grep canonical | sed -e "s/.*href=\"\([^\"]*\).*/\1?mt=1/"" />
- <url4 url4_prefix="" url4_suffix="" url4_follow="" />
+ <url4 url4_prefix="http://www.accuweather.com/en/za/johannesburg/305448/daily-weather-forecast/"; url4_suffix="" url4_follow="grep canonical | sed -e "s/.*href=\"\([^\"]*\).*/\1?day=4\&mt=1/"" />
- <url5 url5_prefix="" url5_suffix="" url5_follow="" />
+ <url5 url5_prefix="http://www.accuweather.com/en/za/johannesburg/305448/daily-weather-forecast/"; url5_suffix="" url5_follow="grep canonical | sed -e "s/.*href=\"\([^\"]*\).*/\1?day=5\&mt=1/"" />
<url6 url6_prefix="" url6_suffix="" url6_follow="" />
@@ -85,7 +85,7 @@
icon_text="grep -A14 class=\"day.*day=3 | grep cond | sed -e "s/<[^>]*>//g""
/>
- <data_day4 url="url1"
+ <data_day4 url="url4"
name="grep -A14 class=\"day.*day=4 | grep href=\"#\" | sed -e "s/<[^>]*>//g""
temperature_low="grep -A14 class=\"day.*day=4 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
temperature_high="grep -A14 class=\"day.*day=4 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
@@ -94,7 +94,7 @@
icon_text="grep -A14 class=\"day.*day=4 | grep cond | sed -e "s/<[^>]*>//g""
/>
- <data_day5 url="url1"
+ <data_day5 url="url5"
name="grep -A14 class=\"day.*day=5 | grep href=\"#\" | sed -e "s/<[^>]*>//g""
temperature_low="grep -A14 class=\"day.*day=5 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
temperature_high="grep -A14 class=\"day.*day=5 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
diff -Nru plasma-widget-cwp-1.6.4/data/www_accuweather_com_world_fahrenheit.xml plasma-widget-cwp-1.6.5/data/www_accuweather_com_world_fahrenheit.xml
--- plasma-widget-cwp-1.6.4/data/www_accuweather_com_world_fahrenheit.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/www_accuweather_com_world_fahrenheit.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="www.accuweather.com World" search_page="http://www.accuweather.com/en/world-weather"; example_zip="305448" unit="F" />
+ <xml_file_version type="cwp" version="2012-10-07" name="www.accuweather.com World" search_page="http://www.accuweather.com/en/world-weather"; example_zip="305448" unit="F" />
<locale_settings locale="utf-8" encoding="utf8" />
@@ -13,9 +13,9 @@
<url3 url3_prefix="http://www.accuweather.com/en/za/johannesburg/305448/current-weather/"; url3_suffix="" url3_follow="grep canonical | sed -e "s/.*href=\"\([^\"]*\).*/\1?mt=0/"" />
- <url4 url4_prefix="" url4_suffix="" url4_follow="" />
+ <url4 url4_prefix="http://www.accuweather.com/en/za/johannesburg/305448/daily-weather-forecast/"; url4_suffix="" url4_follow="grep canonical | sed -e "s/.*href=\"\([^\"]*\).*/\1?day=4\&mt=0/"" />
- <url5 url5_prefix="" url5_suffix="" url5_follow="" />
+ <url5 url5_prefix="http://www.accuweather.com/en/za/johannesburg/305448/daily-weather-forecast/"; url5_suffix="" url5_follow="grep canonical | sed -e "s/.*href=\"\([^\"]*\).*/\1?day=5\&mt=0/"" />
<url6 url6_prefix="" url6_suffix="" url6_follow="" />
@@ -85,7 +85,7 @@
icon_text="grep -A14 class=\"day.*day=3 | grep cond | sed -e "s/<[^>]*>//g""
/>
- <data_day4 url="url1"
+ <data_day4 url="url4"
name="grep -A14 class=\"day.*day=4 | grep href=\"#\" | sed -e "s/<[^>]*>//g""
temperature_low="grep -A14 class=\"day.*day=4 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
temperature_high="grep -A14 class=\"day.*day=4 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
@@ -94,7 +94,7 @@
icon_text="grep -A14 class=\"day.*day=4 | grep cond | sed -e "s/<[^>]*>//g""
/>
- <data_day5 url="url1"
+ <data_day5 url="url5"
name="grep -A14 class=\"day.*day=5 | grep href=\"#\" | sed -e "s/<[^>]*>//g""
temperature_low="grep -A14 class=\"day.*day=5 | grep temp | tail -n 1 | sed -e "s/.*Lo *<\/span> *\([-0-9]*\).*/\1/""
temperature_high="grep -A14 class=\"day.*day=5 | grep temp | tail -n 1 | sed -e "s/.*temp *\"> *\([-0-9]*\).*/\1/""
diff -Nru plasma-widget-cwp-1.6.4/data/www_gismeteo_com.xml plasma-widget-cwp-1.6.5/data/www_gismeteo_com.xml
--- plasma-widget-cwp-1.6.4/data/www_gismeteo_com.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/www_gismeteo_com.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="www.gismeteo.com" search_page="http://www.gismeteo.ru"; example_zip="4944" unit="C" />
+ <xml_file_version type="cwp" version="2012-10-07" name="www.gismeteo.com" search_page="http://www.gismeteo.ru"; example_zip="4944" unit="C" />
<locale_settings locale="utf-8" encoding="utf8" />
@@ -33,28 +33,28 @@
<data_current_temperature url="urlc"
update_time="grep icon\ date | sed -e "s/.*icon date[^>]*>[^:]* \([0-9]\+:[0-9]\+\).*/\1/" | awk '{if ($1 ~ /^[0-9]+:[0-9]+$/) {print} else {print "N.A."} ; }'"
- temperature="grep -A 21 id=\"weather\" | grep "temp c" | sed -e "s/&minus;/-/" | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^-0-9]\([-0-9]\+\)&deg.*/\1/""
+ temperature="grep -A 68 id=\"weather\" | tail -n 34 | grep "temp c" | sed -e "s/&minus;/-/" | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^-0-9]\([-0-9]\+\)&deg.*/\1/""
temperature_felt="echo -n"
/>
<data_current_wind url="urlc"
- wind="grep -A 21 id=\"weather\"|grep -A 4 wicon| tr -d '\r' | tr -d '\n'| sed -e "s/.*wind ms[^>]*>\([^<]*\)<[^<]*class=.unit[^>]>\([^<]*\)<.*<dt>\([^<]*\)<.*/\3 - \1 \2/""
- wind_code="grep -A 21 id=\"weather\"| grep -A 4 wicon| tail -n 1 | sed -e "s/<[^>]*>//g""
- wind_speed="grep -A 21 id=\"weather\" | grep "wind ms" | sed -e "s/.*class=.value[^>]*>\([^<]*\)<.*class=.unit[^>]*>\([^<]*\)<.*/\1 \2/""
+ wind="grep -A 68 id=\"weather\" | tail -n 34 | grep -A 4 wicon | tr -d '\r' | tr -d '\n' | sed -e "s/.*wind ms[^>]*>\([^<]*\)<[^<]*class=.unit[^>]>\([^<]*\)<.*<dt>\([^<]*\)<.*/\3 - \1 \2/""
+ wind_code="grep -A 68 id=\"weather\" | tail -n 34 | grep -A 4 wicon | tr -d '\r' | tr -d '\n' | sed -e "s/.*wind ms[^>]*>\([^<]*\)<[^<]*class=.unit[^>]>\([^<]*\)<.*<dt>\([^<]*\)<.*/\3/""
+ wind_speed="grep -A 68 id=\"weather\" | tail -n 34 | grep "wind ms" | sed -e "s/.*class=.value[^>]*>\([^<]*\)<.*class=.unit[^>]*>\([^<]*\)<.*/\1 \2/""
/>
<data_current_icon url="urlc"
- icon="grep -A 21 id=\"weather\" | grep background-image | sed -e "s/.*\(http[^)]*\).*/\1/""
- icon_code="grep -A 21 id=\"weather\" | grep background-image | sed -e "s/.*\(http[^)]*\).*/\1/" | sed 's/.*new\/\(.*\)\.png.*/\1/'"
- icon_text="grep -A 21 id=\"weather\" | grep -A 1 background-image | tail -n 1 | sed -e "s/<[^>]*>//g""
+ icon="grep -A 68 id=\"weather\" | tail -n 34; | grep background-image | sed -e "s/.*\(http[^)]*\).*/\1/""
+ icon_code="grep -A 68 id=\"weather\" | tail -n 34 | grep background-image | sed -e "s/.*\(http[^)]*\).*/\1/" | sed 's/.*new\/\(.*\)\.png.*/\1/'"
+ icon_text="grep -A 68 id=\"weather\" | tail -n 34 | grep -A 1 background-image | tail -n 1 | sed -e "s/<[^>]*>//g""
/>
<data_current_additional url="urlc"
- humidity="grep -A 26 id=\"weather\" | grep hum | sed -e "s/<[^>]*>//g" | sed -e "s/&nbsp;/ /""
+ humidity="grep -A 68 id=\"weather\" | tail -n 34 | grep hum | sed -e "s/<[^>]*>//g" | sed -e "s/&nbsp;/ /""
rain="echo -n"
dew_point="echo -n"
visibility="echo -n"
- pressure="grep -A 26 id=\"weather\" | grep "press tor" | sed -e "s/<[^>]*>//g""
+ pressure="grep -A 68 id=\"weather\" | tail -n 34 | grep "press tor" | sed -e "s/<[^>]*>//g""
uv_index="echo -n"
/>
diff -Nru plasma-widget-cwp-1.6.4/data/www_weather_com.cn.xml plasma-widget-cwp-1.6.5/data/www_weather_com.cn.xml
--- plasma-widget-cwp-1.6.4/data/www_weather_com.cn.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/www_weather_com.cn.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="www.weather.com.cn" search_page="http://www.weather.com.cn"; example_zip="101010100" unit="C" />
+ <xml_file_version type="cwp" version="2012-10-07" name="www.weather.com.cn" search_page="http://www.weather.com.cn"; example_zip="101010100" unit="C" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.4/data/www_weather_com.xml plasma-widget-cwp-1.6.5/data/www_weather_com.xml
--- plasma-widget-cwp-1.6.4/data/www_weather_com.xml 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/data/www_weather_com.xml 2012-10-07 18:16:51.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-09-24" name="www.weather.com" search_page="http://www.weather.com"; example_zip="USDC0001" unit="F" />
+ <xml_file_version type="cwp" version="2012-10-07" name="www.weather.com" search_page="http://www.weather.com"; example_zip="USDC0001" unit="F" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.4/debian/changelog plasma-widget-cwp-1.6.5/debian/changelog
--- plasma-widget-cwp-1.6.4/debian/changelog 2012-09-24 22:47:42.000000000 +0300
+++ plasma-widget-cwp-1.6.5/debian/changelog 2012-10-07 20:15:29.000000000 +0300
@@ -1,3 +1,9 @@
+plasma-widget-cwp (1.6.5-1) unstable; urgency=low
+
+ * Update to stable release 1.6.5.
+
+ -- Boris Pek <tehnick-8@mail.ru> Sun, 07 Oct 2012 20:15:15 +0300
+
plasma-widget-cwp (1.6.4-1) unstable; urgency=low
* Update to stable release 1.6.4.
diff -Nru plasma-widget-cwp-1.6.4/plasma-applet-cwp.desktop plasma-widget-cwp-1.6.5/plasma-applet-cwp.desktop
--- plasma-widget-cwp-1.6.4/plasma-applet-cwp.desktop 2012-09-24 21:13:16.000000000 +0300
+++ plasma-widget-cwp-1.6.5/plasma-applet-cwp.desktop 2012-10-07 18:16:51.000000000 +0300
@@ -30,7 +30,7 @@
X-KDE-PluginInfo-Author=Georg Hennig
X-KDE-PluginInfo-Email=georg.hennig@web.de
X-KDE-PluginInfo-Name=plasma_applet_cwp
-X-KDE-PluginInfo-Version=1.6.4
+X-KDE-PluginInfo-Version=1.6.5
X-KDE-PluginInfo-Website=http://www.kde-look.org/content/show.php/show.php?content=98925
X-KDE-PluginInfo-Category=
X-KDE-PluginInfo-Depends=
diff -Nru plasma-widget-cwp-1.6.4/README plasma-widget-cwp-1.6.5/README
--- plasma-widget-cwp-1.6.4/README 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/README 2012-10-07 18:16:51.000000000 +0300
@@ -1,5 +1,5 @@
=========================================
-Customizable Weather Plasmoid (CWP) 1.6.4
+Customizable Weather Plasmoid (CWP) 1.6.5
=========================================
This is another weather plasmoid.
diff -Nru plasma-widget-cwp-1.6.4/version.h plasma-widget-cwp-1.6.5/version.h
--- plasma-widget-cwp-1.6.4/version.h 2012-09-24 21:13:17.000000000 +0300
+++ plasma-widget-cwp-1.6.5/version.h 2012-10-07 18:16:51.000000000 +0300
@@ -20,7 +20,7 @@
#ifndef version_h
#define version_h
-#define VERSION "1.6.4"
+#define VERSION "1.6.5"
#define DATE "2009-2012"
#define AUTHOR "Georg Hennig"
#define NAME "Customizable Weather Plasmoid (CWP)"
Reply to: