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

[bdrung at users.alioth.debian.org]

Release 1.3.12-16 to Debian unstable.
Add support to disable dynamic loading of LAME.
Split and update disable-dynamic-loading.patch.
Change order of patches.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: f4eb8878c5ee58bb693467c83be477dc3653346a
X-Git-Newrev: 649c3bfacd16c5684076249579bb5fae61874893

The following commit has been merged in the ubuntu branch:
commit 55006b8c38e68bc6d051345b5ad36192fec36a00
Merge: f4eb8878c5ee58bb693467c83be477dc3653346a 4b76db5484594ff1c96ca68318e577bface53bc3
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Fri Mar 11 17:35:18 2011 +0100

    Merge branch 'master' into ubuntu

diff --combined debian/changelog
index 053d8d4,95dc276..1da272c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,16 +1,32 @@@
+ audacity (1.3.12-16) unstable; urgency=low
+ 
+   * Split and update disable-dynamic-loading.patch.
+   * Add support to disable dynamic loading of LAME.
+ 
+  -- 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 ]
@@@ -30,32 -21,12 +37,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.
diff --combined debian/rules
index 80931b0,afc9d6b..b515777
--- a/debian/rules
+++ b/debian/rules
@@@ -7,6 -7,7 +7,7 @@@ configure_flags := 
  	--disable-dynamic-loading \
  	--with-expat=system \
  	--with-ffmpeg=system \
+ 	--with-lame=local \
  	--with-libflac=system \
  	--with-libid3tag=system \
  	--with-libmad=system \
@@@ -16,9 -17,9 +17,9 @@@
  	--with-libtwolame=system \
  	--with-libvamp=system \
  	--with-libvorbis=system \
 -	--with-midi=local \
 +	--with-midi=system \
  	--with-portaudio=system \
 -	--with-sbsms=local \
 +	--with-sbsms=system \
  	--with-soundtouch=system \
  	$(NULL)
  

-- 
Audacity debian packaging