Source package configuration for dgit-maint-merge(7)

3 files changed, 22 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 068595c..0ec0590 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ mairix (0.24-1) UNRELEASED; urgency=low
   * Update d/copyright and d/control to point to new upstream maintainer.
   * Bump debhelper compat to 10.
   * Bump std-ver to 4.0.1 (no changes required).
+  * Source package configuration for dgit-maint-merge(7):
+    - add d/source/options
+    - add d/source/patch-header
 
  -- Sean Whitton <spwhitton@spwhitton.name>  Thu, 17 Aug 2017 16:28:30 -0700
 
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..292bf17
--- /dev/null
+++ b/debian/source/patch-header
@@ -0,0 +1,17 @@
+The Debian packaging of mairix 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/mairix
+    % cd mairix
+    % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
+
+(If you have dgit, use `dgit clone mairix`, rather than plain `git
+clone`.)
+
+A single combined diff, containing all the changes, follows.