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

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

update package with new library
Merge upstream 3.1.0
Release 3.1.0
add acoustid fingerprinter sink. closes #19
Revert "build: use GNUInstallDirs"
update to libav 10.1
Merge pull request #52 from CalebMorris/master
Added missing cmake link to -ldl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: c6f5e54fa740e52fa3607c6bb7a99f5e23a4cb0c
X-Git-Newrev: 3f9bf768efca3a97385de1382b00720d83a5aa8d

The following commit has been merged in the ubuntu branch:
commit 3b1c0d878fc9d4ac2d4babac13f86bbf6ff0c116
Merge: c6f5e54fa740e52fa3607c6bb7a99f5e23a4cb0c 0f24527a2d06d506ec6d6d465c7a67e5ac93debe
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Sat Apr 19 14:22:27 2014 -0700

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index 87e5ada,052b4e0..792a1b1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,18 @@@
- libgroove (3.0.8+dfsg-1ubuntu1) trusty; urgency=low
++libgroove (3.1.0+dfsg-1ubuntu1) trusty; urgency=low
 +
 +  * release for ubuntu
 +
-  -- Andrew Kelley <superjoe30 at gmail.com>  Tue, 01 Apr 2014 23:38:54 -0700
++ -- Andrew Kelley <superjoe30 at gmail.com>  Sat, 19 Apr 2014 14:02:55 -0700
++
+ libgroove (3.1.0+dfsg-1) experimental; urgency=low
+ 
+   * update to libav 10.1
+   * Revert "build: use GNUInstallDirs"
+   * add acoustid fingerprinter sink
+ 
+  -- Andrew Kelley <superjoe30 at gmail.com>  Sat, 19 Apr 2014 14:02:55 -0700
  
- libgroove (3.0.8+dfsg-1ubuntu1) experimental; urgency=low
+ libgroove (3.0.8+dfsg-1) experimental; urgency=low
  
    * fix memory corruption when replaygain scanning large album
    * update to libav 10.0
@@@ -25,26 -27,6 +33,26 @@@ libgroove (3.0.7+dfsg-1) experimental; 
  
   -- Andrew Kelley <superjoe30 at gmail.com>  Sun, 16 Mar 2014 19:26:57 -0700
  
 +libgroove (3.0.6+dfsg-1ubuntu3) saucy; urgency=low
 +
 +  * fix bug where accessing "album" metadata would instead return
 +    "album_artist"
 +  * use ebur128 true peak instead of sample peak
 +
 + -- Andrew Kelley <superjoe30 at gmail.com>  Wed, 12 Mar 2014 11:46:18 -0700
 +
 +libgroove (3.0.6+dfsg-1ubuntu2) saucy; urgency=low
 +
 +  * fix dependency
 +
 + -- Andrew Kelley <superjoe30 at gmail.com>  Sun, 23 Feb 2014 04:21:18 -0400
 +
 +libgroove (3.0.6+dfsg-1ubuntu1) saucy; urgency=low
 +
 +  * release for ubuntu
 +
 + -- Andrew Kelley <superjoe30 at gmail.com>  Sun, 23 Feb 2014 03:23:18 -0400
 +
  libgroove (3.0.6+dfsg-1) experimental; urgency=low
  
    * Initial release. (Closes: #738461)
diff --combined debian/control
index dff4e5e,80e61db..97330d5
--- a/debian/control
+++ b/debian/control
@@@ -5,10 -5,11 +5,11 @@@ Uploaders: Andrew Kelley <superjoe30 at gm
  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
@@@ -76,11 -77,12 +77,12 @@@ Multi-Arch: sam
  Depends: libgroove3 (= ${binary:Version}),
   libgrooveplayer3 (= ${binary:Version}),
   libgrooveloudness3 (= ${binary:Version}),
+  libgroovefingerprinter (= ${binary:Version}),
   ${misc:Depends}
  Pre-Depends: ${misc:Pre-Depends}
  Description: debugging symbols for libgroove
   This package contains the debugging symbols for libgroove3, libgrooveplayer3,
-  and libgrooveloudness3.
+  libgrooveloudness3, and libgroovefingerprinter3.
  
  
  Package: libgrooveplayer-dev
@@@ -124,3 -126,27 +126,27 @@@ Description: loudness scanner sink for 
   GroovePlaylist and uses the EBU R128 standard to detect loudness. The values
   it produces are compatible with ReplayGain.
   This package contains the shared library.
+ 
+ Package: libgroovefingerprinter-dev
+ Section: libdevel
+ Architecture: any
+ Multi-Arch: same
+ Depends: libgroovefingerprinter3 (= ${binary:Version}), ${misc:Depends}
+ Description: acoustid fingerprinter sink for libgroove (development files)
+  This C library provides a GrooveFingerprinter object which attaches to a
+  GroovePlaylist and chromaprint to generate a unique id for media. The id
+  can be used with the acoustid.org service to find out metadata tags for
+  the media.
+  This package contains the development files.
+ 
+ Package: libgroovefingerprinter3
+ Architecture: any
+ Multi-Arch: same
+ Depends: ${shlibs:Depends}, ${misc:Depends}
+ Pre-Depends: ${misc:Pre-Depends}
+ Description: acoustid fingerprinter sink for libgroove
+  This C library provides a GrooveFingerprinter object which attaches to a
+  GroovePlaylist and chromaprint to generate a unique id for media. The id
+  can be used with the acoustid.org service to find out metadata tags for
+  the media.
+  This package contains the shared library.

-- 
libgroove packaging