diff options
author | Russ Allbery <rra@stanford.edu> | 2010-05-02 18:12:57 -0700 |
---|---|---|
committer | Russ Allbery <rra@stanford.edu> | 2010-05-02 18:12:57 -0700 |
commit | 3d087dc775fed1cbd087db089dc27492064c39f9 (patch) | |
tree | a56970d9683eb22780bf7b1fdd2612e32392b3ed /debian/source | |
parent | 66efc2f97d4cedaa39d90ebf073271bd922c71c0 (diff) |
Switch to 3.0 (quilt) source format with custom patch header
* 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.
Diffstat (limited to 'debian/source')
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/source/options | 1 | ||||
-rw-r--r-- | debian/source/patch-header | 16 |
3 files changed, 18 insertions, 0 deletions
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..acde899 --- /dev/null +++ b/debian/source/patch-header @@ -0,0 +1,16 @@ +Subject: Collected Debian patches for remctl +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. |