summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2017-06-20 17:23:41 +0100
committerSean Whitton <spwhitton@spwhitton.name>2017-06-20 17:23:58 +0100
commit947911808363b7b8fd25b35af3e7234289d28803 (patch)
tree95db08ed256667446f149b1b9720a3adfd39614b
parentf50c17ee3ed7c1dd3306f3a4423ff8caf850cb0e (diff)
Source package configuration for dgit-maint-merge(7)
-rw-r--r--debian/source/options2
-rw-r--r--debian/source/patch-header17
2 files changed, 19 insertions, 0 deletions
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..d256989
--- /dev/null
+++ b/debian/source/patch-header
@@ -0,0 +1,17 @@
+The Debian packaging of emacs-noflet 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-noflet
+ % cd emacs-noflet
+ % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
+
+(If you have dgit, use `dgit clone emacs-noflet`, rather than plain
+`git clone`.)
+
+A single combined diff, containing all the changes, follows.