Move options and patch-header to be local-only

* 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.

diff --git a/debian/changelog b/debian/changelog
index a889147c7472fbe9a8ecccdf34cca51b31167579..f9b4c6ccfcf90e1e4b6da8d7b5af902e7138fe4f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ openafs (1.6.2~pre2-1) UNRELEASED; urgency=low
     - Support newer glibc versions.
   * Remove debian/import-upstream and change README.source to document
     using git-import-orig with --upstream-vcs-tag instead.
+  * 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 <rra@debian.org>  Wed, 02 Jan 2013 21:25:52 -0800
 

diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644 (file)
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 (file)
index 0000000..61524d2
--- /dev/null
+++ b/debian/source/local-patch-header
@@ -0,0 +1,10 @@
+Subject: Collected Debian patches for OpenAFS
+Author: Russ Allbery <rra@debian.org>
+
+The packaging for OpenAFS is maintained in Git with no Debian-specific
+patches, just cherry-picks from upstream (possibly from upstream Gerrit).
+This makes it complex to separate the changes into individual patches.
+They are therefore all included in a single Debian patch.
+
+For full commit history and separated commits, see the packaging Git
+repository.

diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644 (file)
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 (file)
index 61524d2..0000000
--- a/debian/source/patch-header
+++ /dev/null
@@ -1,10 +0,0 @@
-Subject: Collected Debian patches for OpenAFS
-Author: Russ Allbery <rra@debian.org>
-
-The packaging for OpenAFS is maintained in Git with no Debian-specific
-patches, just cherry-picks from upstream (possibly from upstream Gerrit).
-This makes it complex to separate the changes into individual patches.
-They are therefore all included in a single Debian patch.
-
-For full commit history and separated commits, see the packaging Git
-repository.