Merge branch 'master' of ssh://server/scm/spider

Conflicts:
	Changes
	data/cty.dat
	data/prefix_data.pl

diff --git a/Changes b/Changes
index d8095e76e6ec7bafb070e718f2d6279f4150b463..211463698baccb6cc65ebc65ae33ce0ad0eff408 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+04Nov11=======================================================================
+1. Add CTY2115 changes
 20Oct11=======================================================================
 1. Add CTY2113 Changes
 02Oct11=======================================================================

diff --git a/data/cty.dat b/data/cty.dat
index 34319ac284ac3b0c1883677baa6daa30470f09c2..22bd50d0c26a48d5cf25f8aea99829ce4177362a 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -105,7 +105,7 @@ Sierra Leone:             35:  46:  AF:    8.50:    13.25:     0.0:  9L:
 West Malaysia:            28:  54:  AS:    3.95:  -102.23:    -8.0:  9M2:
     9M2,9M4,9W2,9W4,=9M6XX/2,=9M8DX/2;
 East Malaysia:            28:  54:  OC:    2.68:  -113.32:    -8.0:  9M6:
-    9M6,9M8,9M9,9W6,9W8,=9M4CBP,=9M4CRB,=9M4CWS;
+    9M6,9M8,9M9,9W6,9W8,=9M4CBP,=9M4CRB,=9M4CWS,=9M4SMY;
 Nepal:                    22:  42:  AS:   27.70:   -85.33:   -5.75:  9N:
     9N;
 Rep. of Congo:            36:  52:  AF:   -3.12:   -23.03:    -1.0:  9Q:
@@ -288,9 +288,9 @@ Antarctica:               13:  74:  SA:  -90.00:     0.00:     0.0:  CE9:
     LU3Z[73],LU4Z[73],LU5Z[73],LU6Z[73],LU7Z[73],LU8Z[73],LU9Z[73],
     R1AN(29)[69],RI1AN(29)[69],VI0(39)[69],VK0(39)[69],ZL5(30)[71],
     ZM5(30)[71],ZS7(38)[67],=K9PET/KC4,=3Y8XSA(38)[67],=8J1RL(39)[67],
-    =DP0GVN(38)[67],=DP1POL(38)[67],=KC4AAA(39),=KC4AAC[73],=KC4USB(12),
-    =KC4USV(30)[71],=R1ANP(39)[69],=R1ANR(38)[67],=RI1ANC(29)[70],
-    =RI1ANR(38)[67],=VK0BFG(29)[70],=VP8ADE/B[73],=VP8DLM[73],
+    =CE9VPM[73],=DP0GVN(38)[67],=DP1POL(38)[67],=KC4AAA(39),=KC4AAC[73],
+    =KC4USB(12),=KC4USV(30)[71],=OR4TN(38)[67],=R1ANP(39)[69],=R1ANR(38)[67],
+    =RI1ANC(29)[70],=RI1ANR(38)[67],=VK0BFG(29)[70],=VP8ADE/B[73],=VP8DLM[73],
     =ZS6KX/7(38)[67];
 Cuba:                     08:  11:  NA:   21.50:    80.00:     5.0:  CM:
     CL,CM,CO,T4;
@@ -317,7 +317,7 @@ Cape Verde:               35:  46:  AF:   16.00:    24.00:     1.0:  D4:
 Comoros:                  39:  53:  AF:  -11.63:   -43.30:    -3.0:  D6:
     D6;
 Germany:                  14:  28:  EU:   51.00:   -10.00:    -1.0:  DL:
-    DA,DB,DC,DD,DE,DF,DG,DH,DI,DJ,DK,DL,DM,DN,DO,DP,DQ,DR;
+    DA,DB,DC,DD,DE,DF,DG,DH,DI,DJ,DK,DL,DM,DN,DO,DP,DQ,DR,=DL0CUX/LV;
 Philippines:              27:  50:  OC:   13.00:  -122.00:    -8.0:  DU:
     4D,4E,4F,4G,4H,4I,DU,DV,DW,DX,DY,DZ;
 Eritrea:                  37:  48:  AF:   15.00:   -39.00:    -3.0:  E3:
@@ -404,7 +404,7 @@ Amsterdam & St. Paul:     39:  68:  AF:  -37.85:   -77.53:    -5.0:  FT5Z:
 Wallis & Futuna Islands:  32:  62:  OC:  -13.30:   176.20:   -12.0:  FW:
     FW;
 French Guiana:            09:  12:  SA:    4.00:    53.00:     3.0:  FY:
