[audacious-plugins/f15: 15/15] Merge branch 'master' into f15

[Michael Schwendt]

commit e0d6b0f83b9140fc3544f068a0302a238a0ccfb8
Merge: 70a7108 3ee90ca
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Tue Jun 14 16:33:04 2011 +0200

    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore
    	audacious-plugins.spec
    	sources

 .gitignore                                      |   10 +--
 audacious-plugins-2.0.1-xmms-skindir.patch      |   19 -----
 audacious-plugins-2.5-alpha1-xmms-skindir.patch |   17 +++++
 audacious-plugins-2.5.1-vcedit.patch            |   44 ++++++++++++
 audacious-plugins.spec                          |   87 ++++++++++++++---------
 sources                                         |    2 +-
 6 files changed, 118 insertions(+), 61 deletions(-)
---
diff --cc audacious-plugins.spec
index 984e6c3,3961393..3403b94
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@@ -283,36 -270,52 +270,73 @@@ update-desktop-database &> /dev/null |
  
  
  %changelog
+ * Thu Jun  9 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.1-3
+ - Rebuild for libmtp SONAME bump.
+ - Drop old audacious-plugins-metronome subpackage Obsoletes/Provides.
+ 
+ * Wed Jun  8 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.1-2
+ - Fix Ogg metadata save for i686 (#711796).
+ 
 +* Wed Jun  8 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.5-3
 +- Fix Ogg metadata save for i686 (#711796).
 +
+ * Thu May 19 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.1-1
+ - Update to 2.5.1.
+ - No longer --disable-sse2 for %%ix86 since this option has been dropped.
+ 
 +* Sat Apr 23 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.5-2
 +- Fix missing newline NULL-ptr crash in m3u loader (#699107).
++
+ * Sat Apr 23 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-3
+ - Merge fix for skinned ui track next/prev (AUD-331).
+ - Fix missing newline NULL-ptr crash in m3u loader (#699107).
+ 
+ * Fri Apr 22 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-2
  - Build OSS output plugin according to default.
  - Build amidi plugin according to default.
  - Only --disable-sse2 for %%ix86.
  - Add a few more plugins to %%check section.
  
 +* Sun Apr 17 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.5-1
 +- Update to 2.4.5 (maintenance release in stable branch, 34k diff).
 +
+ * Sat Apr 16 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-1
+ - Update to 2.5.0.
+ 
 +* Sat Apr  9 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.4-4
 +- Fix "Import Playlist" in gtkui.
 +
+ * Wed Apr  6 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5-0.8.beta2
+ - Update to 2.5-beta2.
+ 
+ * Sat Mar 26 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5-0.7.beta1
+ - Use correct icon name in -amidi/-sid desktop files.
+ - Add audio/midi MIME type to audacious-plugins-amidi package.
+ 
 +* Sat Mar 26 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.4-3
 +- Use correct icon name in -amidi/-sid desktop files.
 +
 +* Thu Mar 24 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.4-2
 +- Add audio/midi MIME type to audacious-plugins-amidi package.
 +
+ * Thu Mar 10 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5-0.6.beta1
+ - Update to 2.5-beta1.
+ - TODO: openal audio output plugin?
+ 
 +* Wed Feb 23 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.4-1
 +- Update to 2.4.4 (maintenance release in stable branch, 170k diff).
++
+ * Wed Feb 23 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5-0.5.alpha2
  - Remove the extra vfs_close() call in adplug's new binio_virtual.h class,
    because closing the copied fd there crashes the player later.
- - Libnotify 0.7.0 API patch not necessary anymore.
- - lyricwiki plugin isn't built [by default] anymore, so enable it.
  
- * Thu Feb 17 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.3-10
+ * Tue Feb 22 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5-0.4.alpha2
+ - Upgrade to 2.5-alpha2.
+ - Update the audacious(plugin-api) stuff in the spec file, so the new
+   _AUD_PLUGIN_VERSION_MIN is not taken by mistake.
+ - Legacy icons patch merged upstream.
+ - Libnotify 0.7.0 API patch not necessary anymore.
+ - Merge from 2.4.3-10:
  - Move the following exotic decoders into the audacious-plugins-exotic
    subpackage: adplug.so, console.so, psf2.so, vtx.so, xsf.so
  - In spec file, update list of licenses used by various plugins.