Commit Debian 3.0 (quilt) metadata

[dgit (13.17) quilt-fixup]

diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index 70e2f5ef9e5b8aa0276a5be78b4bb67dd8eb72f4..6bba2da777502da565eae337b1118a42bdd175a2 100644 (file)
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -15,9 +15,9 @@ upload of upstream version 1.2.3, you could use:
 clone`.)
 
 A single combined diff, containing all the changes, follows.
---- git-annex-10.20250721.orig/COPYRIGHT
-+++ git-annex-10.20250721/COPYRIGHT
-@@ -63,11 +63,14 @@ License: GPL-2
+--- git-annex-10.20251029.orig/COPYRIGHT
++++ git-annex-10.20251029/COPYRIGHT
+@@ -68,11 +68,14 @@ License: GPL-2
   The full text of version 2 of the GPL is distributed in
   /usr/share/common-licenses/GPL-2 on Debian systems.
  
@@ -33,7 +33,7 @@ A single combined diff, containing all the changes, follows.
  
  Files: doc/tips/automatically_adding_metadata/pre-commit-annex 
  Copyright: 2014 Joey Hess <id@joeyh.name>
-@@ -78,9 +81,6 @@ Files: static/jquery*
+@@ -83,9 +86,6 @@ Files: static/jquery*
  Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
             © 2011 The Dojo Foundation
  License: Expat or GPL-2
@@ -43,7 +43,7 @@ A single combined diff, containing all the changes, follows.
  
  Files: static/*/bootstrap* static/*/glyphicons-halflings*
  Copyright: 2012-2014 Twitter, Inc.
-@@ -110,6 +110,10 @@ License: GPL-3+
+@@ -115,6 +115,10 @@ License: GPL-3+
   this package's source, or in /usr/share/common-licenses/GPL-3 on
   Debian systems.
  
@@ -54,18 +54,9 @@ A single combined diff, containing all the changes, follows.
  License: BSD-2-clause
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
---- git-annex-10.20250721.orig/Database/Keys.hs
-+++ git-annex-10.20250721/Database/Keys.hs
-@@ -260,7 +260,7 @@ isInodeKnown i s = or <$> runReaderIO Co
-  - is an associated file.
-  -}
- reconcileStaged :: Bool -> H.DbQueue -> Annex DbTablesChanged
--reconcileStaged dbisnew qh = ifM isBareRepo
-+reconcileStaged dbisnew qh = ifM notneeded
-       ( return mempty
-       , do
-               gitindex <- inRepo currentIndexFile
-@@ -344,6 +344,14 @@ reconcileStaged dbisnew qh = ifM isBareR
+--- git-annex-10.20251029.orig/Database/Keys.hs
++++ git-annex-10.20251029/Database/Keys.hs
+@@ -335,6 +335,14 @@ reconcileStaged dbisnew qh _ = ifM isBar
                        { gitGlobalOpts = gitGlobalOpts r ++ bypassSmudgeConfig }
                )