-    FY;
+    FY,VERSION;
 England:                  14:  27:  EU:   52.77:     1.47:     0.0:  G:
     2,G,M,ZH,ZI,ZJ;
 Isle of Man:              14:  27:  EU:   54.20:     4.53:     0.0:  GD:
@@ -414,8 +414,9 @@ Northern Ireland:         14:  27:  EU:   54.73:     6.68:     0.0:  GI:
 Jersey:                   14:  27:  EU:   49.22:     2.18:     0.0:  GJ:
     2H,2J,GH,GJ,MH,MJ;
 Scotland:                 14:  27:  EU:   56.82:     4.18:     0.0:  GM:
-    2A,2M,2S,GA,GM,GS,MA,MM,MS,=GB0SSB,=GB1KLD,=GB2CHC,=GB2MOF,=GB2MUL,
-    =GB2OWM,=GB2SWF,=GB3SWF,=GB4SWF,=GB5CC,=GB80GD,=GM6WRW/P,=MM0YHB/P;
+    2A,2M,2S,GA,GM,GS,MA,MM,MS,=GB0SSB,=GB1KLD,=GB1OL,=GB2CHC,=GB2GNL,=GB2LBN,
+    =GB2LT,=GB2MOF,=GB2OWM,=GB2SWF,=GB3SWF,=GB4SWF,=GB5CC,=GB80GD,=GM6WRW/P,
+    =MM0YHB/P;
 Shetland and Fair Isle:   14:  27:  EU:   60.50:     1.50:     0.0:  *GM/s:
     2Z,GZ,MZ,=2M0ZET,=2M1ANT,=2M1ASQ,=2M1ODL,=G0FBJ,=GB0HFC,=GB0OS,=GB2ELH,
     =GB2ZET,=GB4SI,=GM0CXQ,=GM0CYJ,=GM0DJI,=GM0EKM,=GM0ILB,=GM0JDB,=GM0MZD,
@@ -431,7 +432,8 @@ Guernsey:                 14:  27:  EU:   49.45:     2.58:     0.0:  GU:
     2P,2U,GP,GU,MP,MU;
 Wales:                    14:  27:  EU:   52.28:     3.73:     0.0:  GW:
     2C,2W,2X,2Y,GC,GW,MC,MW,=GB0HEL,=GB0MPA,=GB0PLB,=GB0SPS,=GB100GGM,=GB2GGM,
-    =GB2RSC,=GB2TD,=GB4MBC,=GB4MD,=GB4MDI,=GB4RC,=GB4SDD,=GB5FI;
+    =GB2LSA,=GB2RSC,=GB2TD,=GB4BPL,=GB4MBC,=GB4MD,=GB4MDI,=GB4RC,=GB4SDD,
+    =GB5FI;
 Solomon Islands:          28:  51:  OC:   -9.00:  -160.00:   -11.0:  H4:
     H4;
 Temotu:                   32:  51:  OC:  -10.72:  -165.80:   -11.0:  H40:
@@ -475,7 +477,7 @@ Italy:                    15:  28:  EU:   42.82:   -12.58:    -1.0:  I:
 African Italy:            33:  37:  AF:   35.67:   -12.67:    -1.0:  *IG9:
     IG9,IH9;
 Sardinia:                 15:  28:  EU:   40.15:    -9.27:    -1.0:  IS:
-    IM0,IS,IW0U,IW0V,IW0W,IW0X,IW0Y,IW0Z,=IQ0AH,=IQ0QP,=IQ0SS,=IY0GA;
+    IM0,IS,IW0U,IW0V,IW0W,IW0X,IW0Y,IW0Z,=II0M,=IQ0AH,=IQ0QP,=IQ0SS,=IY0GA;
 Sicily:                   15:  28:  EU:   37.50:   -14.00:    -1.0:  *IT9:
     IB9,ID9,IE9,IF9,II9,IJ9,IO9,IQ9,IR9,IT9,IU9,IW9,IZ9;
 Djibouti:                 37:  48:  AF:   11.75:   -42.35:    -3.0:  J2:
