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

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

update to 3.1.1
Merge tag '3.1.1'
Release 3.1.1
fingerprint sink: raw fingerprint is int32_t not uint32_t
fingerprint example: accept --raw parameter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 3f9bf768efca3a97385de1382b00720d83a5aa8d
X-Git-Newrev: e58a1c7fcab22470952fe02b0ed39089da5a696c

The following commit has been merged in the ubuntu branch:
commit e58a1c7fcab22470952fe02b0ed39089da5a696c
Merge: 3f9bf768efca3a97385de1382b00720d83a5aa8d 5e8d1be16d26ab560712761223f31a98d9ab989a
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Mon Apr 21 00:17:50 2014 -0700

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

diff --combined debian/changelog
index 792a1b1,4dd75c3..435a1e1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,13 +1,19 @@@
- libgroove (3.1.0+dfsg-1ubuntu1) trusty; urgency=low
++libgroove (3.1.1+dfsg-1ubuntu1) trusty; urgency=low
 +
 +  * release for ubuntu
 +
-  -- Andrew Kelley <superjoe30 at gmail.com>  Sat, 19 Apr 2014 14:02:55 -0700
++ -- Andrew Kelley <superjoe30 at gmail.com>  Mon, 21 Apr 2014 00:17:00 -0700
++
+ libgroove (3.1.1+dfsg-1) experimental; urgency=low
+ 
+   * fingerprinter example: add --raw option
+   * fingerprinter sink: add error checking to chromaprint function calls
+   * fingerprinter sink: fix documentation. raw fingerprints are signed 32-bit
+     integers, not unsigned 32-bit integers.
+   * fingerprinter sink: change `void *` to `int32_t *` for encode/decode
+     functions
+ 
+  -- Andrew Kelley <superjoe30 at gmail.com>  Mon, 21 Apr 2014 00:12:28 -0700
  
  libgroove (3.1.0+dfsg-1) experimental; urgency=low
  
@@@ -33,26 -38,6 +44,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)

-- 
libgroove packaging