From 904f1b398b6bfe4f8290819e6b4f7eefc4912e48 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 9 Jan 2013 20:32:43 -0800 Subject: [PATCH] Add local-options and local-patch-header to force one Debian patch --- debian/source/local-options | 1 + debian/source/local-patch-header | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 debian/source/local-options create mode 100644 debian/source/local-patch-header 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. -- 2.39.5