@@ -525,7 +527,7 @@ United States:            05:  08:  NA:   37.88:    89.00:     5.0:  K:
     =K4MCK(4)[8],=K4MGE(4)[8],=K4NO(4)[8],=K4NVJ(4)[8],=K4PJ(4)[8],
     =K4RO(4)[8],=K4SPO(4)[8],=K4TD(4)[8],=K4WI(4)[8],=K4WW(4)[8],=K4XU(3)[6],
     =K4ZGB(4)[8],=K5AUP(5)[8],=K5EK(5)[8],=K5KG(5)[8],=K5RQ(5)[8],=K5RR(3)[6],
-    =K5VIP(5)[8],=K5ZD(5)[8],=K6ND(5)[8],=K6NDV(5)[8],=K6PJ(4)[6],
+    =K5VIP(5)[8],=K5ZD(5)[8],=K6ND(5)[8],=K6NDV(5)[8],=K6PJ(4)[6],=K6RM(5)[8],
     =K6SXA(4)[7],=K6XT(4)[7],=K7ABV(4)[6],=K7BG(4)[6],=K7CS(5)[8],=K7IA(4)[7],
     =K7JNX(5)[8],=K7KU(4)[7],=K7OM(5)[8],=K7RB(4)[7],=K7RE(4)[7],=K7RSM(4)[7],
     =K7SCX(4)[7],=K7SV(5)[8],=K7TD(4)[7],=K7VU(4)[7],=K8BN(3)[6],=K8CN(5)[8],
@@ -562,35 +564,35 @@ United States:            05:  08:  NA:   37.88:    89.00:     5.0:  K:
     =N9NC(5)[8],=NA2U(3)[6],=NA4C(4)[8],=NA4K(4)[8],=NA4W(4)[8],=NB4M(4)[8],
     =NB7V(4)[6],=ND2T(3)[6],=ND4X(4)[8],=ND8N(3)[6],=NE4M(4)[8],=NE8J(5)[8],
     =NE9Z(4)[7],=NG7A(5)[8],=NH6Z(3)[6],=NJ4I(4)[8],=NM4K(4)[8],=NN4MM(4)[8],
-    =NN4US(4)[8],=NN7A(4)[7],=NO2D(4)[7],=NO9E(5)[8],=NP2N(4)[7],=NP3D(5)[8],
-    =NQ4U(4)[8],=NR7DX(4)[6],=NS0I(5)[8],=NS2X(4)[8],=NU4B(4)[8],=NV4B(4)[8],
-    =NX1P(3)[6],=NX9T(5)[8],=NY6DX(5)[8],=W0BR(5)[8],=W0IZ(4)[8],=W0JLC(5)[8],
-    =W0PV(5)[8],=W0QQG(5)[8],=W0UCE(5)[8],=W0YK(3)[6],=W0YR(5)[8],
-    =W1ESE(3)[6],=W1NN(4)[8],=W1RH(3)[6],=W1ZD(3)[6],=W2OO(4)[8],=W2VJN(3)[6],
-    =W2VKT(3)[6],=W3CP(3)[6],=W3HDH(4)[8],=W4BCG(4)[8],=W4BCU(4)[8],
-    =W4BK(4)[8],=W4DAN(4)[8],=W4DVG(4)[8],=W4EEH(4)[8],=W4EF(3)[6],
-    =W4GHD(4)[8],=W4GKM(4)[8],=W4HOD(4)[8],=W4HZD(4)[8],=W4JHC(4)[7],
-    =W4JSI(4)[8],=W4KW(4)[8],=W4LC(4)[8],=W4LSC(3)[6],=W4LWW(4)[8],
-    =W4NBS(4)[8],=W4NI(4)[8],=W4NJK(3)[6],=W4NZ(4)[8],=W4PHS(4)[8],
-    =W4PV(4)[8],=W4RK(4)[7],=W4RRE(4)[8],=W4RYW(4)[8],=W4TGB(4)[8],
-    =W4TKI(4)[8],=W4UAL(4)[8],=W4UAT(3)[6],=W4UT(4)[8],=W5DQ(3)[6],
-    =W5JBO(3)[6],=W5JBV(5)[8],=W5JR(5)[8],=W5MPC(5)[8],=W5MX(4)[8],
-    =W5UHQ(4)[8],=W5XB(5)[8],=W6AAN(5)[8],=W6GMT(4)[7],=W6HGF(5)[8],
-    =W6IHG(5)[8],=W6KGP(4)[7],=W6LFB(4)[7],=W6NWS(5)[8],=W6PU(4)[7],
-    =W6SAI(4)[8],=W6UB(4)[8],=W6XR(5)[8],=W7DO(5)[8],=W7HJ(5)[8],=W7IMP(5)[8],
-    =W7IY(5)[8],=W7JI(4)[7],=W7KF(4)[6],=W7KU(4)[7],=W7THY(4)[7],=W8AEF(3)[6],
-    =W8AKS(5)[8],=W8FJ(5)[8],=W8FN(4)[7],=W8HGH(5)[8],=W8IVF(5)[8],
-    =W8JI(5)[8],=W8OHT(5)[8],=W8QZA(3)[6],=W8TK(3)[6],=W8WEJ(5)[8],
-    =W8ZA(5)[8],=W9CF(3)[6],=W9KB(5)[8],=W9LHG(4)[7],=W9NGA(3)[6],=W9UK(5)[8],
-    =W9XQ(4)[7],=WA0KDS(3)[6],=WA0WWW(3)[6],=WA1FCN(4)[8],=WA1PMA(3)[6],
-    =WA1UJU(4)[8],=WA3C(4)[8],=WA4SM(4)[8],=WA4WLI(4)[8],=WA5VGI(3)[6],
-    =WA8OJR(5)[8],=WA8QYJ(5)[8],=WA8WV(5)[8],=WA8ZBT(4)[7],=WB3JFS(3)[6],
-    =WB4YDL(4)[8],=WB4YDY(4)[8],=WB5NMZ(4)[8],=WB8BPU(5)[8],=WB8YYY(5)[8],
-    =WB9KPT(5)[8],=WC2Z(4)[8],=WC7S(4)[7],=WC7V(4)[6],=WD8CQB(5)[8],
-    =WF4U(3)[6],=WF7T(4)[8],=WG7Y(4)[7],=WJ9B(5)[8],=WK5X(5)[8],=WO4O(4)[8],
-    =WP2B(4)[7],=WS6K(4)[8],=WS9M(5)[8],=WT5L(5)[8],=WT9Q(4)[7],=WU9B(3)[6],
-    =WW2Y(4)[7],=WX4MM(4)[8],=WX4TM(4)[8],=WY5I(5)[8],=WY7FD(4)[7],
-    =WY7LL(4)[7],=WY7SS(4)[7],=WZ4F(4)[8];
+    =NN4US(4)[8],=NN7A(4)[7],=NO2D(4)[7],=NO9E(5)[8],=NP3D(5)[8],=NQ4U(4)[8],
+    =NR7DX(4)[6],=NS0I(5)[8],=NS2X(4)[8],=NU4B(4)[8],=NV4B(4)[8],=NX1P(3)[6],
+    =NX9T(5)[8],=NY6DX(5)[8],=W0BR(5)[8],=W0IZ(4)[8],=W0JLC(5)[8],=W0PV(5)[8],
+    =W0QQG(5)[8],=W0UCE(5)[8],=W0YK(3)[6],=W0YR(5)[8],=W1ESE(3)[6],
+    =W1NN(4)[8],=W1RH(3)[6],=W1ZD(3)[6],=W2OO(4)[8],=W2VJN(3)[6],=W2VKT(3)[6],
+    =W3CP(3)[6],=W3HDH(4)[8],=W4BCG(4)[8],=W4BCU(4)[8],=W4BK(4)[8],
+    =W4DAN(4)[8],=W4DVG(4)[8],=W4EEH(4)[8],=W4EF(3)[6],=W4GHD(4)[8],
+    =W4GKM(4)[8],=W4HOD(4)[8],=W4HZD(4)[8],=W4JHC(4)[7],=W4JSI(4)[8],
+    =W4KW(4)[8],=W4LC(4)[8],=W4LSC(3)[6],=W4LWW(4)[8],=W4NBS(4)[8],
+    =W4NI(4)[8],=W4NJK(3)[6],=W4NZ(4)[8],=W4PHS(4)[8],=W4PV(4)[8],=W4RK(4)[7],
+    =W4RRE(4)[8],=W4RYW(4)[8],=W4TGB(4)[8],=W4TKI(4)[8],=W4UAL(4)[8],
+    =W4UAT(3)[6],=W4UT(4)[8],=W5DQ(3)[6],=W5JBO(3)[6],=W5JBV(5)[8],
+    =W5JR(5)[8],=W5MPC(5)[8],=W5MX(4)[8],=W5UHQ(4)[8],=W5XB(5)[8],
+    =W6AAN(5)[8],=W6GMT(4)[7],=W6HGF(5)[8],=W6IHG(5)[8],=W6KGP(4)[7],
+    =W6LFB(4)[7],=W6NWS(5)[8],=W6PU(4)[7],=W6SAI(4)[8],=W6UB(4)[8],
+    =W6XR(5)[8],=W7DO(5)[8],=W7HJ(5)[8],=W7IMP(5)[8],=W7IY(5)[8],=W7JI(4)[7],
+    =W7KF(4)[6],=W7KU(4)[7],=W7THY(4)[7],=W8AEF(3)[6],=W8AKS(5)[8],
+    =W8FJ(5)[8],=W8FN(4)[7],=W8HGH(5)[8],=W8IVF(5)[8],=W8JI(5)[8],
+    =W8OHT(5)[8],=W8QZA(3)[6],=W8TK(3)[6],=W8WEJ(5)[8],=W8ZA(5)[8],
+    =W9CF(3)[6],=W9KB(5)[8],=W9LHG(4)[7],=W9NGA(3)[6],=W9UK(5)[8],=W9XQ(4)[7],
+    =WA0KDS(3)[6],=WA0WWW(3)[6],=WA1FCN(4)[8],=WA1PMA(3)[6],=WA1UJU(4)[8],
+    =WA3C(4)[8],=WA4SM(4)[8],=WA4WLI(4)[8],=WA5VGI(3)[6],=WA8OJR(5)[8],
+    =WA8QYJ(5)[8],=WA8WV(5)[8],=WA8ZBT(4)[7],=WB3JFS(3)[6],=WB4YDL(4)[8],
+    =WB4YDY(4)[8],=WB5NMZ(4)[8],=WB8BPU(5)[8],=WB8YYY(5)[8],=WB9KPT(5)[8],
+    =WC2Z(4)[8],=WC7S(4)[7],=WC7V(4)[6],=WD8CQB(5)[8],=WF4U(3)[6],=WF7T(4)[8],
+    =WG7Y(4)[7],=WJ9B(5)[8],=WK5X(5)[8],=WO4O(4)[8],=WP2B(4)[7],=WS6K(4)[8],
+    =WS9M(5)[8],=WT5L(5)[8],=WT9Q(4)[7],=WU9B(3)[6],=WW2Y(4)[7],=WX4MM(4)[8],
+    =WX4TM(4)[8],=WY5I(5)[8],=WY7FD(4)[7],=WY7LL(4)[7],=WY7SS(4)[7],
+    =WZ4F(4)[8];
 Guantanamo Bay:           08:  11:  NA:   20.00:    75.00:     5.0:  KG4:
     KG4;
 Northern Mariana Islands: 27:  64:  OC:   15.18:  -145.72:   -10.0:  KH0:
