Olivier Tilloy · Iain Lane · Iain Lane · Iain Lane · Marco Trevisan · Marco Trevisan
--- a/debian/changelog
+++ b/debian/changelog
+adwaita-icon-theme (3.36.1-2ubuntu3~ubuntu20.04.1) UNRELEASED; urgency=medium
+
+  * Merge with groovy:
+    - Add missing window icons (LP: #1882271)
+  * debian/{control,gbp.conf}: Update for focal branching
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Fri, 05 Jun 2020 18:31:24 +0200
+
+adwaita-icon-theme (3.36.1-2ubuntu3) groovy; urgency=medium
+
+  * not-in-humanity: Include window decorations action icons
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Thu, 04 Jun 2020 01:41:09 +0200
+
 adwaita-icon-theme (3.36.1-2ubuntu0.20.04.2) focal; urgency=medium

  [ Iain Lane ]

--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ Build-Depends-Indep: gettext,
 Standards-Version: 4.5.0
 XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/adwaita-icon-theme.git
 XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/adwaita-icon-theme
-Vcs-Git: https://salsa.debian.org/gnome-team/adwaita-icon-theme.git -b ubuntu/master
-Vcs-Browser: https://salsa.debian.org/gnome-team/adwaita-icon-theme/tree/ubuntu/master
+Vcs-Git: https://salsa.debian.org/gnome-team/adwaita-icon-theme.git -b ubuntu/focal
+Vcs-Browser: https://salsa.debian.org/gnome-team/adwaita-icon-theme/tree/ubuntu/focal

 Package: adwaita-icon-theme
 Architecture: all

--- a/debian/control.in
+++ b/debian/control.in
@@ -14,8 +14,8 @@ Build-Depends-Indep: gettext,
 Standards-Version: 4.5.0
 XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/adwaita-icon-theme.git
 XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/adwaita-icon-theme
-Vcs-Git: https://salsa.debian.org/gnome-team/adwaita-icon-theme.git -b ubuntu/master
-Vcs-Browser: https://salsa.debian.org/gnome-team/adwaita-icon-theme/tree/ubuntu/master
+Vcs-Git: https://salsa.debian.org/gnome-team/adwaita-icon-theme.git -b ubuntu/focal
+Vcs-Browser: https://salsa.debian.org/gnome-team/adwaita-icon-theme/tree/ubuntu/focal

 Package: adwaita-icon-theme
 Architecture: all

--- a/debian/gbp.conf
+++ b/debian/gbp.conf
 [DEFAULT]
 pristine-tar = True
-debian-branch = ubuntu/master
+debian-branch = ubuntu/focal
 debian-tag = ubuntu/%(version)s
 upstream-branch = upstream/latest
 upstream-vcs-tag = %(version)s

--- a/debian/not-in-humanity.txt
+++ b/debian/not-in-humanity.txt
@@ -157,6 +157,11 @@ viewmag1
 viewmagfit
 view-sort-ascending
 view-sort-descending
+window-close
+window-maximize
+window-minimize
+window-new
+window-restore
 xfce4-mixer
 x-office-presentation
 zoom-best-fit