From ea1301879a60ebfb4fa3e2241d814d97e34b7599 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 15 Jul 2020 13:42:21 -0700 Subject: Source package configuration for dgit-maint-merge(7) --- debian/changelog | 8 ++++++++ debian/source/options | 2 ++ debian/source/patch-header | 17 +++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 debian/source/options create mode 100644 debian/source/patch-header diff --git a/debian/changelog b/debian/changelog index 202cd15..9138d68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +git-repair (1.20200102-2) UNRELEASED; urgency=medium + + * Source package configuration for dgit-maint-merge(7): + - Add d/source/options + - Add d/source/patch-header. + + -- Sean Whitton Wed, 15 Jul 2020 13:42:39 -0700 + git-repair (1.20200102-1) unstable; 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..09526b4 --- /dev/null +++ b/debian/source/patch-header @@ -0,0 +1,17 @@ +The Debian packaging of git-repair 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/git-repair + % cd git-repair + % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian' + +(If you have dgit, use `dgit clone git-repair`, rather than plain `git +clone`.) + +A single combined diff, containing all the changes, follows. -- cgit v1.2.3