Refresh patches

4 files changed, 8 insertions, 74 deletions

diff --git a/debian/changelog b/debian/changelog
index e7f8e47..a615aab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 shairport-sync (2.8.6-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh typo-fixes.patch.
+  * Remove Fix-a-compilation-error-in-audio_pulse-c.patch as it's included
+    upstream.
 
  -- Chris Boot <bootc@debian.org>  Thu, 10 Nov 2016 16:09:31 +0000
 
diff --git a/debian/patches/Fix-a-compilation-error-in-audio_pulse-c.patch b/debian/patches/Fix-a-compilation-error-in-audio_pulse-c.patch
deleted file mode 100644
index 2f9c521..0000000
--- a/debian/patches/Fix-a-compilation-error-in-audio_pulse-c.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 4f3af1842cbdd58aa95948082ca8ee5cc5bee7b3 Mon Sep 17 00:00:00 2001
-From: Mike Brady <mikebrady@eircom.net>
-Date: Tue, 31 May 2016 20:39:58 +0100
-Subject: [PATCH] Fix a compilation error in audio_pulse.c and fix a related
- script error in configure.ac
-
----
- audio_pulse.c | 10 +++++-----
- configure.ac  |  6 +++---
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/audio_pulse.c b/audio_pulse.c
-index e6e3bc5..6fa94e9 100644
---- a/audio_pulse.c
-+++ b/audio_pulse.c
-@@ -42,8 +42,8 @@ static pa_simple *pa_dev = NULL;
- static struct {
-   char *server;
-   char *sink;
--  char *apname;
--} pulse_options = {.server = NULL, .sink = NULL, .apname = NULL};
-+  char *service_name;
-+} pulse_options = {.server = NULL, .sink = NULL, .service_name = NULL};
- 
- static int pa_error;
- 
-@@ -58,7 +58,7 @@ static void help(void) {
- 
- static int init(int argc, char **argv) {
- 
--  pulse_options.apname = config.apname;
-+  pulse_options.service_name = config.service_name;
- 
-   config.audio_backend_buffer_desired_length = 44100; // one second.
-   config.audio_backend_latency_offset = 0;
-@@ -78,7 +78,7 @@ static int init(int argc, char **argv) {
-       pulse_options.sink = optarg;
-       break;
-     case 'n':
--      pulse_options.apname = optarg;
-+      pulse_options.service_name = optarg;
-       break;
-     default:
-       help();
-@@ -97,7 +97,7 @@ static int init(int argc, char **argv) {
- static void pulse_connect(void) {
-   static const pa_sample_spec ss = {.format = PA_SAMPLE_S16LE, .rate = 44100, .channels = 2};
- 
--  pa_dev = pa_simple_new(pulse_options.server, pulse_options.apname, PA_STREAM_PLAYBACK,
-+  pa_dev = pa_simple_new(pulse_options.server, pulse_options.service_name, PA_STREAM_PLAYBACK,
-                          pulse_options.sink, "Shairport Stream", &ss, NULL, NULL, &pa_error);
- 
-   if (!pa_dev)
-diff --git a/configure.ac b/configure.ac
-index f91c9a1..c08c457 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -202,8 +202,8 @@ AC_ARG_WITH(pulseaudio, [  --with-pulseaudio = choose PulseAudio API support. N.
-   AC_MSG_RESULT(>>Including a PulseAudio back end. N.B. no synchronisation -- so underflow or overflow is inevitable!)
-   HAS_PULSE=1
-   AC_DEFINE([CONFIG_PULSE], 1, [Needed by the compiler.])
--  AC_CHECK_LIB([pulse-simple], [pa_simple_new], , AC_MSG_ERROR(PulseAudio support requires the pulse-simple library, possibly in the package libpulse-dev!))
--  AC_CHECK_LIB([pulse], [pa_stream_peek], , AC_MSG_ERROR(PulseAudio support requires the libpulse-dev library!))], )
-+  AC_CHECK_LIB([pulse-simple], [pa_simple_new], , AC_MSG_ERROR(PulseAudio support requires the pulse-simple library -- possibly in the libpulse-dev package!))
-+  AC_CHECK_LIB([pulse], [pa_stream_peek], , AC_MSG_ERROR(PulseAudio support requires the libpulse-dev library.))], )
- AM_CONDITIONAL([USE_PULSE], [test "x$HAS_PULSE" = "x1"])
- 
- # Look for dns_sd flag
diff --git a/debian/patches/series b/debian/patches/series
index 6d8e5e6..e2748c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 typo-fixes.patch
-Fix-a-compilation-error-in-audio_pulse-c.patch
diff --git a/debian/patches/typo-fixes.patch b/debian/patches/typo-fixes.patch
index ffcadf0..33a1901 100644
--- a/debian/patches/typo-fixes.patch
+++ b/debian/patches/typo-fixes.patch
@@ -4,7 +4,7 @@ Last-Update: 2016-02-07
 
 --- a/README.md
 +++ b/README.md
-@@ -257,7 +257,7 @@
+@@ -269,7 +269,7 @@
  
  Please note that the full path to the programs must be specified, and script files will not be executed unless they are marked as executable and have the standard `#!/bin/...` first line. (This behaviour may be different from other Shairports.)
  
@@ -15,7 +15,7 @@ Last-Update: 2016-02-07
  The Raspberry Pi has a built-in audio DAC that is connected to the device's headphone jack. This provides a low-quality output that is nevertheless useful for testing purposes and may be adequate for [very] casual listening. It is not HiFi -- it is quite noisy and can't play anything above about 15kHz. A further problem is that it declares itself to have a very large mixer volume control range -- all the way from -102.38dB up to +4dB, a range of 106.38 dB. In reality, only the top 30dB of it is in any way usable. To help get the most from the DAC, consider using the `volume_range_db` setting in the `general` stanza to instruct Shairport Sync to use the top of the DAC mixer's declared range. For example, if you set the `volume_range_db` figure to 30, the top 30 dB of the range will the used. With this setting on the Raspberry Pi, maximum volume will be +4dB and minimum volume will be -26dB, below which muting will occur.
 --- a/RELEASENOTES.md
 +++ b/RELEASENOTES.md
-@@ -472,7 +472,7 @@
+@@ -548,7 +548,7 @@
  Some big changes "under the hood" have been made, leading to limited support for unsynchronised output to `stdout` or to a named pipe and continuation of defacto support for unsynchronised PulseAudio. Also, support for a configuration file in preference to command line options, an option to ignore volume control and other improvements are provided.
  
  In this release, Shairport Sync gains the ability to read settings from `/etc/shairport-sync.conf`.
@@ -37,7 +37,7 @@ Last-Update: 2016-02-07
    audio_output *output;
 --- a/shairport.c
 +++ b/shairport.c
-@@ -180,7 +180,7 @@
+@@ -182,7 +182,7 @@
           "/etc/shairport-sync.conf.\n");
  
    printf("\n");
@@ -48,15 +48,15 @@ Last-Update: 2016-02-07
    printf("    -a, --name=NAME         set advertised name.\n");
 --- a/man/shairport-sync.7.xml
 +++ b/man/shairport-sync.7.xml
-@@ -458,7 +458,7 @@
+@@ -468,7 +468,7 @@
      A third latency is used when the audio source is forked-daapd. The fourth latency is the default if no other latency is chosen and is used for older versions of iTunes.</p>
      <p>Note: If you are thinking of changing latencies to compensate for a delay in the audio output device, then
      instead of changing these individual latencies, use the <opt>audio_backend_latency_offset</opt> setting in the <opt>alsa</opt> group
 -    (or the appropriate other group if you're not outputing through the alsa backend).</p>
 +    (or the appropriate other group if you're not outputting through the alsa backend).</p>
  
- 
      <option>
+     <p><opt>itunes=</opt><arg>latency</arg><opt>;</opt></p>
 --- a/mdns_avahi.c
 +++ b/mdns_avahi.c
 @@ -188,7 +188,7 @@