From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 10 Feb 2025 05:16:38 +0000 (+0000)
Subject: Merge version 24.12.0-2+rpi1 and 24.12.1-1 to produce 24.12.1-1+rpi1
X-Git-Tag: archive/raspbian/24.12.1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b145ba89848c9122865de6c6060356fe2d18f00b;p=k3b.git

Merge version 24.12.0-2+rpi1 and 24.12.1-1 to produce 24.12.1-1+rpi1
---

b145ba89848c9122865de6c6060356fe2d18f00b
diff --cc debian/changelog
index 6eb0ce6,f22d17e..551d754
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,15 @@@
- k3b (24.12.0-2+rpi1) trixie-staging; urgency=medium
++k3b (24.12.1-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 24.12.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 31 Dec 2024 11:14:36 +0000]
 +  * Remove armhf from qt6-webengine architecture lists.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 31 Dec 2024 11:14:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 10 Feb 2025 05:16:38 +0000
++
+ k3b (24.12.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Salvo 'LtWorf' Tomaselli <ltworf@debian.org>  Fri, 17 Jan 2025 10:16:54 +0100
  
  k3b (24.12.0-2) unstable; urgency=medium