Merge version 9.3.0+dfsg1-1+rpi2 and 9.3.0+dfsg1-1.1 to produce 9.3.0+dfsg1-1.1+rpi1

diff --cc debian/changelog
index 54ec1b94b0e0c73f093a4e193f6493bed2eed752,5daf98bcf4a7a926c6746435834f3bb5aab2cd67..625da76f8e3611fe1347613b7159dcb06423fced
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,10 +1,22 @@@
- vtk9 (9.3.0+dfsg1-1+rpi2) trixie-staging; urgency=medium
++vtk9 (9.3.0+dfsg1-1.1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 9.0.1+dfsg1-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 05 Jan 2021 14:46:48 +0000]
++  * Link with libatomic on armhf too for raspbian.
++
++  [changes brought forward from 9.3.0+dfsg1-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 26 Sep 2024 16:08:15 +0000]
 +  * Change build-depends to libhdf5-mpi-dev
 +  * Add build-depends on libopenmpi-dev, I'm not sure why this is still
 +    trying to link against openmpi libs but I need it built.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 26 Sep 2024 16:08:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 11 Dec 2024 20:34:33 +0000
 +
- vtk9 (9.3.0+dfsg1-1+rpi1) trixie-staging; urgency=medium
+ vtk9 (9.3.0+dfsg1-1.1) unstable; urgency=medium
  
-   [changes brought forward from 9.0.1+dfsg1-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 05 Jan 2021 14:46:48 +0000]
-   * Link with libatomic on armhf too for raspbian.
+   * Non-maintainer upload.
+   * Build against libhdf5-mpi-dev, since libhdf5-openmpi-dev is no longer
+     available on 32-bit architectures. Closes: #1078743.
  
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 22 Jun 2024 13:22:34 +0000
+  -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 22 Nov 2024 11:49:45 +0100
  
  vtk9 (9.3.0+dfsg1-1) unstable; urgency=medium