From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 21 Jun 2025 13:29:54 +0000 (+0100)
Subject: Merge version 4:24.12.3-1+rpi1 and 4:25.04.0-1 to produce 4:25.04.0-1+rpi1
X-Git-Tag: archive/raspbian/4%25.04.0-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b000e3163b6e668d8bd398f9a9e6a57b6a7a6691;p=cantor.git

Merge version 4:24.12.3-1+rpi1 and 4:25.04.0-1 to produce 4:25.04.0-1+rpi1
---

b000e3163b6e668d8bd398f9a9e6a57b6a7a6691
diff --cc debian/changelog
index 8cb09c7,d25204a..708c8e9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,11 +1,18 @@@
- cantor (4:24.12.3-1+rpi1) trixie-staging; urgency=medium
++cantor (4:25.04.0-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 4:24.12.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 02 May 2025 03:08:57 +0000]
 +  * Remove armhf from qtwebengine architecture lists.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 02 May 2025 03:08:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 21 Jun 2025 13:29:53 +0000
++
+ cantor (4:25.04.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Mark libcantorlibs28abi2 as Multi-Arch: same, and libcantorlibs-data as
+     Multi-Arch: foreign.
+   * Update debian/copyright.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 27 Apr 2025 09:18:42 +0200
  
  cantor (4:24.12.3-1) unstable; urgency=medium