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

Tue Jun 3 18:07:49 UTC 2014

Merge tag 'upstream/4.0.3+dfsg'
Release 4.0.3
encoder: create new AVFormatContext on flush and playlist end
fix race condition segfault when attaching a sink
build: link player with -lrt for clock_gettime. closes #67
playlist: fix case where filter graph was not being rebuilt. closes #65
playlist: rename some variables for clearer code
update bundled libav to e780c3daa
Release 4.0.2
player: thread cleanup only if thread was initialized
Merge pull request #64 from gahr/master
Look for includes in the current source tree.
changelog: delete old entries and update current time
changelog: mention SONAME change and new packages
update changelog to reflect debian package changes
math library linkage set to private
build: on unix link with -lm
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 4894d12eac4915842b386ce3445ff4f9dc7db5a5
Merge: 5fe82f1825dd8277bd6b04f2076aff56320684f8 feaf0f41d452e369c3b5c3c5507f10ae4dae5bfa
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Sat May 31 12:11:42 2014 -0700

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

diff --combined debian/changelog
index f39815b,2eb43e7..1c62a74

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,92 -1,27 +1,59 @@@
- libgroove (4.0.1+dfsg-1ubuntu1) trusty; urgency=low
++libgroove (4.0.3+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
- 
-   * build: fix typo in cmake output
-   * README: remove note about Debian package for now
-   * README: document libspeexdsp-dev dependency better.
-   * ability to get the pts from a buffer
-   * include statements outside of extern C
-   * player: specify device by index rather than name.
-   * buffer pts moved from separate function to GrooveBuffer struct
-   * fingerprinter: API refactor
-   * ability to set true peak on playlist items.
-   * GroovePlaylist: rename `volume` to `gain`
-   * support per-sink gain adjustment.
-   * player: support attaching a dummy device.
-   * playlist: remove unnecessary state from SinkMap
-   * player: don't do disable_resample for dummy device
-   * playlist_get_position: always set seconds even when item is NULL
-   * player: fix timing issue with dummy player
-   * playlist: correct generation of the sink map
-   * dummy player: avoid floating point error accumulation
- 
-  -- Andrew Kelley <superjoe30 at gmail.com>  Tue, 13 May 2014 19:44:53 -0700
- 
- libgroove (3.1.1+dfsg-1) experimental; urgency=low
++ -- Andrew Kelley <superjoe30 at gmail.com>  Sat, 31 May 2014 12:11:25 -0700
 +
-   * 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
+ libgroove (4.0.3+dfsg-1) unstable; urgency=low
  
-  -- Andrew Kelley <superjoe30 at gmail.com>  Mon, 21 Apr 2014 00:12:28 -0700
+   * New upstream release
+   * Remove patch to link with -lm because it is included in the new release.
  
- libgroove (3.1.0+dfsg-1) experimental; urgency=low
+  -- Andrew Kelley <superjoe30 at gmail.com>  Sat, 31 May 2014 12:05:52 -0700
  
-   * 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-1) experimental; urgency=low
++libgroove (4.0.1+dfsg-1ubuntu1) trusty; urgency=low
 +
-   * fix memory corruption when replaygain scanning large album
-   * update to libav 10.0
-   * playlist: fix segfault on out of memory
-   * playlist: fix segfault race condition when adding a sink
++  * release for ubuntu
 +
-  -- Andrew Kelley <superjoe30 at gmail.com>  Tue, 01 Apr 2014 23:38:54 -0700
++ -- Andrew Kelley <superjoe30 at gmail.com>  Mon, 21 Apr 2014 00:18:00 -0700
 +
- libgroove (3.0.7+dfsg-1) experimental; urgency=low
+ libgroove (4.0.1+dfsg-1) unstable; urgency=low
  
-   * use ebur128 true peak instead of sample peak
-   * fix bug where accessing "album" metadata would instead
-     return the "album_artist"
-   * use the compand filter to allow setting the gain to > 1.0
-   * log error when cannot set up filter graph
-   * loudness scanning: fix crash for songs with 0 frames.
-   * playlist example: fix race condition
- 
-  -- Andrew Kelley <superjoe30 at gmail.com>  Sun, 16 Mar 2014 19:26:57 -0700
+   * New upstream release
+   * Upload to unstable
+   * SONAME updated from 3 to 4
+   * new binary package: libgroovefingerprinter4
+   * new dev package: libgroovefingerprinter-dev
+   * debian/control: other -dev packages depend on libgroove-dev
+   * debian/copyright: justify the fact that we repack the pristine tar
+   * Better package descriptions
+   * watch: update dversionmangle so that uscan finds current version
+   * add debian/gbp.conf
+   * add patch from upstream to link with -lm
+   * remove Pre-Depends from debug package
+ 
+  -- 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

