[SCM] audacious-plugins/master: Merge NMU 3.7.2-2.1

[mattia at users.alioth.debian.org]

Import Debian changes 3.7.2-2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 972a5db342cd960e1a9bf06b8e629806515b42cb
X-Git-Newrev: d38437cb201adef7b373b557b0f53a3d8a331010

The following commit has been merged in the master branch:
commit d38437cb201adef7b373b557b0f53a3d8a331010
Merge: 972a5db342cd960e1a9bf06b8e629806515b42cb d71e34b15db85931a705925297dc382fba5c74e6
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Feb 20 15:30:55 2017 +0100

    Merge NMU 3.7.2-2.1
    
    Debian release 3.7.2-2.1

diff --combined debian/changelog
index 182f0a3,f889020..6660062
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,10 +1,29 @@@
 +audacious-plugins (3.8.1-1) UNRELEASED; urgency=medium
 +
 +  * Team upload.
 +
 +  [ Mattia Rizzolo ]
 +  * d/control: use /git/ instead of /cgit/ in Vcs-*
 +
 +  [ Mateusz Łukasik ]
 +  * New upstream release.
 +  * debian/control:
 +    - Bump minimal audacious version to 3.8.
 +    - Bump Standards-Version to 3.9.8.
 +  * Bump debhelper version to 10.
 +  * Drop qt5 support.
 +  * Update debian/copyright.
 +  * debian/rules: Add hardening.
 +
 + -- Mattia Rizzolo <mattia at debian.org>  Mon, 02 May 2016 08:16:51 +0000
 +
+ audacious-plugins (3.7.2-2.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Drop build-dependency on oss4-dev for Linux kernel (Closes: #852984)
+ 
+  -- Simon McVittie <smcv at debian.org>  Sun, 29 Jan 2017 11:54:36 +0000
+ 
  audacious-plugins (3.7.2-2) unstable; urgency=medium
  
    * Team upload.
diff --combined debian/control
index 2e7799b,700cd18..b51c878
--- a/debian/control
+++ b/debian/control
@@@ -7,8 -7,8 +7,8 @@@ Uploaders
   Bilal Akhtar <bilalakhtar at ubuntu.com>,
   Cyril Lavier <cyril.lavier at davromaniak.eu>
  Build-Depends:
 - audacious-dev (>= 3.7),
 - debhelper (>= 9),
 + audacious-dev (>= 3.8),
 + debhelper (>= 10),
   dh-autoreconf,
   libasound2-dev (>= 1.0) [linux-any],
   libavcodec-dev (>= 4:0.6.1),
@@@ -47,11 -47,14 +47,11 @@@
   libwavpack-dev (>= 4.31),
   libxcomposite-dev,
   libxml2-dev,
-  oss4-dev
+  oss4-dev [!linux-any],
 - qtbase5-dev,
 - qtmultimedia5-dev,
 - libqt5opengl5-dev
  Homepage: http://www.audacious-media-player.org/
 -Standards-Version: 3.9.7
 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/audacious-plugins.git
 -Vcs-Git: https://anonscm.debian.org/cgit/pkg-multimedia/audacious-plugins.git
 +Standards-Version: 3.9.8
 +Vcs-Browser: https://anonscm.debian.org/git/pkg-multimedia/audacious-plugins.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/audacious-plugins.git
  
  Package: audacious-plugins
  Architecture: any
@@@ -61,9 -64,9 +61,9 @@@ Depends
   ${misc:Depends},
   ${shlibs:Depends}
  Recommends:
 - audacious (>= 3.7)
 + audacious (>= 3.8)
  Breaks:
 - audacious (<< 3.7)
 + audacious (<< 3.8)
  Description: Base plugins for audacious
   Audacious is a fork of beep-media-player which supports winamp skins
   and many codecs.

-- 
Plugins for audacious