Merge version 0.20.1+ds1-1+rpi1 and 0.21.0-1 to produce 0.21.0-1+rpi1

diff --cc debian/changelog
index 08a07b1914f4373649e6cdb2c7ff167b6facb747,0ee96e9d1b72cc6f373307bd8af57e8d225a6a51..044b7b77e855e3c58e6bf0a5fe2e03af30d424c1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,18 +1,28 @@@
- giada (0.20.1+ds1-1+rpi1) bookworm-staging; urgency=medium
++giada (0.21.0-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 0.15.2+ds1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 17 Mar 2019 13:18:55 +0000]
 +  * Link against libatomic on armhf too for raspbian.
 +
 +  [changes introduced in 0.20.1+ds1-1+rpi1 by Peter Michael Green]
 +  * Use no-as-needed when linking with libatomic to workaround library ordering issue.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 11 Mar 2022 14:12:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 21 May 2022 03:12:03 +0000
++
+ giada (0.21.0-1) unstable; urgency=medium
+ 
+   * New upstream version 0.21.0
+   * Remove obsolete ds tag
+   * Refresh patchset
+   * Bump Standards Version to 4.6.1
+   * Update mcl-audio-buffer in d/missing-sources
+   * The desktop file is now correctly installed by upstream
+   * Bring back keywords and translations to the desktop file and add german
+     translation
+   * Add metainfo file to d/copyright
+   * Bump my d/copyright year
+   * Add d/upstream/metadata
+ 
+  -- Dennis Braun <d_braun@kabelmail.de>  Sun, 15 May 2022 18:50:55 +0200
  
  giada (0.20.1+ds1-1) unstable; urgency=medium