@@ -608,11 +610,12 @@ Palmyra & Jarvis Islands: 31:  61:  OC:    5.87:   162.07:    11.0:  KH5:
 Kingman Reef:             31:  61:  OC:    6.40:   162.40:    11.0:  KH5K:
     AH5K,KH5K,NH5K,WH5K;
 Hawaii:                   31:  61:  OC:   19.67:   155.57:    10.0:  KH6:
-    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=K4XV,=K9FD,=KL3FN,=N6KB,=NH2IF;
+    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=AH0A,=K4XV,=K9FD,=KB6EGA,=KL3FN,=N6KB,
+    =NH2IF;
 Kure Island:              31:  61:  OC:   29.00:   178.00:    10.0:  KH7K:
     AH7K,KH7K,NH7K,WH7K;
 American Samoa:           32:  62:  OC:  -14.32:   170.78:    11.0:  KH8:
-    AH8,KH8,NH8,WH8,=K8A;
+    AH8,KH8,NH8,WH8;
 Swains Island:            32:  62:  OC:  -11.05:   171.25:    11.0:  KH8/s:
     =KH8SI;
 Wake Island:              31:  65:  OC:   19.28:  -166.63:   -12.0:  KH9:
@@ -728,8 +731,8 @@ Argentina:                13:  14:  SA:  -34.80:    65.92:     3.0:  LU:
     LW8W[16],LW8X[16],LW8Y[16],LW9V[16],LW9W[16],LW9X[16],LW9Y[16],=LU1DZ/D,
     =LU1YY/XA[16],=LU2AVW/D,=LU2CHP/D,=LU2DJB/J,=LU2DVI/H,=LU2EE/D,=LU2FP/F,
     =LU2HOD/D,=LU3FV/F,=LU3VAL/V[16],=LU4DBT/XA[16],=LU4ETN/F,=LU4HOD/F,
