[SCM] snd/master: Fix suffix-creation for binaries

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9a6ad3d3af919efae47dbe760efea194eeb9782d
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue Jan 26 19:44:12 2016 +0100

    Fix suffix-creation for binaries
    
    for whatever reason $(cdbs_make_curflavor) seems to expand to the full packagename,
    rather than one of the flavours.
    so we just just $(cdb_curpkg) and strip the leading "snd-".

diff --git a/debian/rules b/debian/rules
index eeb4a1f..e47eb6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,11 +67,15 @@ DEB_CONFIGURE_EXTRA_FLAGS_gtk-jack  = --with-gtk \
 
 ## pulse
 DEB_CONFIGURE_EXTRA_FLAGS_gtk-pulse = --with-gtk --with-pulseaudio
+
+## append any extra args for configure
 DEB_CONFIGURE_EXTRA_FLAGS += $(DEB_CONFIGURE_EXTRA_FLAGS_$(cdbs_make_curflavor))
 
-# upstream naively (and worngly) assumes
+# upstream naively (and wrongly) assumes
 # that they only need to link against "-lpulse-simple"
 DEB_MAKE_EXTRA_ARGS_gtk-pulse=AUDIO_LIB="$(shell pkg-config --libs libpulse-simple)"
+
+## append any extra args for make
 DEB_MAKE_EXTRA_ARGS += $(DEB_MAKE_EXTRA_ARGS_$(cdbs_make_curflavor))
 
 ## right; everybody their own changelog filename!
@@ -87,8 +91,8 @@ build/snd-gtk-jack:: snd.gtk-jack.1
 build/snd-gtk-pulse:: snd.gtk-pulse.1
 
 binary-post-install/snd-nox binary-post-install/snd-gtk-jack binary-post-install/snd-gtk-pulse::
-	mv $(CURDIR)/debian/$(cdbs_curpkg)/usr/bin/snd $(CURDIR)/debian/$(cdbs_curpkg)/usr/bin/snd.$(cdbs_make_curflavor)
-
+	mv $(CURDIR)/debian/$(cdbs_curpkg)/usr/bin/snd \
+	   $(CURDIR)/debian/$(cdbs_curpkg)/usr/bin/snd.$(patsubst snd-%,%,$(cdbs_curpkg))
 
 clean::
 	rm -f $(SND_MANPAGES)

-- 
snd packaging