Merge version 0.28.3+dfsg-2+rpi1 and 0.28.5+dfsg-1 to produce 0.28.5+dfsg-1+rpi1

diff --cc debian/changelog
index de91dc08375db22997efc8d9dafd5fa7c23aafab,6dff5d3f475156695f0f00d780ca1fbe2c7abfec..dfda62561b52fa302018396308155ba168a3330a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,41 +1,48 @@@
- exiv2 (0.28.3+dfsg-2+rpi1) trixie-staging; urgency=medium
++exiv2 (0.28.5+dfsg-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 0.28.3+dfsg-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 30 Sep 2024 23:40:44 +0000]
 +  * Update symbols file for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Mon, 30 Sep 2024 23:40:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 21 Jun 2025 15:38:21 +0000
++
+ exiv2 (0.28.5+dfsg-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Bump standards version to 4.7.1, no changes required.
+   * Update the patches:
+     - upstream_Revert-fix-copy-constructors.patch: drop, backported from
+       upstream
+     - pkgconfig-no-private.diff: mark as vendor-specific, since upstream did
+       not agree on changing the pkg-config file for shared library builds
+ 
+  -- Pino Toscano <pino@debian.org>  Wed, 26 Feb 2025 07:09:30 +0100
+ 
+ exiv2 (0.28.4+dfsg-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Backport upstream commit facce628f3622764e91a8161f89ade8cb34bc120 to
+     reintroduce the copy constructors for TIFF-related classes, fixing
+     CVE-2025-26623; patch upstream_Revert-fix-copy-constructors.patch.
+     (Closes: #1098323)
+   * Drop permission fixing of .ini files, as now they all have the right
+     permissions already.
+   * Move some cmake parameters directly in the dh_auto_configure invocation
+     rather than as a separate variable: there is no more double build, as
+     done in the past.
+ 
+  -- Pino Toscano <pino@debian.org>  Thu, 20 Feb 2025 07:48:47 +0100
+ 
+ exiv2 (0.28.4+dfsg-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Update the patches:
+     - cmake-no-private.diff: drop, fixed upstream
+   * Bump standards version to 4.7.0, no changes required.
+   * Drop breaks/replaces for versions older than what is in Debian Bullseye.
+ 
+  -- Pino Toscano <pino@debian.org>  Mon, 10 Feb 2025 17:43:14 +0100
  
  exiv2 (0.28.3+dfsg-2) unstable; urgency=medium