From: Raspbian forward pporter Date: Thu, 19 Apr 2018 18:46:45 +0000 (+0100) Subject: Merge version 1:3.28.0-1+rpi1 and 1:3.28.1-1 to produce 1:3.28.1-1+rpi1 X-Git-Tag: archive/raspbian/1%3.28.1-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ccf2474fbe9f356b572205380cb8f940374beb47;p=gnome-control-center.git Merge version 1:3.28.0-1+rpi1 and 1:3.28.1-1 to produce 1:3.28.1-1+rpi1 --- ccf2474fbe9f356b572205380cb8f940374beb47 diff --cc debian/changelog index 3251f85,edb6abb..a3ad3ed --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,15 +1,24 @@@ - gnome-control-center (1:3.28.0-1+rpi1) buster-staging; urgency=medium ++gnome-control-center (1:3.28.1-1+rpi1) buster-staging; urgency=medium + + [changes brought forward from 1:3.24.3-1+rpi1 by Peter Michael Green at Wed, 13 Sep 2017 22:39:02 +0000] + * Make package built with non-wayland gtk. + [changes introduced in version 1:3.27.92-1+rpi1 by Peter Micheal Green] + * Disable wayland in meson_options.txt + - -- Raspbian forward porter Sun, 25 Mar 2018 01:57:43 +0000 ++ -- Raspbian forward porter Thu, 19 Apr 2018 18:46:45 +0000 ++ + gnome-control-center (1:3.28.1-1) unstable; urgency=medium + + [ Gunnar Hjalmarsson ] + * d/p/0005-Show-scrollbar-on-first-Language-window-if-needed.patch: + - If the list of languages in the region & language panel is too long, + show a scroll bar. + + [ Michael Biebl ] + * New upstream version 3.28.1 + * Drop Build-Depends on network-manager-dev, no longer necessary + + -- Michael Biebl Wed, 11 Apr 2018 18:20:17 +0200 gnome-control-center (1:3.28.0-1) unstable; urgency=medium diff --cc debian/patches/series index 7bebf1a,93ab0dd..ef006d9 --- a/debian/patches/series +++ b/debian/patches/series @@@ -2,5 -2,4 +2,6 @@@ 06_handle_passwd_with_ldap.patch 07_polkit_wheel_sudo_group.patch 0004-Expose-touchpad-settings-if-synaptics-is-in-use.patch + 0005-Show-scrollbar-on-first-Language-window-if-needed.patch +no-wayland.patch +disable-wayland-in-meson_options.txt.patch