[SCM] ebumeter/master: Fix cross build failure

[mattia at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9c54b4f8f6e102a6c72d44058a7bdf2cd3e35baa
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Tue Aug 29 14:48:21 2017 +0200

    Fix cross build failure
    
    + Drop implicitly satisfied build dependency on binutils
    + Make g++ substitutable in source/Makefile
    
    (yes, patch forwarded upstream via private mail)
    
    Closes: #873527
    Thanks: Helmut Grohne <helmut at subdivi.de> for the patch
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 91a17bb..0aac6d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ebumeter (0.4.0-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+
+ -- Mattia Rizzolo <mattia at debian.org>  Tue, 29 Aug 2017 14:42:05 +0200
+
 ebumeter (0.4.0-3) unstable; urgency=medium
 
   * Sign tags.
diff --git a/debian/control b/debian/control
index f8054d1..90072ae 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders:
  Jaromír Mikeš <mira.mikes at seznam.cz>
 Build-Depends:
- binutils,
  debhelper (>= 10),
  libclthreads-dev (>= 2.4.0),
  libclxclient-dev (>= 3.9.0),
diff --git a/debian/patches/02-makefile.patch b/debian/patches/02-makefile.patch
new file mode 100644
index 0000000..dde88bb
--- /dev/null
+++ b/debian/patches/02-makefile.patch
@@ -0,0 +1,28 @@
+Description: use $(CXX) instead of hardcoding g++
+ This fixes cross building, where the compiler used is prefixed by the host architecture
+Author: Helmut Grohne <helmut at subdivi.de>
+Acked-By: Mattia Rizzolo <mattia at debian.org>
+Bug-Debian: https://bugs.debian.org/873527
+Last-Update: 2017-08-29
+Forwarded: Fons Adriaensen <fons at linuxaudio.org>
+
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -36,7 +36,7 @@
+ EBUR128_O = ebur128.o ebu_r128_proc.o peak_proc.o audiofile.o dither.o 
+ ebur128:	LDLIBS += -lsndfile -lzita-resampler
+ ebur128:	$(EBUR128_O)
+-	g++ $(LDFLAGS) -o $@ $(EBUR128_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(EBUR128_O) $(LDLIBS)
+ $(EBUR128_O):
+ -include $(EBUR128_O:%.o=%.d)
+ 
+@@ -48,7 +48,7 @@
+ ebumeter:	LDFLAGS += -L/usr/X11R6/$(LIBDIR)  -pthread
+ ebumeter:	LDLIBS += -lclthreads -lclxclient -lzita-resampler -lpthread -ljack -lpng -lXft -lpng -lX11 -lrt
+ ebumeter:	$(EBUMETER_O)
+-	g++ $(LDFLAGS) -o $@ $(EBUMETER_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(EBUMETER_O) $(LDLIBS)
+ $(EBUMETER_O):
+ -include $(EBUMETER_O:%.o=%.d)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d3b72df..f3a7b11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-makefile.patch
+02-makefile.patch

-- 
ebumeter packaging