Posixify the locales name for variants

For all locales with variants:
- if no ambiguity on the locale (only one variant) just use the regular name
- if ambiguity, pick one as default and append @<variant> to the others
  respecting POSIX

As a result:
- All the 3 components locales added recently are renamed to the usual 2
  components version for all but sr_RS.UTF-8
- Set sr_RS.UTF-8 to the cyrillic variant
- Add sr_RS.UTF-8@latin
- Remove the symlinks aliases they were created to represent the 2 components
  version as aliasas and are now useless
- Update the OptionalObsoleteFiles.inc and ObsoleteFiles.inc to reflect those
  changes

Discussed with:	ache@
Approved by:	re@ (gjb)

1 files changed, 99 insertions, 7 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index d3a16389..15c49dc 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,105 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20160703: POSIXify locales with variants
+OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_TIME
+OLD_DIRS+=usr/share/locale/zh_Hant_TW.UTF-8
+OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_CTYPE
+OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MESSAGES
+OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_TIME
+OLD_DIRS+=usr/share/locale/zh_Hant_TW.Big5
+OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_TIME
+OLD_DIRS+=usr/share/locale/zh_Hant_HK.UTF-8
+OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_CTYPE
+OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MESSAGES
+OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_TIME
+OLD_DIRS+=usr/share/locale/zh_Hans_CN.eucCN
+OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_TIME
+OLD_DIRS+=usr/share/locale/zh_Hans_CN.UTF-8
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_CTYPE
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MESSAGES
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_TIME
+OLD_DIRS+=usr/share/locale/zh_Hans_CN.GBK
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_CTYPE
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MESSAGES
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_TIME
+OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB2312
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_CTYPE
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MESSAGES
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_TIME
+OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB18030
+OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_TIME
+OLD_DIRS+=usr/share/locale/sr_Latn_RS.UTF-8
+OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_COLLATE
+OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_CTYPE
+OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MESSAGES
+OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MONETARY
+OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_NUMERIC
+OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_TIME
+OLD_DIRS+=usr/share/locale/sr_Latn_RS.ISO8859-2
+OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_TIME
+OLD_DIRS+=usr/share/locale/sr_Cyrl_RS.UTF-8
+OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_COLLATE
+OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_CTYPE
+OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MESSAGES
+OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MONETARY
+OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_NUMERIC
+OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_TIME
+OLD_DIRS+=usr/share/locale/sr_Cyrl_RS.ISO8859-5
+OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_TIME
+OLD_DIRS+=usr/share/locale/mn_Cyrl_MN.UTF-8
+OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_TIME
+OLD_DIRS+=usr/share/locale/kk_Cyrl_KZ.UTF-8
 # 20160608: removed pam_verbose_error
 OLD_LIBS+=usr/lib/libpam.so.5
 OLD_LIBS+=usr/lib/pam_chroot.so.5
@@ -398,13 +497,6 @@ OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MONETARY
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_CTYPE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_NUMERIC
 OLD_DIRS+=usr/share/locale/lt_LT.ISO8859-4
-OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_COLLATE
-OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_CTYPE
-OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MESSAGES
-OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MONETARY
-OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_NUMERIC
-OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_TIME
-OLD_DIRS+=usr/share/locale/mn_MN.UTF-8
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES