UBUNTU: [Config] NLS_ISO8859_1=y

BugLink: http://bugs.launchpad.net/bugs/1677230
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/debian.master/abi/4.4.0-72.93/amd64/generic.modules b/debian.master/abi/4.4.0-72.93/amd64/generic.modules
index 2b2fa12fb6be43470d9a6ed9243eb2768f0304be..eada6102af1d093ccfd686a810ffa468b7986549 100644 (file)
--- a/debian.master/abi/4.4.0-72.93/amd64/generic.modules
+++ b/debian.master/abi/4.4.0-72.93/amd64/generic.modules
@@ -2660,7 +2660,6 @@ nls_cp936
 nls_cp949
 nls_cp950
 nls_euc-jp
-nls_iso8859-1
 nls_iso8859-13
 nls_iso8859-14
 nls_iso8859-15

diff --git a/debian.master/abi/4.4.0-72.93/amd64/lowlatency.modules b/debian.master/abi/4.4.0-72.93/amd64/lowlatency.modules
index ec1de5dfcb06c2ac85792d298b9463223f50c847..e3b1a04f0f17a268a88fe94ddf664117a2029127 100644 (file)
--- a/debian.master/abi/4.4.0-72.93/amd64/lowlatency.modules
+++ b/debian.master/abi/4.4.0-72.93/amd64/lowlatency.modules
@@ -2659,7 +2659,6 @@ nls_cp936
 nls_cp949
 nls_cp950
 nls_euc-jp
-nls_iso8859-1
 nls_iso8859-13
 nls_iso8859-14
 nls_iso8859-15

diff --git a/debian.master/abi/4.4.0-72.93/arm64/generic.modules b/debian.master/abi/4.4.0-72.93/arm64/generic.modules
index b5d14dc0c2f2954ff4aeb77b6b2af58a2658991d..2a03d61051e79f3d7602bdd4c9896eb8661024d2 100644 (file)
--- a/debian.master/abi/4.4.0-72.93/arm64/generic.modules
+++ b/debian.master/abi/4.4.0-72.93/arm64/generic.modules
@@ -2511,7 +2511,6 @@ nls_cp936
 nls_cp949
 nls_cp950
 nls_euc-jp
-nls_iso8859-1
 nls_iso8859-13
 nls_iso8859-14
 nls_iso8859-15

diff --git a/debian.master/abi/4.4.0-72.93/armhf/generic-lpae.modules b/debian.master/abi/4.4.0-72.93/armhf/generic-lpae.modules
index 2199c9337f33d76f5a348392d37c5ce1c2a5271a..08af5a5fa96e74080391dc911e1c6eef5c15faa2 100644 (file)
--- a/debian.master/abi/4.4.0-72.93/armhf/generic-lpae.modules
+++ b/debian.master/abi/4.4.0-72.93/armhf/generic-lpae.modules
@@ -2540,7 +2540,6 @@ nls_cp936
 nls_cp949
 nls_cp950
 nls_euc-jp
-nls_iso8859-1
 nls_iso8859-13
 nls_iso8859-14
 nls_iso8859-15

diff --git a/debian.master/abi/4.4.0-72.93/armhf/generic.modules b/debian.master/abi/4.4.0-72.93/armhf/generic.modules
index 00b371f743442741aaf12874a074a40a480619c3..b19403e15026c165ca88b7826dd4a9ff977db523 100644 (file)
--- a/debian.master/abi/4.4.0-72.93/armhf/generic.modules
+++ b/debian.master/abi/4.4.0-72.93/armhf/generic.modules
@@ -2571,7 +2571,6 @@ nls_cp936
 nls_cp949
 nls_cp950
 nls_euc-jp
-nls_iso8859-1
 nls_iso8859-13
 nls_iso8859-14
 nls_iso8859-15

diff --git a/debian.master/abi/4.4.0-72.93/i386/generic.modules b/debian.master/abi/4.4.0-72.93/i386/generic.modules
index 566e669d77d13682369b673533ff266bfb36edf1..e7ba24785a1414e9f71d24e6fa21b303f899335a 100644 (file)
--- a/debian.master/abi/4.4.0-72.93/i386/generic.modules
+++ b/debian.master/abi/4.4.0-72.93/i386/generic.modules
@@ -2700,7 +2700,6 @@ nls_cp936
 nls_cp949
 nls_cp950
 nls_euc-jp
-nls_iso8859-1
 nls_iso8859-13
 nls_iso8859-14
 nls_iso8859-15

diff --git a/debian.master/abi/4.4.0-72.93/i386/lowlatency.modules b/debian.master/abi/4.4.0-72.93/i386/lowlatency.modules
index 2c79bf3aad66113be092483f7966fd561a9c1609..667e6e7f4934e377baf73a95c4ebe1be4878e07b 100644 (file)
--- a/debian.master/abi/4.4.0-72.93/i386/lowlatency.modules
+++ b/debian.master/abi/4.4.0-72.93/i386/lowlatency.modules
@@ -2699,7 +2699,6 @@ nls_cp936
 nls_cp949
 nls_cp950
 nls_euc-jp
