From dae73e6b70b1733e79a275703048fade1a165d41 Mon Sep 17 00:00:00 2001
From: Dirk Koopman <djk@tobit.co.uk>
Date: Tue, 25 Mar 2008 09:24:57 +0000
Subject: [PATCH] include latest cty.dat changes

---
 Changes             |  2 ++
 data/cty.dat        |  6 ++--
 data/prefix_data.pl | 73 +++++++++++++++++++++++++--------------------
 perl/Version.pm     |  2 +-
 4 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/Changes b/Changes
index f96fc48e..750796aa 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+25Mar08=======================================================================
+1. Include some cty.day changes
 19Mar08=======================================================================
 1. Include CTY-1802 cty.dat changes from Jim AD1C
 29Feb08=======================================================================
diff --git a/data/cty.dat b/data/cty.dat
index 9ca87513..11e14aee 100644
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -454,7 +454,7 @@ United States:            05:  08:  NA:   43.00:    87.90:     5.0:  K:
     N0AX(3)[6],N1LN(4)[7],N1SZ(4)[7],N1WI(4),N1ZP(4),N2BJ(4),N2BJL(5),
     N2IC(4)[7],N2LA(4)[7],N2NB(3)[6],N2WN(4),N3AIU(4)[7],N3BB(4)[7],
     N3ZZ(3)[6],N4CVO(4),N4DD(4),N4DW(4),N4GK(4),N4GN(4),N4IR(4),N4IRR(5),
-    N4JF(4),N4KG(4),N4KZ(4),N4NO(4),N4OGW(4)[7],N4QS(4),N4SL(3)[6],N4TN(4),
+    N4JF(4),N4KG(4),N4KZ(4),N4NO(4),N4OGW(4)[8],N4QS(4),N4SL(3)[6],N4TN(4),
     N4TZ(4),N4UW(4),N4VV(4),N4XM(4),N4ZZ(4),N6AR(5)[8],N6MW(5)[8],N6MWA(3)[6],
     N6RFM(5)[8],N6ZO(5)[8],N6ZZ(4)[7],N7DC(5)[8],N7DF(4)[7],N7FLT(4)[6],
     N7IV(4)[7],N7NG(5)[8],N7VMR(4)[6],N8FF(5),N8II(5),N8NA(5),N8PR(5),N8RA(5),
@@ -767,7 +767,7 @@ Canada:                   05:  09:  NA:   45.00:    80.00:     4.0:  VE:
     VE2III(2),VE2IM(2),VE2KK(2),VE2MTA(2),VE2MTB(2),VE2NN(2),VE2NRK(2),
     VE2PR(2),VE2QRZ(2),VE2RB(2),VE2TVU(2),VE2UA(2),VE2VH(2),VE2WDX(2),
     VE2WT(2),VE2XAA/2(2),VE2XY(2),VE2YM(2),VE2Z(2),VE2ZC(5),VE2ZM(5),VE2ZV(5),
-    VE3EY/2(2),VE3NE/2(2),VE3RHJ/2(2),VE8AJ(2),VE8PW(2),VE8RCS(2),VER20080318,
+    VE3EY/2(2),VE3NE/2(2),VE3RHJ/2(2),VE8AJ(2),VE8PW(2),VE8RCS(2),VER20080324,
     VY0AA(4)[3],VY0PW(4)[3],VY2MGY/3(4)[4];
 Australia:                30:  59:  OC:  -22.00:  -135.00:   -10.0:  VK:
     AX,VH,VI,VJ,VK,VL,VM,VN,VZ;
@@ -886,7 +886,7 @@ Niue:                     32:  62:  OC:  -19.00:   169.90:    11.0:  ZK2:
 Tokelau:                  31:  62:  OC:   -8.40:   172.70:    11.0:  ZK3:
     ZK3;
 New Zealand:              32:  60:  OC:  -36.90:  -174.80:   -12.0:  ZL:
-    ZK,ZL,ZM;
+    ZK,ZL,ZM,ZM80WB;
 Chatham Is.:              32:  60:  OC:  -44.00:   176.50:  -12.75:  ZL7:
     ZL7,ZM7;
 Kermadec Is.:             32:  60:  OC:  -30.00:   177.90:   -12.0:  ZL8:
diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index facaada8..bb9392a0 100644
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -37,8 +37,6 @@
   '3D2AG/P' => '314',
   '3D2CI' => '311',
   '3D2CY' => '311',
-  '3D2RR' => '314',
-  '3D2RX' => '314',
   '3D6' => '269',
   '3DA' => '269',
   '3E' => '79',
@@ -67,9 +65,7 @@
   '3Y' => '272,310',
   '3Y/B' => '272',
   '3Y/P' => '310',
-  '3Y0PI' => '310',
   '3Y0X' => '310',
-  '3Y1EE' => '310',
   '3Z' => '147',
   '4A' => '221',
   '4A4' => '222',
@@ -112,7 +108,6 @@
   '4U43' => '275',
   '4U4ITU' => '274',
   '4U4UN' => '275',
-  '4U50SPACE' => '275',
   '4U5ITU' => '274',
   '4U5UN' => '275',
   '4U6ITU' => '274',
@@ -270,13 +265,11 @@
   '9L' => '301',
   '9M0' => '261',
   '9M2' => '302',
-  '9M2/PG5M' => '261',
-  '9M2/PG5M/6' => '303,528',
   '9M4' => '302',
-  '9M4SDX' => '261',
   '9M50' => '302',
   '9M50MS' => '303,528',
   '9M6' => '303,528',
+  '9M6/N1UR' => '261',
   '9M8' => '529',
   '9N' => '304',
   '9O' => '305',
@@ -767,12 +760,9 @@
   'DT8A' => '208',
   'DU' => '33',
   'DU0' => '261',
-  'DU0K' => '261',
   'DV' => '33',
   'DW' => '33',
   'DX' => '33',
-  'DX0JP' => '261',
-  'DX0K' => '261',
   'DY' => '33',
   'DZ' => '33',
   'E2' => '81',
@@ -797,7 +787,6 @@
   'EC9' => '347,348',
   'ED' => '34',
   'ED3RKL' => '208',
-  'ED5ON/6' => '35',
   'ED6' => '35',
   'ED8' => '36',
   'ED9' => '347,348',
@@ -851,12 +840,8 @@
   'FO/DL1AWI' => '327',
   'FO/DL5XU' => '327',
   'FO/DL9AWI' => '327',
-  'FO/HA9G' => '328',
   'FO/M' => '328',
   'FO/OH1RX' => '328',
-  'FO0/F8UFT' => '48',
-  'FO0AAA' => '48',
-  'FO0CI' => '48',
   'FP' => '49',
   'FR' => '50,51,52,53',
   'FR/G' => '51',
@@ -1108,6 +1093,7 @@
   'GB4MD' => '66',
   'GB4MDI' => '66',
   'GB4MNH' => '61',
+  'GB4MUU' => '66',
   'GB4NDG' => '66',
   'GB4NFE' => '64,352',
   'GB4PMS' => '64,352',
@@ -1312,7 +1298,6 @@
   'JA' => '92,360,361,362,363',
   'JA3' => '360',
   'JA6' => '361',
-  'JA6GXK/JD1' => '93',
   'JA7' => '362',
   'JA8' => '363',
   'JB' => '92',
@@ -1321,7 +1306,6 @@
   'JD/M' => '93',
   'JD/O' => '94',
   'JD1' => '94',
-  'JD1/JI7BCD' => '93',
   'JD1BME' => '93',
   'JD1BMM' => '93',
   'JD1YAA' => '93',
@@ -1804,7 +1788,6 @@
   'LU' => '119,397,398',
   'LU/DH4PB/R' => '119,397,398',
   'LU/DH4PB/S' => '119,397,398',
-  'LU/R1ANF' => '208',
   'LU1AEE/D' => '119,397,398',
   'LU1AF/D' => '119,397,398',
   'LU1CDP/D' => '119,397,398',
@@ -1836,7 +1819,6 @@
   'LU2EE/D' => '119,397,398',
   'LU2EE/E' => '119,397,398',
   'LU2EJB/X' => '119,397,398',
-  'LU2ERA/Z' => '206',
   'LU2VC/D' => '119,397,398',
   'LU2WV/O' => '119,397,398',
   'LU2XX/X' => '119,397,398',
@@ -1887,6 +1869,7 @@
   'LU6EPR/E' => '119,397,398',
   'LU6EYK/X' => '119,397,398',
   'LU6JJ/D' => '119,397,398',
+  'LU6UAL/D' => '119,397,398',
   'LU6UO/D' => '119,397,398',
   'LU6UO/P' => '119,397,398',
   'LU6UO/Q' => '119,397,398',
@@ -1896,6 +1879,7 @@
   'LU6XAH/X' => '119,397,398',
   'LU7AC/D' => '119,397,398',
   'LU7BTO/D' => '119,397,398',
+  'LU7DBL/D' => '119,397,398',
   'LU7DID/V' => '119,397,398',
   'LU7DID/Y' => '119,397,398',
   'LU7DIR/D' => '119,397,398',
