summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2018-07-22 11:56:36 +0800
committerSean Whitton <spwhitton@spwhitton.name>2018-07-22 11:56:36 +0800
commit61318d0b33214e9cfe53d88aefcfe7a8289377bb (patch)
tree6d098d0126221146fe42b2b268e76f75aad1611b
parente35a28a2a42dde13b0be281f90d5204e50e24bcb (diff)
Commit Debian 3.0 (quilt) metadata
[dgit (5.10~bpo9+1) quilt-fixup]
-rw-r--r--debian/patches/debian-changes51
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 52 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
deleted file mode 100644
index b45c73f7d4..0000000000
--- a/debian/patches/debian-changes
+++ /dev/null
@@ -1,51 +0,0 @@
-The Debian packaging of git-annex is maintained in git, using the
-merging workflow described in dgit-maint-merge(7). There isn't a
-patch queue that can be represented as a quilt series.
-
-A detailed breakdown of the changes is available from their canonical
-representation - git commits in the packaging repository. For
-example, to see the changes made by the Debian maintainer in the first
-upload of upstream version 1.2.3, you could use:
-
- % git clone https://git.dgit.debian.org/git-annex
- % cd git-annex
- % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
-
-(If you have dgit, use `dgit clone git-annex`, rather than plain `git
-clone`.)
-
-A single combined diff, containing all the changes, follows.
---- git-annex-6.20180626.orig/COPYRIGHT
-+++ git-annex-6.20180626/COPYRIGHT
-@@ -27,7 +27,7 @@ License: BSD-2-clause
- Files: Utility/HttpManagerRestricted.hs
- Copyright: 2018 Joey Hess <id@joeyh.name>
- 2013 Michael Snoyman
--License: MIT
-+License: Expat
-
- Files: Utility/*
- Copyright: 2012-2018 Joey Hess <id@joeyh.name>
-@@ -53,10 +53,10 @@ License: GPL-3+
- Files: static/jquery*
- Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
- © 2011 The Dojo Foundation
--License: MIT or GPL-2
-+License: Expat or GPL-2
- The full text of version 2 of the GPL is distributed in
-- /usr/share/common-licenses/GPL-2 on Debian systems. The text of the MIT
-- license is in the MIT section below.
-+ /usr/share/common-licenses/GPL-2 on Debian systems. The text of the Expat
-+ license is in the Expat section below.
-
- Files: static/*/bootstrap* static/*/glyphicons-halflings*
- Copyright: 2012-2014 Twitter, Inc.
-@@ -140,7 +140,7 @@ License: BSD-2-clause
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
--License: MIT
-+License: Expat
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7bb825291d..0000000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-debian-changes