[SCM] snd/master: added flavour suffix to the binaries to make them coinstallable

[umlaeute at users.alioth.debian.org]

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

    added flavour suffix to the binaries to make them coinstallable

diff --git a/debian/rules b/debian/rules
index baa1d2c..6fc5bbb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,7 @@ DEB_CONFIGURE_EXTRA_FLAGS = \
 ## per flavor configure options
 
 # nox, use ALSA on linux and OSS non non-linux
-DEB_CONFIGURE_EXTRA_FLAGS_nox       = --without-gui
+DEB_CONFIGURE_EXTRA_FLAGS_nox       = --without-gui -program-suffix=.nox
 ifneq (,$(findstring linux,$(DEB_HOST_ARCH_OS)))
 DEB_CONFIGURE_EXTRA_FLAGS_nox += --with-alsa
 else
@@ -53,7 +53,7 @@ DEB_CONFIGURE_EXTRA_FLAGS_nox += --with-oss
 endif
 
 # jack
-DEB_CONFIGURE_EXTRA_FLAGS_gtk-jack  = --with-gtk
+DEB_CONFIGURE_EXTRA_FLAGS_gtk-jack  = --with-gtk --program-suffix=.gtk-jack
 # the code includes inline-asm for atomic ops, but only for i386/amd64/powerpc
 # see https://bugs.debian.org/#555538
 ifneq (,$(findstring :$(DEB_HOST_ARCH_CPU):,:i386:powerpc:amd64:))
@@ -61,7 +61,7 @@ DEB_CONFIGURE_EXTRA_FLAGS_gtk-jack  += --with-jack
 endif
 
 ## pulse
-DEB_CONFIGURE_EXTRA_FLAGS_gtk-pulse = --with-gtk --with-pulseaudio
+DEB_CONFIGURE_EXTRA_FLAGS_gtk-pulse = --with-gtk --with-pulseaudio --program-suffix=.gtk-pulse
 DEB_CONFIGURE_EXTRA_FLAGS += $(DEB_CONFIGURE_EXTRA_FLAGS_$(cdbs_make_curflavor))
 
 # upstream naively (and worngly) assumes
@@ -71,3 +71,16 @@ DEB_MAKE_EXTRA_ARGS += $(DEB_MAKE_EXTRA_ARGS_$(cdbs_make_curflavor))
 
 ## right; everybody their own changelog filename!
 DEB_INSTALL_CHANGELOGS_ALL=HISTORY.Snd
+
+
+SND_MANPAGES=snd.nox.1 snd.gtk-jack.1 snd.gtk-pulse.1
+$(SND_MANPAGES): snd.1
+	cp $^ $@
+
+build/snd-nox:: snd.nox.1
+build/snd-gtk-jack:: snd.gtk-jack.1
+build/snd-gtk-pulse:: snd.gtk-pulse.1
+
+
+clean::
+	rm -f $(SND_MANPAGES)
diff --git a/debian/snd-gtk-jack.manpages b/debian/snd-gtk-jack.manpages
index 6d86788..5099752 100644
--- a/debian/snd-gtk-jack.manpages
+++ b/debian/snd-gtk-jack.manpages
@@ -1 +1 @@
-snd.1
+snd.gtk-jack.1
diff --git a/debian/snd-gtk-pulse.manpages b/debian/snd-gtk-pulse.manpages
index 6d86788..b5c57b7 100644
--- a/debian/snd-gtk-pulse.manpages
+++ b/debian/snd-gtk-pulse.manpages
@@ -1 +1 @@
-snd.1
+snd.gtk-pulse.1
diff --git a/debian/snd-nox.manpages b/debian/snd-nox.manpages
index 6d86788..7b8d551 100644
--- a/debian/snd-nox.manpages
+++ b/debian/snd-nox.manpages
@@ -1 +1 @@
-snd.1
+snd.nox.1

-- 
snd packaging