From: Russ Allbery Date: Thu, 10 Jan 2013 04:32:43 +0000 (-0800) Subject: Add local-options and local-patch-header to force one Debian patch X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=904f1b398b6bfe4f8290819e6b4f7eefc4912e48;p=packages%2Fa%2Fafs-monitor.git Add local-options and local-patch-header to force one Debian patch --- diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000..7423a2d --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1 @@ +single-debian-patch diff --git a/debian/source/local-patch-header b/debian/source/local-patch-header new file mode 100644 index 0000000..9eda065 --- /dev/null +++ b/debian/source/local-patch-header @@ -0,0 +1,16 @@ +Subject: Collected Debian patches for nagios-plugins-afs +Author: Russ Allbery + +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.