Merge version 0.187-2+rpi2 and 0.188-2.1 to produce 0.188-2.1+rpi1

diff --cc debian/changelog
index ce25e68e6b6e17063ecee39a19ec27e92b5bd4e4,2177d921e558788cd5e9ff65db34d56bbf32a6ff..f345d571a8c883f637650c4c5d3e8ca6b6ef2959
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,67 +1,79 @@@
- elfutils (0.187-2+rpi2) bookworm-staging; urgency=medium
++elfutils (0.188-2.1+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 0.187-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 09 Sep 2022 17:53:50 +0000]
++  * Don't try to install elfutils.urls, raspbian does not currently run
++    a debuginfod service.
++
++  [changes brought forward from 0.187-2+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 11 Sep 2022 19:16:36 +0000]
 +  * Add build conflicts on libzstd-dev, if it's installed refrernces to it
 +    end up in the .pc file which causes build failures downstream,
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 11 Sep 2022 19:16:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Feb 2023 18:15:16 +0000
 +
- elfutils (0.187-2+rpi1) bookworm-staging; urgency=medium
+ elfutils (0.188-2.1) unstable; urgency=medium
  
-   * Don't try to install elfutils.urls, raspbian does not currently run
-     a debuginfod service.
+   * Non-maintainer upload.
+   * Add debconf template translation
+     - Dutch translation.
+       Thanks to Frans Spiesschaert (Closes: #994141)
+     - French translation.
+       Thanks Jean-Pierre Giraud (Closes: #994667)
+     - German translation.
+       Thanks Helge Kreutzmann (Closes: #997891)
+     - Portuguese translation.
+       Thanks Américo Monteiro (Closes: #1001920)
+     - Spanish translation.
+       Thanks Camaleón (Closes: #1003517)
+     - Brazilian Portuguese translation.
+       Thanks Paulo Henrique de Lima Santana (Closes: #1025512)
+ 
+  -- Helge Kreutzmann <debian@helgefjell.de>  Sat, 14 Jan 2023 14:54:50 +0100
+ 
+ elfutils (0.188-2) unstable; urgency=medium
+ 
+   [ Bastian Germann ]
+   * d/copyright: Convert to machine-readable format, adding missing
+     licenses.  (Closes: #1019937)
+ 
+  -- Sergio Durigan Junior <sergiodj@debian.org>  Wed, 21 Dec 2022 15:13:47 -0500
+ 
+ elfutils (0.188-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * d/p/{hurd-hacks.diff,kfreebsd-debuginfod,kfreebsd-mremap-stub}:
+     Refresh patches against new upstream version.
+   * d/{libdebuginfod1,libdw1}.symbols: Add new symbols.
+   * d/rules: Remove debuginfod.service.8 during installation.
+     Currently, we don't install debuginfod.service.
+   * Rename upstream's signing key file.
+     - d/u/signing-key.asc: Rename from d/upstream-signing-key.pgp.
+     - d/s/included-binaries: Remove.
+ 
+  -- Sergio Durigan Junior <sergiodj@debian.org>  Sun, 13 Nov 2022 20:52:25 -0500
+ 
+ elfutils (0.187-4) unstable; urgency=medium
+ 
+   * Fix Ubuntu upgrade path for libdebuginfod-common. (LP: #1990638)
+     - d/libdebuginfod-common.postinst: Split Ubuntu-specific code into a
+       separate function.  Clean up ucf/ucfr configuration files when
+       upgrading from libdebuginfod-common versions before 0.187-3.  Create
+       links for the debuginfod shell snippets directly.
+     - d/libdebuginfod-common.postrm: Handle Debian and Ubuntu purge
+       differently.
+ 
+  -- Sergio Durigan Junior <sergiodj@debian.org>  Sat, 24 Sep 2022 16:34:05 -0400
+ 
+ elfutils (0.187-3) unstable; urgency=medium
+ 
+   * Always install debuginfod shell snippets in Ubuntu.
+     - d/libdebuginfod-common.config: Remove snippet to db_input the Ubuntu
+       question.
+     - d/libdebuginfod-common.postinst: Always install debuginfod shell
+       snippets in Ubuntu.
+     - d/libdebuginfod-common.templates: Remove
+       libdebuginfod/useubuntudebuginfod question.
  
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 09 Sep 2022 17:53:50 +0000
+  -- Sergio Durigan Junior <sergiodj@debian.org>  Wed, 21 Sep 2022 19:08:05 -0400
  
  elfutils (0.187-2) unstable; urgency=medium