Merge version 3.5.7-1+rpi1 and 3.6.1-1 to produce 3.6.1-1+rpi1

diff --cc debian/changelog
index 4f04af4e68df76f7e28c5bb844c9e7d42a9d5b9a,58dd2caa8bd539822f2c95c0cc868c3ef7daa326..7f5f72240d2564d0ee3c4d4cd51c18473e59e180
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,35 +1,42 @@@
- polybar (3.5.7-1+rpi1) bookworm-staging; urgency=medium
++polybar (3.6.1-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 3.5.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 13 Dec 2020 08:52:59 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Oct 2021 12:00:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 13 Mar 2022 08:42:16 +0000
++
+ polybar (3.6.1-1) unstable; urgency=medium
+ 
+   * New upstream version 3.6.1
+   * Remove patches applied upstream
+ 
+  -- Samuel Henrique <samueloph@debian.org>  Sat, 05 Mar 2022 19:26:21 +0000
+ 
+ polybar (3.6.0-3) unstable; urgency=medium
+ 
+   * d/p/fix_ldflags_override.patch: New upstream patch to fix ldflags override
+     and hopefully a FTBFS on mipsel and armel
+ 
+  -- Samuel Henrique <samueloph@debian.org>  Fri, 04 Mar 2022 19:39:01 +0000
+ 
+ polybar (3.6.0-2) unstable; urgency=medium
+ 
+   * d/p/fix_missing_includes.patch: New upstream patch to fix FTBFS
+ 
+  -- Samuel Henrique <samueloph@debian.org>  Wed, 02 Mar 2022 21:38:12 +0000
+ 
+ polybar (3.6.0-1) unstable; urgency=medium
+ 
+   * New upstream version 3.6.0
+   * Remove unneeded patches in favor of config flags
+   * d/control: Add new B-D libuv1-dev
+   * d/p/fix_doc_flags.patch: New patch to allow skipping installation of docs
+   * d/polybar.install: Remove file, upstream now installs config example
+   * d/copyright: Update file
+   * d/salsa-ci.yml: Remove file in favor of configuring salsa by pointing to
+     salsa-ci project instead of file
+ 
+  -- Samuel Henrique <samueloph@debian.org>  Tue, 01 Mar 2022 22:20:40 +0000
  
  polybar (3.5.7-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge