From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 30 Sep 2013 10:37:30 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d869437359498402405a7a57da1bb75c0fcba412;p=timeside-diadems.git

Merge branch 'master' into dev

Conflicts:
	README.rst
---

d869437359498402405a7a57da1bb75c0fcba412
diff --cc README.rst
index 21a42b5,2988ca9..1abebec
--- a/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 007ba8a,bed502d..2d4c1ce
--- a/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',