diff -Nru gnome-control-center-41.7/debian/changelog gnome-control-center-41.7/debian/changelog --- gnome-control-center-41.7/debian/changelog 2022-07-05 12:22:21.000000000 +0000 +++ gnome-control-center-41.7/debian/changelog 2022-08-11 20:10:13.000000000 +0000 @@ -1,6 +1,20 @@ +gnome-control-center (1:41.7-0ubuntu0.22.04.4) jammy; urgency=medium + + * debian/patches: Read the user value for gedit setting before changing it. + This is an oversight while backporting the patch that is already in + kinetic. (LP: #1968213) + * debian/gbp.conf: Set upstream branch to upstream/42.x + + -- Marco Trevisan (Treviño) Thu, 11 Aug 2022 16:10:13 -0400 + gnome-control-center (1:41.7-0ubuntu0.22.04.3) jammy; urgency=medium - [ Marco Trevisan (Treviño) ] + * debian/control.in: Depend on gnome-remote-desktop (LP: #1980606) + + -- Jeremy Bicha Tue, 05 Jul 2022 08:22:21 -0400 + +gnome-control-center (1:41.7-0ubuntu0.22.04.2) jammy; urgency=medium + * debian/patches: Refresh indexes * debian/patches: Ensure VNC/RDP remote control setting is honored (LP: #1977663) @@ -12,10 +26,7 @@ At the same time, avoid changing the gedit color scheme if an user previously set a non-Yaru theme. (LP: #1968213) - [ Jeremy Bicha ] - * debian/control.in: Depend on gnome-remote-desktop (LP: #1980606) - - -- Jeremy Bicha Tue, 05 Jul 2022 08:22:21 -0400 + -- Marco Trevisan (Treviño) Tue, 28 Jun 2022 05:41:03 +0200 gnome-control-center (1:41.7-0ubuntu0.22.04.1) jammy; urgency=medium diff -Nru gnome-control-center-41.7/debian/control gnome-control-center-41.7/debian/control --- gnome-control-center-41.7/debian/control 2022-07-05 12:22:21.000000000 +0000 +++ gnome-control-center-41.7/debian/control 2022-08-11 20:10:13.000000000 +0000 @@ -7,7 +7,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Iain Lane , Jeremy Bicha , Laurent Bigonville , Sebastien Bacher +Uploaders: Iain Lane , Jeremy Bicha , Laurent Bigonville , Sebastien Bacher Build-Depends: debhelper-compat (= 13), dh-sequence-gnome (>= 0.22.2), libaccountsservice-dev (>= 0.6.39), diff -Nru gnome-control-center-41.7/debian/gbp.conf gnome-control-center-41.7/debian/gbp.conf --- gnome-control-center-41.7/debian/gbp.conf 2022-07-05 12:22:21.000000000 +0000 +++ gnome-control-center-41.7/debian/gbp.conf 2022-08-11 20:10:13.000000000 +0000 @@ -1,7 +1,7 @@ [DEFAULT] pristine-tar = True debian-branch=ubuntu/jammy -upstream-branch = upstream/41.x +upstream-branch = upstream/42.x debian-tag=ubuntu/%(version)s [buildpackage] diff -Nru gnome-control-center-41.7/debian/patches/ubuntu/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch gnome-control-center-41.7/debian/patches/ubuntu/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch --- gnome-control-center-41.7/debian/patches/ubuntu/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch 2022-07-05 12:22:21.000000000 +0000 +++ gnome-control-center-41.7/debian/patches/ubuntu/Allow-tweaking-some-settings-for-Ubuntu-Dock.patch 2022-08-11 20:10:13.000000000 +0000 @@ -24,7 +24,7 @@ panels/ubuntu/cc-ubuntu-dock-dialog.c | 106 ++ panels/ubuntu/cc-ubuntu-dock-dialog.h | 31 + panels/ubuntu/cc-ubuntu-dock-dialog.ui | 120 ++ - panels/ubuntu/cc-ubuntu-panel.c | 1747 ++++++++++++++++++++++++ + panels/ubuntu/cc-ubuntu-panel.c | 1750 ++++++++++++++++++++++++ panels/ubuntu/cc-ubuntu-panel.h | 35 + panels/ubuntu/cc-ubuntu-panel.ui | 618 +++++++++ panels/ubuntu/gnome-ubuntu-panel.desktop.in.in | 16 + @@ -33,7 +33,7 @@ po/POTFILES.in | 5 + shell/cc-panel-list.c | 1 + shell/cc-panel-loader.c | 3 + - 17 files changed, 2824 insertions(+) + 17 files changed, 2827 insertions(+) create mode 100644 panels/ubuntu/appearance.css create mode 100644 panels/ubuntu/assets/colors/color.svg.in create mode 100644 panels/ubuntu/assets/theme-dark.svg @@ -394,10 +394,10 @@ + diff --git a/panels/ubuntu/cc-ubuntu-panel.c b/panels/ubuntu/cc-ubuntu-panel.c new file mode 100644 -index 0000000..b31f192 +index 0000000..94db097 --- /dev/null +++ b/panels/ubuntu/cc-ubuntu-panel.c -@@ -0,0 +1,1747 @@ +@@ -0,0 +1,1750 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* + * Copyright (C) 2017-2022 Canonical Ltd @@ -971,6 +971,9 @@ + g_autoptr(GVariant) gedit_user_value = NULL; + const char *gedit_theme_name = NULL; + ++ gedit_user_value = g_settings_get_user_value (self->gedit_settings, ++ GEDIT_THEME_KEY); ++ + if (gedit_user_value) + gedit_theme_name = g_variant_get_string (gedit_user_value, NULL); +