Gunnar Hjalmarsson has proposed merging
~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix_bionic into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1823778 in gnome-control-center (Ubuntu): "Unable to set Serbian as
Language"
https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1823778
For more details, see:
https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365984
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix_bionic into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index c124bf3..34b8d1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gnome-control-center (1:3.28.2-0ubuntu0.18.04.4) bionic; urgency=medium
+
+ * debian/patches/ubuntu-region-langpack-install.patch:
+- Dropped, which makes Serbian language items show up as selectable
+ in Region & Language (LP: #1823778).
+ * debian/patches/52_region_language.patch:
+- Prevent that the modifier part is dropped when a language
+ represented by a locale with modifier is set (LP: #1823778).
+
+ -- Gunnar Hjalmarsson Sat, 13 Apr 2019 03:05:00 +0200
+
gnome-control-center (1:3.28.2-0ubuntu0.18.04.3) bionic; urgency=medium
* debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch:
diff --git a/debian/patches/52_region_language.patch b/debian/patches/52_region_language.patch
index b6cc0ba..ab78f7f 100644
--- a/debian/patches/52_region_language.patch
+++ b/debian/patches/52_region_language.patch
@@ -285,26 +285,7 @@ Index: b/panels/region/cc-region-panel.c
===
--- a/panels/region/cc-region-panel.c
+++ b/panels/region/cc-region-panel.c
-@@ -377,11 +377,15 @@
-gint response_id,
-CcRegionPanel *self)
- {
--const gchar *language;
-+const gchar *locale, *language, *country;
-+gchar *name = NULL;
-
- if (response_id == GTK_RESPONSE_OK) {
--language = cc_language_chooser_get_language (GTK_WIDGET (chooser));
--update_language (self, language);
-+locale = cc_language_chooser_get_language (GTK_WIDGET (chooser));
-+gnome_parse_locale (locale, &language, &country, NULL, NULL);
-+name = g_strdup_printf ("%s_%s", language, country);
-+update_language (self, name);
-+g_free (name);
- }
-
- gtk_widget_destroy (GTK_WIDGET (chooser));
-@@ -403,6 +407,47 @@
+@@ -403,6 +403,47 @@
}
static void
@@ -352,7 +333,7 @@ Index: b/panels/region/cc-region-panel.c
update_region (CcRegionPanel *self,
const gchar *region)
{
-@@ -413,6 +458,7 @@
+@@ -413,6 +454,7 @@
} else {
if (g_strcmp0 (region, priv->region) == 0)
return;
@@ -360,7 +341,7 @@ Index: b/panels/region/cc-region-panel.c
g_settings_set_string (priv->locale_settings, KEY_REGION, region);
if (priv->login_auto_apply)
set_system_region (self, region);
-@@ -593,7 +639,7 @@
+@@ -593,7 +635,7 @@
CcRegionPanelPrivate *priv = self->priv;
g_free (priv->region);
@@ -369,7 +350,7 @@ Index: b/panels/region/cc-region-panel.c
update_region_label (self);
}
-@@ -622,15 +668,19 @@
+@@ -622,15 +664,19 @@
{
CcRegionPanelPrivate *priv = self->priv;
const gchar *language = NULL;
@@ -393,7 +374,7 @@ Index: b/panels/region/cc-region-panel.c
update_language_label (self);
}
-@@ -1485,6 +1535,16 @@
+@@ -1485,6 +1531,16 @@
update_buttons (self);
}
@@ -410,7 +391,7 @@ Index: b/panels/region/cc-region-panel.c
static void
on_localed_properties_changed (GDBusProxy *proxy,
GVariant *changed_properties,
-@@ -1499,32 +1559,46 @@
+@@ -1499,32 +1555,46 @@
const gchar **strv;
gsize len;
gint i;
@@ -466,7 +447,7 @@ Index: b/panels/region/cc-region-panel.c
update_language_label (self);
}
-@@ -1594,27 +1668,24 @@
+@@ -1594,27 +1664,24 @@
CcRegionPanelPrivate *priv = self->priv;
GVariantBuilder *b;
gchar *s;
diff --git a/debian/patches/series b/debian/patches/series
index 6357c3a..6d1a542 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,7 +12,6 @@
99_add_lock-on-suspend.patch
ubuntu-gnome-version.patch
ubuntu-region-packagekit.patch
-ubuntu-region-langpack-install.patch
ubuntu-language-support.patch
ubuntu-printer-support.patch
ubuntu-legacy-notifications.patch
diff --git a/debian/patches/ubuntu-re
