[SCM] audacity/master: Change order of patches.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 153897f900e0400d826f11dde539ecfbac0e0605
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Mar 10 11:52:24 2011 +0100

    Change order of patches.

diff --git a/debian/patches/disable-dynamic-loading.patch b/debian/patches/disable-dynamic-loading.patch
index 1eb8328..5dab64f 100644
--- a/debian/patches/disable-dynamic-loading.patch
+++ b/debian/patches/disable-dynamic-loading.patch
@@ -613,17 +613,18 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
        {
           wxLogMessage(wxT("FFmpeg : ERROR - Couldn't write last audio frame to output file."));
           break;
-@@ -593,34 +617,34 @@
+@@ -592,35 +616,35 @@
+    }
+ 
+    // Write any file trailers.
+-   FFmpegLibsInst->av_write_trailer(mEncFormatCtx);
++   FFMPEG_LIB(av_write_trailer(mEncFormatCtx));
  
     // Close the codecs.
     if (mEncAudioStream != NULL)
 -      FFmpegLibsInst->avcodec_close(mEncAudioStream->codec);
 +      FFMPEG_LIB(avcodec_close(mEncAudioStream->codec));
  
-    // Write any file trailers.
--   FFmpegLibsInst->av_write_trailer(mEncFormatCtx);
-+   FFMPEG_LIB(av_write_trailer(mEncFormatCtx));
- 
     for (i = 0; i < (int)mEncFormatCtx->nb_streams; i++)
     {
 -      FFmpegLibsInst->av_freep(&mEncFormatCtx->streams[i]->codec);
diff --git a/debian/patches/fix-wma-export-crash.patch b/debian/patches/fix-wma-export-crash.patch
index ffaf69c..fff1a79 100644
--- a/debian/patches/fix-wma-export-crash.patch
+++ b/debian/patches/fix-wma-export-crash.patch
@@ -3,22 +3,22 @@ Author: Leland Lucius <leland at audacityteam.org>
 Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=274
 Bug-Ubuntu: https://launchpad.net/bugs/695648
 
---- audacity-1.3.12.orig/src/export/ExportFFmpeg.cpp
-+++ audacity-1.3.12/src/export/ExportFFmpeg.cpp
-@@ -615,13 +615,13 @@ bool ExportFFmpeg::Finalize()
+--- a/src/export/ExportFFmpeg.cpp
++++ b/src/export/ExportFFmpeg.cpp
+@@ -591,13 +591,13 @@
        }
     }
  
 +   // Write any file trailers.
-+   FFMPEG_LIB(av_write_trailer(mEncFormatCtx));
++   FFmpegLibsInst->av_write_trailer(mEncFormatCtx);
 +
     // Close the codecs.
     if (mEncAudioStream != NULL)
-       FFMPEG_LIB(avcodec_close(mEncAudioStream->codec));
+       FFmpegLibsInst->avcodec_close(mEncAudioStream->codec);
  
 -   // Write any file trailers.
--   FFMPEG_LIB(av_write_trailer(mEncFormatCtx));
+-   FFmpegLibsInst->av_write_trailer(mEncFormatCtx);
 -
     for (i = 0; i < (int)mEncFormatCtx->nb_streams; i++)
     {
-       FFMPEG_LIB(av_freep(&mEncFormatCtx->streams[i]->codec));
+       FFmpegLibsInst->av_freep(&mEncFormatCtx->streams[i]->codec);
diff --git a/debian/patches/series b/debian/patches/series
index 69b7c09..4300a69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,12 +2,12 @@ enable-experimental-linking.patch
 fix-slider-background-color.patch
 open-mixer.patch
 fix-ftbfs-with-gcc-4.5.patch
-disable-dynamic-loading.patch
 portsmf-configure.patch
 fix-const-char-conversion.patch
 system-portaudio.patch
 portmixer-include-directory.patch
 soundtouch-pkgconfig-file.patch
 fix-wma-export-crash.patch
+disable-dynamic-loading.patch
 autoreconf.patch
 configure.patch
diff --git a/debian/patches/system-portaudio.patch b/debian/patches/system-portaudio.patch
index e857800..0422cde 100644
--- a/debian/patches/system-portaudio.patch
+++ b/debian/patches/system-portaudio.patch
@@ -3,7 +3,7 @@ Author: Benjamin Drung <bdrung at debian.org>
 
 --- a/configure.in
 +++ b/configure.in
-@@ -311,7 +311,7 @@
+@@ -305,7 +305,7 @@
  dnl-------------------------------------------------------------
  dnl LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG LIBLRDF SLV2 REDLAND PORTSMF TAGLIB"
  dnl disable plugin categorisation and LV2 libs for 1.3.7 release
@@ -12,7 +12,7 @@ Author: Benjamin Drung <bdrung at debian.org>
  
  AC_MSG_NOTICE([Determining what libraries are available in this tree and on the system])
  
-@@ -334,6 +334,7 @@
+@@ -328,6 +328,7 @@
  dnl AUDACITY_CHECKLIB_LIBLRDF
  AUDACITY_CHECKLIB_PORTSMF
  dnl AUDACITY_CHECKLIB_TAGLIB
@@ -20,7 +20,7 @@ Author: Benjamin Drung <bdrung at debian.org>
  
  dnl Decide what libraries to build with, and whether to use system or local libraries
  dnl Set variables based on choices.
-@@ -403,6 +404,14 @@
+@@ -397,6 +398,14 @@
     fi
  fi
  
@@ -35,7 +35,7 @@ Author: Benjamin Drung <bdrung at debian.org>
  dnl we can only have one sample rate conversion library used.
  dnl by now we will have both enabled if they are present, regardless of whether
  dnl they were requested, unless one was specifically disabled.
-@@ -564,13 +573,6 @@
+@@ -558,13 +567,6 @@
     ;;
  esac
  
@@ -49,7 +49,7 @@ Author: Benjamin Drung <bdrung at debian.org>
  
  case "${host_os}" in
     darwin* | rhapsody*)
-@@ -608,7 +610,6 @@
+@@ -602,7 +604,6 @@
     LOCAL_LIBS="$LOCAL_LIBS portmixer/libportmixer.a"
  
     AC_CONFIG_SUBDIRS([lib-src/portmixer])
@@ -57,7 +57,7 @@ Author: Benjamin Drung <bdrung at debian.org>
  fi
  
  dnl Check for lrint/lrintf
-@@ -673,13 +674,6 @@
+@@ -667,13 +668,6 @@
  
  AC_OUTPUT
  

-- 
Audacity debian packaging