From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 11 Dec 2020 20:23:28 +0000 (+0000)
Subject: Merge version 3.0-3+rpi1 and 3.0-5 to produce 3.0-5+rpi1
X-Git-Tag: archive/raspbian/3.0-5+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c2fc2763666a289b6a4f0e454c0f001ecfd7e500;p=bibletime.git

Merge version 3.0-3+rpi1 and 3.0-5 to produce 3.0-5+rpi1
---

c2fc2763666a289b6a4f0e454c0f001ecfd7e500
diff --cc debian/changelog
index 166c502,dd3a456..be7e77c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,22 @@@
- bibletime (3.0-3+rpi1) bullseye-staging; urgency=medium
++bibletime (3.0-5+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2.11.2-11+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 18 Nov 2018 15:41:42 +0000]
 +  * Use qtwebkit for raspbian (we don't have qtwebengine).
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 22 Nov 2020 21:17:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 11 Dec 2020 20:23:28 +0000
++
+ bibletime (3.0-5) unstable; urgency=medium
+ 
+   * updated standards version
+   * new upload to unstable with depends on libsword 1.9
+ 
+  -- Teus Benschop <teusbenschop@debian.org>  Sat, 28 Nov 2020 20:49:19 +0100
+ 
+ bibletime (3.0-4) experimental; urgency=medium
+ 
+   * depend on libsword 1.9
+ 
+  -- Teus Benschop <teusbenschop@debian.org>  Sat, 21 Nov 2020 16:58:14 +0100
  
  bibletime (3.0-3) unstable; urgency=medium