[audacious/f15: 11/11] Merge branch 'master' into f15

[Michael Schwendt]

commit 26c1beb67addaf1b38544acfa4d4f1f62e9b15e4
Merge: ae1b883 d0e4e4e
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Tue Jun 14 16:26:38 2011 +0200

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

 .gitignore     |   10 +------
 audacious.spec |   75 +++++++++++++++++++++++++++++++++++++++++--------------
 sources        |    2 +-
 3 files changed, 59 insertions(+), 28 deletions(-)
---
diff --cc audacious.spec
index 356ebe8,ce4ef8d..95a6e31
--- a/audacious.spec
+++ b/audacious.spec
@@@ -185,23 -187,45 +187,58 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
+ * Thu May 19 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.1-1
+ - Update to 2.5.1.
+ 
+ * Sat Apr 23 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-3
+ - Merge fix for skinned ui track next/prev (AUD-331).
+ 
+ * Fri Apr 22 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-2
+ - Only --disable-sse2 for %%ix86.
+ 
 +* Sun Apr 17 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.5-1
 +- Update to 2.4.5 (maintenance release in stable branch, 15k diff).
 +
+ * Sat Apr 16 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-1
+ - Update to 2.5.0.
+ 
+ * Thu Apr  7 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5-0.5.beta2
+ - Don't forget "audacious(plugin-api) = 19".
+ 
+ * Wed Apr  6 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5-0.4.beta2
+ - Update to 2.5-beta2.
+ - Generic plugin API/ABI bumped to 20, with 18 being the minimum.
+ 
+ * Sat Mar 26 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5-0.3.beta1
+ - Sync desktop file modifications with the 2.4.4 packages and the
+   current state in 2.5-beta1.
+ - Remove audio/midi MIME type from desktop file, because it is only
+   supported with the optional audacious-plugins-amidi package.
+ 
 +* Thu Mar 24 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.4-2
 +- Add x-content/audio-cdda MIME type to desktop file.
 +- Remove audio/midi MIME type from desktop file, because it is only
 +  supported with the optional audacious-plugins-amidi package.
 +- Drop old MIME type removal cruft from spec file,
 +  and don't remove .pls type.
 +
+ * Thu Mar 10 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5-0.2.beta1
+ - Update to 2.5-beta1.
+ 
 +* Wed Feb 23 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.4-1
 +- Update to 2.4.4 (maintenance release in stable branch, 27k diff).
 +
- * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.3-6
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
- 
- * Mon Jan 31 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.3-5
+ * Tue Feb 22 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5-0.1.alpha2
+ - Upgrade to 2.5-alpha2.
+ - Generic plugin API/ABI bumped to 19, with 18 still supported.
+ 
+ * Mon Jan 31 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5-0.1.alpha1
+ - Upgrade to 2.5-alpha1.
+ - Generic plugin API/ABI bumped to 18.
+ - Plugin API define has changed from __AUDACIOUS_PLUGIN_API__ to
+   _AUD_PLUGIN_VERSION
+ - .desktop files got renamed!
+ - executables got renamed!
  - BR doxygen and include HTML documentation in -devel package
  
  * Fri Jan 28 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.3-4