[debian-edu-commits] debian-edu/pkg-team/ 01/01: Dropped 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 27aed3459daf0b4e39f74c3da89afceab8e2d8dc
Author: Javier Serrano Polo <javier at jasp.net>
Date:   Mon Jul 11 20:30:45 2016 +0200

    Dropped workaround for #824715
---
 debian/changelog                  | 1 +
 debian/patches/license-gpl3.patch | 1 +
 debian/patches/sort-glob.patch    | 1 +
 debian/rules                      | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9169d86..1cb82d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ lmms (1.1.3-4) unstable; urgency=medium
   * Sort lists generated from globbing expressions (reproducibility).
   * Fixed upgrade that installs recommended packages (Closes: #827039).
   * Dropped unused build dependencies.
+  * Dropped workaround for #824715, wineg++ is fixed.
 
  -- Javier Serrano Polo <javier at jasp.net>  Wed, 08 Jun 2016 01:25:37 +0200
 
diff --git a/debian/patches/license-gpl3.patch b/debian/patches/license-gpl3.patch
index 59b53a0..ce0c7b8 100644
--- a/debian/patches/license-gpl3.patch
+++ b/debian/patches/license-gpl3.patch
@@ -4,6 +4,7 @@ Description: Add GPL-3 to license information
  dialog.
 Author: Javier Serrano Polo <javier at jasp.net>
 Forwarded: https://github.com/LMMS/lmms/pull/2773
+Applied-Upstream: 1.1.91
 
 Index: lmms-1.1.3/COPYING
 ===================================================================
diff --git a/debian/patches/sort-glob.patch b/debian/patches/sort-glob.patch
index af96e1e..0ab3f7f 100644
--- a/debian/patches/sort-glob.patch
+++ b/debian/patches/sort-glob.patch
@@ -5,6 +5,7 @@ Description: Sort lists generated from globbing expressions
  lists. This issue does not affect CMake after version 3.5.2.
 Author: Javier Serrano Polo <javier at jasp.net>
 Forwarded: https://github.com/LMMS/lmms/pull/2829
+Applied-Upstream: 1.1.91
 
 Index: lmms-1.1.3/CMakeLists.txt
 ===================================================================
diff --git a/debian/rules b/debian/rules
index adf9be5..b7bddf9 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) -lstdc++"
+CMAKE_OPTS+= -DWINE_CXX_FLAGS=-Wl,--enable-new-dtags,-rpath=$(WINE_PATH)
 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