Get rid of deprecated ru_SU.* locales. ru_RU.* will be used instead.

4 files changed, 6 insertions, 121 deletions

diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 6b2c54c..0ac770e 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -16,9 +16,9 @@ LOCALES=	cs_CZ.ISO_8859-2 \
 		la_LN.ISO_8859-2 \
 		la_LN.ISO_8859-4 \
 		lt_LT.ISO_8859-4 \
-		ru_SU.CP866 \
-		ru_SU.ISO_8859-5 \
-		ru_SU.KOI8-R \
+		ru_RU.CP866 \
+		ru_RU.ISO_8859-5 \
+		ru_RU.KOI8-R \
 		sv_SE.DIS_8859-15 \
 		sv_SE.ISO_8859-1 \
 		uk_UA.KOI8-U
@@ -57,9 +57,9 @@ la_LN.DIS_8859-15.out:  map.DIS_8859-15
 la_LN.ISO_8859-1.out:   map.ISO_8859-1
 la_LN.ISO_8859-4.out:   map.ISO_8859-4
 lt_LT.ISO_8859-4.out:   map.ISO_8859-4
-ru_SU.CP866.out:        map.CP866
-ru_SU.ISO_8859-5.out:   map.ISO_8859-5
-ru_SU.KOI8-R.out:       map.KOI8-R
+ru_RU.CP866.out:        map.CP866
+ru_RU.ISO_8859-5.out:   map.ISO_8859-5
+ru_RU.KOI8-R.out:       map.KOI8-R
 sv_SE.DIS_8859-15.out:  map.DIS_8859-15
 sv_SE.ISO_8859-1.out:   map.ISO_8859-1
 uk_UA.KOI8-U.out:       map.KOI8-U
