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

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

The following commit has been merged in the ubuntu branch:
commit 3f9bf768efca3a97385de1382b00720d83a5aa8d
Merge: 7ea38bf674dd4dcffe23d1aafe5d887ad29cac78 b030e24b421b5b16ed38448a4a32e26a5ea5a468
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Sat Apr 19 14:44:01 2014 -0700

    Merge branch 'master' into ubuntu

diff --combined debian/control
index 97330d5,c4fbaba..8cebe46
--- 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
@@@ -77,7 -77,7 +77,7 @@@ Multi-Arch: sam
  Depends: libgroove3 (= ${binary:Version}),
   libgrooveplayer3 (= ${binary:Version}),
   libgrooveloudness3 (= ${binary:Version}),
-  libgroovefingerprinter (= ${binary:Version}),
+  libgroovefingerprinter3 (= ${binary:Version}),
   ${misc:Depends}
  Pre-Depends: ${misc:Pre-Depends}
  Description: debugging symbols for libgroove

-- 
libgroove packaging