Merge version 4:20.12.0-4+rpi1 and 4:21.08.0-1 to produce 4:21.08.0-1+rpi1

diff --cc debian/changelog
index b8b34db264c8e9e788fe6ea511fe80d7ed7ba371,198131cb3f3997a926ecede9fdc87498973fcfc7..09a6c01d6ce4a5dbf7e2e46a33367052bee535c4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,35 +1,48 @@@
- konqueror (4:20.12.0-4+rpi1) bullseye-staging; urgency=medium
++konqueror (4:21.08.0-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 4:17.08.3-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 07 Jan 2018 14:14:20 +0000]
 +  * Remove armhf from webengine arches since raspbian doesn't currently have it.
 +
 +  [changes introduced in 4:18.12.0-1+rpi1 by Peter Michal Green]
 +  * Also remove armhf from architecture list for webengine directory in debian/konqueror.install
 +
 +  [changes introduced in 4:20.12.0-4+rpi1 by Peter Michael Green]
 +  * Also remove armhf from architecture list for webengine specific plugins in debian/konq-plugins.install
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 07 Jan 2021 16:44:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Sep 2021 17:40:30 +0000
++
+ konqueror (4:21.08.0-1) unstable; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.08.0).
+ 
+  -- Norbert Preining <norbert@preining.info>  Mon, 16 Aug 2021 16:21:04 +0900
+ 
+ konqueror (4:21.04.2-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.04.2).
+ 
+  -- Norbert Preining <norbert@preining.info>  Thu, 10 Jun 2021 19:45:36 +0900
+ 
+ konqueror (4:21.04.1-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.04.1).
+   * Add upstream fix for unresponsive url input.
+ 
+  -- Norbert Preining <norbert@preining.info>  Fri, 04 Jun 2021 04:49:47 +0900
+ 
+ konqueror (4:21.04.0-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.04.0).
+   * Borrow minimal upstream signing key from k3b.
+   * Drop Kubuntu from maintainer name.
+   * Added myself to the uploaders.
+   * Update list of installed files.
+ 
+  -- Norbert Preining <norbert@preining.info>  Tue, 27 Apr 2021 19:49:01 +0900
  
  konqueror (4:20.12.0-4) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/konq-plugins.install
Simple merge

diff --cc debian/konqueror.install
Simple merge