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

[bdrung at users.alioth.debian.org]

Release 1.3.13-3 to Debian unstable.
Apply upstream fix for upstream bug #137.
Apply followup commits for fixing upstream bug #367.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 6918a854917d83cbb6b01b2ac507be9dc5a40576
X-Git-Newrev: 31de584b664293a9b85a3eddba4d405755b06767

The following commit has been merged in the ubuntu branch:
commit 6c70b6474144f73170860024a177a59dd54d0851
Merge: 6918a854917d83cbb6b01b2ac507be9dc5a40576 b773f31a10c393aae1af1cb594f2aae9f7a890c7
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Apr 23 12:10:33 2011 +0200

    Merge branch 'master' into ubuntu

diff --combined debian/changelog
index 0638e93,3640aa9..7ed58c4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,16 +1,30 @@@
+ audacity (1.3.13-3) unstable; urgency=low
+ 
+   * Apply followup commits for fixing upstream bug #367.
+   * Apply upstream fix for upstream bug #137.
+ 
+  -- Benjamin Drung <bdrung at debian.org>  Sat, 23 Apr 2011 11:43:42 +0200
+ 
 +audacity (1.3.13-2ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian unstable. Remaining changes:
 +    - Build against libmp3lame.
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Sun, 17 Apr 2011 19:02:55 +0200
 +
  audacity (1.3.13-2) unstable; urgency=low
  
    * Apply two upstream fixes for the upstream bugs #350 and #367.
  
   -- Benjamin Drung <bdrung at debian.org>  Sun, 17 Apr 2011 18:43:04 +0200
  
 +audacity (1.3.13-1ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian unstable (LP: #759314). Remaining changes:
 +    - Build against libmp3lame.
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Wed, 13 Apr 2011 02:00:19 +0200
 +
  audacity (1.3.13-1) unstable; urgency=low
  
    * New upstream release (LP: #608948, #690226, #694778, #713584, #753323).
@@@ -28,13 -21,6 +35,13 @@@
  
   -- Benjamin Drung <bdrung at debian.org>  Wed, 13 Apr 2011 01:43:29 +0200
  
 +audacity (1.3.12-17ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian unstable. Remaining changes:
 +    - Build against libmp3lame.
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Sat, 09 Apr 2011 18:53:18 +0200
 +
  audacity (1.3.12-17) unstable; urgency=low
  
    * Drop article from the description synopsis.
@@@ -45,15 -31,6 +52,15 @@@
  
   -- Benjamin Drung <bdrung at debian.org>  Sat, 09 Apr 2011 18:25:32 +0200
  
 +audacity (1.3.12-16ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian unstable. Remaining changes:
 +    - Build against portSMF.
 +    - Build against libsbsms.
 +  * Build against libmp3lame.
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Fri, 11 Mar 2011 17:47:09 +0100
 +
  audacity (1.3.12-16) unstable; urgency=low
  
    * Split and update disable-dynamic-loading.patch.
@@@ -61,28 -38,12 +68,28 @@@
  
   -- Benjamin Drung <bdrung at debian.org>  Fri, 11 Mar 2011 17:10:04 +0100
  
 +audacity (1.3.12-15ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian unstable. Remaining changes:
 +    - Build against portSMF.
 +    - Build against libsbsms.
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Wed, 09 Mar 2011 12:29:45 +0100
 +
  audacity (1.3.12-15) unstable; urgency=low
  
    * Fix crash on WMA export (LP: #695648).
  
   -- Benjamin Drung <bdrung at debian.org>  Wed, 09 Mar 2011 12:09:51 +0100
  
 +audacity (1.3.12-14ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian unstable. Remaining changes:
 +    - Build against portSMF.
 +    - Build against libsbsms.
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Mon, 28 Feb 2011 20:31:41 +0100
 +
  audacity (1.3.12-14) unstable; urgency=low
  
    [ Fabian Greffrath ]
@@@ -93,32 -54,12 +100,32 @@@
  
   -- Benjamin Drung <bdrung at debian.org>  Mon, 28 Feb 2011 15:04:39 +0100
  
 +audacity (1.3.12-13ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian unstable. Remaining changes:
 +    - Build against portSMF.
 +    - Build against libsbsms.
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Sat, 26 Feb 2011 23:33:16 +0100
 +
  audacity (1.3.12-13) unstable; urgency=low
  
    * Compile against system portAudio (Closes: #323711).
  
   -- Benjamin Drung <bdrung at debian.org>  Sat, 26 Feb 2011 23:02:54 +0100
  
 +audacity (1.3.12-12ubuntu2) natty; urgency=low
 +
 +  * Build against libsbsms.
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Thu, 24 Feb 2011 22:28:02 +0100
 +
 +audacity (1.3.12-12ubuntu1) natty; urgency=low
 +
 +  * Build against portSMF.
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Sat, 19 Feb 2011 19:21:53 +0100
 +
  audacity (1.3.12-12) unstable; urgency=low
  
    * Rebuild against the newest soundtouch.

-- 
Audacity debian packaging