summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2017-08-18 14:31:13 -0700
committerSean Whitton <spwhitton@spwhitton.name>2017-08-18 14:31:24 -0700
commit24f07c230ffc9dfe1dcbb79630c1538e6d941980 (patch)
treef04f74825e0b8a113681d7788cbc698b01ca2632 /debian
parent7ea8cf1357839d81241c3ea22fe9d00d4f8f09eb (diff)
Source package configuration for dgit-maint-merge(7)
Diffstat (limited to 'debian')
-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..6204785
--- /dev/null
+++ b/debian/source/patch-header
@@ -0,0 +1,17 @@
+The Debian packaging of s-el 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/s-el
+ % cd s-el
+ % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
+
+(If you have dgit, use `dgit clone s-el`, rather than plain `git
+clone`.)
+
+A single combined diff, containing all the changes, follows.