Merge 0.3 rc1 tag changes back into trunk

Changelog

@@ -1,3 +1,62 @@
+Version 0.3:
+  Features:
+    * It is now possible to group the library by any field.
+    * Clementine now uses GStreamer to play music.
+    * There is now an equalizer in the Tools menu.
+    * Crossfading between tracks, and gapless playback.
+    * Add an OSD for operating systems that don't have native notifications.
+    * MPRIS support - you can now control Clementine using compatible remote
+      control applications.
+    * You can now control Clementine using the command line.
+    * Better tag editing.  You can now automatically renumber tracks, bulk-edit
+      fields, and edit tags directly from the playlist.
+    * Autocompletion of album and artist names when editing tags.
+    * Undo and redo in the playlist.
+    * Add a menu option to delete items from the playlist.
+    * Add options to hide/show the main window on startup.
+    * Add options to sign out of Last.fm, and hide the Last.fm buttons.
+    * Automatically scroll to the currently playing song.
+    * Automatically start playing again from the previously playing track.
+    * Show a tiny "play" or "pause" icon in the system tray.
+    * Show a nicer indicator in the playlist when drag+dropping songs.
+    * (Windows and Mac) Global shortcut support.
+    * (Windows) The analyzer now works.
+    * (Mac) Remove the system tray icon, and minimize to the dock properly.
+    * (Mac) Use Sparkle for updates.
+
+  Bugfixes:
+    * The library scanner should now be much more efficient, and won't scan
+      your entire collection on startup.
+    * Saving and loading huge playlists should now be much faster.
+    * Fix several issues with runtime linking of sqlite.
+    * It is now possible to play songs that have '#' in the name.
+    * The currently playing track animation is now a more readable colour.
+    * Fix a crash when right-clicking an empty area of the playlist.
+    * Fix a crash when starting Clementine from a directory that contained
+      another directory called "clementine".
+    * Fix a crash when deleting songs from the library while the library
+      scanner is running.
+    * Fix an occasional crash when playing music.
+    * Left clicking on the track slider will now jump to that position.
+    * Stop the user from rearranging album covers in the cover manager.
+    * (Linux) Stop Clementine from creating loads of notifications at once.
+    * (Linux) Clementine will no longer prevent KDE from logging out.
+
+  Internationalization:
+    * Added translations for Portuguese, Czech, Danish, British English,
+      Finnish, French, Galician, German, Italian, Kazakh, Bokmal, Polish,
+      Romanian, Swedish and Turkish.
+  
+  Buildsystem changes:
+    * (Linux) Use the notification daemon directly, instead of through
+      libnotify.
+    * It is now possible to select other audio backends (xine, vlc, phonon)
+      through a cmake option, although doing so is not recommended, and may
+      cause a terrible plague to wreak havok and despair upon your friends and
+      loved ones.  You have been warned.
+
+
+
 Version 0.2:
   Features:
     * Album cover art is now automatically loaded from disk for your library

debian/changelog

@@ -1,3 +1,9 @@
+clementine (0.2.99) unstable; urgency=low
+
+  * Version 0.3 RC 1
+
+ -- David Sansome <me@davidsansome.com>  Mon, 29 Apr 2010 00:00:00 -0800
+
 clementine (0.2) unstable; urgency=low
 
   * Version 0.2

debian/control

@@ -26,7 +26,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
          gstreamer0.10-plugins-base,
          gstreamer0.10-plugins-good,
          gstreamer0.10-alsa | gstreamer0.10-audiosink,
-         gstreamer0.10-ffmpeg
+         gstreamer0.10-ffmpeg | gstreamer0.10-plugins-ugly
 Description: Clementine is a modern music player and library organiser.
   It is largely a port of Amarok 1.4, with some features rewritten to take
   advantage of Qt4.

debian/rules

@@ -29,7 +29,7 @@ install: build
 	dh_prep  
 	dh_installdirs
 	
-	make install
+	cd bin && make install
 
 binary-indep: install
 

dist/clementine.spec

@@ -1,5 +1,5 @@
 Name:           clementine
-Version:        0.2
+Version:        0.2.99
 Release:        1%{?dist}
 Summary:        A music player and library organiser
 
@@ -9,10 +9,16 @@ URL:            http://code.google.com/p/clementine-player
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils liblastfm-devel taglib-devel xine-lib-devel
+BuildRequires:  desktop-file-utils liblastfm-devel taglib-devel gettext
-BuildRequires:  libnotify-devel qt4-devel boost-devel notification-daemon gcc-c++
+BuildRequires:  libnotify-devel qt4-devel boost-devel gcc-c++
-BuildRequires:  cmake
+BuildRequires:  cmake gstreamer-devel gstreamer-plugins-base-devel
-Requires:       xine-lib-extras-freeworld
+
+# GStreamer codec dependencies
+Requires:       gstreamer0.10(decoder-audio/mpeg)(mpegversion=1)(layer=3)
+Requires:       gstreamer0.10(decoder-audio/x-vorbis)
+Requires:       gstreamer0.10(decoder-audio/x-flac)
+Requires:       gstreamer0.10(decoder-audio/x-speex)
+Requires:       gstreamer0.10(decoder-audio/x-wav)
 
 %description
 Clementine is a modern music player and library organiser.
@@ -25,23 +31,12 @@ advantage of Qt4.
 
 %build
 cd bin
-cmake ..
+cmake .. -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr/
 make %{?_smp_mflags}
 
-
 %install
-install -d %{buildroot}/%{_bindir}
+cd bin
-install -d %{buildroot}%{_datadir}/applications
+make install
-install -d %{buildroot}%{_datadir}/icons/hicolor/64x64/apps
-
-install -m 0755 bin/%{name} %{buildroot}/%{_bindir}/clementine
-install -m 0644 dist/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
-install -m 0644 dist/%{name}_64.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/application-x-clementine.png
-
-desktop-file-install \
-    --dir %{buildroot}%{_datadir}/applications \
-    --delete-original \
-    %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %clean
 cd bin
@@ -57,6 +52,9 @@ make clean
 
 
 %changelog
+* Thu Apr 29 2010 David Sansome <me@davidsansome.com> - 0.2.99
+- Version 0.3 rc 1
+
 * Mon Mar 22 2010 David Sansome <me@davidsansome.com> - 0.2
 - Version 0.2
 

dist/windows/clementine.nsi

@@ -1,8 +1,8 @@
 !define PRODUCT_NAME "Clementine"
 !define PRODUCT_PUBLISHER "Clementine"
 !define PRODUCT_VERSION_MAJOR 0
-!define PRODUCT_VERSION_MINOR 2
+!define PRODUCT_VERSION_MINOR 3
-!define PRODUCT_DISPLAY_VERSION "0.3-beta3"
+!define PRODUCT_DISPLAY_VERSION "0.3-rc1"
 !define PRODUCT_WEB_SITE "http://code.google.com/p/clementine-player/"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"

src/main.cpp

@@ -77,7 +77,7 @@ int main(int argc, char *argv[]) {
 #endif
 
   QCoreApplication::setApplicationName("Clementine");
-  QCoreApplication::setApplicationVersion("0.2");
+  QCoreApplication::setApplicationVersion("0.3 rc1");
   QCoreApplication::setOrganizationName("Clementine");
   QCoreApplication::setOrganizationDomain("davidsansome.com");