Commit Debian 3.0 (quilt) metadata
authorSean Whitton <spwhitton@spwhitton.name>
Sat, 7 Nov 2020 19:47:55 +0000 (12:47 -0700)
committerSean Whitton <spwhitton@spwhitton.name>
Sat, 7 Nov 2020 19:47:55 +0000 (12:47 -0700)
[dgit (9.10~bpo10+1) quilt-fixup]

debian/patches/debian-changes

index 9042d21dfa2cf536fa6c8c653c12311875eec906..a0db08b634a46450c61afc2826a3887fad66b123 100644 (file)
@@ -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-8.20201007.orig/COPYRIGHT
-+++ git-annex-8.20201007/COPYRIGHT
-@@ -59,6 +59,10 @@ License: GPL-2
+--- git-annex-8.20201103.orig/COPYRIGHT
++++ git-annex-8.20201103/COPYRIGHT
+@@ -69,6 +69,10 @@ License: GPL-2
   The full text of version 2 of the GPL is distributed in
   /usr/share/common-licenses/GPL-2 on Debian systems.
  
@@ -28,7 +28,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>
             2016 Klaus Ethgen <Klaus@Ethgen.ch>
-@@ -68,9 +72,6 @@ Files: static/jquery*
+@@ -78,9 +82,6 @@ Files: static/jquery*
  Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
             © 2011 The Dojo Foundation
  License: Expat or GPL-2
@@ -38,7 +38,7 @@ A single combined diff, containing all the changes, follows.
  
  Files: static/*/bootstrap* static/*/glyphicons-halflings*
  Copyright: 2012-2014 Twitter, Inc.
-@@ -100,6 +101,10 @@ License: GPL-3+
+@@ -110,6 +111,10 @@ License: GPL-3+
   this package's source, or in /usr/share/common-licenses/GPL-3 on
   Debian systems.
  
@@ -49,8 +49,8 @@ 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-8.20201007.orig/git-annex.cabal
-+++ git-annex-8.20201007/git-annex.cabal
+--- git-annex-8.20201103.orig/git-annex.cabal
++++ git-annex-8.20201103/git-annex.cabal
 @@ -321,7 +321,7 @@ Executable git-annex
     unix-compat (>= 0.5),
     SafeSemaphore,