Merge version 0.6.1-2+rpi1 and 1.0.2-5 to produce 1.0.2-5+rpi1

diff --cc debian/changelog
index a07b03e3ced709e4bd0232ef8208964052970383,9a24e45911b6df2885c28b8c825138a6e242f44d..e042baeb07c0bbdb502f72994f013e0541284b8b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,32 +1,39 @@@
- haskell-hedgehog (0.6.1-2+rpi1) bullseye-staging; urgency=medium
++haskell-hedgehog (1.0.2-5+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 0.6.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 16 Nov 2019 07:34:53 +0000]
 +  * Apply C.UTF-8 locale to the whole build, not just the tests.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 16 Nov 2019 07:34:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 17 Aug 2020 21:28:01 +0000
 +
- haskell-hedgehog (0.6.1-2) unstable; urgency=medium
+ haskell-hedgehog (1.0.2-5) unstable; urgency=medium
  
-   * Patch for newer deps
-     - note: this version FTBFS, but at least it is not bd-uninstallable
+   * Patch out fail.
  
-  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 30 Aug 2019 14:07:13 +0200
+  -- Clint Adams <clint@debian.org>  Fri, 12 Jun 2020 21:03:16 -0400
+ 
+ haskell-hedgehog (1.0.2-4) unstable; urgency=medium
+ 
+   * Fix Build-Depends.
+ 
+  -- Clint Adams <clint@debian.org>  Fri, 12 Jun 2020 19:33:40 -0400
+ 
+ haskell-hedgehog (1.0.2-3) unstable; urgency=medium
+ 
+   * Fix Build-Depends.
+ 
+  -- Clint Adams <clint@debian.org>  Thu, 11 Jun 2020 22:14:47 -0400
+ 
+ haskell-hedgehog (1.0.2-2) unstable; urgency=medium
+ 
+   * Patch for newer template-haskell and pretty-show.
+ 
+  -- Clint Adams <clint@debian.org>  Thu, 11 Jun 2020 08:54:54 -0400
+ 
+ haskell-hedgehog (1.0.2-1) unstable; urgency=medium
+ 
+   * New upstream version.
+ 
+  -- Clint Adams <clint@debian.org>  Sat, 30 May 2020 23:44:24 -0400
  
  haskell-hedgehog (0.6.1-1) unstable; urgency=medium