switch to dgit-maint-merge(7) workflow

3 files changed, 26 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 3530439..3708a16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+keysafe (0.20161107-2) UNRELEASED; urgency=medium
+
+  * Switch to dgit-maint-merge(7) workflow.
+    - Add d/source/options
+    - Add d/source/patch-header
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Wed, 25 Jan 2017 07:59:02 -0700
+
 keysafe (0.20161107-1) experimental; urgency=medium
 
   * New upstream release.
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..0dacc46
--- /dev/null
+++ b/debian/source/patch-header
@@ -0,0 +1,16 @@
+The Debian packaging of foo 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/
+    % cd foo
+    % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
+
+(If you have dgit, use `dgit clone foo`, rather than plain `git clone`.)
+
+A single combined diff, containing all the changes, follows.