-    =LU5DEM/W[16],=LU5DGI/W[16],=LU5FZ/F,=LU6EE/XA[16],=LU6FE/H,=LU7FM/F,
-    =LU7JMS/J,=LU8DZE/D,=LU9JMG/J,=LU9XPA/L,=LW2EIY/H;
+    =LU5DEM/W[16],=LU5DGI/W[16],=LU5DX/H,=LU5FZ/F,=LU6EE/XA[16],=LU6FE/H,
+    =LU7FM/F,=LU7JMS/J,=LU8DZE/D,=LU9JMG/J,=LU9XPA/L,=LW2EIY/H,=LW3DKO/D;
 Luxembourg:               14:  27:  EU:   50.00:    -6.00:    -1.0:  LX:
     LX;
 Lithuania:                15:  29:  EU:   55.45:   -23.63:    -2.0:  LY:
@@ -1109,10 +1112,10 @@ Canada:                   05:  09:  NA:   44.35:    78.75:     5.0:  VE:
     CI1(1)[2],CI2,CJ2[4],CK2[4],CY1,CY2(2),CZ0(2)[4],CZ1(1)[2],CZ2,VA2[4],
     VB2[4],VC2[4],VD1,VD2(2),VE2[4],VF0(2)[4],VF1(1)[2],VF2,VG2[4],VO1,VO2(2),
     VX2[4],VY0(2)[4],VY1(1)[2],VY2,XJ1,XJ2(2),XK0(2)[4],XK1(1)[2],XK2,XL2[4],
-    XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20111024,=VE0MDL(3)[2],
-    =VE2/JA8BMK(2)[4],=VE2AEJ(4)[4],=VE2CSI(2)[4],=VE2DXY(2)[4],=VE2FK[9],
-    =VE2GSO(2)[4],=VE2III(2)[4],=VE2IM(2)[4],=VE2TKH(2)[4],=VE7MID/VE2(2)[4],
-    =VY0PW(4)[3];
+    XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20111103,=VA2PL(2)[4],
+    =VE0MDL(3)[2],=VE2/JA8BMK(2)[4],=VE2AEJ(4)[4],=VE2CSI(2)[4],=VE2DXY(2)[4],
+    =VE2FK[9],=VE2GSO(2)[4],=VE2IDX(2)[4],=VE2III(2)[4],=VE2IM(2)[4],
+    =VE2TKH(2)[4],=VE3ZF/2(2)[4],=VE7MID/VE2(2)[4],=VY0PW(4)[3];
 Australia:                30:  59:  OC:  -23.70:  -132.33:   -10.0:  VK:
     AX,VH,VI,VJ,VK,VL,VM,VN,VZ,AX4[55],VH4[55],VI4[55],VJ4[55],VK4[55],
     VL4[55],VM4[55],VN4[55],VZ4[55];
@@ -1124,7 +1127,7 @@ Cocos-Keeling:            29:  54:  OC:  -12.15:   -96.82:    -6.5:  VK9C:
     AX9C,AX9Y,VH9C,VH9Y,VI9C,VI9Y,VJ9C,VJ9Y,VK9C,VK9Y,VL9C,VL9Y,VM9C,VM9Y,
     VN9C,VN9Y,VZ9C,VZ9Y,=VK9AA;
 Lord Howe Island:         30:  60:  OC:  -31.55:  -159.08:   -10.5:  VK9L:
-    AX9L,VH9L,VI9L,VJ9L,VK9L,VL9L,VM9L,VN9L,VZ9L,=VERSION,=VK9FLHI,=VK9ZLH;
+    AX9L,VH9L,VI9L,VJ9L,VK9L,VL9L,VM9L,VN9L,VZ9L,=VK9FLHI,=VK9ZLH;
 Mellish Reef:             30:  56:  OC:  -17.40:  -155.85:   -10.0:  VK9M:
     AX9M,VH9M,VI9M,VJ9M,VK9M,VL9M,VM9M,VN9M,VZ9M;
 Norfolk Island:           32:  60:  OC:  -29.03:  -167.93:   -11.5:  VK9N:
@@ -1163,7 +1166,8 @@ Chagos Islands:           39:  41:  AF:   -7.32:   -72.42:    -6.0:  VQ9:
 Hong Kong:                24:  44:  AS:   22.28:  -114.18:    -8.0:  VR:
     VR;
 India:                    22:  41:  AS:   22.50:   -77.58:    -5.5:  VU:
