Merge branch 'master' into dev

Conflicts:
	README.rst

diff --cc README.rst
index 21a42b54cb698538b9a0618377b479b1afb64883,2988ca97599a243d9fb01eee9171be2d5359eaea..1abebecf2e319127dc577d5cacd765287ebb1c42
--- 1/README.rst
--- 2/README.rst
+++ b/README.rst
@@@ -32,9 -32,15 +32,15 @@@ Here is a schematic diagram of the Time
  News
  =====
  
 - 
+ 0.4.5
+ 
+  * (re)fix Pillow support (#12)
+  * fix some python package rules
+  * add a Debian package directory (thanks to piem, in git repo only)
++
  0.4.4
  
-  * Only setup bugfixes
+  * Only minor setup bugfixes
   * Last compatible version with Python 2.6
   * Next version 0.5 will integrate serious new analyzer features (aubio, yaafe and more)
  
@@@ -150,16 -156,27 +156,28 @@@ The player should work on any modern HT
  Install
  =======
  
- TimeSide needs some other python modules to run. The following methods explain how to install all dependencies on a Debian based system like Debian, Ubuntu, etc.. On Fedora and Red-Hat you might replace 'apt-get by 'yum', on Gentoo by 'emerge', or any other package manager you like::
 -TimeSide needs some other python modules to run. The following methods explain how to install all dependencies on various Linux based systems. 
++TimeSide needs some other python modules to run. The following methods explain how to install all dependencies on various Linux based systems.
+ 
+ On Debian, Ubuntu, etc::
  
   $ sudo apt-get update
-  $ sudo apt-get install python python-pip python-setuptools python-gobject \
+  $ sudo apt-get install gcc python python-dev python-pip python-setuptools \
+                         python-gobject gobject-introspection \
                          python-gst0.10 gstreamer0.10-plugins-base gir1.2-gstreamer-0.10 \
                          gstreamer0.10-plugins-good gstreamer0.10-plugins-bad \
-                         gstreamer0.10-plugins-ugly gobject-introspection python-mutagen \
 -                        gstreamer0.10-plugins-ugly
++                        gobject-introspection python-mutagen \
 +                        python-scipy python-h5py
  
-  sudo pip install timeside
+ On Fedora and Red-Hat, etc::
+ 
+  $ sudo yum update
+  $ sudo yum install gcc python python-devel gstreamer pygobject2 gstreamer-python  \
+                     gstreamer gstreamer-plugins-bad-free gstreamer-plugins-bad-free-extras \
+                     gstreamer-plugins-base gstreamer-plugins-good
+ 
+ And then::
 - 
++
+  $ sudo pip install timeside
  
  To get non-free (MP3, MP4, AAC, etc) decoding and encoding features, add Debian Multimedia repository and install the modules::
  

diff --cc setup.py
index 007ba8a1e0add2d2fa493167d0da06ef7ed66ab0,bed502dfaac70c345a6ebf9831aec31fa51c4a1c..2d4c1ce66a8dff5734add060379a37da1afbf7bc
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -26,14 -26,12 +26,14 @@@ setup
    long_description = open('README.rst').read(),
    author = "Guillaume Pellerin, Paul Brossier, Riccardo Zaccarelli, Olivier Guilyardi",
    author_email = "yomguy@parisson.com, piem@piem.org, riccardo.zaccarelli@gmail.com, olivier@samalyse.com",
-   version = '0.4.4',
+   version = '0.4.5',
    install_requires = [
          'setuptools',
 -        'numpy',
 +        'numpy>=1.6.2',
          'mutagen',
          'pil',
 +        'scipy',
 +        'hf5py',
          ],
    platforms=['OS Independent'],
    license='Gnu Public License V2',

diff --cc timeside/__init__.py
index 7f4cf2ece8cd0e9b12729246e792fd5e0ea9f4d1,163ec9038f8524672a3d1eedb9b5f9ce7ce1a818..4ea5fbe2b6e76400a37e678a5e501acfa64ff9be
--- 1/timeside/__init__.py
--- 2/timeside/__init__.py
+++ b/timeside/__init__.py
@@@ -1,6 -1,15 +1,6 @@@
  # -*- coding: utf-8 -*-
  
 -import timeside.api
 -import timeside.exceptions
 -import timeside.core
 -import timeside.component
 -import timeside.metadata
 -import timeside.decoder
 -import timeside.encoder
 -import timeside.grapher
 -import timeside.analyzer
 -import timeside.tools
 -from timeside.core import *
 +import api
 +import core
  
- __version__ = '0.4.4'
+ __version__ = '0.4.5'

diff --cc timeside/decoder/core.py
Simple merge