summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cowgill <jcowgill@debian.org>2019-08-12 23:46:59 +0100
committerJames Cowgill <jcowgill@debian.org>2019-08-29 00:34:14 +0100
commit7e2e248e4e1d1c8242da5aea0dc95e9dd4de8e04 (patch)
treefa936cfff293f58f5b6f83f1966cd92c14d70ff0
parent201600482b688c336483706aadeadce550dae7a8 (diff)
d/source: Add dgit-maint-merge workflow files
-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 000000000..ce071fb48
--- /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 000000000..e15744e47
--- /dev/null
+++ b/debian/source/patch-header
@@ -0,0 +1,17 @@
+The Debian packaging of aom 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/aom
+ % cd aom
+ % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
+
+(If you have dgit, use `dgit clone aom`, rather than plain `git
+clone`.)
+
+A single combined diff, containing all the changes, follows.