diff -Nru haskell-hs-bibutils-6.7.0.0/debian/changelog haskell-hs-bibutils-6.7.0.0/debian/changelog
--- haskell-hs-bibutils-6.7.0.0/debian/changelog	2019-08-31 01:47:40.000000000 +0000
+++ haskell-hs-bibutils-6.7.0.0/debian/changelog	2020-05-02 00:49:14.000000000 +0000
@@ -1,3 +1,9 @@
+haskell-hs-bibutils (6.7.0.0-1+rpi1) bullseye-staging; urgency=medium
+
+  * Add patch from bts to build with bibutils 6.10 (Closes: #958663)
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 02 May 2020 00:49:14 +0000
+
 haskell-hs-bibutils (6.7.0.0-1) unstable; urgency=medium
 
   [ Dmitry Bogatov ]
diff -Nru haskell-hs-bibutils-6.7.0.0/debian/patches/bibutils6.10.patch haskell-hs-bibutils-6.7.0.0/debian/patches/bibutils6.10.patch
--- haskell-hs-bibutils-6.7.0.0/debian/patches/bibutils6.10.patch	1970-01-01 00:00:00.000000000 +0000
+++ haskell-hs-bibutils-6.7.0.0/debian/patches/bibutils6.10.patch	2020-05-02 00:46:31.000000000 +0000
@@ -0,0 +1,41 @@
+Description: Changes for the transition to libbibutils7
+Author: Pierre Gruet <pgtdebian@free.fr>
+Last-Update: 2020-04-18
+
+--- a/src/Text/Bibutils.hsc
++++ b/src/Text/Bibutils.hsc
+@@ -137,13 +137,13 @@
+ -- | A type for storing the C struct with the bibliography data.
+ -- Mostly opaque to the Haskell side. See 'numberOfRefs' to retrieve
+ -- the number of references stored in the struct.
+-newtype Bibl = Bibl { nrefs :: CLong }
++newtype Bibl = Bibl { n :: CLong }
+ 
+ instance Storable Bibl where
+     sizeOf    _     = #{size      bibl}
+     alignment _     = #{alignment bibl}
+-    peek p          = #{peek      bibl, nrefs } p >>= return . Bibl
+-    poke p (Bibl n) = #{poke      bibl, nrefs } p n
++    peek p          = #{peek      bibl, n } p >>= return . Bibl
++    poke p (Bibl nb) = #{poke      bibl, n } p nb
+ 
+ -- | Initialize the 'Bibl' C struct. Usually the first function being
+ -- called.
+@@ -160,7 +160,7 @@
+ -- | Retrieve the number of references from a 'Bibl' C struct.
+ numberOfRefs :: ForeignPtr Bibl -> IO Int
+ numberOfRefs b
+-    = withForeignPtr b $ \cb -> peek cb >>= return . fromIntegral . nrefs
++    = withForeignPtr b $ \cb -> peek cb >>= return . fromIntegral . n
+ 
+ -- | A type for storing the Param C struct. It should be accessed with
+ -- the functions provided, such as 'setCharsetIn', etc.
+@@ -395,7 +395,7 @@
+         c_bibl_addtocorps cparam centry
+ 
+ bibl_reporterr :: Status -> IO ()
+-bibl_reporterr (Status n) = c_bibl_reporterr n
++bibl_reporterr (Status nb) = c_bibl_reporterr nb
+ 
+ newtype BiblioIn  = BiblioIn  { unBiblioIn  :: CInt }
+     deriving ( Eq )
diff -Nru haskell-hs-bibutils-6.7.0.0/debian/patches/series haskell-hs-bibutils-6.7.0.0/debian/patches/series
--- haskell-hs-bibutils-6.7.0.0/debian/patches/series	2019-08-26 00:08:40.000000000 +0000
+++ haskell-hs-bibutils-6.7.0.0/debian/patches/series	2020-05-02 00:49:04.000000000 +0000
@@ -1,3 +1,4 @@
 fix_cabal.patch
 bibutils-include-path
 patch-to-build-with-bibutils-6.2.patch
+bibutils6.10.patch