From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 21 Dec 2023 02:14:11 +0000 (+0000)
Subject: Merge version 1.10.0-1+rpi1 and 1.10.7-1 to produce 1.10.7-1+rpi1
X-Git-Tag: archive/raspbian/1.10.7-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fdab3e08245b493d5bdf12da44b501dcc940e846;p=kdiff3.git

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

025acb21351860c715ced75d04c7a74d750637c4
diff --cc debian/changelog
index 368f5ce,6dd5d7c..1e0ec4a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,44 +1,51 @@@
- kdiff3 (1.10.0-1+rpi1) bookworm-staging; urgency=medium
++kdiff3 (1.10.7-1+rpi1) trixie-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Feb 2023 20:01:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 21 Dec 2023 02:14:11 +0000
++
+ kdiff3 (1.10.7-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Pino Toscano <pino@debian.org>  Wed, 13 Dec 2023 09:43:59 +0100
+ 
+ kdiff3 (1.10.6-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 01 Oct 2023 21:13:53 +0200
+ 
+ kdiff3 (1.10.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop the transitional kdiff3-qt package, no more needed after two Debian
+     stable releases.
+   * Drop the breaks/replaces for versions older than Debian Bullseye.
+ 
+  -- Pino Toscano <pino@debian.org>  Mon, 10 Jul 2023 05:38:51 +0200
+ 
+ kdiff3 (1.10.4-1) unstable; urgency=medium
+ 
+   * Upload to unstable.
+   * New upstream release.
+   * Switch Vcs-* fields back to the 'master' packaging branch.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 11 Jun 2023 22:04:44 +0200
+ 
+ kdiff3 (1.10.2-1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 07 May 2023 09:12:42 +0200
+ 
+ kdiff3 (1.10.1-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Switch Vcs-* fields to the 'experimental' packaging branch.
+ 
+  -- Pino Toscano <pino@debian.org>  Fri, 31 Mar 2023 09:29:22 +0200
  
  kdiff3 (1.10.0-1) unstable; urgency=medium