--- Begin Message ---
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.4-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.3/ChangeLog plasma-widget-cwp-1.6.4/ChangeLog
--- plasma-widget-cwp-1.6.3/ChangeLog 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/ChangeLog 2012-09-24 21:13:16.000000000 +0300
@@ -1,3 +1,11 @@
+1.6.4
+=====
+- xml: ilmeteo.it: fixed apostrophe character in location names
+- xml: pogodynka.pl: fixed wrong low temperature in some cases
+- xml: accuweather.com (US): fixed location names
+- xml: accuweather.com (US): fixed forecast after midnight
+
+
1.6.3
=====
- xml: de.weather.com: fixed wind directions
diff -Nru plasma-widget-cwp-1.6.3/data/br_weather_com.xml plasma-widget-cwp-1.6.4/data/br_weather_com.xml
--- plasma-widget-cwp-1.6.3/data/br_weather_com.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/br_weather_com.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="br.weather.com" search_page="http://br.weather.com"; example_zip="BRXX0043" unit="C" />
+ <xml_file_version type="cwp" version="2012-09-24" 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.3/data/de_weather_com.xml plasma-widget-cwp-1.6.4/data/de_weather_com.xml
--- plasma-widget-cwp-1.6.3/data/de_weather_com.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/de_weather_com.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="de.weather.com" search_page="http://de.weather.com"; example_zip="80331" unit="C" />
+ <xml_file_version type="cwp" version="2012-09-24" 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.3/data/espanol_weather_com.xml plasma-widget-cwp-1.6.4/data/espanol_weather_com.xml
--- plasma-widget-cwp-1.6.3/data/espanol_weather_com.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/espanol_weather_com.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" 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-09-24" 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.3/data/freemeteo_com_celsius.xml plasma-widget-cwp-1.6.4/data/freemeteo_com_celsius.xml
--- plasma-widget-cwp-1.6.3/data/freemeteo_com_celsius.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/freemeteo_com_celsius.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="C" />
+ <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" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.3/data/freemeteo_com_fahrenheit.xml plasma-widget-cwp-1.6.4/data/freemeteo_com_fahrenheit.xml
--- plasma-widget-cwp-1.6.3/data/freemeteo_com_fahrenheit.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/freemeteo_com_fahrenheit.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="freemeteo.com" search_page="http://freemeteo.com"; example_zip="gid=3117735&la=4" unit="F" />
+ <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" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.3/data/fr_weather_com.xml plasma-widget-cwp-1.6.4/data/fr_weather_com.xml
--- plasma-widget-cwp-1.6.3/data/fr_weather_com.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/fr_weather_com.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="fr.weather.com" search_page="http://fr.weather.com"; example_zip="Paris-FRXX0076" unit="C" />
+ <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" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.3/data/ilmeteo_it.xml plasma-widget-cwp-1.6.4/data/ilmeteo_it.xml
--- plasma-widget-cwp-1.6.3/data/ilmeteo_it.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/ilmeteo_it.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="ilmeteo.it" search_page="http://www.ilmeteo.it"; example_zip="Roma" unit="C" />
+ <xml_file_version type="cwp" version="2012-09-24" name="ilmeteo.it" search_page="http://www.ilmeteo.it"; example_zip="Roma" unit="C" />
<locale_settings locale="utf-8" encoding="utf8" />
@@ -22,8 +22,8 @@
<url7 url7_prefix="" url7_suffix="" url7_follow="" />
<data_location url="url2"
- location="grep Link\ veloci | sed -e "s/.*Link veloci: <a href[^>]*>\([^<]*\).*<a href.*<a href[^>]*>\([^<]*\).*/\2/""
- country="grep Link\ veloci | sed -e "s/.*Link veloci: <a href[^>]*>\([^<]*\).*<a href.*<a href[^>]*>\([^<]*\).*/\1/""
+ location="grep Link\ veloci | sed -e "s/.*Link veloci: <a href[^>]*>\([^<]*\).*<a href.*<a href[^>]*>\([^<]*\).*/\2/" | sed -e "s/&#039;/\'/g""
+ country="grep Link\ veloci | sed -e "s/.*Link veloci: <a href[^>]*>\([^<]*\).*<a href.*<a href[^>]*>\([^<]*\).*/\1/" | sed -e "s/&#039;/\'/g""
/>
<data_sun url="urlc"
diff -Nru plasma-widget-cwp-1.6.3/data/in_weather_com.xml plasma-widget-cwp-1.6.4/data/in_weather_com.xml
--- plasma-widget-cwp-1.6.3/data/in_weather_com.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/in_weather_com.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="in.weather.com" search_page="http://in.weather.com"; example_zip="New-Delhi-INXX0096" unit="C" />
+ <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" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.3/data/myforecast_com_celsius.xml plasma-widget-cwp-1.6.4/data/myforecast_com_celsius.xml
--- plasma-widget-cwp-1.6.3/data/myforecast_com_celsius.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/myforecast_com_celsius.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="C" />
+ <xml_file_version type="cwp" version="2012-09-24" 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.3/data/myforecast_com_fahrenheit.xml plasma-widget-cwp-1.6.4/data/myforecast_com_fahrenheit.xml
--- plasma-widget-cwp-1.6.3/data/myforecast_com_fahrenheit.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/myforecast_com_fahrenheit.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="www.myforecast.com" search_page="http://www.myforecast.com"; example_zip="12844" unit="F" />
+ <xml_file_version type="cwp" version="2012-09-24" 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.3/data/pogodynka_pl.xml plasma-widget-cwp-1.6.4/data/pogodynka_pl.xml
--- plasma-widget-cwp-1.6.3/data/pogodynka_pl.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/pogodynka_pl.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="pogodynka.pl" search_page="http://www.pogodynka.pl"; example_zip="polska/warszawa_warszawa" unit="C" />
+ <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" />
<locale_settings locale="utf-8" encoding="utf8" />
@@ -60,65 +60,65 @@
<data_day1 url="url1"
name="grep span\ class=\'godzina\' | head -n 1 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^0-9]*\).*/\1/""
- temperature_low="echo -n"
- temperature_high="grep -A 15 1[34]:00 | grep temperatura | head -n 1 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
- icon="grep -A 15 1[34]:00 | grep ico | head -n 1 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/""
- icon_code="grep -A 15 1[34]:00 | grep ico | head -n 1 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).jpg.*/\1/""
- icon_text="grep -A 15 1[34]:00 | grep opis | head -n 1 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/""
+ temperature_low="grep -A 15 span\ class=\'godzina\' | grep -A 14 [12]:00 | grep temperatura | head -n 1 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
+ temperature_high="grep -A 14 1[34]:00 | grep temperatura | head -n 1 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
+ icon="grep -A 14 1[34]:00 | grep ico | head -n 1 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/""
+ icon_code="grep -A 14 1[34]:00 | grep ico | head -n 1 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).jpg.*/\1/""
+ icon_text="grep -A 14 1[34]:00 | grep opis | head -n 1 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/""
/>
<data_day2 url="url1"
name="grep span\ class=\'godzina\' | head -n 2 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^0-9]*\).*/\1/""
- temperature_low="grep -A 15 [12]:00 | grep temperatura | head -n 2 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
- temperature_high="grep -A 15 1[34]:00 | grep temperatura | head -n 2 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
- icon="grep -A 15 1[34]:00 | grep ico | head -n 3 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/""
- icon_code="grep -A 15 1[34]:00 | grep ico | head -n 3 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).jpg.*/\1/""
- icon_text="grep -A 15 1[34]:00 | grep opis | head -n 3 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/""
+ temperature_low="grep -A 15 span\ class=\'godzina\' | grep -A 14 [12]:00 | grep temperatura | head -n 2 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
+ temperature_high="grep -A 14 1[34]:00 | grep temperatura | head -n 2 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
+ icon="grep -A 14 1[34]:00 | grep ico | head -n 3 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/""
+ icon_code="grep -A 14 1[34]:00 | grep ico | head -n 3 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).jpg.*/\1/""
+ icon_text="grep -A 14 1[34]:00 | grep opis | head -n 3 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/""
/>
<data_day3 url="url1"
name="grep span\ class=\'godzina\' | head -n 3 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^0-9]*\).*/\1/""
- temperature_low="grep -A 15 [12]:00 | grep temperatura | head -n 3 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
- temperature_high="grep -A 15 1[34]:00 | grep temperatura | head -n 3 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
- icon="grep -A 15 1[34]:00 | grep ico | head -n 5 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/""
- icon_code="grep -A 15 1[34]:00 | grep ico | head -n 5 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).jpg.*/\1/""
- icon_text="grep -A 15 1[34]:00 | grep opis | head -n 5 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/""
+ temperature_low="grep -A 15 span\ class=\'godzina\' | grep -A 14 [12]:00 | grep temperatura | head -n 3 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
+ temperature_high="grep -A 14 1[34]:00 | grep temperatura | head -n 3 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
+ icon="grep -A 14 1[34]:00 | grep ico | head -n 5 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/""
+ icon_code="grep -A 14 1[34]:00 | grep ico | head -n 5 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).jpg.*/\1/""
+ icon_text="grep -A 14 1[34]:00 | grep opis | head -n 5 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/""
/>
<data_day4 url="url1"
name="grep span\ class=\'godzina\' | head -n 4 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^0-9]*\).*/\1/""
- temperature_low="grep -A 15 [12]:00 | grep temperatura | head -n 4 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
- temperature_high="grep -A 15 1[34]:00 | grep temperatura | head -n 4 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
- icon="grep -A 15 1[34]:00 | grep ico | head -n 7 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/""
- icon_code="grep -A 15 1[34]:00 | grep ico | head -n 7 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).jpg.*/\1/""
- icon_text="grep -A 15 1[34]:00 | grep opis | head -n 7 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/""
+ temperature_low="grep -A 15 span\ class=\'godzina\' | grep -A 14 [12]:00 | grep temperatura | head -n 4 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
+ temperature_high="grep -A 14 1[34]:00 | grep temperatura | head -n 4 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
+ icon="grep -A 14 1[34]:00 | grep ico | head -n 7 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/""
+ icon_code="grep -A 14 1[34]:00 | grep ico | head -n 7 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).jpg.*/\1/""
+ icon_text="grep -A 14 1[34]:00 | grep opis | head -n 7 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/""
/>
<data_day5 url="url1"
name="grep span\ class=\'godzina\' | head -n 5 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^0-9]*\).*/\1/""
- temperature_low="grep -A 15 [12]:00 | grep temperatura | head -n 5 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
- temperature_high="grep -A 15 1[34]:00 | grep temperatura | head -n 5 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
- icon="grep -A 15 1[34]:00 | grep ico | head -n 9 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/""
- icon_code="grep -A 15 1[34]:00 | grep ico | head -n 9 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).jpg.*/\1/""
- icon_text="grep -A 15 1[34]:00 | grep opis | head -n 9 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/""
+ temperature_low="grep -A 15 span\ class=\'godzina\' | grep -A 14 [12]:00 | grep temperatura | head -n 5 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
+ temperature_high="grep -A 14 1[34]:00 | grep temperatura | head -n 5 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
+ icon="grep -A 14 1[34]:00 | grep ico | head -n 9 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/""
+ icon_code="grep -A 14 1[34]:00 | grep ico | head -n 9 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).jpg.*/\1/""
+ icon_text="grep -A 14 1[34]:00 | grep opis | head -n 9 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/""
/>
<data_day6 url="url1"
name="grep span\ class=\'godzina\' | head -n 6 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^0-9]*\).*/\1/""
- temperature_low="grep -A 15 [12]:00 | grep temperatura | head -n 6 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
- temperature_high="grep -A 15 1[34]:00 | grep temperatura | head -n 6 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
- icon="grep -A 15 1[34]:00 | grep ico | head -n 11 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/""
- icon_code="grep -A 15 1[34]:00 | grep ico | head -n 11 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).jpg.*/\1/""
- icon_text="grep -A 15 1[34]:00 | grep opis | head -n 11 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/""
+ temperature_low="grep -A 15 span\ class=\'godzina\' | grep -A 14 [12]:00 | grep temperatura | head -n 6 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
+ temperature_high="grep -A 14 1[34]:00 | grep temperatura | head -n 6 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
+ icon="grep -A 14 1[34]:00 | grep ico | head -n 11 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/""
+ icon_code="grep -A 14 1[34]:00 | grep ico | head -n 11 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).jpg.*/\1/""
+ icon_text="grep -A 14 1[34]:00 | grep opis | head -n 11 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/""
/>
<data_day7 url="url1"
name="grep span\ class=\'godzina\' | head -n 7 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^0-9]*\).*/\1/""
- temperature_low="grep -A 15 [12]:00 | grep temperatura | head -n 7 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
- temperature_high="grep -A 15 1[34]:00 | grep temperatura | head -n 7 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
- icon="grep -A 15 1[34]:00 | grep ico | head -n 13 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/""
- icon_code="grep -A 15 1[34]:00 | grep ico | head -n 13 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).jpg.*/\1/""
- icon_text="grep -A 15 1[34]:00 | grep opis | head -n 13 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/""
+ temperature_low="grep -A 15 span\ class=\'godzina\' | grep -A 14 [12]:00 | grep temperatura | head -n 7 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
+ temperature_high="grep -A 14 1[34]:00 | grep temperatura | head -n 7 | tail -n 1 | sed -e "s/[^<]*<[^>]*>\([^<]*\).*/\1/""
+ icon="grep -A 14 1[34]:00 | grep ico | head -n 13 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/""
+ icon_code="grep -A 14 1[34]:00 | grep ico | head -n 13 | tail -n 1 | sed -e "s/[^\.]*img src=\([^>]*\).*/http:\/\/www.pogodynka.pl\1/" | sed -e "s/.*\/\([^\/]*\).jpg.*/\1/""
+ icon_text="grep -A 14 1[34]:00 | grep opis | head -n 13 | tail -n 1 | sed -e "s/[^<]*<[^>]*><[^>]*>\([^<]*\).*/\1/""
/>
<icon_transform
diff -Nru plasma-widget-cwp-1.6.3/data/satellite_images.xml plasma-widget-cwp-1.6.4/data/satellite_images.xml
--- plasma-widget-cwp-1.6.3/data/satellite_images.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/satellite_images.xml 2012-09-24 21:13:17.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-08-07" />
+ <xml_file_version type="cwp_satellite_images" version="2012-09-24" />
<!--Global-->
<image name="- - Global - -" url="" />
diff -Nru plasma-widget-cwp-1.6.3/data/uk_weather_com.xml plasma-widget-cwp-1.6.4/data/uk_weather_com.xml
--- plasma-widget-cwp-1.6.3/data/uk_weather_com.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/uk_weather_com.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="uk.weather.com" search_page="http://uk.weather.com"; example_zip="London-UKXX0085" unit="C" />
+ <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" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.3/data/wetter_com.xml plasma-widget-cwp-1.6.4/data/wetter_com.xml
--- plasma-widget-cwp-1.6.3/data/wetter_com.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/wetter_com.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="www.wetter.com" search_page="http://www.wetter.com"; example_zip="DE0006515" unit="C" />
+ <xml_file_version type="cwp" version="2012-09-24" 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.3/data/www_accuweather_com_us_celsius.xml plasma-widget-cwp-1.6.4/data/www_accuweather_com_us_celsius.xml
--- plasma-widget-cwp-1.6.3/data/www_accuweather_com_us_celsius.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/www_accuweather_com_us_celsius.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="85001" unit="C" />
+ <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" />
<locale_settings locale="utf-8" encoding="utf8" />
@@ -22,8 +22,8 @@
<url7 url7_prefix="" url7_suffix="" url7_follow="" />
<data_location url="url3"
- location="grep apgUserInfoObj= | sed -e "s/.*city:'\([^']*\)'.*/\1/""
- country="grep apgUserInfoObj= | sed -e "s/.*state:'\([^']*\)'.*/\1/""
+ location="grep apgUserInfoObj[\ ]*= | sed -e "s/.*city:[ ]*'\([^']*\)'.*/\1/""
+ country="grep apgUserInfoObj[\ ]*= | sed -e "s/.*state:[ ]*'\([^']*\)'.*/\1/""
/>
<data_sun url="url3"
@@ -59,12 +59,12 @@
/>
<data_day1 url="url1"
- 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 -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 current\ first | 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 current\ first | grep cond | sed -e "s/<[^>]*>//g""
+ 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""
/>
<data_day2 url="url1"
diff -Nru plasma-widget-cwp-1.6.3/data/www_accuweather_com_us_fahrenheit.xml plasma-widget-cwp-1.6.4/data/www_accuweather_com_us_fahrenheit.xml
--- plasma-widget-cwp-1.6.3/data/www_accuweather_com_us_fahrenheit.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/www_accuweather_com_us_fahrenheit.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="www.accuweather.com US" search_page="http://www.accuweather.com"; example_zip="85001" unit="F" />
+ <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" />
<locale_settings locale="utf-8" encoding="utf8" />
@@ -22,8 +22,8 @@
<url7 url7_prefix="" url7_suffix="" url7_follow="" />
<data_location url="url3"
- location="grep apgUserInfoObj= | sed -e "s/.*city:'\([^']*\)'.*/\1/""
- country="grep apgUserInfoObj= | sed -e "s/.*state:'\([^']*\)'.*/\1/""
+ location="grep apgUserInfoObj[\ ]*= | sed -e "s/.*city:[ ]*'\([^']*\)'.*/\1/""
+ country="grep apgUserInfoObj[\ ]*= | sed -e "s/.*state:[ ]*'\([^']*\)'.*/\1/""
/>
<data_sun url="url3"
@@ -59,12 +59,12 @@
/>
<data_day1 url="url1"
- 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 -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 current\ first | 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 current\ first | grep cond | sed -e "s/<[^>]*>//g""
+ 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""
/>
<data_day2 url="url1"
diff -Nru plasma-widget-cwp-1.6.3/data/www_accuweather_com_world_celsius.xml plasma-widget-cwp-1.6.4/data/www_accuweather_com_world_celsius.xml
--- plasma-widget-cwp-1.6.3/data/www_accuweather_com_world_celsius.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/www_accuweather_com_world_celsius.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" 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-09-24" 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" />
diff -Nru plasma-widget-cwp-1.6.3/data/www_accuweather_com_world_fahrenheit.xml plasma-widget-cwp-1.6.4/data/www_accuweather_com_world_fahrenheit.xml
--- plasma-widget-cwp-1.6.3/data/www_accuweather_com_world_fahrenheit.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/www_accuweather_com_world_fahrenheit.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" 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-09-24" 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" />
diff -Nru plasma-widget-cwp-1.6.3/data/www_gismeteo_com.xml plasma-widget-cwp-1.6.4/data/www_gismeteo_com.xml
--- plasma-widget-cwp-1.6.3/data/www_gismeteo_com.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/www_gismeteo_com.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="www.gismeteo.com" search_page="http://www.gismeteo.ru"; example_zip="4944" unit="C" />
+ <xml_file_version type="cwp" version="2012-09-24" name="www.gismeteo.com" search_page="http://www.gismeteo.ru"; example_zip="4944" unit="C" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.3/data/www_weather_com.cn.xml plasma-widget-cwp-1.6.4/data/www_weather_com.cn.xml
--- plasma-widget-cwp-1.6.3/data/www_weather_com.cn.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/www_weather_com.cn.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="www.weather.com.cn" search_page="http://www.weather.com.cn"; example_zip="101010100" unit="C" />
+ <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" />
<locale_settings locale="utf-8" encoding="utf8" />
diff -Nru plasma-widget-cwp-1.6.3/data/www_weather_com.xml plasma-widget-cwp-1.6.4/data/www_weather_com.xml
--- plasma-widget-cwp-1.6.3/data/www_weather_com.xml 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/data/www_weather_com.xml 2012-09-24 21:13:17.000000000 +0300
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<custom_weather>
- <xml_file_version type="cwp" version="2012-08-07" name="www.weather.com" search_page="http://www.weather.com"; example_zip="USDC0001" unit="F" />
+ <xml_file_version type="cwp" version="2012-09-24" 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.3/debian/changelog plasma-widget-cwp-1.6.4/debian/changelog
--- plasma-widget-cwp-1.6.3/debian/changelog 2012-08-07 23:41:39.000000000 +0300
+++ plasma-widget-cwp-1.6.4/debian/changelog 2012-09-24 22:47:42.000000000 +0300
@@ -1,3 +1,9 @@
+plasma-widget-cwp (1.6.4-1) unstable; urgency=low
+
+ * Update to stable release 1.6.4.
+
+ -- Boris Pek <tehnick-8@mail.ru> Mon, 24 Sep 2012 22:47:27 +0300
+
plasma-widget-cwp (1.6.3-1) unstable; urgency=low
* Update to stable release 1.6.3.
diff -Nru plasma-widget-cwp-1.6.3/plasma-applet-cwp.desktop plasma-widget-cwp-1.6.4/plasma-applet-cwp.desktop
--- plasma-widget-cwp-1.6.3/plasma-applet-cwp.desktop 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/plasma-applet-cwp.desktop 2012-09-24 21:13:16.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.3
+X-KDE-PluginInfo-Version=1.6.4
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.3/README plasma-widget-cwp-1.6.4/README
--- plasma-widget-cwp-1.6.3/README 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/README 2012-09-24 21:13:17.000000000 +0300
@@ -1,5 +1,5 @@
=========================================
-Customizable Weather Plasmoid (CWP) 1.6.3
+Customizable Weather Plasmoid (CWP) 1.6.4
=========================================
This is another weather plasmoid.
diff -Nru plasma-widget-cwp-1.6.3/version.h plasma-widget-cwp-1.6.4/version.h
--- plasma-widget-cwp-1.6.3/version.h 2012-08-07 22:31:30.000000000 +0300
+++ plasma-widget-cwp-1.6.4/version.h 2012-09-24 21:13:17.000000000 +0300
@@ -20,7 +20,7 @@
#ifndef version_h
#define version_h
-#define VERSION "1.6.3"
+#define VERSION "1.6.4"
#define DATE "2009-2012"
#define AUTHOR "Georg Hennig"
#define NAME "Customizable Weather Plasmoid (CWP)"
--- End Message ---