[SCM] snd/master: Fixing conflicts to allow co-installation

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 39a0a7cabd30f4db1003b6df32b1481e4ffbb565
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Mon Jan 25 23:11:31 2016 +0100

    Fixing conflicts to allow co-installation

diff --git a/debian/control b/debian/control
index cda2aea..1b5c4c5 100644
--- a/debian/control
+++ b/debian/control
@@ -51,11 +51,11 @@ Provides: snd-gtk-alsa [linux-any], snd-gtk
 Depends: snd (>= ${source:Version}),
  ${shlibs:Depends},
  ${misc:Depends}
-Conflicts: snd-dmotif, snd-dmotif-alsa, snd-smotif, snd-gtk-alsa,
- snd-gtk-pulse
+Conflicts: snd-dmotif, snd-dmotif-alsa, snd-smotif
 Breaks: snd-gtk (<< 11-3)
 Replaces: snd (<< 5.10), snd-dmotif, snd-dmotif-alsa, snd-smotif,
- snd-gtk-alsa, snd-gtk (<< 11-3), snd-gtk-pulse
+ snd-gtk (<< 11-3),
+ snd-gtk-alsa (<< 16.1-2), snd-gtk-pulse (<< 16.1-2)
 Description: Sound file editor (GTK+ user interface - JACK)
  Snd is a powerful sound file editor that can be customized and extended using
  the Scheme programming language.
@@ -69,11 +69,11 @@ Provides: snd-gtk-alsa [linux-any], snd-gtk
 Depends: snd (>= ${source:Version}),
  ${shlibs:Depends},
  ${misc:Depends}
-Conflicts: snd-dmotif, snd-dmotif-alsa, snd-smotif, snd-gtk-alsa,
- snd-gtk-jack
+Conflicts: snd-dmotif, snd-dmotif-alsa, snd-smotif, snd-gtk-alsa (<< 16.1-2)
 Breaks: snd-gtk (<< 11-3)
 Replaces: snd (<< 5.10), snd-dmotif, snd-dmotif-alsa, snd-smotif,
- snd-gtk-alsa, snd-gtk (<< 11-3), snd-gtk-jack
+ snd-gtk (<< 11-3),
+ snd-gtk-alsa (<< 16.1-2), snd-gtk-jack (<< 16.1-2)
 Description: Sound file editor (GTK+ user interface - PulseAudio)
  Snd is a powerful sound file editor that can be customized and extended using
  the Scheme programming language.
@@ -87,12 +87,13 @@ Depends: snd (>= ${source:Version}),
  ${shlibs:Depends},
  ${misc:Depends}
 Provides: snd-nox-alsa [linux-any]
-Conflicts: snd-dmotif, snd-dmotif-alsa, snd-smotif, snd-gtk-alsa,
- snd-gtk-jack, snd-gtk-pulse
+Conflicts: snd-dmotif, snd-dmotif-alsa, snd-smotif,
+ snd-gtk (<< 16.1-2)
 Breaks: snd-gtk (<< 11-3),
  snd-nox-alsa (<< 11.2-2)
 Replaces: snd (<< 5.10), snd-dmotif, snd-dmotif-alsa, snd-smotif,
- snd-gtk-alsa, snd-gtk (<< 11-3), snd-gtk-jack, snd-gtk-pulse,
+ snd-gtk (<< 11-3),
+ snd-gtk-alsa (<< 16.1-2), snd-gtk-jack (<< 16.1-2), snd-gtk-pulse (<< 16.1-2),
  snd-nox-alsa (<< 11.2-2)
 Description: Sound file editor (without X support)
  Snd is a powerful sound file editor that can be customized and extended using

-- 
snd packaging