[SCM] ardour3/master: Merge branch 'master' of git://git.debian.org/git/pkg-multimedia/ardour3

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

Release to unstable
Add patch to print to stdout instead of stderr
Update changelog for release
Pass correct -j flag to waf. Closes: #748584
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9c354dcd0476f02cac5d3253529cc1d32fd73814
X-Git-Newrev: ed76cd83b900a779c359c2a90182d2101013a44b

The following commit has been merged in the master branch:
commit bc63420f7a71a26462cd7d3d055cd0c605c270e8
Merge: 4af9e91dd3eb60c7cb20f74d7e074171fb69e83c 9c354dcd0476f02cac5d3253529cc1d32fd73814
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Fri Oct 3 13:58:07 2014 +0200

    Merge branch 'master' of git://git.debian.org/git/pkg-multimedia/ardour3
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 8517db4,3271f53..c21ff8c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,17 +1,25 @@@
 +ardour3 (3.5.403~dfsg-1) unstable; urgency=high
 +
 +  * Imported Upstream version 3.5.403~dfsg
 +  * Critical bugfix release. All users are recommended to upgrade.
 +  * Details: https://community.ardour.org/node/8457
 +
 + -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Fri, 03 Oct 2014 13:02:45 +0200
 +
+ ardour3 (3.5.380~dfsg-3) unstable; urgency=medium
+ 
+   * Prevent build failures in slower architectures by
+     forcing waf logging to stdout instead of stderr.
+ 
+  -- Felipe Sateler <fsateler at debian.org>  Fri, 11 Jul 2014 12:46:37 -0400
+ 
+ ardour3 (3.5.380~dfsg-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Pass correct -j flag to waf. Closes: #748584
+ 
+  -- Felipe Sateler <fsateler at debian.org>  Mon, 16 Jun 2014 11:03:20 -0400
+ 
  ardour3 (3.5.380~dfsg-1) unstable; urgency=low
  
    * Imported Upstream version 3.5.380~dfsg

-- 
ardour3 packaging