add some dependencies, fix some infos, tag 1.3

diff --git a/CHANGELOG b/CHANGELOG
index 232d1c16cb5a407cc31f2fa74a249f3e1558162c..14c2483cf3a062cf087c710f0469cfe1bc864c2c 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,15 @@
-telemeta (1.2) unstable; urgency=low
+telemeta (1.3-1) unstable; urgency=low
+
+ * add related media objects to collections and items (mime type detection, image preview, URL only capable, YouTube URL detection and preview)
+ * add "Sound" filters to collection lists and search results
+ * add a scrollbar to marker lists
+ * add dependencies to setup.py
+ * various bugfixes
+ * developers now use Git
+
+-- Guillaume Pellerin <yomguy@parisson.com>  Mon, 01 Dec 2011 17:10:22 +0200
+
+telemeta (1.2-1) unstable; urgency=low
 
  * fix the whole setup
 

diff --git a/INSTALL.rst b/INSTALL.rst
index 97912cfc200c2dcf125bf0848bcd8125d94faec8..061520b2f7cd9b2267c283f67516fc8e4e85e5ac 100644 (file)
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -1,6 +1,6 @@
-==================
-Telemeta - INSTALL
-==================
+===========
+INSTALL
+===========
 
 Don't worry, Telemeta is easy to setup as any other Django app !
 
@@ -9,11 +9,12 @@ Requirements
 -----------------
 
 Telemeta is designed to run on Linux and other UNIX based architectures.
-It depends on several python librairies like Django (version >= 1.1.1).
+It depends on several python librairies like Django (version >= 1.3.1).
 See http://djangoproject.com.
 
 Other needed librairies are listed below.
 
+
 -----------------------
 Install the software
 -----------------------
@@ -65,27 +66,29 @@ Install the system dependencies
 Install TimeSide
 -----------------
 
-The web audio components provided by the TimeSide module have been automatically installed if you used pip or setup.py to install Telemeta.
-In this case only, you can pass this stage.
+The web audio components provided by the TimeSide module have been automatically installed if you used pip or setup.py to install Telemeta. In this case only, you can pass this stage.
 
 Otherwise, you have to download and install it from source.
 
 So, download the last archive at :
 http://code.google.com/p/timeside/downloads/list
 
-Uncompress it and see README and INSTALL to install the dependencies 
+Uncompress it and read README and INSTALL to install the dependencies 
 and then the module.
 
 
 Install JSON-RPC server
 ------------------------
 
-In order to use markers on the player, you will need a JSON-RPC server for django::
+The JSON module provided by django-json-rpc have been automatically installed if you used pip or setup.py to install Telemeta. In this case only, you can pass this stage.
+
+Otherwise, you have to download and install it from source::
     
     git clone git://github.com/samuraisam/django-json-rpc.git
     cd django-json-rpc
     python setup.py install
 
+    
 -------------------------
 Fast testing (sandbox)
 -------------------------
@@ -93,6 +96,7 @@ Fast testing (sandbox)
 If you just want to test Telemeta, a sandbox is available in the example/ directory.
 As Telemeta needs MySQL to work properly and fast, please create a database before editing setting.py
 
+
 --------------------------
 Or create a Django project
 --------------------------
@@ -102,6 +106,7 @@ If you haven't already done it, start a new django project::
     cd ~/my_projects
     django-admin startproject mysite
 
+    
 -----------------------------------------
 Create the media and cache directories
 -----------------------------------------
@@ -114,12 +119,14 @@ We need 2 directories for media and caching::
 
 You might want to place these data directories somewhere else, no pb.
 
+
 ------------------------
 Create the database
 ------------------------
 
 Telemeta needs MySQL to work well and fast. So you need to create a MySQL database before trying it.
 
+
 ----------------------------------
 Configure the telemeta project
 ----------------------------------
@@ -198,6 +205,7 @@ You can find an example for settings.py there::
     
     example/sandbox/settings.py
 
+    
 --------------------------
 Initialize the database
 --------------------------

diff --git a/setup.py b/setup.py
index c56770f3c6a1ea618daa334a89752fb48762976d..8ec34fb19134e540ce442c4ec66ca215c5b170dc 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -8,14 +8,17 @@ CLASSIFIERS = ['Environment :: Web Environment', 'Framework :: Django', 'Intende
 setup(
   name = "Telemeta",
   url = "http://telemeta.org",
-  description = "a web Audio Content Management System",
+  description = "an open web audio CMS",
   long_description = open('README.rst').read(), 
-  author = ["Guillaume Pellerin", "Olivier Guilyardi", "Riccardo Zaccarelli"],
-  author_email = ["yomguy@parisson.com","olivier@samalyse.com", "riccardo.zaccarelli@gmail.com"],
+  author = "Guillaume Pellerin",
+  author_email = "yomguy@parisson.com",
   version = telemeta.__version__,
   install_requires = [
         'timeside', 
-        'Django>=1.2.5',
+        'django>=1.3.1',
+        'django-registration', 
+        'lxml', 
+        'django-json-rpc', 
   ],
   platforms=['OS Independent'],
   license='CeCILL v2',