Merge version 1:3.28.0-1+rpi1 and 1:3.28.1-1 to produce 1:3.28.1-1+rpi1

diff --cc debian/changelog
index 3251f8577038a1e64b803d135475a5cf171c70eb,edb6abb62614a96e3530fc0994b8338be60c2e93..a3ad3ed01e9d0549743d6071c4f1f3fbb5584797
--- 1/debian/changelog
--- 2/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 <plugwash@raspbian.org> 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 <root@raspbian.org>  Sun, 25 Mar 2018 01:57:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  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 <biebl@debian.org>  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 7bebf1aebdfd0497e26be08f1b49334e9198a907,93ab0dd3dea17014e72b2b8b56087de523aa899d..ef006d9059c11617669d01fd340bc1d2e72f1af7
--- 1/debian/patches/series
--- 2/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