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

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

update changelog and symbols for new release
Merge tag 'upstream/4.1.0+dfsg'
Release 4.1.0
ability to stop buffering when any sinks are full
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 0203d5a45c8e48ba9f4b821d6c7825bbb4e0ff07
X-Git-Newrev: f010fe79abd1f83a279ffb3d0365d129a986f7c5

The following commit has been merged in the ubuntu branch:
commit f010fe79abd1f83a279ffb3d0365d129a986f7c5
Merge: 0203d5a45c8e48ba9f4b821d6c7825bbb4e0ff07 3fdf5d2a82ab042d1389f2805e4993f080358d8a
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Fri Jun 13 18:31:29 2014 -0700

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

diff --combined debian/changelog
index 0ff0976,8e3caed..e642e90
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- libgroove (4.0.4+dfsg-1ubuntu1) trusty; urgency=low
++libgroove (4.1.0+dfsg-1ubuntu1) trusty; urgency=low
 +
 +  * release for ubuntu
 +
-  -- Andrew Kelley <superjoe30 at gmail.com>  Tue, 03 Jun 2014 10:59:57 -0700
++ -- Andrew Kelley <superjoe30 at gmail.com>  Fri, 13 Jun 2014 18:31:04 -0700
++
+ libgroove (4.1.0+dfsg-1) unstable; urgency=low
+ 
+   * New upstream release
+ 
+  -- Andrew Kelley <superjoe30 at gmail.com>  Fri, 13 Jun 2014 18:27:09 -0700
  
  libgroove (4.0.4+dfsg-1) unstable; urgency=low
  
@@@ -11,12 -11,6 +17,12 @@@
  
   -- Andrew Kelley <superjoe30 at gmail.com>  Tue, 03 Jun 2014 10:48:30 -0700
  
 +libgroove (4.0.1+dfsg-1ubuntu1) trusty; urgency=low
 +
 +  * release for ubuntu
 +
 + -- Andrew Kelley <superjoe30 at gmail.com>  Mon, 21 Apr 2014 00:18:00 -0700
 +
  libgroove (4.0.1+dfsg-1) unstable; urgency=low
  
    * New upstream release
@@@ -34,26 -28,6 +40,26 @@@
  
   -- Andrew Kelley <superjoe30 at gmail.com>  Wed, 14 May 2014 12:48:42 -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