Merge remote branch 'phish3/master'

diff --combined src/Makefile.am
index 5db6b39c14f85e4feadd5740cbfb853ee26c5d6b,fc8803ce8fb44cffb5475182608299bde5817e5c..3be28692d4d8778cb71064e1022f4ecfd41249db
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -109,6 -109,30 +109,6 @@@ MODULE_LDFLAGS = -module -disable-stati
  #          Extra files            #
  ###################################
  
 -ALSA_PROFILES = \
 -              modules/alsa/mixer/profile-sets/default.conf \
 -              modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
 -              modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
 -
 -ALSA_PATHS = \
 -              modules/alsa/mixer/paths/analog-input-aux.conf \
 -              modules/alsa/mixer/paths/analog-input.conf \
 -              modules/alsa/mixer/paths/analog-input.conf.common \
 -              modules/alsa/mixer/paths/analog-input-fm.conf \
 -              modules/alsa/mixer/paths/analog-input-linein.conf \
 -              modules/alsa/mixer/paths/analog-input-mic.conf \
 -              modules/alsa/mixer/paths/analog-input-mic.conf.common \
 -              modules/alsa/mixer/paths/analog-input-mic-line.conf \
 -              modules/alsa/mixer/paths/analog-input-tvtuner.conf \
 -              modules/alsa/mixer/paths/analog-input-video.conf \
 -              modules/alsa/mixer/paths/analog-output.conf \
 -              modules/alsa/mixer/paths/analog-output-speaker.conf \
 -              modules/alsa/mixer/paths/analog-output.conf.common \
 -              modules/alsa/mixer/paths/analog-output-headphones.conf \
 -              modules/alsa/mixer/paths/analog-output-headphones-2.conf \
 -              modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \
 -              modules/alsa/mixer/paths/analog-output-mono.conf
 -
  EXTRA_DIST = \
                pulse/client.conf.in \
                pulse/version.h.in \
@@@ -125,7 -149,10 +125,7 @@@
                daemon/pulseaudio.desktop.in \
                daemon/pulseaudio-kde.desktop.in \
                map-file \
 -              daemon/pulseaudio-system.conf \
 -              modules/alsa/mixer/profile-sets/90-pulseaudio.rules \
 -              ${ALSA_PROFILES} \
 -              ${ALSA_PATHS}
 +              daemon/pulseaudio-system.conf
  
  pulseconf_DATA = \
                default.pa \
@@@ -1067,34 -1094,14 +1067,34 @@@ modlibexec_LTLIBRARIES += 
                module-alsa-source.la \
                module-alsa-card.la
  
 -alsaprofilesets_DATA = ${ALSA_PROFILES}
 +dist_alsaprofilesets_DATA = \
 +              modules/alsa/mixer/profile-sets/default.conf \
 +              modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
 +              modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
  
  if HAVE_UDEV
 -udevrules_DATA = \
 +dist_udevrules_DATA = \
                modules/alsa/mixer/profile-sets/90-pulseaudio.rules
  endif
  
 -alsapaths_DATA = ${ALSA_PATHS}
 +dist_alsapaths_DATA = \
 +              modules/alsa/mixer/paths/analog-input-aux.conf \
 +              modules/alsa/mixer/paths/analog-input.conf \
 +              modules/alsa/mixer/paths/analog-input.conf.common \
 +              modules/alsa/mixer/paths/analog-input-fm.conf \
 +              modules/alsa/mixer/paths/analog-input-linein.conf \
 +              modules/alsa/mixer/paths/analog-input-mic.conf \
 +              modules/alsa/mixer/paths/analog-input-mic.conf.common \
 +              modules/alsa/mixer/paths/analog-input-mic-line.conf \
 +              modules/alsa/mixer/paths/analog-input-tvtuner.conf \
 +              modules/alsa/mixer/paths/analog-input-video.conf \
 +              modules/alsa/mixer/paths/analog-output.conf \
 +              modules/alsa/mixer/paths/analog-output-speaker.conf \
 +              modules/alsa/mixer/paths/analog-output.conf.common \
 +              modules/alsa/mixer/paths/analog-output-headphones.conf \
 +              modules/alsa/mixer/paths/analog-output-headphones-2.conf \
 +              modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \
 +              modules/alsa/mixer/paths/analog-output-mono.conf
  
  endif
  
@@@ -1185,6 -1192,7 +1185,7 @@@ endi
  if HAVE_FFTW
  modlibexec_LTLIBRARIES += \
                module-equalizer-sink.la
+ bin_SCRIPTS += utils/qpaeq
  endif
  
  # These are generated by an M4 script