-    8T,8U,8V,8W,8X,8Y,AT,AU,AV,AW,VT,VU,VV,VW;
+    8T,8U,8V,8W,8X,8Y,AT,AU,AV,AW,VT,VU,VV,VW,=VU2CDP/F1,=VU2PAI/F1,
+    =VU2SWS/F1,=VU2UR/F1,=VU3DJQ/F1,=VU3VOC/F1;
 Andaman/Nicobar Islands:  26:  49:  AS:   12.37:   -92.78:    -5.5:  VU4:
     VU4;
 Lakshadweep:              22:  41:  AS:   11.23:   -72.78:    -5.5:  VU7:

diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index 8edf7ae67127b6d6c2978c94dd75bb469d065f23..d246727a6761412449f50128f044dcfd347363b4 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -291,6 +291,7 @@
   '=9M4CBP' => '289,652',
   '=9M4CRB' => '289,652',
   '=9M4CWS' => '289,652',
+  '=9M4SMY' => '289,652',
   '=9M6XX/2' => '288',
   '=9M8DX/2' => '288',
   '=AA4DD' => '207',
@@ -311,6 +312,7 @@
   '=AG3V' => '207',
   '=AG4CZ' => '207',
   '=AG4W' => '207',
+  '=AH0A' => '105,419,420',
   '=AH0AH' => '424',
   '=AH2DT' => '207',
   '=AI1P' => '207',
@@ -318,6 +320,8 @@
   '=AJ4A' => '207',
   '=AJ4F' => '207',
   '=BS7H' => '304',
+  '=CE9VPM' => '97,397,398,400,401,402,403,404,405,406,407,408,409,410,412,414',
+  '=DL0CUX/LV' => '32',
   '=DP0GVN' => '97,397,398,400,401,402,403,404,405,406,407,408,409,410,412,414',
   '=DP1POL' => '97,397,398,400,401,402,403,404,405,406,407,408,409,410,412,414',
   '=DT8A' => '341',
@@ -339,12 +343,16 @@
   '=GB0SSB' => '64,382',
   '=GB100GGM' => '66',
   '=GB1KLD' => '64,382',
+  '=GB1OL' => '64,382',
   '=GB1SPD' => '62',
   '=GB2CHC' => '64,382',
   '=GB2ELH' => '382',
   '=GB2GGM' => '66',
+  '=GB2GNL' => '64,382',
+  '=GB2LBN' => '64,382',
+  '=GB2LSA' => '66',
+  '=GB2LT' => '64,382',
   '=GB2MOF' => '64,382',
-  '=GB2MUL' => '64,382',
   '=GB2OWM' => '64,382',
   '=GB2RSC' => '66',
   '=GB2SPD' => '62',
@@ -352,6 +360,7 @@
   '=GB2TD' => '66',
   '=GB2ZET' => '382',
   '=GB3SWF' => '64,382',
+  '=GB4BPL' => '66',
   '=GB4MBC' => '66',
   '=GB4MD' => '66',
   '=GB4MDI' => '66',
@@ -429,6 +438,7 @@
   '=HK0TU' => '330',
   '=HZ1SBS/J' => '82,384,385',
   '=I1SR' => '341',
+  '=II0M' => '84',
   '=IQ0AH' => '84',
   '=IQ0QP' => '84',
   '=IQ0SS' => '84',
@@ -506,6 +516,7 @@
   '=K6ND' => '207',
   '=K6NDV' => '207',
   '=K6PJ' => '207',
+  '=K6RM' => '207',
   '=K6SXA' => '207',
   '=K6XT' => '207',
   '=K7ABV' => '207',
@@ -522,7 +533,6 @@
   '=K7SV' => '207',
   '=K7TD' => '207',
   '=K7VU' => '207',
-  '=K8A' => '107,319',
   '=K8BN' => '207',
   '=K8CN' => '207',
   '=K8FC' => '207',
@@ -557,6 +567,7 @@
   '=KA4TEU' => '207',
   '=KA8Q' => '207',
   '=KB2OPM' => '113',
+  '=KB6EGA' => '105,419,420',
   '=KB7Q' => '207',
   '=KB8V' => '207',
   '=KC2TE' => '113',
@@ -658,6 +669,7 @@
   '=LU4HOD/F' => '117,428,429',
   '=LU5DEM/W' => '117,428,429',
   '=LU5DGI/W' => '117,428,429',
