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

3 files changed, 22 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index a24278b..f902c89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ emacs-async (1.9.3-1) UNRELEASED; urgency=medium
     - Drop d/upstream/signing-key.asc
   * Start installing README.md again.
   * Patch README.md for Debian.
+  * Source package configuration for dgit-maint-merge(7):
+    - Add d/source/options
+    - Add d/source/patch-header.
 
  -- Sean Whitton <spwhitton@spwhitton.name>  Tue, 12 Jun 2018 10:44:59 +0100
 
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..10ae27b
--- /dev/null
+++ b/debian/source/patch-header
@@ -0,0 +1,17 @@
+The Debian packaging of emacs-async 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/emacs-async
+    % cd emacs-async
+    % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
+
+(If you have dgit, use `dgit clone emacs-async`, rather than plain
+`git clone`.)
+
+A single combined diff, containing all the changes, follows.