[SCM] audacity/master: Drop additional-mime-types.patch (accepted upstream).

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 010bb5fd4561aeb1d187bb8f5b14165a444b1431
Author: Benjamin Drung <bdrung at debian.org>
Date:   Fri Aug 24 11:31:10 2012 +0200

    Drop additional-mime-types.patch (accepted upstream).

diff --git a/debian/patches/additional-mime-types.patch b/debian/patches/additional-mime-types.patch
deleted file mode 100644
index 69b6f80..0000000
--- a/debian/patches/additional-mime-types.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Description: Register FLAC file type in .desktop file.
-Author: Benjamin Drung <bdrung at debian.org>
-Bug-Debian: http://bugs.debian.org/661921
-Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=483
-
---- a/src/audacity.desktop.in
-+++ b/src/audacity.desktop.in
-@@ -17,4 +17,4 @@
- Exec=@AUDACITY_NAME@ %F
- StartupNotify=false
- Terminal=false
--MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-mp3;audio/x-wav;application/x-audacity-project;
-+MimeType=application/x-audacity-project;@MIMETYPES@
---- a/configure.in
-+++ b/configure.in
-@@ -89,6 +89,8 @@
- dnl audacity. Each name in the list should be a _target_ in lib-src/Makefile
- AC_SUBST(LIBSRC_BUILD)
- 
-+AC_SUBST(MIMETYPES)
-+
- dnl allow the user to specify options to configure that change the
- dnl name "audacity" anywhere it appears in a pathname.   This allows
- dnl multiple versions of Audacity to be installed concurrently
-@@ -482,6 +484,9 @@
- for lib in $LIBRARIES ; do
-    eval LIB_USE_LOCAL=\$${lib}_USE_LOCAL
-    eval LIB_USE_SYSTEM=\$${lib}_USE_SYSTEM
-+   if test "$LIB_USE_LOCAL" = yes -o "$LIB_USE_SYSTEM" = yes; then
-+      eval MIMETYPES=\"${MIMETYPES}\$${lib}_MIMETYPES\"
-+   fi
-    if test "x$LIB_USE_LOCAL" = "xyes" ; then
-       eval LIBSRC_BUILD=\"$LIBSRC_BUILD \$${lib}_LOCAL_BUILD\"
-       eval LOCAL_LIBS=\"$LOCAL_LIBS \$${lib}_LOCAL_LIBS\"
---- a/m4/audacity_checklib_libflac.m4
-+++ b/m4/audacity_checklib_libflac.m4
-@@ -68,5 +68,7 @@
-    else
-       AC_MSG_NOTICE([FLAC libraries are NOT available in this source tree])
-    fi
-+
-+   LIBFLAC_MIMETYPES="audio/flac;audio/x-flac;"
- ])
- 
---- a/m4/audacity_checklib_libmad.m4
-+++ b/m4/audacity_checklib_libmad.m4
-@@ -59,5 +59,6 @@
-       LIBMAD_LOCAL_AVAILABLE="no"
-       AC_MSG_NOTICE([libmad libraries are NOT available in the local tree])
-    fi
-+   LIBMAD_MIMETYPES="audio/mpeg;audio/x-mp3;"
- ])
- 
---- a/m4/audacity_checklib_libsndfile.m4
-+++ b/m4/audacity_checklib_libsndfile.m4
-@@ -50,6 +50,6 @@
-       LIBSNDFILE_LOCAL_AVAILABLE="no"
-       AC_MSG_NOTICE([libsndfile libraries are NOT available in this source tree])
-    fi
--
-+   LIBSNDFILE_MIMETYPES="audio/basic;audio/x-aiff;audio/x-wav;"
- ])
- 
---- a/m4/audacity_checklib_libvorbis.m4
-+++ b/m4/audacity_checklib_libvorbis.m4
-@@ -64,5 +64,6 @@
-    else
-       AC_MSG_NOTICE([Vorbis libraries are NOT available in this source tree])
-    fi
-+   LIBVORBIS_MIMETYPES="application/ogg;audio/x-vorbis+ogg;"
- ])
- 
diff --git a/debian/patches/series b/debian/patches/series
index a253699..d7c8142 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 disable-dynamic-ffmpeg.patch
-additional-mime-types.patch

-- 
Audacity debian packaging