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

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

all other -dev packages depend on libgroove-dev
justify the fact that we repack the pristine tar
better package descriptions
remove leftover file from old version
watch: update dversionmangle so that uscan finds current version
add debian/gbp.conf
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 5fe82f1825dd8277bd6b04f2076aff56320684f8
Merge: 384abcded56f3b4565e59e1e8954601273fd5d70 f3ea5e630e6451c40c163fb4ad5f1b777055b854
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Wed May 14 11:56:10 2014 -0700

    Merge branch 'master' into ubuntu

diff --combined debian/control
index 7b18776,d6fafce..02c8c9c
--- 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
@@@ -49,10 -49,10 +49,10 @@@ Architecture: an
  Multi-Arch: same
  Depends: ${shlibs:Depends}, ${misc:Depends}
  Pre-Depends: ${misc:Pre-Depends}
- Description: audio dispatching library
-  This C library provides an sink-based API for decoding and encoding audio.
+ Description: music player backend
+  This library provides decoding and encoding of audio on a playlist.
   It is intended to be used as a backend for music player applications, however
-  it may also be used as a backend for any audio processing utility.
+  it is generic enough to be used as a backend for any audio processing utility.
   .
   Features:
    * Uses libav for decoding and encoding.
@@@ -88,10 -88,13 +88,13 @@@ Package: libgrooveplayer-de
  Section: libdevel
  Architecture: any
  Multi-Arch: same
- Depends: libgrooveplayer4 (= ${binary:Version}), ${misc:Depends}
+ Depends: libgrooveplayer4 (= ${binary:Version}),
+  libgroove-dev,
+  ${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: libgrooveplayer4
@@@ -99,20 -102,23 +102,23 @@@ Architecture: an
  Multi-Arch: same
  Depends: ${shlibs:Depends}, ${misc:Depends}
  Pre-Depends: ${misc:Pre-Depends}
- Description: audio device playback sink for libgroove
-  This C library provides a GroovePlayer object which attaches to a
-  GroovePlaylist and sends audio frames to a sound device.
+ Description: hardware audio playback for libgroove
+  This libgroove plugin plays audio via a sound device.
+  .
   This package contains the shared library.
  
  Package: libgrooveloudness-dev
  Section: libdevel
  Architecture: any
  Multi-Arch: same
- Depends: libgrooveloudness4 (= ${binary:Version}), ${misc:Depends}
+ Depends: libgrooveloudness4 (= ${binary:Version}),
+  libgroove-dev,
+  ${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: libgrooveloudness4
@@@ -120,22 -126,25 +126,25 @@@ Architecture: an
  Multi-Arch: same
  Depends: ${shlibs:Depends}, ${misc:Depends}
  Pre-Depends: ${misc:Pre-Depends}
- Description: loudness scanner sink for libgroove
-  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.
+ Description: loudness scanner for libgroove
+  This libgroove plugin uses the EBU R128 standard to detect loudness.
+  The values it produces are compatible with ReplayGain.
+  .
   This package contains the shared library.
  
  Package: libgroovefingerprinter-dev
  Section: libdevel
  Architecture: any
  Multi-Arch: same
- Depends: libgroovefingerprinter4 (= ${binary:Version}), ${misc:Depends}
+ Depends: libgroovefingerprinter4 (= ${binary:Version}),
+  libgroove-dev, 
+  ${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
   can be used with the acoustid.org service to find out metadata tags for
   the media.
+  .
   This package contains the development files.
  
  Package: libgroovefingerprinter4
@@@ -143,9 -152,8 +152,8 @@@ Architecture: an
  Multi-Arch: same
  Depends: ${shlibs:Depends}, ${misc:Depends}
  Pre-Depends: ${misc:Pre-Depends}
- Description: acoustid fingerprinter sink for libgroove
-  This C library provides a GrooveFingerprinter object which attaches to a
-  GroovePlaylist and chromaprint to generate a unique id for media. The id
-  can be used with the acoustid.org service to find out metadata tags for
-  the media.
+ Description: acoustid fingerprinter for libgroove
+  This libgroove plugin generates audio fingerprints which can be used with the
+  acoustid.org service to find out metadata tags for the media.
+  .
   This package contains the shared library.

-- 
libgroove packaging