5 files changed, 58 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 202cd15..d51fac3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+git-repair (1.20200102-2) unstable; urgency=medium
+
+  * Patch Utility/HumanTime.hs to update type constraint Monad -> MonadFail
+    (Closes: #964041).
+  * Source package configuration for dgit-maint-merge(7):
+    - Add d/source/options
+    - Add d/source/patch-header.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Wed, 15 Jul 2020 13:46:18 -0700
+
 git-repair (1.20200102-1) unstable; urgency=medium
 
   * New upstream release.
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
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..ce071fb
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+single-debian-patch
+auto-commit
diff --git a/debian/source/patch-header b/debian/source/patch-header
new file mode 100644
index 0000000..09526b4
--- /dev/null
+++ b/debian/source/patch-header
@@ -0,0 +1,17 @@
+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.