From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 13 Feb 2023 20:01:53 +0000 (+0000)
Subject: Merge version 1.9.6-1+rpi1 and 1.10.0-1 to produce 1.10.0-1+rpi1
X-Git-Tag: raspbian/1.10.0-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a0549791cf91beea3720dbfca7989630809d79f3;p=kdiff3.git

Merge version 1.9.6-1+rpi1 and 1.10.0-1 to produce 1.10.0-1+rpi1
---

795e87fb1ab25af4749cd0e53218e598623dd685
diff --cc debian/changelog
index f27c9b5,20d28bc..368f5ce
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,15 +1,22 @@@
- kdiff3 (1.9.6-1+rpi1) bookworm-staging; urgency=medium
++kdiff3 (1.10.0-1+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 1.9.6-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 07 Jul 2022 23:26:09 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 07 Jul 2022 23:26:09 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Feb 2023 20:01:52 +0000
++
+ kdiff3 (1.10.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update standards version to 4.6.2, no changes needed.
+   * Update the build dependencies according to the upstream build system:
+     - bump cmake to 3.14
+     - bump Qt packages to 5.15.2
+     - bump KF packages to 5.50.0
+     - bump libboost-dev to 1.71.0
+   * Update install files.
+ 
+  -- Pino Toscano <pino@debian.org>  Tue, 10 Jan 2023 22:32:12 +0100
  
  kdiff3 (1.9.6-1) unstable; urgency=medium