Merge version 1.4+really1.3.40-1+rpi2 and 1.4+really1.3.40-2 to produce 1.4+really1...

diff --cc debian/changelog
index 07d7930ca8e1ce63a2910f19ac6f13925b9e938b,fc7561fdcd1f2e7cc40a934288ea13c1954de381..000a1c4823181a211f5f600aea7120cb3f789e97
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,8 +1,18 @@@
- graphicsmagick (1.4+really1.3.40-1+rpi2) bookworm-staging; urgency=medium
++graphicsmagick (1.4+really1.3.40-2+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 1.4+really1.3.36-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 30 Dec 2020 03:11:26 +0000]
++  * Ignore test failures, the tests fail on 64-bit kernels.
++
++  [changes brought forward from 1.4+really1.3.40-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 19 Jan 2023 18:12:16 +0000]
 +  * Remove hardcoded dependency on libtiff5 (Closes: #1029212)
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 19 Jan 2023 18:12:16 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 21 Jan 2023 21:05:10 +0000
 +
- graphicsmagick (1.4+really1.3.40-1+rpi1) bookworm-staging; urgency=medium
+ graphicsmagick (1.4+really1.3.40-2) unstable; urgency=medium
  
-   [changes brought forward from 1.4+really1.3.36-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 30 Dec 2020 03:11:26 +0000]
-   * Ignore test failures, the tests fail on 64-bit kernels.
+   * Don't force tiff dependency, let shlibs handle it (closes: #1029212).
  
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Jan 2023 14:55:22 +0000
+  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Thu, 19 Jan 2023 19:44:45 +0100
  
  graphicsmagick (1.4+really1.3.40-1) unstable; urgency=medium