[SCM] bs1770gain/master: Merge tag 'upstream/0.4.8'

[pere at users.alioth.debian.org]

Imported Upstream version 0.4.8
Imported Upstream version 0.4.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3df1e340277e01b211e4743c2c8a1d0c4b6d4268
X-Git-Newrev: f6390f8309f7c5ae0627fcb93dd8adb803a2852a

The following commit has been merged in the master branch:
commit 1c7973b79316a70bc79fc438b348d855f08f569a
Merge: 3df1e340277e01b211e4743c2c8a1d0c4b6d4268 4e3882f3e096c9c9dcda21516b2cf6c4c79217a2
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Dec 19 13:27:50 2015 +0100

    Merge tag 'upstream/0.4.8'
    
    Upstream version 0.4.8

diff --combined bs1770gain/Makefile.in
index 7251838,0dd0037..3ad5ece
--- a/bs1770gain/Makefile.in
+++ b/bs1770gain/Makefile.in
@@@ -50,6 -50,12 +50,12 @@@ POST_INSTALL = 
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
+ 
+ #CFLAGS+=-g
+ #CFLAGS+=-ggdb
+ #LDFLAGS+=-static-libgcc
+ #LDFLAGS+=-static-libstdc++
+ @WIN32_TRUE at am__append_1 = -municode
  bin_PROGRAMS = bs1770gain$(EXEEXT)
  subdir = bs1770gain
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@@ -127,11 -133,6 +133,11 @@@ ECHO_N = @ECHO_N
  ECHO_T = @ECHO_T@
  EGREP = @EGREP@
  EXEEXT = @EXEEXT@
 +
 +#CFLAGS+=-g
 +#CFLAGS+=-ggdb
 +#LDFLAGS+=-static-libgcc
 +#LDFLAGS+=-static-libstdc++
  FFMPEG_PREFIX = @FFMPEG_PREFIX@
  FFSOX_AVCODEC_V = @FFSOX_AVCODEC_V@
  FFSOX_AVFORMAT_V = @FFSOX_AVFORMAT_V@
@@@ -144,7 -145,7 +150,7 @@@ INSTALL_DATA = @INSTALL_DATA
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@ @BS1770GAIN_LDFLAGS@
+ LDFLAGS = @LDFLAGS@ $(am__append_1) @BS1770GAIN_LDFLAGS@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
  LTLIBOBJS = @LTLIBOBJS@

-- 
bs1770gain packaging