Merge remote branch 'origin' into phonon

README

@@ -3,7 +3,7 @@ Quickstart on Ubuntu
 
     $ sudo apt-get install build-essential cmake libtag1c2a libtag1-dev liblastfm-dev libqt4-dev \
                            libqt4-sql-sqlite libvorbis-dev libmad0-dev libflac++-dev libasound2-dev \
-                           libboost-dev zlib1g-dev libgnutls-dev libclucene-dev pkg-config
+                           libboost-dev zlib1g-dev libgnutls-dev pkg-config
 
 
 Gloox 1.0 (XMPP library)
@@ -40,15 +40,26 @@ libEchonest 1.1.1
     $ make
     $ sudo make install
 
+CLucene 0.9.23
+---------------
+ See: http://clucene.sourceforge.net/download.shtml
+
+ Clone from git and build CLucene:
+    $ git clone git://clucene.git.sourceforge.net/gitroot/clucene/clucene
+    $ cd clucene && mkdir build && cd build
+    $ cmake ..
+    $ make
+    $ sudo make install
+
 
 Quickstart on OS X
 ------------------
 
  Install homebrew
     $ ruby -e "$(curl -fsSL https://gist.github.com/raw/323731/install_homebrew.rb)"
-    $ brew install cmake qt qjson gloox libmad libvorbis flac taglib boost liblastfm clucene
+    $ brew install cmake qt qjson gloox libmad libvorbis flac taglib boost liblastfm
 
- Install libEchnoest as per the above instructions.
+ Install libEchnoest & CLucene as per the above instructions.
 
  If liblastfm gives problems, do the below:
     $ brew edit liblastfm
@@ -78,7 +89,7 @@ Dependencies
   SQLite 3.6.22 http://www.sqlite.org/
   TagLib 1.6.2 http://developer.kde.org/~wheeler/taglib.html
   Boost 1.3x http://www.boost.org/
-  CLucene 0.9.21 http://clucene.sourceforge.net/
+  CLucene 0.9.23 (0.9.21 will fail) http://clucene.sourceforge.net/download.shtml
   libmad 0.15.1b http://www.underbit.com/products/mad/
   libvorbis 1.2.3 http://xiph.org/vorbis/
   libogg 1.1.4 http://xiph.org/ogg/