added CTY-1710 prefix changes

diff --git a/Changes b/Changes
index 5394d7a41f25c4043960ebf323a485bbe41b4cc4..481199f64a2b0a312410e7562cd5afe36dd943f2 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+21Nov07=======================================================================
+1. Added CTY-1710 prefix changes
 19Nov07=======================================================================
 1. change MRTG graphs to be based on GMT, not localtime. This allows one to
 more easily compare debug data with traffic graphs.

diff --git a/data/cty.dat b/data/cty.dat
index 1447d5abc9847d4d173a7f4edfd688d107e60975..1b763253237cc7a52c02fe336d9567877e5b8294 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -268,7 +268,7 @@ Mayotte:                  39:  53:  AF:  -13.00:   -45.30:    -3.0:  FH:
 French St. Martin:        08:  11:  NA:   18.10:    63.10:     4.0:  FJ:\r
     FJ,FS,TO5D;\r
 New Caledonia:            32:  56:  OC:  -22.30:  -166.50:   -11.0:  FK:\r
-    FK,TX8,TX1A,TX5CW;\r
+    FK,TX8,TX1A,TX3SAM,TX5CW;\r
 Chesterfield Is.:         30:  56:  OC:  -19.90:  -158.30:   -11.0:  FK/c:\r
     TX0AT,TX0C,TX0DX,TX9;\r
 Martinique:               08:  11:  NA:   14.60:    61.00:     4.0:  FM:\r
@@ -518,27 +518,28 @@ Argentina:                13:  14:  SA:  -34.60:    58.40:     3.0:  LU:
     L30EY/D,L30EY/V,L40E/D,L44D/D,L80AA/D,L8D/X,LO0D/D,LO7E/D,LU/DH4PB/R,\r
     LU/DH4PB/S,LU1AEE/D,LU1AF/D,LU1CDP/D,LU1DK/D,LU1DMA/E,LU1DZ/E,LU1DZ/P,\r
     LU1DZ/Q,LU1DZ/R,LU1DZ/S,LU1DZ/X,LU1EJ/W,LU1EQ/D,LU1EYW/D,LU1OFN/I,\r
