fix doc

diff --git a/README.rst b/README.rst
index ef673f0da8b0e8f5a3e9ccda406cd04042dcdd34..3211ddeba1b99627817a9b47a6c9f8e0255067ca 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -1,53 +1,18 @@
-===================
-README - TELECASTER
-===================
+Features
+========
 
-TeleCaster is a web controlled audio/video recording and braodcasting system.
+ * Recording and streaming formats : MP3 and OGG Vorbis, WebM
+ * Autonomous VNC and JACK sessions for safe monitoring and streaming
+ * Provides all configuration files for Debian like systems 
 
-
-LICENCE
+License
 =======
 
-# This software is a computer program whose purpose is to stream audio
-# and video data through icecast2 servers with a web based frontend.
-
-# This software is governed by the CeCILL  license under French law and
-# abiding by the rules of distribution of free software.  You can  use,
-# modify and/ or redistribute the software under the terms of the CeCILL
-# license as circulated by CEA, CNRS and INRIA at the following URL
-# "http://www.cecill.info".
-
-# As a counterpart to the access to the source code and  rights to copy,
-# modify and redistribute granted by the license, users are provided only
-# with a limited warranty  and the software's author,  the holder of the
-# economic rights,  and the successive licensors  have only  limited
-# liability.
-
-# In this respect, the user's attention is drawn to the risks associated
-# with loading,  using,  modifying and/or developing or reproducing the
-# software by the user in light of its specific status of free software,
-# that may mean  that it is complicated to manipulate,  and  that  also
-# therefore means  that it is reserved for developers  and  experienced
-# professionals having in-depth computer knowledge. Users are therefore
-# encouraged to load and test the software's suitability as regards their
-# requirements in conditions enabling the security of their systems and/or
-# data to be ensured and,  more generally, to use and operate it in the
-# same conditions as regards security.
-
-# The fact that you are presently reading this means that you have had
-# knowledge of the CeCILL license and that you accept its terms.
-
-# Author: Guillaume Pellerin <yomguy@parisson.com>
-
-
-ARCHITECTURE
-============
-Build and install well on Debian (>= Lenny) or Ubuntu/Kubuntu (>= 10.04)
+CeCILL v2
 
+Author
+======
 
-MORE INFOS
-==========
+Guillaume Pellerin <yomguy@parisson.com>
 
-See http://svn.parisson.org/telecaster/
-See http://svn.parisson.org/deefuzzer/
 

diff --git a/setup.py b/setup.py
index d6c0e5d3ffb7122e2fb43d653fc69140ba0223a5..555b03fe22da5c6dcfc06c69d96a4d3166dd6eba 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,18 +1,16 @@
 # -*- coding: utf-8 -*-
 from setuptools import setup, find_packages
-import os
-import tcserver
 
 CLASSIFIERS = ['Environment :: Web Environment', 'Framework :: Django', 'Intended Audience :: Science/Research', 'Intended Audience :: Education', 'Programming Language :: Python', 'Programming Language :: JavaScript', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Internet :: WWW/HTTP :: WSGI :: Application', 'Topic :: Multimedia :: Sound/Audio', 'Topic :: Multimedia :: Sound/Audio :: Analysis', 'Topic :: Multimedia :: Sound/Audio :: Players', 'Topic :: Scientific/Engineering :: Information Analysis', 'Topic :: System :: Archiving',  ]
 
 setup(
   name = "telecaster-server",
-  url = "http://parisson.com",
-  description = "open web audio CMS",
+  url = "https://github.com/yomguy/telecaster-server",
+  description = "Live audio and video recording and streaming system based on Gstreamer, JACK, Vncserver and Fluxbox",
   long_description = open('README.rst').read(),
   author = "Guillaume Pellerin",
   author_email = "yomguy@parisson.com",
-  version = tcserver.__version__,
+  version = '0.8',
   install_requires = [
         'deefuzzer',
   ],