diff options
| author | Russ Allbery <eagle@eyrie.org> | 2018-08-26 16:10:08 -0700 |
|---|---|---|
| committer | Russ Allbery <eagle@eyrie.org> | 2018-08-26 16:10:08 -0700 |
| commit | 9b7c413fb2dba448ddb16d4e25e71c23a43a12b2 (patch) | |
| tree | be79c0dc9302fb72921688608b7dd1d82650b0ff | |
| parent | e5d1ae1ff24172d94132f6d00b68b656913644fc (diff) | |
Remove custom patch handling configuration
* Delete debian/source/local-options and local-patch-header and use
standard patch handling.
| -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 0343e1e..7c907dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ libpam-afs-session (2.6-2) unstable; urgency=medium - Install the upstream release notes as NEWS.gz, not changelog.gz. - Add Rules-Requires-Root: no. - Use https for URLs in debian/control and debian/copyright. + * Delete debian/source/local-options and local-patch-header and use + standard patch handling. * Bump watch file version to 4 and use https for URL. * Remove version qualifications on libpam-runtime and libpam0g dependencies, which were older than oldoldstable. 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 c54970c..0000000 --- a/debian/source/local-patch-header +++ /dev/null @@ -1,16 +0,0 @@ -Subject: Collected Debian patches for pam-afs-session -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. |