-    LU1VOF/D,LU1VZ/V,LU1XAW/X,LU1XY/X,LU1YU/D,LU1YY/Y,LU2DT/D,LU2DT/LH,\r
-    LU2DVI/H,LU2EE/D,LU2EE/E,LU2EJB/X,LU2VC/D,LU2WV/O,LU2XX/X,LU3CQ/D,\r
-    LU3DJI/D,LU3DJI/W,LU3DOC/D,LU3DR/D,LU3DR/V,LU3DXG/D,LU3ES/D,LU3ES/W,\r
-    LU4AAO/D,LU4DA/D,LU4DQ/D,LU4DRC/Y,LU4DRH/D,LU4DRH/E,LU4EJ/D,LU4ETN/D,\r
-    LU4WG/W,LU5BE/D,LU5BOJ/O,LU5DEM/D,LU5DEM/V,LU5DIT/D,LU5DIT/V,LU5DRV/D,\r
-    LU5DRV/V,LU5DT/D,LU5DV/D,LU5DWS/D,LU5EAO/D,LU5EFX/Y,LU5EWO/D,LU5FZ/D,\r
-    LU5XC/X,LU6DBL/D,LU6DKT/D,LU6DRD/D,LU6DRD/E,LU6DRN/D,LU6DRR/D,LU6EC/W,\r
-    LU6EJJ/D,LU6EPR/D,LU6EPR/E,LU6EYK/X,LU6JJ/D,LU6UO/D,LU6UO/P,LU6UO/Q,\r
-    LU6UO/R,LU6UO/S,LU6UO/X,LU6XAH/X,LU7AC/D,LU7BTO/D,LU7DID/V,LU7DID/Y,\r
-    LU7DIR/D,LU7DJJ/W,LU7DP/D,LU7DR/D,LU7DSY/D,LU7DSY/V,LU7DSY/W,LU7DW/D,\r
-    LU7DZL/D,LU7DZL/E,LU7EGH/V,LU7EGY/D,LU7EO/D,LU7EPC/D,LU7EPC/W,LU7VCH/D,\r
-    LU7WFM/W,LU7WW/W,LU8ADX/D,LU8DCH/D,LU8DCH/Q,LU8DRH/D,LU8DWR/D,LU8DWR/V,\r
-    LU8EBJ/D,LU8EBJ/E,LU8EBK/D,LU8EBK/E,LU8ECF/D,LU8ECF/E,LU8EEM/D,LU8EGS/D,\r
-    LU8EHQ/D,LU8EHQ/E,LU8EHQ/W,LU8EKB/W,LU8EKC/D,LU8EOT/X,LU8EOT/Y,LU8ERH/D,\r
-    LU8EXJ/D,LU8EXN/D,LU8FOZ/V,LU8VCC/D,LU8XC/X,LU8XW/X,LU9ARB/D,LU9AUC/D,\r
-    LU9DBK/X,LU9DKX/X,LU9EI/F,LU9EJS/E,LU9ESD/D,LU9ESD/V,LU9ESD/Y,LU9EV/LH,\r
-    LU9JMG/J,LW1DAL/D,LW1EXU/D,LW1EXU/Y,LW2DX/E,LW2DX/P,LW2DX/Q,LW2DX/R,\r
-    LW2DX/S,LW2DX/Y,LW2ENB/D,LW3DKC/D,LW3DKC/E,LW3DKO/D,LW3DKO/E,LW3HAQ/D,\r
-    LW4DRH/D,LW4DRH/E,LW4DRV/D,LW4EM/E,LW4EM/LH,LW5DR/LH,LW5DWX/D,LW5EE/D,\r
-    LW5EE/V,LW5EOL/D,LW6DTM/D,LW7DAF/D,LW7DAF/W,LW7DLY/D,LW7DNS/E,LW8DMK/D,\r
-    LW8ECQ/D,LW8EU/D,LW8EXF/D,LW9DCF/Y,LW9EAG/D,LW9EAG/V,LW9EVA/D,LW9EVA/E;\r
+    LU1VOF/D,LU1VZ/V,LU1XAW/X,LU1XY/X,LU1YU/D,LU1YY/Y,LU2CRM/XA,LU2DT/D,\r
+    LU2DT/LH,LU2DVI/H,LU2EE/D,LU2EE/E,LU2EJB/X,LU2VC/D,LU2WV/O,LU2XX/X,\r
+    LU3CQ/D,LU3DJI/D,LU3DJI/W,LU3DOC/D,LU3DR/D,LU3DR/V,LU3DXG/D,LU3ES/D,\r
+    LU3ES/W,LU4AAO/D,LU4DA/D,LU4DQ/D,LU4DRC/Y,LU4DRH/D,LU4DRH/E,LU4EJ/D,\r
+    LU4ETN/D,LU4WG/W,LU5BE/D,LU5BOJ/O,LU5DEM/D,LU5DEM/V,LU5DIT/D,LU5DIT/V,\r
+    LU5DRV/D,LU5DRV/V,LU5DT/D,LU5DV/D,LU5DWS/D,LU5EAO/D,LU5EFX/Y,LU5EWO/D,\r
+    LU5FZ/D,LU5XC/X,LU6DBL/D,LU6DKT/D,LU6DRD/D,LU6DRD/E,LU6DRN/D,LU6DRR/D,\r
+    LU6EC/W,LU6EJJ/D,LU6EPR/D,LU6EPR/E,LU6EYK/X,LU6JJ/D,LU6UO/D,LU6UO/P,\r
+    LU6UO/Q,LU6UO/R,LU6UO/S,LU6UO/X,LU6XAH/X,LU7AC/D,LU7BTO/D,LU7DID/V,\r
+    LU7DID/Y,LU7DIR/D,LU7DJJ/W,LU7DP/D,LU7DR/D,LU7DSY/D,LU7DSY/V,LU7DSY/W,\r
+    LU7DW/D,LU7DZL/D,LU7DZL/E,LU7EGH/V,LU7EGY/D,LU7EO/D,LU7EPC/D,LU7EPC/W,\r
+    LU7VCH/D,LU7WFM/W,LU7WW/W,LU8ADX/D,LU8DCH/D,LU8DCH/Q,LU8DRH/D,LU8DWR/D,\r
+    LU8DWR/V,LU8EBJ/D,LU8EBJ/E,LU8EBK/D,LU8EBK/E,LU8ECF/D,LU8ECF/E,LU8EEM/D,\r
+    LU8EGS/D,LU8EHQ/D,LU8EHQ/E,LU8EHQ/W,LU8EKB/W,LU8EKC/D,LU8EOT/X,LU8EOT/Y,\r
+    LU8ERH/D,LU8EXJ/D,LU8EXN/D,LU8FOZ/V,LU8VCC/D,LU8XC/X,LU8XW/X,LU9ARB/D,\r
+    LU9AUC/D,LU9DBK/X,LU9DKX/X,LU9DPD/XA,LU9EI/F,LU9EJS/E,LU9ESD/D,LU9ESD/V,\r
+    LU9ESD/Y,LU9EV/LH,LU9JMG/J,LW1DAL/D,LW1EXU/D,LW1EXU/Y,LW2DX/E,LW2DX/P,\r
+    LW2DX/Q,LW2DX/R,LW2DX/S,LW2DX/Y,LW2ENB/D,LW3DKC/D,LW3DKC/E,LW3DKO/D,\r
+    LW3DKO/E,LW3HAQ/D,LW4DRH/D,LW4DRH/E,LW4DRV/D,LW4EM/E,LW4EM/LH,LW5DR/LH,\r
+    LW5DWX/D,LW5EE/D,LW5EE/V,LW5EOL/D,LW6DTM/D,LW7DAF/D,LW7DAF/W,LW7DLY/D,\r
+    LW7DNS/E,LW8DMK/D,LW8ECQ/D,LW8EU/D,LW8EXF/D,LW9DCF/Y,LW9EAG/D,LW9EAG/V,\r
+    LW9EVA/D,LW9EVA/E;\r
 Luxembourg:               14:  27:  EU:   49.60:    -6.20:    -1.0:  LX:\r
     LX;\r
 Lithuania:                15:  29:  EU:   54.50:   -25.50:    -2.0:  LY:\r