@@ -1920,6 +1904,7 @@
   'LU8DCH/D' => '119,397,398',
   'LU8DCH/Q' => '119,397,398',
   'LU8DRH/D' => '119,397,398',
+  'LU8DSJ/D' => '119,397,398',
   'LU8DWR/D' => '119,397,398',
   'LU8DWR/V' => '119,397,398',
   'LU8EBJ/D' => '119,397,398',
@@ -2372,7 +2357,6 @@
   'OI0' => '126',
   'OJ' => '125',
   'OJ0' => '127',
-  'OJ1ABOA' => '99,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385',
   'OK' => '128',
   'OL' => '128',
   'OM' => '320',
@@ -2424,73 +2408,93 @@
   'PO' => '231',
   'PP' => '137',
   'PP0F' => '139',
+  'PP0R' => '139',
   'PP0S' => '140',
   'PP0T' => '141',
   'PP0ZF' => '139',
+  'PP0ZR' => '139',
   'PP0ZS' => '140',
   'PP0ZT' => '141',
   'PQ' => '137',
   'PQ0F' => '139',
+  'PQ0R' => '139',
   'PQ0S' => '140',
   'PQ0T' => '141',
   'PQ0ZF' => '139',
+  'PQ0ZR' => '139',
   'PQ0ZS' => '140',
   'PQ0ZT' => '141',
   'PR' => '137',
   'PR0F' => '139',
+  'PR0R' => '139',
   'PR0S' => '140',
   'PR0T' => '141',
   'PR0ZF' => '139',
+  'PR0ZR' => '139',
   'PR0ZS' => '140',
   'PR0ZT' => '141',
   'PS' => '137',
   'PS0F' => '139',
+  'PS0R' => '139',
   'PS0S' => '140',
   'PS0T' => '141',
   'PS0ZF' => '139',
+  'PS0ZR' => '139',
   'PS0ZS' => '140',
   'PS0ZT' => '141',
   'PT' => '137',
   'PT0F' => '139',
+  'PT0R' => '139',
   'PT0S' => '140',
   'PT0T' => '141',
   'PT0ZF' => '139',
+  'PT0ZR' => '139',
   'PT0ZS' => '140',
   'PT0ZT' => '141',
   'PU' => '137',
   'PU0F' => '139',
+  'PU0R' => '139',
   'PU0S' => '140',
   'PU0T' => '141',
   'PU0ZF' => '139',
+  'PU0ZR' => '139',
   'PU0ZS' => '140',
   'PU0ZT' => '141',
   'PV' => '137',
   'PV0F' => '139',
+  'PV0R' => '139',
   'PV0S' => '140',
   'PV0T' => '141',
   'PV0ZF' => '139',
+  'PV0ZR' => '139',
   'PV0ZS' => '140',
   'PV0ZT' => '141',
   'PW' => '137',
   'PW0F' => '139',
+  'PW0R' => '139',
   'PW0S' => '140',
   'PW0T' => '141',
   'PW0ZF' => '139',
+  'PW0ZR' => '139',
   'PW0ZS' => '140',
   'PW0ZT' => '141',
   'PX' => '137',
   'PX0F' => '139',
+  'PX0R' => '139',
   'PX0S' => '140',
   'PX0T' => '141',
   'PX0ZF' => '139',
+  'PX0ZR' => '139',
   'PX0ZS' => '140',
   'PX0ZT' => '141',
   'PY' => '137,407,408,409',
   'PY0' => '139,140,141',
   'PY0F' => '139',
+  'PY0R' => '139',
   'PY0S' => '140',
   'PY0T' => '141',
   'PY0ZF' => '139',
+  'PY0ZR' => '139',
   'PY0ZS' => '140',
   'PY0ZT' => '141',
   'PZ' => '142',
@@ -2506,12 +2510,9 @@
   'R2' => '175',
   'R245GS' => '173,419,420,421,422',
   'R3' => '420',
-  'R30ZF' => '176,426,431',
   'R35NP' => '176,426,431',
   'R3F/9' => '176,426,431',
   'R4' => '421',
-  'R450W' => '176,426,431',
-  'R5K/2' => '175',
   'R6' => '422',
   'R7' => '176,426,431',
   'R7C' => '173,419,420,421,422',
@@ -2968,7 +2969,6 @@
   'SF' => '146',
   'SG' => '146',
   'SH' => '146',
-  'SH75' => '124',
   'SI' => '146',
   'SJ' => '146',
   'SK' => '146',
@@ -3037,6 +3037,7 @@
   'TO0O' => '46',
   'TO0P' => '46',
   'TO1A' => '46',
+  'TO1C' => '46',
   'TO1T' => '43',
   'TO1USB' => '43',
   'TO1YR' => '46',
