summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2024-02-27 13:04:52 +0800
committerSean Whitton <spwhitton@spwhitton.name>2024-02-27 13:04:52 +0800
commit81f5692eb7986b0d4deae47ab11e3cdd8f02b755 (patch)
tree1ba012acd08a80c02dbeb804aba5c2d4d4fe8901
parent0027b03f9c720f201002120afcba14b9ba41cd96 (diff)
Commit Debian 3.0 (quilt) metadata
[dgit (11.5) quilt-fixup]
-rw-r--r--debian/patches/debian-changes17
1 files changed, 11 insertions, 6 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index 307b86e6eb..d58c14a3fb 100644
--- 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.20230926.orig/COPYRIGHT
-+++ git-annex-10.20230926/COPYRIGHT
-@@ -64,6 +64,10 @@ License: GPL-2
+--- git-annex-10.20240129.orig/COPYRIGHT
++++ git-annex-10.20240129/COPYRIGHT
+@@ -64,11 +64,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.
@@ -25,10 +25,15 @@ A single combined diff, containing all the changes, follows.
+Copyright: © 2010-2017 Joey Hess <id@joeyh.name>
+License: GPL-3+
+
+ Files: Database/RawFilePath.hs
+ Copyright: © 2012 Michael Snoyman, http://www.yesodweb.com/
+ © 2023 Joey Hess <id@joeyh.name>
+ License: Expat
+- The text of the Expat license is in the Expat section below.
+
Files: doc/tips/automatically_adding_metadata/pre-commit-annex
Copyright: 2014 Joey Hess <id@joeyh.name>
- 2016 Klaus Ethgen <Klaus@Ethgen.ch>
-@@ -73,9 +77,6 @@ Files: static/jquery*
+@@ -79,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 +43,7 @@ A single combined diff, containing all the changes, follows.
Files: static/*/bootstrap* static/*/glyphicons-halflings*
Copyright: 2012-2014 Twitter, Inc.
-@@ -105,6 +106,10 @@ License: GPL-3+
+@@ -111,6 +111,10 @@ License: GPL-3+
this package's source, or in /usr/share/common-licenses/GPL-3 on
Debian systems.