@@ -761,7 +762,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),\r
     VE2PR(2),VE2QRZ(2),VE2RB(2),VE2TVU(2),VE2UA(2),VE2VH(2),VE2WDX(2),\r
     VE2WT(2),VE2XAA/2(2),VE2XY(2),VE2YM(2),VE2Z(2),VE2ZC(5),VE2ZM(5),VE2ZV(5),\r
-    VE3EY/2(2),VE3NE/2(2),VE3RHJ/2(2),VE8AJ(2),VE8PW(2),VE8RCS(2),VER20071116,\r
+    VE3EY/2(2),VE3NE/2(2),VE3RHJ/2(2),VE8AJ(2),VE8PW(2),VE8RCS(2),VER20071121,\r
     VY0AA(4)[3],VY0PW(4)[3],VY2MGY/3(4)[4];\r
 Australia:                30:  59:  OC:  -22.00:  -135.00:   -10.0:  VK:\r
     AX,VH,VI,VJ,VK,VL,VM,VN,VZ;\r
@@ -811,11 +812,11 @@ Chagos Is.:               39:  41:  AF:   -7.30:   -72.40:    -5.0:  VQ9:
 Hong Kong:                24:  44:  AS:   22.30:  -114.30:    -8.0:  VR:\r
     VR;\r
 India:                    22:  41:  AS:   22.00:   -80.00:    -5.5:  VU:\r