@@ -3062,6 +3063,7 @@
   'TO5J' => '46',
   'TO5MM' => '46',
   'TO5ROM' => '43',
+  'TO5RZ' => '337',
   'TO5S' => '43',
   'TO5T' => '46',
   'TO5X' => '46',
@@ -3131,8 +3133,6 @@
   'UA' => '173,419,420,421,422',
   'UA0' => '424,425,427,428,430',
   'UA1' => '419',
-  'UA1AAE/2' => '175',
-  'UA1PBN/1' => '174',
   'UA2' => '175',
   'UA3' => '420',
   'UA4' => '421',
@@ -3202,7 +3202,6 @@
   'UE3' => '420',
   'UE4' => '421',
   'UE6' => '422',
-  'UE60SWA' => '176,426,431',
   'UE7' => '176,426,431',
   'UE8' => '432',
   'UE8T' => '176,426,431',
@@ -3394,7 +3393,7 @@
   'VE8PW' => '191',
   'VE8RCS' => '191',
   'VE9' => '437',
-  'VER20080212' => '191',
+  'VER20080324' => '191',
   'VERSION' => '537',
   'VF' => '435',
   'VF0' => '191',
@@ -3455,6 +3454,7 @@
   'VK9/Y' => '195',
   'VK9/Z' => '196',
   'VK9AA' => '195',
+  'VK9AL' => '193',
   'VK9C' => '195',
   'VK9CL' => '193',
   'VK9CN' => '197',
@@ -3530,7 +3530,6 @@
   'VP6' => '211,331',
   'VP6/D' => '331',
   'VP6D' => '331',
-  'VP6DI' => '331',
   'VP6DX' => '331',
   'VP8' => '205,206,207,208,228',
   'VP8/F' => '228',
@@ -3539,10 +3538,10 @@
   'VP8/LZ1UQ' => '208',
   'VP8/O' => '206',
   'VP8/S' => '207',
+  'VP8DIF' => '205',
   'VP8DJB' => '99,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385',
   'VP8DJK' => '208',
   'VP8DKF' => '99,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385',
-  'VP8DKX' => '205',
   'VP8PJ' => '99,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385',
   'VP8ROT' => '99,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385',
   'VP8SGK' => '205',
@@ -4056,13 +4055,13 @@
   'ZL4' => '522',
   'ZL5' => '368',
   'ZL7' => '254',
-  'ZL75' => '253,519,520,521,522',
   'ZL8' => '255',
   'ZL9' => '256',
   'ZM' => '253',
   'ZM5' => '99,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385',
   'ZM7' => '254',
   'ZM8' => '255',
+  'ZM80WB' => '253,519,520,521,522',
   'ZM9' => '256',
   'ZP' => '322',
   'ZR' => '257',
@@ -4080,37 +4079,47 @@
   'ZU8' => '258',
   'ZV' => '137',
   'ZV0F' => '139',
+  'ZV0R' => '139',
   'ZV0S' => '140',
   'ZV0T' => '141',
   'ZV0ZF' => '139',
+  'ZV0ZR' => '139',
   'ZV0ZS' => '140',
   'ZV0ZT' => '141',
   'ZW' => '137',
   'ZW0F' => '139',
+  'ZW0R' => '139',
   'ZW0S' => '140',
   'ZW0T' => '141',
   'ZW0ZF' => '139',
+  'ZW0ZR' => '139',
   'ZW0ZS' => '140',
   'ZW0ZT' => '141',
   'ZX' => '137',
   'ZX0F' => '139',
+  'ZX0R' => '139',
   'ZX0S' => '140',
   'ZX0T' => '141',
   'ZX0ZF' => '139',
+  'ZX0ZR' => '139',
   'ZX0ZS' => '140',
   'ZX0ZT' => '141',
   'ZY' => '137',
   'ZY0F' => '139',
+  'ZY0R' => '139',
   'ZY0S' => '140',
   'ZY0T' => '141',
   'ZY0ZF' => '139',
+  'ZY0ZR' => '139',
   'ZY0ZS' => '140',
   'ZY0ZT' => '141',
   'ZZ' => '137',
   'ZZ0F' => '139',
+  'ZZ0R' => '139',
   'ZZ0S' => '140',
   'ZZ0T' => '141',
   'ZZ0ZF' => '139',
+  'ZZ0ZR' => '139',
   'ZZ0ZS' => '140',
   'ZZ0ZT' => '141',
 );
diff --git a/perl/Version.pm b/perl/Version.pm
index 86d4fe82..280c5fad 100644
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
-$build = '216';
+$build = '217';
 
 1;
-- 
2.34.1