[SCM] stk/master: Merge remote-tracking branch 'origin/master'

[fsateler at users.alioth.debian.org]

Merge tag 'debian/4.4.4-6'
Finalize changelog
Update changelog
Rename package for GCC 5 transition
Remove obsolete dirs files
Bump Standards-Version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 32914e3527ff59d038c1fd82fe393d6290e45794
X-Git-Newrev: a037895840c5532da767a6eff0a439bcc8168f9c

The following commit has been merged in the master branch:
commit ce4e534b4b843f57b9c4f1ec72f90d25d306c8be
Merge: 9c6f352b59f05cd480b336e4c1a7215b8bd30d37 32914e3527ff59d038c1fd82fe393d6290e45794
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Nov 27 20:12:24 2015 -0300

    Merge remote-tracking branch 'origin/master'

diff --combined debian/control
index 533d198,9530288..393548e
--- a/debian/control
+++ b/debian/control
@@@ -6,14 -6,15 +6,14 @@@ Uploaders
   Alessio Treglia <alessio at debian.org>,
   Felipe Sateler <fsateler at debian.org>
  Build-Depends:
 - autoconf,
 - autotools-dev,
 + dh-autoreconf,
   debhelper (>= 9),
   libasound2-dev [linux-any],
   libjack-dev [linux-any],
   libreadline-dev,
   librtaudio-dev (>= 4.1.1~ds0~) [linux-any],
   librtmidi-dev (>= 2.1.0~) [linux-any]
- Standards-Version: 3.9.4
+ Standards-Version: 3.9.6
  Homepage: http://ccrma.stanford.edu/software/stk/
  Vcs-Git: git://anonscm.debian.org/pkg-multimedia/stk.git
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/stk.git
@@@ -25,7 -26,7 +25,7 @@@ Multi-Arch: sam
  Depends:
   librtaudio-dev (>= 4.0.11~) [linux-any],
   librtmidi-dev (>= 2.0.1~) [linux-any],
-  libstk0c2a (= ${binary:Version}),
+  libstk0v5 (= ${binary:Version}),
   ${misc:Depends}
  Description: Sound Synthesis Toolkit (development files)
   The Sound Synthesis Toolkit is a C++ library with implementations
@@@ -35,13 -36,11 +35,11 @@@
   .
   This package provides the development files for the sound synthesis toolkit.
  
- Package: libstk0c2a
+ Package: libstk0v5
  Conflicts:
-  libstk0,
-  libstk0c2
+  libstk0c2a
  Replaces:
-  libstk0,
-  libstk0c2
+  libstk0c2a
  Architecture: any
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
@@@ -57,7 -56,7 +55,7 @@@ Description: Sound Synthesis Toolki
  Package: stk
  Architecture: any
  Depends:
-  libstk0c2a (= ${binary:Version}),
+  libstk0v5 (= ${binary:Version}),
   tk,
   ${misc:Depends},
   ${shlibs:Depends}

-- 
stk packaging