-    8T,8U,8V,8W,8X,8Y,AT,AU,AV,AW,VT,VU,VV,VW,AT7CD;\r
+    8T,8U,8V,8W,8X,8Y,AT,AU,AV,AW,VT,VU,VV,VW;\r
 Andaman & Nicobar:        26:  49:  AS:   11.70:   -92.80:    -5.5:  VU4:\r
-    8T4,8U4,8V4,8W4,8X4,8Y4,AT4,AU4,AV4,AW4,VT4,VU4,VV4,VW4,VU3VPX,VU3VPY;\r
+    VU4,VU3VPX,VU3VPY;\r
 Laccadive Is.:            22:  41:  AS:   10.00:   -73.00:    -5.5:  VU7:\r
-    8T7,8U7,8V7,8W7,8X7,8Y7,AT7,AU7,AV7,AW7,VT7,VU7,VV7,VW7;\r
+    VU7;\r
 Mexico:                   06:  10:  NA:   19.40:    99.10:     6.0:  XE:\r
     4A,4B,4C,6D,6E,6F,6G,6H,6I,6J,XA,XB,XC,XD,XE,XF,XG,XH,XI;\r
 Revilla Gigedo:           06:  10:  NA:   19.00:   111.50:     7.0:  XF4:\r

diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index b6e4ac31256c98018c60045319d5c1c5a42909a9..3fcefb1ff1072302d9414512e16d6d9a6c3e61ff 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -475,7 +475,6 @@
   'AT0' => '365',
   'AT4' => '214',
   'AT7' => '215',
-  'AT7CD' => '213,456,457,458',
   'AU' => '459',
   'AU4' => '214',
   'AU7' => '215',
@@ -1828,6 +1827,7 @@
   'LU1Z' => '99,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384',
   'LU1ZA' => '206',
   'LU1ZC' => '208',
+  'LU2CRM/XA' => '119,396,397',
   'LU2DT/D' => '119,396,397',
   'LU2DT/LH' => '119,396,397',
   'LU2DVI/H' => '119,396,397',
@@ -1946,6 +1946,7 @@
   'LU9AUC/D' => '119,396,397',
   'LU9DBK/X' => '119,396,397',
   'LU9DKX/X' => '119,396,397',
+  'LU9DPD/XA' => '119,396,397',
   'LU9EI/F' => '119,396,397',
   'LU9EJS/E' => '119,396,397',
   'LU9ESD/D' => '119,396,397',
@@ -3092,6 +3093,7 @@
   'TX0DX' => '330',
   'TX0P' => '44',
   'TX1A' => '45,330',
+  'TX3SAM' => '45,330',
   'TX4B' => '46',
   'TX5C' => '48',
   'TX5CW' => '45,330',
@@ -3387,7 +3389,7 @@
   'VE8PW' => '191',
   'VE8RCS' => '191',
   'VE9' => '436',
-  'VER20071116' => '191',
+  'VER20071121' => '191',
   'VERSION' => '536',
   'VF' => '434',
   'VF0' => '191',
@@ -3547,8 +3549,6 @@
   'VR6' => '211',
   'VS' => '212',
   'VT' => '459',
-  'VT4' => '214',
-  'VT7' => '215',
   'VU' => '213,456,457,458',
   'VU3VPX' => '214',
   'VU3VPY' => '214',
@@ -3557,11 +3557,7 @@
   'VU7/A' => '214',
   'VU7/L' => '215',
   'VV' => '459',
-  'VV4' => '214',
-  'VV7' => '215',
   'VW' => '459',
-  'VW4' => '214',
-  'VW7' => '215',
   'VX' => '434',
   'VY' => '434',
   'VY0' => '441',

diff --git a/perl/Version.pm b/perl/Version.pm
index b96932ad6d24a1e42a8966ece5e60516f52c51fb..983e222c9c979de56f575c33d3e58aca9387f13a 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
-$build = '192';
+$build = '193';
 
 1;