Merge version 1.0.4-4+rpi1 and 1.0.4-5-1 to produce 1.0.4-5-1+rpi1

diff --cc debian/changelog
index b232c89d5d8338d64addae55059bb4a59f074cb7,b1873cffe42c63ce041b5d6225380cb2389eef3f..df73b9c423f772c10e13502baa10950516f780ee
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,17 +1,24 @@@
- libappimage (1.0.4-4+rpi1) bookworm-staging; urgency=medium
++libappimage (1.0.4-5-1+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 1.0.4-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 05 Jan 2023 09:17:08 +0000]
 +  * Update symbols file for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 05 Jan 2023 09:17:08 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Feb 2023 21:01:03 +0000
++
+ libappimage (1.0.4-5-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Fix & simplify the watch file, using the newer template provided by
+     uscan(1); drop almost all the options, no more needed now.
+   * Update the patches:
+     - disable_wget_dependency.patch: drop, no more needed
+     - enable_debianabimanager.diff: refresh
+   * Update the build dependencies according to the upstream build system:
+     - drop desktop-file-utils, libboost-thread-dev, libboost-system-dev, and
+       xxd, no more needed
+ 
+  -- Pino Toscano <pino@debian.org>  Mon, 02 Jan 2023 08:20:13 +0100
  
  libappimage (1.0.4-4) unstable; urgency=medium