diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2020-07-15 13:46:25 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-07-15 13:46:25 -0700 |
| commit | 34f99f9355c275917ff91539bbdac60a56ad7e17 (patch) | |
| tree | f8456a9508e5e81bd0d684651c6c54c64a71de3d | |
| parent | 255750d40aff8dbd27da64dfff0406d96bf2339f (diff) | |
| download | git-repair-debian/1.20200102-2.tar.gz | |
Commit Debian 3.0 (quilt) metadatadebian/1.20200102-2archive/debian/1.20200102-2
[dgit (9.10~bpo10+1) quilt-fixup]
| -rw-r--r-- | debian/patches/debian-changes | 28 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes new file mode 100644 index 0000000..5093f71 --- /dev/null +++ b/debian/patches/debian-changes @@ -0,0 +1,28 @@ +The Debian packaging of git-repair 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-repair + % cd git-repair + % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian' + +(If you have dgit, use `dgit clone git-repair`, rather than plain `git +clone`.) + +A single combined diff, containing all the changes, follows. +--- git-repair-1.20200102.orig/Utility/HumanTime.hs ++++ git-repair-1.20200102/Utility/HumanTime.hs +@@ -44,7 +44,7 @@ daysToDuration :: Integer -> Duration + daysToDuration i = Duration $ i * dsecs + + {- Parses a human-input time duration, of the form "5h", "1m", "5h1m", etc -} +-parseDuration :: Monad m => String -> m Duration ++parseDuration :: MonadFail m => String -> m Duration + parseDuration = maybe parsefail (return . Duration) . go 0 + where + go n [] = return n diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7bb8252 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +debian-changes |