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

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

update changelog
Merge tag 'upstream/4.1.1+dfsg'
Release 4.1.1
dummy player: fix timing issues
playlist: fix race condition which can cause decoder to hang
debian/changelog: document change to symbols file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: f010fe79abd1f83a279ffb3d0365d129a986f7c5
X-Git-Newrev: 57c431e110ede1ba74d3889321b3e7fbd7b14cd0

The following commit has been merged in the ubuntu branch:
commit 57c431e110ede1ba74d3889321b3e7fbd7b14cd0
Merge: f010fe79abd1f83a279ffb3d0365d129a986f7c5 35c8468fca732769b8aaa06b09fc6436170f0d18
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Fri Jun 20 15:05:28 2014 -0700

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

diff --combined debian/changelog
index e642e90,3cb42c0..411472f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,15 +1,21 @@@
- libgroove (4.1.0+dfsg-1ubuntu1) trusty; urgency=low
++libgroove (4.1.1+dfsg-1ubuntu1) trusty; urgency=low
 +
 +  * release for ubuntu
 +
-  -- Andrew Kelley <superjoe30 at gmail.com>  Fri, 13 Jun 2014 18:31:04 -0700
++ -- Andrew Kelley <superjoe30 at gmail.com>  Fri, 20 Jun 2014 15:05:21 -0700
++
+ libgroove (4.1.1+dfsg-1) unstable; urgency=low
+ 
+   * New upstream release
+ 
+  -- Andrew Kelley <superjoe30 at gmail.com>  Fri, 20 Jun 2014 15:04:01 -0700
  
  libgroove (4.1.0+dfsg-1) unstable; urgency=low
  
    * New upstream release
+   * Add groove_playlist_set_fill_mode symbol for libgroove4
  
-  -- Andrew Kelley <superjoe30 at gmail.com>  Fri, 13 Jun 2014 18:27:09 -0700
+  -- Andrew Kelley <superjoe30 at gmail.com>  Sun, 15 Jun 2014 16:59:40 -0700
  
  libgroove (4.0.4+dfsg-1) unstable; urgency=low
  
@@@ -17,12 -18,6 +24,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
@@@ -40,26 -35,6 +47,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