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

Wed May 14 03:12:54 UTC 2014

update control file to 4.0.1
update symbols for 4.0.1
update changelog
Merge tag '4.0.1'
Release 4.0.1
dummy player: avoid floating point error accumulation
playlist: correct generation of the sink map
player: fix timing issue with dummy player
playlist_get_position: always set seconds even when item is NULL
Merge tag '4.0.0'
Release 4.0.0
player: don't do disable_resample for dummy device
playlist: remove unnecessary state from SinkMap
player: support attaching a dummy device. closes #60
support per-sink gain adjustment. closes #41
GroovePlaylist: rename `volume` to `gain`
ability to set true peak on playlist items. closes #50
fingerprinter: API refactor
update changelog
buffer pts moved from separate function to GrooveBuffer struct
now working on 4.0.0
player: specify device by index rather than name. closes #44
include statements outside of extern C
ability to get the pts from a buffer
README: document libspeexdsp-dev dependency better. closes #55
README: remove note about Debian package for now
build: fix typo in cmake output
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: e58a1c7fcab22470952fe02b0ed39089da5a696c
X-Git-Newrev: d5a8f9a2ba1a0bb903e8bbcb9dc8bc573f190dcc

The following commit has been merged in the ubuntu branch:
commit e77b3fc82271572fe9790b46adee888f53597d1b
Merge: e58a1c7fcab22470952fe02b0ed39089da5a696c d32b4bcf25f8325de1fcd3ab26137c581bbda965
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Tue May 13 20:02:51 2014 -0700

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

diff --combined debian/changelog
index 435a1e1,d1500da..f39815b

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,25 +1,31 @@@
- libgroove (3.1.1+dfsg-1ubuntu1) trusty; urgency=low
++libgroove (4.0.1+dfsg-1ubuntu1) trusty; urgency=low
 +
 +  * release for ubuntu
 +
-  -- Andrew Kelley <superjoe30 at gmail.com>  Mon, 21 Apr 2014 00:17:00 -0700
++ -- 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
  
@@@ -44,26 -61,6 +67,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)
diff --combined debian/control
index 8cebe46,f5ae680..c0e2dc1
--- a/debian/control
+++ b/debian/control
@@@ -6,10 -6,10 +6,10 @@@ Build-Depends: debhelper (>= 9)
   cmake,
   libebur128-dev,
   libchromaprint-dev,
 - libavcodec-dev (>= 6:10~),
 - libavformat-dev (>= 6:10~),
 - libavfilter-dev (>= 6:10~),
 - libavutil-dev (>= 6:10~),
 + libavcodec-dev (>= 6:10~~),
 + libavformat-dev (>= 6:10~~),
 + libavfilter-dev (>= 6:10~~),
 + libavutil-dev (>= 6:10~~),
   libav-tools,
   libsdl2-dev,
   pkg-config
@@@ -23,7 -23,7 +23,7 @@@ Package: libgroove-de
  Section: libdevel
  Architecture: any
  Multi-Arch: same
- Depends: libgroove3 (= ${binary:Version}), ${misc:Depends}
+ Depends: libgroove4 (= ${binary:Version}), ${misc:Depends}
  Description: audio dispatching library (development files)
   This C library provides an sink-based API for decoding and encoding audio.
   It is intended to be used as a backend for music player applications, however
@@@ -44,7 -44,7 +44,7 @@@
   .
   This package contains the development files.
  
- Package: libgroove3
+ Package: libgroove4
  Architecture: any
  Multi-Arch: same
  Depends: ${shlibs:Depends}, ${misc:Depends}
@@@ -74,28 -74,28 +74,28 @@@ Section: debu
  Priority: extra
  Architecture: any
  Multi-Arch: same
- Depends: libgroove3 (= ${binary:Version}),
-  libgrooveplayer3 (= ${binary:Version}),
-  libgrooveloudness3 (= ${binary:Version}),
-  libgroovefingerprinter3 (= ${binary:Version}),
+ Depends: libgroove4 (= ${binary:Version}),
+  libgrooveplayer4 (= ${binary:Version}),
+  libgrooveloudness4 (= ${binary:Version}),
+  libgroovefingerprinter4 (= ${binary:Version}),
   ${misc:Depends}
  Pre-Depends: ${misc:Pre-Depends}
  Description: debugging symbols for libgroove
-  This package contains the debugging symbols for libgroove3, libgrooveplayer3,
-  libgrooveloudness3, and libgroovefingerprinter3.
+  This package contains the debugging symbols for libgroove4, libgrooveplayer4,
+  libgrooveloudness4, and libgroovefingerprinter4.
  
  
  Package: libgrooveplayer-dev
  Section: libdevel
  Architecture: any
  Multi-Arch: same
- Depends: libgrooveplayer3 (= ${binary:Version}), ${misc:Depends}
+ Depends: libgrooveplayer4 (= ${binary:Version}), ${misc:Depends}
  Description: audio device playback sink for libgroove (development files)
   This C library provides a GroovePlayer struct which attaches to a
   GroovePlaylist and sends audio frames to a sound device.
   This package contains the development files.
  
- Package: libgrooveplayer3
+ Package: libgrooveplayer4
  Architecture: any
  Multi-Arch: same
  Depends: ${shlibs:Depends}, ${misc:Depends}
@@@ -109,14 -109,14 +109,14 @@@ Package: libgrooveloudness-de
  Section: libdevel
  Architecture: any
  Multi-Arch: same
- Depends: libgrooveloudness3 (= ${binary:Version}), ${misc:Depends}
+ Depends: libgrooveloudness4 (= ${binary:Version}), ${misc:Depends}
  Description: loudness scanner sink for libgroove (development files)
   This C library provides a GrooveLoudness object which attaches to a
   GroovePlaylist and uses the EBU R128 standard to detect loudness. The values
   it produces are compatible with ReplayGain.
   This package contains the development files.
  
- Package: libgrooveloudness3
+ Package: libgrooveloudness4
  Architecture: any
  Multi-Arch: same
  Depends: ${shlibs:Depends}, ${misc:Depends}
@@@ -131,7 -131,7 +131,7 @@@ Package: libgroovefingerprinter-de
  Section: libdevel
  Architecture: any
  Multi-Arch: same
- Depends: libgroovefingerprinter3 (= ${binary:Version}), ${misc:Depends}
+ Depends: libgroovefingerprinter4 (= ${binary:Version}), ${misc:Depends}
  Description: acoustid fingerprinter sink for libgroove (development files)
   This C library provides a GrooveFingerprinter object which attaches to a
   GroovePlaylist and chromaprint to generate a unique id for media. The id
@@@ -139,7 -139,7 +139,7 @@@
   the media.
   This package contains the development files.
  
- Package: libgroovefingerprinter3
+ Package: libgroovefingerprinter4
  Architecture: any
  Multi-Arch: same
  Depends: ${shlibs:Depends}, ${misc:Depends}

-- 
libgroove packaging

