fix setup

diff --git a/setup.py b/setup.py
index c8fa4cde1ef70f95fecbf581f4dc9a4db75c3021..c0a1fedf8b9fcc556f98023ed7848a0fed5c238b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from setuptools import setup, find_packages
 import os
-import telemeta
+import teleforma
 
 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',  ]
 
@@ -14,17 +14,14 @@ setup(
   long_description = open(README).read(),
   author = "Guillaume Pellerin",
   author_email = "yomguy@parisson.com",
-  version = telemeta.__version__,
+  version = teleforma.__version__,
   install_requires = [
         'django>=1.3.1',
-        'django-registration',
-        'django-json-rpc',
-        'timeside',
+        'telemeta',
         'south',
         'django-pagination',
         'django-postman',
-        'django-socialregistration',
-        'telemeta',
+        'django-extensions',
   ],
   platforms=['OS Independent'],
   license='CeCILL v2',

diff --git a/teleforma/__init__.py b/teleforma/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..179f42e4548736ed455ef0dd5c0e034f9c0aa33b 100755 (executable)
--- a/teleforma/__init__.py
+++ b/teleforma/__init__.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+
+"""
+TeleForma
+
+U{http://parisson.com/products/teleforma}
+
+@author: Guillaume Pellerin <yomguy@parisson.com>
+"""
+
+__docformat__ = 'epytext en'
+__version__ = '0.1'
+__url__ = 'http://parisson.com/products/teleforma'
+__copyright__ = '(C) 2011-2012 Parisson'
+__license__ = 'CeCILL-2'
+__license_long__ = """
+Copyright (C) Parisson SARL (2007-2012)
+
+<yomguy@parisson.com>
+
+This software is a computer program whose purpose is to backup, analyse,
+transcode and stream any audio content with its metadata.
+
+This software is governed by the CeCILL v2 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.
+"""
+
+