From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 2 Apr 2025 19:25:33 +0000 (+0100)
Subject: Merge version 3.1.0-2+rpi1 and 3.1.1-1 to produce 3.1.1-1+rpi1
X-Git-Tag: archive/raspbian/3.1.1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=30dd0dabee876046fe40de14426366b6cad92c90;p=bibletime.git

Merge version 3.1.0-2+rpi1 and 3.1.1-1 to produce 3.1.1-1+rpi1
---

30dd0dabee876046fe40de14426366b6cad92c90
diff --cc debian/changelog
index a03eb1d,6c0e7bf..f0a649c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- bibletime (3.1.0-2+rpi1) trixie-staging; urgency=medium
++bibletime (3.1.1-1+rpi1) trixie-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>  Fri, 14 Mar 2025 23:42:17 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 02 Apr 2025 19:25:32 +0000
++
+ bibletime (3.1.1-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream version 3.1.1
+ 
+  -- Bastian Germann <bage@debian.org>  Thu, 27 Mar 2025 11:56:02 +0100
  
  bibletime (3.1.0-2) unstable; urgency=medium