Merge version 0.1.0.4-1+rpi2 and 0.1.0.4-3 to produce 0.1.0.4-3+rpi1

diff --cc debian/changelog
index c7a29ac4142fcf984c7e99c172722570502b3d61,71ef5f4116408ce612900de5c32053172be48a32..f728b5ce85e4b946950ca30edbcd56f33eaf8f57
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,16 +1,26 @@@
- haskell-hsopenssl-x509-system (0.1.0.4-1+rpi2) trixie-staging; urgency=medium
++haskell-hsopenssl-x509-system (0.1.0.4-3+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 0.1.0.3-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 20 Jun 2022 02:50:18 +0000]
++  * Force C.UTF-8 locale.
++
++  [changes brought forward from 0.1.0.4-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 22 Feb 2024 18:10:16 +0000]
 +  * Remove build-dependency on ghc-doc.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 22 Feb 2024 18:10:16 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Aug 2025 22:16:59 +0000
 +
- haskell-hsopenssl-x509-system (0.1.0.4-1+rpi1) bookworm-staging; urgency=medium
+ haskell-hsopenssl-x509-system (0.1.0.4-3) unstable; urgency=medium
  
-   [changes brought forward from 0.1.0.3-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 20 Jun 2022 02:50:18 +0000]
-   * Force C.UTF-8 locale.
+   * Declare compliance with Debian policy 4.7.0
+   * Sourceful upload for GHC 9.6
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Wed, 18 Sep 2024 15:32:40 +0300
+ 
+ haskell-hsopenssl-x509-system (0.1.0.4-2) unstable; urgency=medium
+ 
+   * Declare compliance with Debian policy 4.6.2
+   * Sourceful upload for GHC 9.4
  
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 19 Oct 2022 03:42:32 +0000
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Sat, 02 Sep 2023 16:26:07 +0300
  
  haskell-hsopenssl-x509-system (0.1.0.4-1) unstable; urgency=medium
  

diff --cc debian/control
index c198238b725bd49b18d09a5c67fd73cae6555e28,cc1164b0ea80a3fe0a3d8db4e4e7c70572199bbc..93ac4afc4b60d1f0bcc433887851746f21f58560
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -13,9 -13,9 +13,9 @@@ Build-Depends: debhelper (>= 10)
   libghc-hsopenssl-dev (<< 0.12),
   libghc-hsopenssl-prof (>= 0.11),
   libghc-hsopenssl-prof (<< 0.12),
 -Build-Depends-Indep: ghc-doc,
 +Build-Depends-Indep:
   libghc-hsopenssl-doc,
- Standards-Version: 4.6.1
+ Standards-Version: 4.7.0
  Homepage: https://github.com/redneb/HsOpenSSL-x509-system
  Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-hsopenssl-x509-system
  Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-hsopenssl-x509-system]