rev 5204 - in trunk/packages/kdetoys/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Sat Dec 30 19:40:41 CET 2006
Author: modax-guest
Date: 2006-12-30 19:40:40 +0100 (Sat, 30 Dec 2006)
New Revision: 5204
Added:
trunk/packages/kdetoys/debian/patches/03_kweather_canada_station_update.diff
trunk/packages/kdetoys/debian/patches/04_kweather_station_selection_bug.diff
Modified:
trunk/packages/kdetoys/debian/changelog
Log:
* 03_kweather_canada_station_update.diff - combined patch from bug #348459 with all dead stations (more than half on the original patch) removed.
* 04_kweather_station_selection_bug.diff - station selection breakage fix (kde svn r616273)
Modified: trunk/packages/kdetoys/debian/changelog
===================================================================
--- trunk/packages/kdetoys/debian/changelog 2006-12-30 12:01:41 UTC (rev 5203)
+++ trunk/packages/kdetoys/debian/changelog 2006-12-30 18:40:40 UTC (rev 5204)
@@ -1,13 +1,17 @@
-kdetoys (4:3.5.5-3) unstable; urgency=high
+kdetoys (4:3.5.5-3) unstable; urgency=medium
- * Weather station data updates only; no code changes.
+ +++ Changes by Modestas Vainius:
* Previous revision didn't add Lithuania to the country list as it was
supposed to. So sync weather_stations.desktop and station.dat with KDE
3.5 branch, which include Lithuanian stations in addition to other
station updates.
* Fix Latvia country code (LA -> LV) and add Latvian Liepaja station.
+ * Add/update Canadian weather stations. The patch based on the one in the
+ bug report, but with all dead stations removed. (Closes: #400291)
+ * Add patch from upstream svn (commit 616273) to fix occasional station
+ selection breakage. (Closes: #348459)
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 30 Dec 2006 13:47:46 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 30 Dec 2006 20:28:47 +0200
kdetoys (4:3.5.5-2) unstable; urgency=low
Added: trunk/packages/kdetoys/debian/patches/03_kweather_canada_station_update.diff
===================================================================
--- trunk/packages/kdetoys/debian/patches/03_kweather_canada_station_update.diff 2006-12-30 12:01:41 UTC (rev 5203)
+++ trunk/packages/kdetoys/debian/patches/03_kweather_canada_station_update.diff 2006-12-30 18:40:40 UTC (rev 5204)
@@ -0,0 +1,504 @@
+--- kweather/weather_stations.desktop 2005-10-10 08:58:37.000000000 -0600
++++ kweather/weather_stations.desktop 2006-11-17 20:22:18.000000000 -0700
+@@ -1508,84 +1508,318 @@
+
+ [CA]
+ name=Canada
+-states=AB BC MB NB NF NS NT ON QC SK YK
++states=AB BC MB NB NF NS NT NU ON PE QC SK YK
+
+ [CA_AB]
+ name=Alberta
+-loc0=Calgary CYYC ------ ---
+-loc1=Edmonton CYEG ------ ---
+-loc2=Edmonton/Villeneuve CZVL ------ ---
++loc0=Calgary\\ International\\ Airport CYYC ------ ---
++loc1=Calgary\\ Springbank CYBW ------ ---
++loc2=Edmonton\\ (Municipal) CYXD ------ ---
++loc3=Edmonton\\ International\\ Airport CYEG ------ ---
++loc4=Edmonton\\ Namao CYED ------ ---
++loc5=Grande\\ Prairie CYQU ------ ---
++loc6=Lethbridge CYQL ------ ---
++loc7=Medicine\\ Hat CYXH ------ ---
++loc8=Red\\ Deer CYQF ------ ---
++loc9=Cold\\ Lake CYOD ------ ---
++loc10=Edson CYET ------ ---
++loc11=Fort\\ Chipewyan CYPY ------ ---
++loc12=Ft.\\ McMurray CYMM ------ ---
++loc13=High\\ Level CYOJ ------ ---
++loc14=Lloydminster CYLL ------ ---
++loc15=Peace\\ River CYPE ------ ---
++loc16=Pincher\\ Creek\\ Airport CZPC ------ ---
++loc17=Slave\\ Lake CYZH ------ ---
++loc18=Suffield\\ Airport CYSD ------ ---
++loc19=Whitecourt CYZU ------ ---
+
+ [CA_BC]
+ name=British Columbia
+ loc0=Abbotsford CYXX ------ ---
+-loc1=Comox CYQQ ------ ---
+-loc2=Port\\ Hardy CYZT ------ ---
+-loc3=Smithers CYYD ------ ---
+-loc4=Vancouver CYVR ------ ---
+-loc5=Victoria CYYJ ------ ---
++loc1=Kelowna\\ Airport CYLW ------ ---
++loc2=Vancouver\\ International\\ Airport CYVR ------ ---
++loc3=Victoria\\ (Harbour) CYWH ------ ---
++loc4=Victoria\\ International\\ Airport CYYJ ------ ---
++loc5=Bella\\ Coola\\ Airport CYBD ------ ---
++loc6=Blue\\ River CYCP ------ ---
++loc7=Campbell\\ River\\ Airport CYBL ------ ---
++loc8=Castlegar\\ Airport CYCG ------ ---
++loc9=Chetwynd\\ Airport CYCQ ------ ---
++loc10=Clinton CWCL ------ ---
++loc11=Comox CYQQ ------ ---
++loc12=Cranbrook CYXC ------ ---
++loc13=Dawson\\ Creek\\ Airport CYDQ ------ ---
++loc14=Dease\\ Lake CWDL ------ ---
++loc15=Fort\\ Nelson CYYE ------ ---
++loc16=Ft.\\ St.\\ John CYXJ ------ ---
++loc17=Golden\\ Airport CYGE ------ ---
++loc18=Hope CYHE ------ ---
++loc19=Ingenika\\ Point CWWU ------ ---
++loc20=Kamloops CYKA ------ ---
++loc21=Lytton CWLY ------ ---
++loc22=Mackenzie CYZY ------ ---
++loc23=Nanaimo\\ Airport CYCD ------ ---
++loc24=Penticton CYYF ------ ---
++loc25=Port\\ Hardy CYZT ------ ---
++loc26=Powell\\ River\\ Airport CYPW ------ ---
++loc27=Prince\\ George CYXS ------ ---
++loc28=Prince\\ Rupert CYPR ------ ---
++loc29=Princeton\\ Airport CYDC ------ ---
++loc30=Quesnel\\ Airport CYQZ ------ ---
++loc31=Revelstoke CYRV ------ ---
++loc32=Sandspit CYZP ------ ---
++loc33=Smithers CYYD ------ ---
++loc34=Sparwood/Elk\\ Valley CWSW ------ ---
++loc35=Stewart\\ Airport CZST ------ ---
++loc36=Terrace CYXT ------ ---
++loc37=Tofino\\ Airport CYAZ ------ ---
++loc38=Whistler CWAE ------ ---
++loc39=Williams\\ Lake CYWL ------ ---
+
+ [CA_MB]
+ name=Manitoba
+-loc0=Churchill CYYQ ------ ---
+-loc1=Winnipeg CYWG ------ ---
++loc0=Brandon CYBR ------ ---
++loc1=Winnipeg\\ International\\ Airport CYWG ------ ---
++loc2=Berens\\ River\\ Airport CYBV ------ ---
++loc3=Buffalo\\ Narrows CYVT ------ ---
++loc4=Churchill CYYQ ------ ---
++loc5=Dauphin CYDN ------ ---
++loc6=Flin\\ Flon\\ Airport CYFO ------ ---
++loc7=Gillam CYGX ------ ---
++loc8=Island\\ Lake CYIV ------ ---
++loc9=Lynn\\ Lake CYYL ------ ---
++loc10=Norway\\ House CYNE ------ ---
++loc11=Pickle\\ Lake CYPL ------ ---
++loc12=Portage\\ Southport CYPG ------ ---
++loc13=The\\ Pas CYQD ------ ---
++loc14=Thompson CYTH ------ ---
+
+ [CA_NB]
+ name=New Brunswick
+-loc0=Chatham CYCH ------ ---
+-loc1=Fredericton CYFC ------ ---
+-loc2=Moncton CYQM ------ ---
+-loc3=Saint\\ John CYSJ ------ ---
++loc0=Fredericton CYFC ------ ---
++loc1=Moncton CYQM ------ ---
++loc2=Saint\\ John CYSJ ------ ---
++loc3=Bathurst\\ Airport CZBF ------ ---
++loc4=Gagetown CYCX ------ ---
++loc5=Saint\\ Leonard\\ Airport CYSL ------ ---
+
+ [CA_NF]
+ name=Newfoundland
+-loc0=Churchill\\ Falls KZUM ------ ---
+-loc1=Gander CYQX ------ ---
+-loc2=Goose\\ Bay CYYR ------ ---
+-loc3=Saint\\ Anthony CYAY ------ ---
+-loc4=St.\\ John's CYYT ------ ---
+-loc5=Stephenville CYJT ------ ---
++loc0=Gander CYQX ------ ---
++loc1=Gander\\ International\\ Airport CYQX ------ ---
++loc2=St.\\ John's CYYT ------ ---
++loc3=St.\\ John's CYYT ------ ---
++loc4=Cape\\ Kakkiviak CWKW ------ ---
++loc5=Cape\\ Kiglapait CWYK ------ ---
++loc6=Cartwright CWCA ------ ---
++loc7=Churchill\\ Falls CZUM ------ ---
++loc8=Deer\\ Lake CYDF ------ ---
++loc9=Goose CYYR ------ ---
++loc10=Goose\\ Bay CYYR ------ ---
++loc11=Makkovik\\ Airport CYFT ------ ---
++loc12=Mary's\\ Harbour CYMH ------ ---
++loc13=Nain CYDP ------ ---
++loc14=Saglek\\ Bay CWZZ ------ ---
++loc15=Saint\\ Anthony CYAY ------ ---
++loc16=Saint\\ Anthony\\ Airport CYAY ------ ---
++loc17=Stephenville CYJT ------ ---
++loc18=Stephenville CYJT ------ ---
++loc19=Tukialik\\ Bay CWTU ------ ---
++loc20=Wabush\\ Lake CYWK ------ ---
+
+ [CA_NS]
+ name=Nova Scotia
+-loc0=Greenwood CYZX ------ ---
+-loc1=Halifax CYHZ ------ ---
+-loc2=Shearwater CYAW ------ ---
+-loc3=Sydney CYQY ------ ---
++loc0=Halifax\\ International\\ Airport CYHZ ------ ---
++loc1=Greenwood CYZX ------ ---
++loc2=Sable\\ Island CWSA ------ ---
++loc3=Shearwater CYAW ------ ---
++loc4=Sydney CYQY ------ ---
++loc5=Yarmouth CYQI ------ ---
+
+ [CA_NT]
+ name=Northwest Territories
+-loc0=Iqaluit CYFB ------ ---
+-loc1=Yellowknife CYZF ------ ---
++loc0=Yellowknife CYZF ------ ---
++loc1=Aklavik\\ Airport CYKD ------ ---
++loc2=Cape\\ Parry CZCP ------ ---
++loc3=Deline\\ Airport CYWJ ------ ---
++loc4=Ekati CYOA ------ ---
++loc5=Fort\\ Good\\ Hope\\ Airport CYGH ------ ---
++loc6=Fort\\ Liard\\ Airport CYJF ------ ---
++loc7=Fort\\ McPherson\\ Airport CZFM ------ ---
++loc8=Fort\\ Resolution CYFR ------ ---
++loc9=Fort\\ Simpson CYFS ------ ---
++loc10=Fort\\ Smith CYSM ------ ---
++loc11=Hat\\ Island CWIL ------ ---
++loc12=Hay\\ River CYHY ------ ---
++loc13=Holman\\ Island\\ Airport CYHI ------ ---
++loc14=Inuvik CYEV ------ ---
++loc15=Lac\\ La\\ Martre CWMT ------ ---
++loc16=Liverpool\\ Bay CWLI ------ ---
++loc17=Lutselk'e CYLK ------ ---
++loc18=Norman\\ Wells CYVQ ------ ---
++loc19=Paulatuk\\ Airport CYPC ------ ---
++loc20=Rowley\\ Island CWRX ------ ---
++loc21=Sachs\\ Harbour\\ Airport CYSY ------ ---
++loc22=Storm\\ Hills CWVH ------ ---
++loc23=Tuktoyaktuk CYUB ------ ---
++
++[CA_NU]
++name=Nunavut
++loc0=Cambridge\\ Bay CYCB ------ ---
++loc1=Iqaluit CYFB ------ ---
++loc2=Rankine\\ Inlet CYRT ------ ---
++loc3=Akuluvik\\ Airport CYKO ------ ---
++loc4=Alert\\ Airport CYLT ------ ---
++loc5=Arviat\\ Airport CYEK ------ ---
++loc6=Baker\\ Lake CYBK ------ ---
++loc7=Brevoort\\ Island CWOB ------ ---
++loc8=Broughton\\ Island CWVD ------ ---
++loc9=Broughton\\ Island\\ Airport CYVM ------ ---
++loc10=Cape\\ Dorset CYTE ------ ---
++loc11=Cape\\ Dyer CWFD ------ ---
++loc12=Cape\\ Mercy CWYM ------ ---
++loc13=Chesterfield\\ Inlet CYCS ------ ---
++loc14=Clyde CYCY ------ ---
++loc15=Coral\\ Harbour CYZS ------ ---
++loc16=Croker\\ River CWXR ------ ---
++loc17=Dewar\\ Lakes CWUW ------ ---
++loc18=Eureka CWEU ------ ---
++loc19=Gjoa\\ Haven\\ Airport CYHK ------ ---
++loc20=Grise\\ Fiord CWGZ ------ ---
++loc21=Hall\\ Beach CYUX ------ ---
++loc22=Igloolik\\ Airport CYGT ------ ---
++loc23=Ivujivik\\ Airport CYIK ------ ---
++loc24=Kangiqsujuaq CYKG ------ ---
++loc25=Kangirsuk CYAS ------ ---
++loc26=Kugluktuk CYCO ------ ---
++loc27=Longstaff\\ Bluff CWLX ------ ---
++loc28=Lupin\\ Airport CYWO ------ ---
++loc29=Nanisivik\\ Airport CYSR ------ ---
++loc30=Pangnirtung\\ Airport CYXP ------ ---
++loc31=Pelly\\ Bay\\ Airport CYBB ------ ---
++loc32=Pond\\ Inlet CYIO ------ ---
++loc33=Quaqtaq\\ Airport CYHA ------ ---
++loc34=Repulse\\ Bay\\ Airport CYUT ------ ---
++loc35=Resolute CYRB ------ ---
++loc36=Salliut\\ Airport CYZG ------ ---
++loc37=Sanikiluaq\\ Airport CYSK ------ ---
++loc38=Shepherd\\ Bay CYUS ------ ---
++loc39=Spence\\ Bay\\ Airport CYYH ------ ---
++loc40=Whale\\ Cove\\ Airport CYXN ------ ---
+
+ [CA_ON]
+ name=Ontario
+-loc0=Ottawa CYOW ------ ---
+-loc1=Toronto CYYZ ------ 047
+-loc2=Trenton CYTR ------ ---
+-loc3=Windsor CYQG ------ ---
++loc0=Hamilton\\ Airport CYHM ------ ---
++loc1=London CYXU ------ ---
++loc2=Ottawa\\ (International\\ Airport) CYOW ------ ---
++loc3=Toronto\\ (Buttonville) CYKZ ------ ---
++loc4=Toronto\\ (Pearson) CYYZ ------ 047
++loc5=Toronto\\ Island\\ Airport CYTZ ------ ---
++loc6=Waterloo\\ Well CYKF ------ ---
++loc7=Windsor CYQG ------ ---
++loc8=Big\\ Trout\\ Lake CYTL ------ ---
++loc9=Borden CYBN ------ ---
++loc10=Chapleau CYLD ------ ---
++loc11=Dryden\\ Airport CYHD ------ ---
++loc12=Earlton CYXR ------ ---
++loc13=Elliot\\ Lake CYEL ------ ---
++loc14=Geraldton CYGQ ------ ---
++loc15=Gore\\ Bay CYZE ------ ---
++loc16=Kapuskasing CYYU ------ ---
++loc17=Kenora CYQK ------ ---
++loc18=Kingston CYGK ------ ---
++loc19=Moosonee CYMO ------ ---
++loc20=Muskoka CYQA ------ ---
++loc21=North\\ Bay CYYB ------ ---
++loc22=Petawawa CYWA ------ ---
++loc23=Peterborough\\ Airport CYPQ ------ ---
++loc24=Red\\ Lake CYRL ------ ---
++loc25=Saint\\ Catharines\\ Airport CYSN ------ ---
++loc26=Sarnia\\ Airport CYZR ------ ---
++loc27=Sault\\ Ste.\\ Marie CYAM ------ ---
++loc28=Sioux\\ Lookout CYXL ------ ---
++loc29=Sudbury CYSB ------ ---
++loc30=Terrace\\ Bay CYTJ ------ ---
++loc31=Thunder\\ Bay CYQT ------ ---
++loc32=Timmins CYTS ------ ---
++loc33=Trenton CYTR ------ ---
++loc34=Wawa CYXZ ------ ---
++loc35=Wiarton CYVV ------ ---
++
++[CA_PE]
++name=Prince Edward Island
++loc0=Charlottetown CYYG ------ ---
+
+ [CA_QC]
+ name=Quebec
+-loc0=Bagotville CYBG ------ ---
+-loc1=Gatineau CYND ------ ---
+-loc2=La\\ Grande CYGL ------ ---
+-loc3=Montreal\\ Saint-Hubert CYHU ------ ---
+-loc4=Montreal\\ Mirabel CYMX ------ ---
+-loc5=Montreal\\ Dorval CYUL ------ ---
+-loc6=Quebec\\ City CYQB ------ ---
+-loc7=Sept-Iles CYZV ------ ---
++loc0=Gatineau\\ Airport CYND ------ ---
++loc1=Montreal\\ Dorval CYUL ------ ---
++loc2=Montreal\\ Saint-Hubert CYHU ------ ---
++loc3=Sherbrooke CYSC ------ ---
++loc4=Bagotville CYBG ------ ---
++loc5=Baie\\ Comeau CYBC ------ ---
++loc6=Blanc\\ Sablon CYBX ------ ---
++loc7=Chibougamau-Chapais CYMT ------ ---
++loc8=Eastmain\\ River\\ Airport CZEM ------ ---
++loc9=Gaspe CYGP ------ ---
++loc10=Havre\\ St.\\ Pierre CYGV ------ ---
++loc11=Iles\\ De\\ La\\ Madeleineque CYGR ------ ---
++loc12=Inukjuak\\ Airport CYPH ------ ---
++loc13=Kangiksualujjuaq CYLU ------ ---
++loc14=Kuujjuaq CYVP ------ ---
++loc15=Kuujjuarapik CYGW ------ ---
++loc16=La\\ Grande CYGL ------ ---
++loc17=La\\ Grande\\ IV CYAH ------ ---
++loc18=La\\ Grande\\ Riviere CYGL ------ ---
++loc19=Matagami CYNM ------ ---
++loc20=Mont\\ Joli CYYY ------ ---
++loc21=Natashquan CYNA ------ ---
++loc22=Nemiscau\\ Airport CYHH ------ ---
++loc23=Povungnituq CYPX ------ ---
++loc24=Roberval CYRJ ------ ---
++loc25=Rouyn\\ Airport CYUY ------ ---
++loc26=Saint\\ Hubert\\ Airport CYHU ------ ---
++loc27=Schefferville CYKL ------ ---
++loc28=Sept-Iles CYZV ------ ---
++loc29=Tasiujaq CYTQ ------ ---
++loc30=Umiujaq CYMU ------ ---
++loc31=Val\\ D'Or CYVO ------ ---
++loc32=Valcartier\\ Airport CYOY ------ ---
++loc33=Waskaganish\\ Airport CYKQ ------ ---
++loc34=Wemindji\\ (Aeroport) CYNC ------ ---
+
+ [CA_SK]
+ name=Saskatchewan
+-loc0=Nipawin CYBU ------ ---
+-loc1=Regina CYQR ------ ---
+-loc2=Saskatoon CYXE ------ ---
+-loc3=Swift\\ Current CYYN ------ ---
++loc0=Moose\\ Jaw CYMJ ------ ---
++loc1=Prince\\ Albert CYPA ------ ---
++loc2=Regina CYQR ------ ---
++loc3=Saskatoon CYXE ------ ---
++loc4=Broadview CWIK ------ ---
++loc5=Estevan CYEN ------ ---
++loc6=Jimmy\\ Lake CWHN ------ ---
++loc7=Key\\ Lake CYKJ ------ ---
++loc8=Kindersley CYKY ------ ---
++loc9=La\\ Ronge CYVC ------ ---
++loc10=Meadow\\ Lake CYLJ ------ ---
++loc11=Nipawin CYBU ------ ---
++loc12=North\\ Battleford CYQW ------ ---
++loc13=Stony\\ Rapids\\ Airport CYSF ------ ---
++loc14=Swift\\ Current CYYN ------ ---
++loc15=Yorkton CYQV ------ ---
+
+ [CA_YK]
+ name=Yukon
+-loc0=Shingle\\ Point CYUA ------ ---
++loc0=Whitehorse CYXY ------ ---
++loc1=Beaver\\ Creek CYXQ ------ ---
++loc2=Burwash\\ Airport CYDB ------ ---
++loc3=Dawson CYDA ------ ---
++loc4=Faro\\ Airport CZFA ------ ---
++loc5=Komakuk\\ Beach CWKM ------ ---
++loc6=Mayo\\ Airport CYMA ------ ---
++loc7=Old\\ Crow\\ Airport CYOC ------ ---
++loc8=Shingle\\ Point CYUA ------ ---
++loc9=Teslin CYZW ------ ---
++loc10=Watson\\ Lake CYQH ------ ---
+
+ [MX]
+ name=Mexico
+--- kweather/stations.dat 2005-09-10 02:21:23.000000000 -0600
++++ kweather/stations.dat 2006-11-17 20:22:41.000000000 -0700
+@@ -130,7 +130,7 @@
+ CWEV;71;085;Ellice River Automated Reporting Station ;;Canada;4;67-42N;104-28W;;;42;;
+ CWEW;71;524;L'Assomption;;Canada;4;45-49N;073-26W;45-49N;073-26W;21;21;
+ CWEZ;71;473;Saturna Island Meteorological Aeronautical Presentation System ;;Canada;4;48-47N;123-03W;;;24;;
+-CWFD;71;094;Cape Dyer, N. W. T.;;Canada;4;66-35N;061-37W;;;393;393;P
++CWFD;71;094;Cape Dyer, NU;;Canada;4;66-35N;061-37W;;;393;393;P
+ CWFE;71;238;Elk Island National Park;;Canada;4;53-41N;112-52W;;;716;;
+ CWFF;71;456;Melfort Automatic Weather Reporting System ;;Canada;4;52-49N;104-36W;;;490;;
+ CWFG;71;478;Sartine Island Meteorological Aeronautical Presentation System ;;Canada;4;50-49N;128-54W;;;112;;
+@@ -189,7 +189,7 @@
+ CWIF;--;---;Quatsino Light Station ;;Canada;4;50-26N;128-02W;;;21;;
+ CWIG;--;---;Ile Aux Grues, Que.;;Canada;4;47-04N;070-32W;;;18;;
+ CWII;71;552;Victoria Beach ;;Canada;4;50-42N;096-34W;;;220;;
+-CWIJ;71;496;Lupin, N. W. T.;;Canada;4;65-46N;111-14W;;;500;500;P
++CWIJ;71;496;Lupin, NU;;Canada;4;65-46N;111-14W;;;500;500;P
+ CWIK;71;861;Broadview, Sask.;;Canada;4;50-23N;102-41W;50-23N;102-35W;598;602;P
+ CWIL;71;084;Hat Island, N. W. T.;;Canada;4;68-19N;100-05W;;;36;;
+ CWIM;--;---;Upsala Radar Site ;;Canada;4;49-02N;090-25W;;;480;;
+@@ -249,7 +249,7 @@
+ CWLP;71;485;Herbert Island Meteorological Aeronautical Presentation System ;;Canada;4;50-56N;127-38W;;;17;;
+ CWLQ;71;271;Nipissing;;Canada;4;46-19N;079-28W;;;204;;
+ CWLS;71;631;Mount Forest, Ont.;;Canada;4;43-59N;080-45W;;;415;;P
+-CWLT;71;082;Alert, N. W. T.;;Canada;4;82-30N;062-20W;82-30N;062-20W;63;66;P
++CWLT;71;082;Alert, NU;;Canada;4;82-30N;062-20W;82-30N;062-20W;63;66;P
+ CWLU;--;---;Lauzon, Que.;;Canada;4;46-50N;071-10W;;;20;;
+ CWLV;71;454;Waskesiu Lake Automated Reporting Station ;;Canada;4;53-55N;106-04W;;;569;;
+ CWLX;71;091;Longstaff Bluff, N. W. T.;;Canada;4;68-53N;075-08W;;;162;161;P
+@@ -319,7 +319,7 @@
+ CWPR;71;032;Princeton Automatic Weather Reporting System ;;Canada;4;50-36N;120-31W;;;700;;
+ CWPS;71;464;Long Point Meteorological Aeronautical Presentation System ;;Canada;4;42-34N;080-03W;;;175;;
+ CWPU;71;050;Puntzi Mountain, B. C.;;Canada;4;52-07N;124-08W;;;910;910;P
+-CWPX;--;---;Cape Peel West, N. W. T.;;Canada;4;69-02N;107-49W;;;165;;
++CWPX;--;---;Cape Peel West, NU;;Canada;4;69-02N;107-49W;;;165;;
+ CWPY;--;---;Fort Chipewyan Automated Reporting Station ;;Canada;4;58-46N;111-08W;;;232;;
+ CWPZ;71;952;Burns Lake CS , B. C.;;Canada;4;54-23N;125-57W;;;713;;
+ CWQC;71;475;Port Alberni, B. C.;;Canada;4;49-15N;124-50W;;;2;2;P
+@@ -343,7 +343,7 @@
+ CWRA;71;800;Cape Race, Nfld;;Canada;4;46-39N;053-04W;;;27;28;P
+ CWRD;71;246;Red Earth;;Canada;4;56-32N;115-16W;;;546;;
+ CWRF;71;918;Pelly Bay 1;;Canada;4;69-26N;089-44W;;;325;;
+-CWRH;71;972;Resolution Island, N. W. T.;;Canada;4;61-35N;64-39W;;;369;;
++CWRH;71;972;Resolution Island, NU;;Canada;4;61-35N;64-39W;;;369;;
+ CWRJ;71;510;Rosetown East, Sask;;Canada;4;51-34N;107-55W;;;586;;P
+ CWRK;--;---;Bancroft Automatic Weather Reporting System;;Canada;4;45-04N;077-52W;;;331;;
+ CWRM;--;---;Rocky House Marine Aviation Reporting Station ;;Canada;4;52-26N;114-56W;;;988;;
+@@ -531,13 +531,13 @@
+ CYCG;71;884;Castlegar Airport;;Canada;4;49-18N;117-38W;49-18N;117-38W;495;495;
+ CYCH;71;717;Chatham Can-Mil ;;Canada;4;47-00N;065-27W;47-01N;065-27W;31;34;
+ CYCL;71;711;Charlo, N. B.;;Canada;4;47-59N;066-20W;;;38;38;P
+-CYCO;71;938;Coppermine, N. W. T.;;Canada;4;67-49N;115-08W;67-50N;115-07W;22;22;P
++CYCO;71;938;Kugluktuk, NU;;Canada;4;67-49N;115-08W;67-50N;115-07W;22;22;P
+ CYCP;71;883;Blue River, B. C.;;Canada;4;52-08N;119-18W;;;679;683;P
+ CYCQ;--;---;Chetwynd Airport;;Canada;4;55-42N;121-38W;;;609;;
+ CYCS;--;---;Chesterfield Inlet;;Canada;4;63-20N;090-43W;;;11;;
+ CYCT;71;873;Coronation Marine Aviation Reporting Station ;;Canada;4;52-04N;111-27W;;;791;;
+ CYCX;71;701;Gagetown Can-Mil ;;Canada;4;45-50N;066-26W;45-50N;066-26W;51;51;
+-CYCY;71;090;Clyde, N. W. T.;;Canada;4;70-29N;068-31W;70-27N;068-33W;25;26;P
++CYCY;71;090;Clyde, NU;;Canada;4;70-29N;068-31W;70-27N;068-33W;25;26;P
+ CYDA;71;966;Dawson, Y. T.;;Canada;4;64-03N;139-08W;;;370;370;P
+ CYDB;--;---;Burwash Airport;;Canada;4;61-22N;139-02W;;;807;;
+ CYDC;71;886;Princeton Airport ;;Canada;4;49-28N;120-31W;;;700;;
+@@ -554,7 +554,7 @@
+ CYET;71;881;Edson, Alta.;;Canada;4;53-35N;116-28W;;;921;927;P
+ CYEU;--;---;Eureka Man ;;Canada;4;80-00N;085-49W;;;78;;
+ CYEV;71;957;Inuvik, N. W. T.;;Canada;4;68-18N;133-29W;68-19N;133-32W;59;68;P
+-CYFB;71;909;Iqaluit, N. W. T.;;Canada;4;63-45N;068-33W;63-45N;068-33W;34;34;P
++CYFB;71;909;Iqaluit, NU;;Canada;4;63-45N;068-33W;63-45N;068-33W;34;34;P
+ CYFC;71;700;Fredericton, N. B.;;Canada;4;45-52N;066-32W;;;17;20;P
+ CYFO;--;---;Flin Flon Airport;;Canada;4;54-41N;101-41W;;;304;;
+ CYFR;--;---;Fort Resolution;;Canada;4;61-11N;113-41W;;;164;;
+@@ -585,7 +585,7 @@
+ CYHZ;71;395;Halifax International Airport ;;Canada;4;44-53N;063-30W;;;145;;
+ CYID;--;---;Digby Airport Aviation Weather Reporting Station ;;Canada;4;44-33N;065-47W;;;152;;
+ CYIK;--;---;Ivujivik Airport Supplementary Aviation Weather Reporting Station ;;Canada;4;62-25N;077-57W;;;42;;
+-CYIO;71;095;Pond Inlet, N. W. T.;;Canada;4;72-42N;077-58W;;;59;55;P
++CYIO;71;095;Pond Inlet, NU;;Canada;4;72-42N;077-58W;;;59;55;P
+ CYIV;71;145;Island Lake, Man.;;Canada;4;53-51N;094-39W;53-52N;094-40W;237;237;P
+ CYJF;--;---;Fort Liard Airport;;Canada;4;60-14N;123-29W;;;215;;
+ CYJT;71;815;Stephenville, Nfld.;;Canada;4;48-32N;058-33W;48-32N;058-33W;8;26;P
+@@ -600,10 +600,10 @@
+ CYKY;71;129;Kindersley, Sask.;;Canada;4;51-31N;109-10W;51-31N;109-11W;694;694;P
+ CYKZ;--;---;Toronto Buttonville;;Canada;4;43-52N;079-22W;;;198;;
+ CYLA;--;---;Aupaluk, Que.;;Canada;4;59-17-48N;069-35-59W;;;35;;
+-CYLC;--;---;Kimmirut A Nwt;;Canada;4;62-51N;069-53W;;;53;;
++CYLC;--;---;Kimmirut A NU;;Canada;4;62-51N;069-53W;;;53;;
+ CYLD;--;---;Chapleau, Ont.;;Canada;4;47-49N;083-21W;;;447;;
+ CYLJ;71;125;Meadow Lake, Sask.;;Canada;4;54-08N;108-31W;;;480;480;P
+-CYLK;--;---;Lutsel KE, N. W. T.;;Canada;4;62-25N;110-40W;;;179;;
++CYLK;--;---;Lutselk'e, N. W. T.;;Canada;4;62-25N;110-40W;;;179;;
+ CYLL;71;871;Lloydminister, Alta.;;Canada;4;53-19N;110-04W;;;665;669;P
+ CYLT;--;---;Alert Airport;;Canada;4;82-31N;062-17W;;;31;;
+ CYLU;--;---;Kangiksualujjuaq A;;Canada;4;58-43N;065-59W;;;60;;
+@@ -681,7 +681,7 @@
+ CYSR;--;---;Nanisivik Airport ;;Canada;4;72-59N;084-38W;;;649;;
+ CYSU;71;702;Summerside Can-Mil ;;Canada;4;46-26N;063-50W;46-26N;063-50W;24;24;
+ CYSY;--;---;Sachs Harbour Airport;;Canada;4;72-00N;125-17W;;;86;;
+-CYTE;71;910;Cape Dorset, N. W. T.;;Canada;4;64-13N;076-32W;;;51;50;P
++CYTE;71;910;Cape Dorset, NU;;Canada;4;64-13N;076-32W;;;51;50;P
+ CYTH;71;079;Thompson Weather Office, Man;;Canada;4;55-48N;097-51W;55-48N;097-52W;204;222;P
+ CYTJ;--;---;Terrace Bay Supplementary Aviation Weather Reporting Station ;;Canada;4;48-49N;087-06W;;;287;;
+ CYTL;71;848;Big Trout Lake;;Canada;4;53-50N;089-52W;53-50N;089-52W;224;224;
+@@ -693,14 +693,14 @@
+ CYUA;71;968;Shingle Point, Y. T.;;Canada;4;68-57N;137-13W;;;56;38;P
+ CYUB;71;954;Tuktoyaktuk ;;Canada;4;69-27N;133-01W;69-27N;133-01W;5;5;
+ CYUI;71;939;Cape Young Airport;;Canada;4;68-56N;116-55W;;;16;;
+-CYUJ;71;937;Lady Franklin Point, N. W. T.;;Canada;4;68-30N;113-13W;;;21;16;P
++CYUJ;71;937;Lady Franklin Point, NU;;Canada;4;68-30N;113-13W;;;21;16;P
+ CYUK;71;929;Byron Bay Airport;;Canada;4;68-45N;109-04W;;;92;;
+ CYUL;71;627;Montreal / Pierre Elliot Trudeau International Airport, Que;;Canada;4;45-28N;073-45W;45-28N;073-45W;31;36;P
+ CYUQ;71;071;Jenny Lind Island Airport;;Canada;4;68-39N;101-44W;;;18;;
+-CYUS;71;911;Shepherd Bay, N. W. T.;;Canada;4;68-49N;093-26W;;;51;42;P
++CYUS;71;911;Shepherd Bay, NU;;Canada;4;68-49N;093-26W;;;51;42;P
+ CYUT;--;---;Repulse Bay Airport;;Canada;4;66-32N;086-15W;;;24;;
+ CYUV;--;---;Longstaff Blf Airport;;Canada;4;68-56N;075-17W;;;14;;
+-CYUX;71;081;Hall Beach, N. W. T.;;Canada;4;68-47N;081-15W;68-46N;081-13W;8;8;P
++CYUX;71;081;Hall Beach, NU;;Canada;4;68-47N;081-15W;68-46N;081-13W;8;8;P
+ CYUY;--;---;Rouyn Airport;;Canada;4;48-12N;078-50W;;;301;;
+ CYVC;71;922;La Ronge, Sask;;Canada;4;55-09N;105-16W;;;375;379;P
+ CYVM;--;---;Broughton Island Airport;;Canada;4;67-33N;064-02W;;;6;;
+@@ -758,7 +758,7 @@
+ CYZH;71;069;Slave Lake, Alta;;Canada;4;55-18N;114-47W;55-18N;114-47W;581;581;P
+ CYZP;71;101;Sandspit, B. C.;;Canada;4;53-15N;131-49W;;;6;6;P
+ CYZR;71;634;Sarnia Airport ;;Canada;4;43-00N;082-19W;;;181;;
+-CYZS;71;915;Coral Harbour, N. W. T.;;Canada;4;64-12N;083-22W;64-12N;083-22W;64;64;P
++CYZS;71;915;Coral Harbour, NU;;Canada;4;64-12N;083-22W;64-12N;083-22W;64;64;P
+ CYZT;71;109;Port Hardy, B. C.;;Canada;4;50-41N;127-22W;50-41N;127-22W;22;22;P
+ CYZU;71;930;Whitecourt, Alta.;;Canada;4;54-09N;115-47W;;;783;782;P
+ CYZV;71;811;Sept-Iles, Que.;;Canada;4;50-13N;066-16W;50-13N;066-15W;55;55;P
+@@ -771,7 +771,7 @@
+ CZDI;71;180;Churchill Falls;;Canada;4;53-34N;064-06W;;;440;;
+ CZEM;--;---;Eastmain River Airport;;Canada;4;52-14N;078-31W;;;7;;
+ CZFA;--;---;Faro Airport;;Canada;4;62-12N;133-22W;;;717;;
+-CZFM;--;---;Fort Mcpherson Airport;;Canada;4;67-24N;134-51W;;;43;;
++CZFM;--;---;Fort McPherson Airport;;Canada;4;67-24N;134-51W;;;43;;
+ CZFN;--;---;Fort Norman Airport;;Canada;4;64-55N;125-34W;;;98;;
+ CZNB;--;---;North Bay Remote Environment Automatic Data Acquisition Concept ;;Canada;4;46-22N;079-25W;;;364;;
+ CZOC;71;044;Old Crow Automatic Weather Reporting System ;;Canada;4;67-34N;139-50W;;;251;;
Added: trunk/packages/kdetoys/debian/patches/04_kweather_station_selection_bug.diff
===================================================================
--- trunk/packages/kdetoys/debian/patches/04_kweather_station_selection_bug.diff 2006-12-30 12:01:41 UTC (rev 5203)
+++ trunk/packages/kdetoys/debian/patches/04_kweather_station_selection_bug.diff 2006-12-30 18:40:40 UTC (rev 5204)
@@ -0,0 +1,290 @@
+Index: kdetoys/kweather/kcmweather.h
+===================================================================
+--- kdetoys/kweather/kcmweather.h (revision 616272)
++++ kdetoys/kweather/kcmweather.h (revision 616273)
+@@ -41,10 +41,9 @@
+
+ protected:
+ void fillStationList();
+- void focusInEvent( QFocusEvent * );
++ virtual void showEvent( QShowEvent * );
+
+ private slots:
+- void processURL( const QString& );
+ void enableLogWidgets( bool value );
+ void changeViewMode( int mode );
+ void reportLocationChanged();
+Index: kdetoys/kweather/kweather.h
+===================================================================
+--- kdetoys/kweather/kweather.h (revision 616272)
++++ kdetoys/kweather/kweather.h (revision 616273)
+@@ -77,6 +77,7 @@
+ //DCOPRef *mWeatherService;
+ KPopupMenu *mContextMenu;
+ WeatherService_stub *mWeatherService;
++ KCMultiDialog *settingsDialog;
+ };
+
+ #endif
+Index: kdetoys/kweather/kcmweather.cpp
+===================================================================
+--- kdetoys/kweather/kcmweather.cpp (revision 616272)
++++ kdetoys/kweather/kcmweather.cpp (revision 616273)
+@@ -83,17 +83,51 @@
+ {
+ delete mWeatherService;
+ }
+-void KCMWeather::focusInEvent(QFocusEvent *)
++void KCMWeather::showEvent( QShowEvent * )
+ {
+ fillStationList();
+ }
+
+ void KCMWeather::fillStationList()
+ {
++ // store current selection
++ QString current = mWidget->m_reportLocation->currentText();
++
++ mWidget->m_reportLocation->clear();
++
+ QStringList stationList = mWeatherService->listStations();
+ QStringList::Iterator idx = stationList.begin();
++
++ // get station name from station id for sorting afterwards
+ for(; idx != stationList.end(); ++idx)
+- mWidget->m_reportLocation->insertItem(mWeatherService->stationName(*idx));
++ *idx = mWeatherService->stationName(*idx);
++
++ stationList.sort();
++
++ idx = stationList.begin();
++ for(; idx != stationList.end(); ++idx)
++ mWidget->m_reportLocation->insertItem(*idx);
++
++ // restore previous selection
++ if ( current.isEmpty() )
++ {
++ // nothing defined yet; show this situation to the user, otherwise
++ // he will see the first available setting which is not what he selected to view
++ mWidget->m_reportLocation->insertItem("");
++ mWidget->m_reportLocation->setCurrentText("");
++ }
++ else
++ {
++ for (int i = 0; i < mWidget->m_reportLocation->count(); i++)
++ if ( mWidget->m_reportLocation->text(i) == current )
++ {
++ mWidget->m_reportLocation->setCurrentItem(i);
++ break;
++ }
++ }
++
++ if ( current != mWidget->m_reportLocation->currentText() )
++ reportLocationChanged();
+ }
+
+ void KCMWeather::changeViewMode( int mode )
+@@ -102,11 +136,6 @@
+ emit changed( true );
+ }
+
+-void KCMWeather::processURL( const QString &url )
+-{
+- kapp->invokeBrowser( url );
+-}
+-
+ void KCMWeather::enableLogWidgets( bool value )
+ {
+ mWidget->m_logFile->setEnabled( value );
+@@ -135,7 +164,10 @@
+ QString loc = config.readEntry( "report_location" );
+
+ mWidget->m_logFile->setURL( config.readPathEntry( "log_file_name" ) );
+- mWidget->m_reportLocation->setCurrentText( mWeatherService->stationName( loc ) );
++
++ if ( ! loc.isEmpty() )
++ mWidget->m_reportLocation->setCurrentText( mWeatherService->stationName( loc ) );
++
+ mWidget->m_viewMode->setButton( config.readNumEntry( "smallview_mode", dockwidget::ShowAll ) );
+ changeViewMode( config.readNumEntry( "smallview_mode", dockwidget::ShowAll ) );
+ emit changed( false );
+@@ -149,8 +181,13 @@
+ config.setGroup( "General Options" );
+ config.writeEntry( "logging", mWidget->m_enableLog->isChecked() );
+ config.writeEntry( "log_file_name", mWidget->m_logFile->url() );
+- // Station idx to local idx
+- config.writeEntry( "report_location", mWeatherService->stationCode( mWidget->m_reportLocation->currentText() ) );
++
++ // Station idx to local idx; if nothing selected yet, keep it empty
++ QString loc;
++ if ( ! mWidget->m_reportLocation->currentText().isEmpty() )
++ loc = mWeatherService->stationCode( mWidget->m_reportLocation->currentText() );
++ config.writeEntry( "report_location", loc);
++
+ config.writeEntry( "smallview_mode", mViewMode );
+ config.sync();
+
+Index: kdetoys/kweather/prefdialogdata.ui
+===================================================================
+--- kdetoys/kweather/prefdialogdata.ui (revision 616272)
++++ kdetoys/kweather/prefdialogdata.ui (revision 616273)
+@@ -27,12 +27,6 @@
+ <height>0</height>
+ </size>
+ </property>
+- <property name="maximumSize">
+- <size>
+- <width>640</width>
+- <height>480</height>
+- </size>
+- </property>
+ <property name="focusPolicy">
+ <enum>TabFocus</enum>
+ </property>
+@@ -83,6 +77,20 @@
+ <property name="name">
+ <cstring>m_reportLocation</cstring>
+ </property>
++ <property name="sizePolicy">
++ <sizepolicy>
++ <hsizetype>3</hsizetype>
++ <vsizetype>0</vsizetype>
++ <horstretch>0</horstretch>
++ <verstretch>0</verstretch>
++ </sizepolicy>
++ </property>
++ <property name="minimumSize">
++ <size>
++ <width>0</width>
++ <height>0</height>
++ </size>
++ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+@@ -284,4 +292,10 @@
+ </includes>
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
++<includehints>
++ <includehint>kcombobox.h</includehint>
++ <includehint>kurlrequester.h</includehint>
++ <includehint>klineedit.h</includehint>
++ <includehint>kpushbutton.h</includehint>
++</includehints>
+ </UI>
+Index: kdetoys/kweather/kweather.cpp
+===================================================================
+--- kdetoys/kweather/kweather.cpp (revision 616272)
++++ kdetoys/kweather/kweather.cpp (revision 616273)
+@@ -52,7 +52,7 @@
+ QWidget *parent, const char *name):
+ KPanelApplet(configFile, t, actions, parent, name), weatherIface(),
+ mFirstRun( false ), mReport( 0 ), mClient( 0 ),
+- mContextMenu( 0 ), mWeatherService( 0 )
++ mContextMenu( 0 ), mWeatherService( 0 ), settingsDialog( 0 )
+ {
+ kdDebug(12004) << "Constructor " << endl;
+ setObjId("weatherIface");
+@@ -146,32 +146,41 @@
+ }
+
+ /** prefs */
+-void kweather::preferences(){
++void kweather::preferences()
++{
+ kdDebug(12004) << "prefs" << endl;
+
+ savePrefs();
+
+- static KCMultiDialog *dlg = 0;
++ if ( settingsDialog == 0 )
++ {
++ settingsDialog = new KCMultiDialog( this );
++ connect( settingsDialog, SIGNAL( configCommitted() ), SLOT( slotPrefsAccepted() ) );
+
+- if ( dlg == 0 ) {
+- dlg = new KCMultiDialog( );
+- connect( dlg, SIGNAL( configCommitted(const QCString&) ), SLOT( slotPrefsAccepted() ) );
+-
+- dlg->addModule( "kcmweather.desktop" );
+- dlg->addModule( "kcmweatherservice.desktop" );
++ settingsDialog->addModule( "kcmweather.desktop" );
++ settingsDialog->addModule( "kcmweatherservice.desktop" );
+ }
+
+- dlg->show();
+- dlg->raise();
++ settingsDialog->show();
++ settingsDialog->raise();
+ }
+
+ /** The help handler */
+-void kweather::help(){
++void kweather::help()
++{
+ kapp->invokeHelp(QString::null, QString::fromLatin1("kweather"));
+ }
+
+ /** Display the current weather report. */
+-void kweather::doReport(){
++void kweather::doReport()
++{
++ if ( reportLocation.isEmpty() )
++ {
++ // no station to display defined -> open settings dialog
++ preferences();
++ return;
++ }
++
+ kdDebug(12004) << "Showing out the report" << endl;
+ if ( mReport == 0 )
+ {
+Index: kdetoys/kweather/kcmweatherservice.cpp
+===================================================================
+--- kdetoys/kweather/kcmweatherservice.cpp (revision 616272)
++++ kdetoys/kweather/kcmweatherservice.cpp (revision 616273)
+@@ -43,6 +43,10 @@
+ {
+ QVBoxLayout *layout = new QVBoxLayout( this );
+ mWidget = new ServiceConfigWidget( this );
++
++ // not needed, as a change immediately changes the service
++ //connect(mWidget, SIGNAL(changed(bool)), this, SIGNAL(changed(bool)));
++
+ layout->addWidget( mWidget );
+ KAboutData *about = new KAboutData( "kcmweatherservice",
+ I18N_NOOP( "KWeather Configure Dialog" ),
+Index: kdetoys/kweather/dockwidget.cpp
+===================================================================
+--- kdetoys/kweather/dockwidget.cpp (revision 616272)
++++ kdetoys/kweather/dockwidget.cpp (revision 616273)
+@@ -47,7 +47,8 @@
+
+ void dockwidget::setLocationCode(const QString &locationCode)
+ {
+- m_locationCode = locationCode;
++ m_locationCode = locationCode;
++ showWeather();
+ }
+
+ void dockwidget::setViewMode(int _mode)
+@@ -82,7 +83,7 @@
+ QString wind = "?";
+ QString pressure = "?";
+
+- if ( m_weatherService->stationNeedsMaintenance( m_locationCode ) )
++ if ( !m_locationCode.isEmpty() && m_weatherService->stationNeedsMaintenance( m_locationCode ) )
+ {
+ tip = i18n("Station reports that it needs maintenance\n"
+ "Please try again later");
+@@ -111,6 +112,9 @@
+ // On null or empty location code, or if the station needs maintenance, this will return the dunno icon.
+ QPixmap icon = m_weatherService->icon( m_locationCode );
+
++ if ( ! m_locationCode.isEmpty() )
++ tip = m_weatherService->stationName( m_locationCode ) + "\n" + tip;
++
+ QToolTip::remove(m_button);
+ QToolTip::add(m_button, tip);
+
More information about the pkg-kde-commits
mailing list