diff --git a/share/colldef/ru_SU.CP866.src b/share/colldef/ru_SU.CP866.src
deleted file mode 100644
index 2fc2d20..0000000
--- a/share/colldef/ru_SU.CP866.src
+++ /dev/null
@@ -1,39 +0,0 @@
-# CP866 (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.CP866
-order \
-# controls
-	<NU>;...;<US>;\
-#
-	<NS>;<SP>;!;\";<Nb>;<DO>;\
-	%;&;';\(;\);*;+;<-:>;\,;-;.;/;\
-# digits
-	0;1;(2,<2S>);3;...;9;\
-#
-	:;\;;\<;<=<>;=;</>=>;>;?;<Co>;<At>;\
-# capital
-	A;...;Z;\
-	<A=>;<B=>;<V=>;<G=>;<D=>;<E=>;<IO>;<Z%>;<Z=>;\
-	<I=>;<J=>;<K=>;<L=>;<M=>;<N=>;<O=>;<P=>;<R=>;\
-	<S=>;<T=>;<U=>;<F=>;<H=>;<C=>;<C%>;<S%>;<Sc>;\
-	<=">;<Y=>;<%">;<JE>;<JU>;<JA>;\
-#
-	[;\\;];^;_;`;\
-# small
-	a;...;z;\
-	<a=>;<b=>;<v=>;<g=>;<d=>;<e=>;<io>;<z%>;<z=>;\
-	<i=>;<j=>;<k=>;<l=>;<m=>;<n=>;<o=>;<p=>;<r=>;\
-	<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
-	<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
-#
-	\{;|;\};~;<.M>;<DG>;<DT>;\
-#
-	<sb>;<RT>;<?2>;<Iu>;<Il>;\
-	<hh>;<HH>;<vv>;<VV>;<dr>;<dR>;<Dr>;<DR>;\
-	<dl>;<dL>;<Dl>;<LD>;<ur>;<uR>;<Ur>;<UR>;\
-	<ul>;<uL>;<Ul>;<UL>;<vr>;<vR>;<Vr>;<VR>;\
-	<vl>;<vL>;<Vl>;<VL>;<dh>;<dH>;<Dh>;<DH>;\
-	<uh>;<uH>;<Uh>;<UH>;<vh>;<vH>;<Vh>;<VH>;\
-	<TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>
diff --git a/share/colldef/ru_SU.ISO_8859-5.src b/share/colldef/ru_SU.ISO_8859-5.src
deleted file mode 100644
index 459851d..0000000
--- a/share/colldef/ru_SU.ISO_8859-5.src
+++ /dev/null
@@ -1,37 +0,0 @@
-# Russian part of ISO8859-5 (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-5
-order \
-# controls
-	<NU>;...;<US>;\
-#
-	<NS>;<SP>;!;\";<Nb>;<DO>;\
-	%;&;';\(;\);*;+;\,;-;.;/;\
-# digits
-	0;...;9;\
-#
-	:;\;;\<;=;>;?;<At>;\
-# capital
-	A;...;Z;\
-	<A=>;<B=>;<V=>;<G=>;<D=>;<E=>;<IO>;<Z%>;<Z=>;\
-	<I=>;<J=>;<K=>;<L=>;<M=>;<N=>;<O=>;<P=>;<R=>;\
-	<S=>;<T=>;<U=>;<F=>;<H=>;<C=>;<C%>;<S%>;<Sc>;\
-	<=">;<Y=>;<%">;<JE>;<JU>;<JA>;\
-#
-	[;\\;];^;_;`;\
-# small
-	a;...;z;\
-	<a=>;<b=>;<v=>;<g=>;<d=>;<e=>;<io>;<z%>;<z=>;\
-	<i=>;<j=>;<k=>;<l=>;<m=>;<n=>;<o=>;<p=>;<r=>;\
-	<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
-	<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
-#
-	\{;|;\};~;<DT>;<PA>;<HO>;<BH>;<NH>;<IN>;<NL>;\
-	<SA>;<ES>;<HS>;<HJ>;<VS>;<PD>;<PU>;<RI>;<S2>;\
-	<S3>;<DC>;<P1>;<P2>;<TS>;<CC>;<MW>;<SG>;<EG>;\
-	<SS>;<GC>;<SC>;<CI>;<ST>;<OC>;<PM>;<AC>;<D%>;\
-	<G%>;<IE>;<DS>;<II>;<YI>;<J%>;<LJ>;<NJ>;<Ts>;\
-	<KJ>;<-->;<V%>;<DZ>;<N0>;<d%>;<g%>;<ie>;<ds>;\
-	<ii>;<yi>;<j%>;<lj>;<nj>;<ts>;<kj>;<SE>;<v%>;<dz>
diff --git a/share/colldef/ru_SU.KOI8-R.src b/share/colldef/ru_SU.KOI8-R.src
deleted file mode 100644
index 3a67bc4..0000000
--- a/share/colldef/ru_SU.KOI8-R.src
+++ /dev/null
@@ -1,39 +0,0 @@
-# koi8-r (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.KOI8-R
-order \
-# controls
-	<NU>;...;<US>;\
-#
-	<NS>;<SP>;!;\";<Nb>;<DO>;\
-	%;&;';\(;\);*;+;<-:>;\,;-;.;/;\
-# digits
-	0;1;(2,<2S>);3;...;9;\
-#
-	:;\;;\<;<=<>;=;</>=>;>;?;<Co>;<At>;\
-# capital
-	A;...;Z;\
-	<A=>;<B=>;<V=>;<G=>;<D=>;<E=>;<IO>;<Z%>;<Z=>;\
-	<I=>;<J=>;<K=>;<L=>;<M=>;<N=>;<O=>;<P=>;<R=>;\
-	<S=>;<T=>;<U=>;<F=>;<H=>;<C=>;<C%>;<S%>;<Sc>;\
-	<=">;<Y=>;<%">;<JE>;<JU>;<JA>;\
-#
-	[;\\;];^;_;`;\
-# small
-	a;...;z;\
-	<a=>;<b=>;<v=>;<g=>;<d=>;<e=>;<io>;<z%>;<z=>;\
-	<i=>;<j=>;<k=>;<l=>;<m=>;<n=>;<o=>;<p=>;<r=>;\
-	<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
-	<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
-#
-	\{;|;\};~;<.M>;<DG>;<DT>;\
-#
-	<sb>;<RT>;<?2>;<Iu>;<Il>;\
-	<hh>;<HH>;<vv>;<VV>;<dr>;<dR>;<Dr>;<DR>;\
-	<dl>;<dL>;<Dl>;<LD>;<ur>;<uR>;<Ur>;<UR>;\
-	<ul>;<uL>;<Ul>;<UL>;<vr>;<vR>;<Vr>;<VR>;\
-	<vl>;<vL>;<Vl>;<VL>;<dh>;<dH>;<Dh>;<DH>;\
-	<uh>;<uH>;<Uh>;<UH>;<vh>;<vH>;<Vh>;<VH>;\
-	<TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>