[SCM] vlc/master: Combine link-vlc-cache-gen-with-c++.patch and link-vlc-with-c++.patch to link-binaries-with-c++.patch.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit abf3b6771d103fb41cddd9c3cde687718fbde322
Author: Benjamin Drung <bdrung at debian.org>
Date:   Fri Mar 22 13:21:31 2013 +0100

    Combine link-vlc-cache-gen-with-c++.patch and link-vlc-with-c++.patch to link-binaries-with-c++.patch.

diff --git a/debian/patches/link-vlc-cache-gen-with-c++.patch b/debian/patches/link-binaries-with-c++.patch
similarity index 83%
rename from debian/patches/link-vlc-cache-gen-with-c++.patch
rename to debian/patches/link-binaries-with-c++.patch
index 77aa978..0f8f1ca 100644
--- a/debian/patches/link-vlc-cache-gen-with-c++.patch
+++ b/debian/patches/link-binaries-with-c++.patch
@@ -10,9 +10,19 @@ Subject: [PATCH] Link vlc-cache-gen with the C++ standard library to avoid
 Origin: upstream, http://git.videolan.org/?p=vlc.git;a=commitdiff;h=07d38617832be934896fa7a14fe52f1a65c901ab
 Bug-Debian: http://bugs.debian.org/660934
 Bug-Debian: http://bugs.debian.org/660935
+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
+ 
 @@ -59,7 +59,7 @@
  vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc
  	$(WINDRES) --include-dir $(top_srcdir)/share/icons -i $< -o $@
diff --git a/debian/patches/link-vlc-with-c++.patch b/debian/patches/link-vlc-with-c++.patch
deleted file mode 100644
index 44dd2cf..0000000
--- a/debian/patches/link-vlc-with-c++.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 5bc48cf..474a8fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 v4l-kfreebsd.patch
-link-vlc-cache-gen-with-c++.patch
-link-vlc-with-c++.patch
+link-binaries-with-c++.patch
 bp-man-update-title-dvd-syntax.patch

-- 
VLC media player packaging