[debian-edu-commits] debian-edu/pkg-team/ 01/01: Added workaround for #824715

[Javier Serrano Polo]

This is an automated email from the git hooks/post-receive script.

jasp00-guest pushed a commit to branch master
in repository lmms.

commit eb4113c2c49b13b222cb887173ce4a91d63d332a
Author: Javier Serrano Polo <javier at jasp.net>
Date:   Thu Jun 2 20:36:57 2016 +0200

    Added workaround for #824715
---
 debian/changelog | 3 ++-
 debian/rules     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca2c665..a8917ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ lmms (1.1.3-3) unstable; urgency=low
   [ Javier Serrano Polo ]
   * Dropped Wine path from PATH.
   * Fixed lmms-common upgrade (Closes: #825287).
-  * Hid vocoder plug-in, it is now in swh-plugins.
+  * Hid vocoder plug-in, it is now in swh-plugins (Closes: #826110).
+  * Added workaround for #824715 (Closes: #825286).
 
  -- Javier Serrano Polo <javier at jasp.net>  Sat, 28 May 2016 21:47:04 +0200
 
diff --git a/debian/rules b/debian/rules
index b7bddf9..adf9be5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ endif
 
 ifeq ($(DEB_HOST_ARCH),i386)
 WINE_PATH := /usr/lib/$(DEB_HOST_MULTIARCH)/wine
-CMAKE_OPTS+= -DWINE_CXX_FLAGS=-Wl,--enable-new-dtags,-rpath=$(WINE_PATH)
+CMAKE_OPTS+= -DWINE_CXX_FLAGS="-Wl,--enable-new-dtags,-rpath=$(WINE_PATH) -lstdc++"
 else
 CMAKE_OPTS+= -DWANT_VST_NOWINE=1 \
 	-DREMOTE_VST_PLUGIN_FILEPATH=../../i386-linux-gnu/lmms/RemoteVstPlugin

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/lmms.git