diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2018-05-10 10:33:45 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-05-10 10:33:45 -0700 |
commit | 0a1c001eb688c188dc1ca0a29bf4e7b8ca1986f1 (patch) | |
tree | eef53a3cf5f99eb6ff0c32f8b4540a91d3c12c7a | |
parent | b033d068d6d2c9658e9cdbbb4c805c608bc5b9f6 (diff) |
Commit Debian 3.0 (quilt) metadatadebian/6.20180509-1_bpo9+1archive/debian/6.20180509-1_bpo9+1
[dgit (4.3~bpo9+1) quilt-fixup]
-rw-r--r-- | debian/patches/debian-changes | 29 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes new file mode 100644 index 0000000000..2648c2708f --- /dev/null +++ b/debian/patches/debian-changes @@ -0,0 +1,29 @@ +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.20180509.orig/Utility/Url.hs ++++ git-annex-6.20180509/Utility/Url.hs +@@ -322,7 +322,8 @@ download meterupdate url file uo = + _ -> show he + #else + let msg = case he of +- StatusCodeException status _ _ -> statusMessage status ++ StatusCodeException status _ _ -> ++ B8.toString (statusMessage status) + _ -> show he + #endif + hPutStrLn stderr $ "download failed: " ++ msg diff --git a/debian/patches/series b/debian/patches/series index e69de29bb2..7bb825291d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +debian-changes |