From 4e5a7ab9957ab77196fd72d06607942ea34d36a5 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 27 Mar 2013 15:34:47 -0700 Subject: Move single-debian-patch to local-options * Move single-debian-patch to local-options and patch-header to local-patch-header so that they only apply to the packages I build and NMUs get regular version-numbered patches. Change-Id: I8c0fe6bd544fafca774feebde7664b8cf975cfeb --- debian/changelog | 3 +++ debian/source/local-options | 1 + debian/source/local-patch-header | 16 ++++++++++++++++ debian/source/options | 1 - debian/source/patch-header | 16 ---------------- 5 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 debian/source/local-options create mode 100644 debian/source/local-patch-header delete mode 100644 debian/source/options delete mode 100644 debian/source/patch-header diff --git a/debian/changelog b/debian/changelog index b3463eb..968d86c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ wallet (1.0-1) UNRELEASED; urgency=low - New acl check command that returns whether the named ACL exists. - New comments field for objects and wallet commands to set and retrieve it. + * Move single-debian-patch to local-options and patch-header to + local-patch-header so that they only apply to the packages I build and + NMUs get regular version-numbered patches. -- Russ Allbery Wed, 27 Mar 2013 15:23:54 -0700 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..7aa2307 --- /dev/null +++ b/debian/source/local-patch-header @@ -0,0 +1,16 @@ +Subject: Collected Debian patches for wallet +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. diff --git a/debian/source/options b/debian/source/options deleted file mode 100644 index 7423a2d..0000000 --- a/debian/source/options +++ /dev/null @@ -1 +0,0 @@ -single-debian-patch diff --git a/debian/source/patch-header b/debian/source/patch-header deleted file mode 100644 index 7aa2307..0000000 --- a/debian/source/patch-header +++ /dev/null @@ -1,16 +0,0 @@ -Subject: Collected Debian patches for wallet -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. -- cgit v1.2.3