[SCM] vlc/master: Link vlc with the C++ standard library.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 86d80aa98b075f3a2507572451c951ba29dc40d3
Author: Benjamin Drung <bdrung at debian.org>
Date:   Thu Mar 1 21:46:01 2012 +0100

    Link vlc with the C++ standard library.
    
    Closes: #661819

diff --git a/debian/patches/link-vlc-with-c++.patch b/debian/patches/link-vlc-with-c++.patch
new file mode 100644
index 0000000..44dd2cf
--- /dev/null
+++ b/debian/patches/link-vlc-with-c++.patch
@@ -0,0 +1,16 @@
+Description: Link vlc with the C++ standard library
+ See the corresponding vlc-cache-gen patch for more details.
+Author: Benjamin Drung <bdrung at debian.org>
+Bug-Debian: http://bugs.debian.org/661819
+
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
+@@ -16,7 +16,7 @@
+ if !HAVE_WIN32
+ if !HAVE_WINCE
+ bin_PROGRAMS += vlc-wrapper
+-vlc_SOURCES = vlc.c override.c
++vlc_SOURCES = vlc.c override.c dummy.cpp
+ endif
+ endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b9b7109..a673ab9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ bp-monotonic-clock.patch
 altivec-cflags.patch
 v4l-kfreebsd.patch
 link-vlc-cache-gen-with-c++.patch
+link-vlc-with-c++.patch

-- 
VLC media player packaging