+  '=LU5DX/H' => '117,428,429',
   '=LU5FZ/F' => '117,428,429',
   '=LU6EE/XA' => '117,428,429',
   '=LU6FE/H' => '117,428,429',
@@ -667,6 +679,7 @@
   '=LU9JMG/J' => '117,428,429',
   '=LU9XPA/L' => '117,428,429',
   '=LW2EIY/H' => '117,428,429',
+  '=LW3DKO/D' => '117,428,429',
   '=MA1FJM' => '382',
   '=MM0LSM' => '382',
   '=MM0XAU' => '382',
@@ -774,7 +787,6 @@
   '=NN7A' => '207',
   '=NO2D' => '207',
   '=NO9E' => '207',
-  '=NP2N' => '207',
   '=NP3D' => '207',
   '=NQ4U' => '207',
   '=NR7DX' => '207',
@@ -786,6 +798,7 @@
   '=NX9T' => '207',
   '=NY6DX' => '207',
   '=OH7QA/S' => '123,440,441,442,443,444,445,446,447,448',
+  '=OR4TN' => '97,397,398,400,401,402,403,404,405,406,407,408,409,410,412,414',
   '=R1ANP' => '97,397,398,400,401,402,403,404,405,406,407,408,409,410,412,414',
   '=R1ANR' => '97,397,398,400,401,402,403,404,405,406,407,408,409,410,412,414',
   '=RI1ANC' => '97,397,398,400,401,402,403,404,405,406,407,408,409,410,412,414',
@@ -813,6 +826,7 @@
   '=TX5A' => '314',
   '=TX5C' => '48',
   '=TX7M' => '314',
+  '=VA2PL' => '187,544,545,546,547,548,549,550,551,552',
   '=VE0MDL' => '187,544,545,546,547,548,549,550,551,552',
   '=VE2/JA8BMK' => '187,544,545,546,547,548,549,550,551,552',
   '=VE2AEJ' => '187,544,545,546,547,548,549,550,551,552',
@@ -820,12 +834,13 @@
   '=VE2DXY' => '187,544,545,546,547,548,549,550,551,552',
   '=VE2FK' => '187,544,545,546,547,548,549,550,551,552',
   '=VE2GSO' => '187,544,545,546,547,548,549,550,551,552',
+  '=VE2IDX' => '187,544,545,546,547,548,549,550,551,552',
   '=VE2III' => '187,544,545,546,547,548,549,550,551,552',
   '=VE2IM' => '187,544,545,546,547,548,549,550,551,552',
   '=VE2TKH' => '187,544,545,546,547,548,549,550,551,552',
+  '=VE3ZF/2' => '187,544,545,546,547,548,549,550,551,552',
   '=VE7MID/VE2' => '187,544,545,546,547,548,549,550,551,552',
-  '=VER20111024' => '187,544,545,546,547,548,549,550,551,552',
-  '=VERSION' => '333',
+  '=VER20111103' => '187,544,545,546,547,548,549,550,551,552',
   '=VK0BFG' => '97,397,398,400,401,402,403,404,405,406,407,408,409,410,412,414',
   '=VK0IR' => '190',
   '=VK0KEV' => '191',
@@ -838,6 +853,12 @@
   '=VP8DIF' => '338',
   '=VP8DLM' => '97,397,398,400,401,402,403,404,405,406,407,408,409,410,412,414',
   '=VP8THU' => '340',
+  '=VU2CDP/F1' => '200,576,577,578',
+  '=VU2PAI/F1' => '200,576,577,578',
+  '=VU2SWS/F1' => '200,576,577,578',
+  '=VU2UR/F1' => '200,576,577,578',
+  '=VU3DJQ/F1' => '200,576,577,578',
+  '=VU3VOC/F1' => '200,576,577,578',
   '=VY0PW' => '187,544,545,546,547,548,549,550,551,552',
   '=W0BR' => '207',
   '=W0IZ' => '207',

diff --git a/perl/Version.pm b/perl/Version.pm
index d32b17230eb5797cdb6209c15d31e2c27c631585..985314d568e7361a1e0084f8db7ea3d3cb58f7ca 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,7 +11,7 @@ use vars qw($version $subversion $build $gitversion);
 
 $version = '1.55';
 $subversion = '0';
-$build = '94';
-$gitversion = '6262a02';
+$build = '95';
+$gitversion = '9bbfe9a';
 
 1;