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

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

Revert "debian: update symbols files"
update changelog
Merge tag 'upstream/4.0.4+dfsg'
Release 4.0.4
playlist: handle pause correctly for streams. closes #68
player: reset play_head and play_pos on flush
README: update short description
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 384abcded56f3b4565e59e1e8954601273fd5d70
X-Git-Newrev: 0203d5a45c8e48ba9f4b821d6c7825bbb4e0ff07

The following commit has been merged in the ubuntu branch:
commit 0203d5a45c8e48ba9f4b821d6c7825bbb4e0ff07
Merge: ca69bbb8aeee1f1672e709d3b3444046a43aecf1 738debd699d6422da5d01a9c38dcc06397a5ee63
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Tue Jun 3 11:00:04 2014 -0700

    Merge branch 'master' into ubuntu

diff --combined debian/changelog
index 1c62a74,7f295fe..0ff0976
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,10 +1,22 @@@
- libgroove (4.0.3+dfsg-1ubuntu1) trusty; urgency=low
++libgroove (4.0.4+dfsg-1ubuntu1) trusty; urgency=low
 +
 +  * release for ubuntu
 +
-  -- Andrew Kelley <superjoe30 at gmail.com>  Sat, 31 May 2014 12:11:25 -0700
++ -- Andrew Kelley <superjoe30 at gmail.com>  Tue, 03 Jun 2014 10:59:57 -0700
 +
- libgroove (4.0.3+dfsg-1) unstable; urgency=low
+ libgroove (4.0.4+dfsg-1) unstable; urgency=low
  
    * New upstream release
    * Remove patch to link with -lm because it is included in the new release.
  
-  -- Andrew Kelley <superjoe30 at gmail.com>  Sat, 31 May 2014 12:05:52 -0700
+  -- 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 -22,6 +34,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