Merge branch 'debian/master' into ubuntu/precise

3 files changed, 0 insertions, 18 deletions

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 7aa2307..0000000
--- a/debian/source/local-patch-header
+++ /dev/null
@@ -1,16 +0,0 @@
-Subject: Collected Debian patches for wallet
-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.
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index b7bc1f2..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1 +0,0 @@
-compression = "xz"