From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 19 Aug 2025 17:40:35 +0000 (+0000)
Subject: Manual merge of version 10.20240430-1+rpi2 and 10.20250416-2 to produce 10.20250416... 
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5b927f8b68f0306e46fdfe04143142b3ab2f0baf;p=git-annex.git

Manual merge of version 10.20240430-1+rpi2 and 10.20250416-2 to produce 10.20250416-2+rpi1
---

5b927f8b68f0306e46fdfe04143142b3ab2f0baf
diff --cc debian/changelog
index c29c17dcdb,0f095b8a64..b6b067b3d9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,47 +1,57 @@@
- git-annex (10.20240430-1+rpi2) trixie-staging; urgency=medium
++git-annex (10.20250416-2+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 10.20240430-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 13 Jul 2024 05:46:10 +0000]
++  * Force use of llc-14.
++
++  [changes brought forward from 10.20240430-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 26 Sep 2024 21:51:32 +0000]
 +  * Force use of llc-11 instead of llc-14.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 26 Sep 2024 21:51:32 +0000
++ -- Peter Michael Green <plugwash@debian.org>  Tue, 19 Aug 2025 17:39:24 +0000
 +
- git-annex (10.20240430-1+rpi1) trixie-staging; urgency=medium
+ git-annex (10.20250416-2) unstable; urgency=medium
  
-   * Force use of llc-14.
+   * Cherry pick compatibility fix for Git 2.5.0 (Closes: #1108526).
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Tue, 01 Jul 2025 11:23:57 +0100
+ 
+ git-annex (10.20250416-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Fri, 25 Apr 2025 14:34:27 +0800
+ 
+ git-annex (10.20250115-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Sun, 09 Mar 2025 17:26:00 +0800
+ 
+ git-annex (10.20241202-2) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Dandan Zhang <zhangdandan@loongson.cn> ]
+   * Add build-depends for loong64 (Closes: #1060833).
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 06 Mar 2025 12:46:53 +0100
+ 
+ git-annex (10.20241202-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Fri, 06 Dec 2024 11:34:27 +0800
+ 
+ git-annex (10.20241031-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Fri, 08 Nov 2024 10:45:27 +0800
+ 
+ git-annex (10.20240927-1) unstable; urgency=medium
+ 
+   * New upstream release.
  
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 13 Jul 2024 05:46:10 +0000
+  -- Sean Whitton <spwhitton@spwhitton.name>  Thu, 17 Oct 2024 11:15:11 +0800
  
  git-annex (10.20240430-1) unstable; urgency=medium