[SCM] swh-plugins/master: Merge branch 'debian/unstable'

[jcowgill at users.alioth.debian.org]

Upload to unstable
Link gsm_1215.so plugin against system libgsm
Fix vocoder-ladspa Breaks/Replaces
New changelog entry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ec1b185f25ec66420fed049596b9357783671c57
X-Git-Newrev: 9f243479e0e06668c1e990da1b48535099e2476a

The following commit has been merged in the master branch:
commit 9f243479e0e06668c1e990da1b48535099e2476a
Merge: ec1b185f25ec66420fed049596b9357783671c57 43a8cbdc147f29c8f45fafea0177ec9f8ba43a34
Author: James Cowgill <jcowgill at debian.org>
Date:   Mon Apr 3 20:16:55 2017 +0100

    Merge branch 'debian/unstable'

diff --combined debian/control
index 1550a8b,af39003..194a760
--- a/debian/control
+++ b/debian/control
@@@ -7,7 -7,7 +7,7 @@@ Uploaders
   Jaromír Mikeš <mira.mikes at seznam.cz>
  Build-Depends:
   chrpath,
 - debhelper (>= 10~),
 + debhelper (>= 10),
   dh-autoreconf,
   ladspa-sdk,
   libfftw3-dev,
@@@ -16,11 -16,6 +16,6 @@@
   libxml-parser-perl,
   libgsm1-dev,
   pkg-config
- Replaces:
-  lmms (<= 1.1.3-2)
-  ${cdbs:Replaces}
- Breaks:
-  lmms (<= 1.1.3-2)
  Standards-Version: 3.9.8
  Homepage: http://plugin.org.uk/
  Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/swh-plugins.git
@@@ -31,6 -26,11 +26,11 @@@ Architecture: an
  Depends:
   ${misc:Depends},
   ${shlibs:Depends}
+ Replaces:
+  vocoder-ladspa (<< 1.1.3-3~),
+  ${cdbs:Replaces}
+ Breaks:
+  vocoder-ladspa (<< 1.1.3-3~)
  Provides:
   ladspa-plugin
  Description: Steve Harris's LADSPA plugins

-- 
swh-plugins packaging