From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 9 Nov 2017 13:02:02 +0000 (+0000)
Subject: Merge version 1:3.24.3-1+rpi1 and 1:3.26.1-2 to produce 1:3.26.1-2+rpi1
X-Git-Tag: archive/raspbian/1%3.26.1-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4b3e6e77b969f0080ceeef5353062abf4f372b3a;p=gnome-control-center.git

Merge version 1:3.24.3-1+rpi1 and 1:3.26.1-2 to produce 1:3.26.1-2+rpi1
---

4b3e6e77b969f0080ceeef5353062abf4f372b3a
diff --cc debian/changelog
index 8d6df21,ffc73f6..2dad02d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,37 +1,44 @@@
- gnome-control-center (1:3.24.3-1+rpi1) buster-staging; urgency=medium
++gnome-control-center (1:3.26.1-2+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 13 Sep 2017 22:39:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Nov 2017 13:02:02 +0000
++
+ gnome-control-center (1:3.26.1-2) unstable; urgency=medium
+ 
+   * Release to unstable
+   * Add fix-about-desktop.patch:
+     - Fix launching About panel (LP: #1721802)
+   * Bump Standards-Version to 4.1.1
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Fri, 13 Oct 2017 17:16:32 -0400
+ 
+ gnome-control-center (1:3.26.1-1) experimental; urgency=medium
+ 
+   * Team upload
+   * New upstream release
+ 
+  -- Simon McVittie <smcv@debian.org>  Fri, 06 Oct 2017 10:36:51 +0100
+ 
+ gnome-control-center (1:3.26.0-1) experimental; urgency=medium
+ 
+   * Team upload
+   * debian/watch: Go back to checking for stable versions only
+   * New upstream stable release
+ 
+  -- Simon McVittie <smcv@debian.org>  Wed, 13 Sep 2017 11:56:48 +0100
+ 
+ gnome-control-center (1:3.25.92.1-1) experimental; urgency=medium
+ 
+   * Team upload
+   * debian/watch: Check for development versions too
+   * New upstream release
+     - Increase build and runtime dependencies as per configure.ac
+   * Add Suggests: gnome-software | gnome-packagekit, for Updates
+     button in overview panel
+ 
+  -- Simon McVittie <smcv@debian.org>  Thu, 07 Sep 2017 11:59:44 +0100
  
  gnome-control-center (1:3.24.3-1) unstable; urgency=medium
  
diff --cc debian/patches/series
index 45a3c08,28a656f..a51902d
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,4 +1,5 @@@
  01_menu_category.patch
  06_handle_passwd_with_ldap.patch
  07_polkit_wheel_sudo_group.patch
+ fix-about-desktop.patch
 +no-wayland.patch