[SCM] libgroove/ubuntu: Merge branch 'master' into ubuntu

[andrewrk-guest at users.alioth.debian.org]

link with math patch: private linking
remove Pre-Depends from debug package
add patch for linking against math library
add lintian override for libgrooveloudness4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: d5a8f9a2ba1a0bb903e8bbcb9dc8bc573f190dcc
X-Git-Newrev: 384abcded56f3b4565e59e1e8954601273fd5d70

The following commit has been merged in the ubuntu branch:
commit 384abcded56f3b4565e59e1e8954601273fd5d70
Merge: d5a8f9a2ba1a0bb903e8bbcb9dc8bc573f190dcc 805b119e23b8e13699f19b782acfc6fbf758fb31
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Tue May 13 20:52:05 2014 -0700

    Merge branch 'master' into ubuntu

diff --combined debian/control
index c0e2dc1,8f5ea54..7b18776
--- a/debian/control
+++ b/debian/control
@@@ -6,10 -6,10 +6,10 @@@ Build-Depends: debhelper (>= 9)
   cmake,
   libebur128-dev,
   libchromaprint-dev,
 - libavcodec-dev (>= 6:10~),
 - libavformat-dev (>= 6:10~),
 - libavfilter-dev (>= 6:10~),
 - libavutil-dev (>= 6:10~),
 + libavcodec-dev (>= 6:10~~),
 + libavformat-dev (>= 6:10~~),
 + libavfilter-dev (>= 6:10~~),
 + libavutil-dev (>= 6:10~~),
   libav-tools,
   libsdl2-dev,
   pkg-config
@@@ -79,7 -79,6 +79,6 @@@ Depends: libgroove4 (= ${binary:Version
   libgrooveloudness4 (= ${binary:Version}),
   libgroovefingerprinter4 (= ${binary:Version}),
   ${misc:Depends}
- Pre-Depends: ${misc:Pre-Depends}
  Description: debugging symbols for libgroove
   This package contains the debugging symbols for libgroove4, libgrooveplayer4,
   libgrooveloudness4, and libgroovefingerprinter4.

-- 
libgroove packaging