From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 14 Mar 2025 23:42:17 +0000 (+0000)
Subject: Merge version 3.1.0-1+rpi1 and 3.1.0-2 to produce 3.1.0-2+rpi1
X-Git-Tag: raspbian/3.1.0-2+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6fd7066cd56b853c99195ab7dd67c4096749af3f;p=bibletime.git

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

074318bf1ee9df813eb3426589bb46d18d1509a9
diff --cc debian/changelog
index 9d855ca,ddd1e0e..a03eb1d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- bibletime (3.1.0-1+rpi1) trixie-staging; urgency=medium
++bibletime (3.1.0-2+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>  Thu, 06 Mar 2025 03:26:51 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 14 Mar 2025 23:42:17 +0000
++
+ bibletime (3.1.0-2) unstable; urgency=medium
+ 
+   * Team upload
+   * Revert "Backup Brazilian translation (Closes: #1043811)"
+   * Depend on qml6-module-qtquick
+ 
+  -- Bastian Germann <bage@debian.org>  Fri, 07 Mar 2025 01:46:13 +0100
  
  bibletime (3.1.0-1) unstable; urgency=medium