-nls_iso8859-1
 nls_iso8859-13
 nls_iso8859-14
 nls_iso8859-15

diff --git a/debian.master/abi/4.4.0-72.93/powerpc/powerpc-e500mc.modules b/debian.master/abi/4.4.0-72.93/powerpc/powerpc-e500mc.modules
index 7c6e2c2c2e828d526c6093978eb861ba66b28e93..d86261f751a03373366bd25ffa6a8a2c33e491c1 100644 (file)
--- a/debian.master/abi/4.4.0-72.93/powerpc/powerpc-e500mc.modules
+++ b/debian.master/abi/4.4.0-72.93/powerpc/powerpc-e500mc.modules
@@ -2500,7 +2500,6 @@ nls_cp936
 nls_cp949
 nls_cp950
 nls_euc-jp
-nls_iso8859-1
 nls_iso8859-13
 nls_iso8859-14
 nls_iso8859-15

diff --git a/debian.master/abi/4.4.0-72.93/powerpc/powerpc-smp.modules b/debian.master/abi/4.4.0-72.93/powerpc/powerpc-smp.modules
index f685f0c65b158f38e1e432743b2d96a00b0f445d..1afcba3f18bfadbf06edfc8ac5ea91c1be7dcefb 100644 (file)
--- a/debian.master/abi/4.4.0-72.93/powerpc/powerpc-smp.modules
+++ b/debian.master/abi/4.4.0-72.93/powerpc/powerpc-smp.modules
@@ -2472,7 +2472,6 @@ nls_cp936
 nls_cp949
 nls_cp950
 nls_euc-jp
-nls_iso8859-1
 nls_iso8859-13
 nls_iso8859-14
 nls_iso8859-15

diff --git a/debian.master/abi/4.4.0-72.93/powerpc/powerpc64-emb.modules b/debian.master/abi/4.4.0-72.93/powerpc/powerpc64-emb.modules
index 52f500e148d203b7a1c887c2a4231bda951c239d..22d7b08326b27731c339c8e7c01d23469c4e4fd1 100644 (file)
--- a/debian.master/abi/4.4.0-72.93/powerpc/powerpc64-emb.modules
+++ b/debian.master/abi/4.4.0-72.93/powerpc/powerpc64-emb.modules
@@ -2488,7 +2488,6 @@ nls_cp936
 nls_cp949
 nls_cp950
 nls_euc-jp
-nls_iso8859-1
 nls_iso8859-13
 nls_iso8859-14
 nls_iso8859-15

diff --git a/debian.master/abi/4.4.0-72.93/powerpc/powerpc64-smp.modules b/debian.master/abi/4.4.0-72.93/powerpc/powerpc64-smp.modules
index a86e99b009c4d6e61909d66c68e06c50a709a163..df21087247703577a250741659aa889bdb6829d9 100644 (file)
--- a/debian.master/abi/4.4.0-72.93/powerpc/powerpc64-smp.modules
+++ b/debian.master/abi/4.4.0-72.93/powerpc/powerpc64-smp.modules
@@ -2484,7 +2484,6 @@ nls_cp936
 nls_cp949
 nls_cp950
 nls_euc-jp
-nls_iso8859-1
 nls_iso8859-13
 nls_iso8859-14
 nls_iso8859-15

diff --git a/debian.master/abi/4.4.0-72.93/ppc64el/generic.modules b/debian.master/abi/4.4.0-72.93/ppc64el/generic.modules
index a647f1b0b3d859e301f8c37b41c918488275b29d..856b531850bde20791779619b652e55426184044 100644 (file)
--- a/debian.master/abi/4.4.0-72.93/ppc64el/generic.modules
+++ b/debian.master/abi/4.4.0-72.93/ppc64el/generic.modules
@@ -2447,7 +2447,6 @@ nls_cp936
 nls_cp949
 nls_cp950
 nls_euc-jp
-nls_iso8859-1
 nls_iso8859-13
 nls_iso8859-14
 nls_iso8859-15

diff --git a/debian.master/abi/4.4.0-72.93/s390x/generic.modules b/debian.master/abi/4.4.0-72.93/s390x/generic.modules
index 29425d20ab094b15f44a837b0cc1b4e07fd2f56b..855320fa4f075eac72218d9fdd2b778bc3165243 100644 (file)
--- a/debian.master/abi/4.4.0-72.93/s390x/generic.modules
+++ b/debian.master/abi/4.4.0-72.93/s390x/generic.modules
@@ -522,7 +522,6 @@ nls_cp936
 nls_cp949
 nls_cp950
 nls_euc-jp
-nls_iso8859-1
 nls_iso8859-13
 nls_iso8859-14
 nls_iso8859-15

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 7bc7f62b2abd4f2f08fb0c317aee0d0e14c3b531..0ed8ff266c6d3a601ff1a4c0ed262182cd635043 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5351,7 +5351,7 @@ CONFIG_NLS_CODEPAGE_936=m
 CONFIG_NLS_CODEPAGE_949=m
 CONFIG_NLS_CODEPAGE_950=m
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_13=m
 CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m