diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2018-10-20 12:19:30 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-10-20 12:19:59 -0700 |
commit | f99f2e3b473586d5951e8c82ff5246f4d9d16ad9 (patch) | |
tree | 7162d68f5229efeaa9b00fc51991924404f70415 /debian | |
parent | aaf5afe11c922bb7c39d9d6aeaa1b1107b9f91f2 (diff) |
Source package configuration for dgit-maint-merge(7)
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/source/options | 2 | ||||
-rw-r--r-- | debian/source/patch-header | 17 |
3 files changed, 20 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 8a8f899..ed40002 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ zenburn-emacs (2.6-1) UNRELEASED; urgency=medium * Point Vcs-* at salsa. * Update Maintainer field for team rename. * Bump copyright years. + * Create d/source/{options,patch-header} for dgit-maint-merge(7). -- Sean Whitton <spwhitton@spwhitton.name> Sat, 20 Oct 2018 12:14:25 -0700 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..6a87e9d --- /dev/null +++ b/debian/source/patch-header @@ -0,0 +1,17 @@ +The Debian packaging of zenburn-emacs 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/zenburn-emacs + % cd zenburn-emacs + % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian' + +(If you have dgit, use `dgit clone zenburn-emacs`, rather than plain +`git clone`.) + +A single combined diff, containing all the changes, follows. |