diff options
| author | Russ Allbery <rra@stanford.edu> | 2010-08-25 18:31:05 -0700 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2010-08-25 18:31:05 -0700 |
| commit | 6ff6baaea8ba05ca022c0f3415a2fa48f1112743 (patch) | |
| tree | 77e79f2351ffaa628a1586091116e26cb2f268ee | |
| parent | 5f8c3f23e187c4aeb9ad3542762bbf00fff66549 (diff) | |
Switch to 3.0 (quilt) source format
* Switch to 3.0 (quilt) source format. Force a single Debian patch and
include a custom patch header explaining that it is a rollup of any
fixes cherry-picked from upstream and breaking those patches out
separately would be work for no gain.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/source/options | 1 | ||||
| -rw-r--r-- | debian/source/patch-header | 16 |
4 files changed, 22 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 9ad11a0..bc04d4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,10 @@ wallet (0.12-1) UNRELEASED; urgency=low other sites. * Install the other contrib scripts except convert-srvtab-db to the examples directory for wallet-server. + * Switch to 3.0 (quilt) source format. Force a single Debian patch and + include a custom patch header explaining that it is a rollup of any + fixes cherry-picked from upstream and breaking those patches out + separately would be work for no gain. * Update standards version to 3.9.1 (no changes required). -- Russ Allbery <rra@debian.org> Wed, 25 Aug 2010 18:03:49 -0700 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..7423a2d --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +single-debian-patch diff --git a/debian/source/patch-header b/debian/source/patch-header new file mode 100644 index 0000000..7aa2307 --- /dev/null +++ b/debian/source/patch-header @@ -0,0 +1,16 @@ +Subject: Collected Debian patches for wallet +Author: Russ Allbery <rra@debian.org> + +Since I am also upstream for this package, there will normally not be any +patches to apply to the upstream source. However, occasionally I'll pull +up specific upstream commits prior to making an upstream release. When +this happens, this patch will collect all of those modifications. + +I use Git to maintain both the upstream source and the Debian packages, +and generating individual patches rather than using git cherry-pick takes +extra work for no gain. Since I'm also upstream, there's no need to +separate the patches for later upstream submission. Hence, I take this +approach with a unified patch when it's necessary. + +For full commit history and separated commits, see the upstream Git +repsitory. |