diff options
author | Russ Allbery <eagle@eyrie.org> | 2018-08-26 17:54:06 -0700 |
---|---|---|
committer | Russ Allbery <eagle@eyrie.org> | 2018-08-26 17:54:06 -0700 |
commit | 540cf9fe4f203129fa55f3affe896b671a74ed6a (patch) | |
tree | 9c5c0938deaf3bf5d7ff2843a37b94d7080a9ca1 | |
parent | 1fc20d1fc04537c7c1a58e58fdbd7fc0217257d4 (diff) |
Switch to normal patch management
* Remove debian/source/local-options and local-patch-header and switch
to normal patch management.
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/source/local-options | 1 | ||||
-rw-r--r-- | debian/source/local-patch-header | 16 |
3 files changed, 2 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog index 1c1cbb8..df0dc86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ krb5-sync (3.1-2) UNRELEASED; urgency=medium * Switch to the DEP-14 branch layout and update debian/gbp.conf and Vcs-Git accordingly. + * Remove debian/source/local-options and local-patch-header and switch + to normal patch management. -- Russ Allbery <rra@debian.org> Sun, 26 Aug 2018 17:52:39 -0700 diff --git a/debian/source/local-options b/debian/source/local-options deleted file mode 100644 index 7423a2d..0000000 --- a/debian/source/local-options +++ /dev/null @@ -1 +0,0 @@ -single-debian-patch diff --git a/debian/source/local-patch-header b/debian/source/local-patch-header deleted file mode 100644 index f4f432c..0000000 --- a/debian/source/local-patch-header +++ /dev/null @@ -1,16 +0,0 @@ -Subject: Collected Debian patches for krb5-sync -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. |