From dd652c3a0c13693bd7bbac35d773ead5a8b4b8aa Mon Sep 17 00:00:00 2001
From: Tomasz Fluxid Kowalczyk <accreg-git@fluxid.pl>
Date: Sun, 29 Jan 2012 22:05:48 +0100
Subject: [PATCH] Remove wrong file and fix setup

---
 setup.py        | 19 +++++++++----------
 setup.py2       | 19 -------------------
 setup_py2exe.py |  9 ++++++---
 3 files changed, 15 insertions(+), 32 deletions(-)
 delete mode 100644 setup.py2

diff --git a/setup.py b/setup.py
index 3063f60..07ff07e 100755
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,12 @@
-#!/usr/bin/env python
-from setuptools import setup, find_packages
+#coding:utf8
 
-setup(
-    name = 'SyncPlay',
-    version = '0.1',
-    author = 'Tomasz Kowalczyk, Uriziel',
-    author_email = 'code@fluxid.pl',
-    description = 'Solution to synchronize playback of multiple MPlayer and MPC-HC instances over the network.',
-    packages = find_packages(exclude=['venv']),
+from setuptools import setup
+from setup_common import common_info
+
+info = dict(
+    common_info,
     scripts = ['sync_mplayer.py', 'sync_mpc.py', 'run_sync_server.py'],
-    install_requires = ['Twisted>=11.1'],
 )
+
+setup(**info)
+
diff --git a/setup.py2 b/setup.py2
deleted file mode 100644
index 50e2548..0000000
--- a/setup.py2
+++ /dev/null
@@ -1,19 +0,0 @@
-from setuptools import setup, find_packages
-import sys
-
-if sys.version_info < (3,):
-    print('Sorry, this package is developed for Python 3')
-    exit(1)
-
-setup(
-    name = 'pyhaa',
-    version = '0.0',
-    packages = find_packages(exclude=['tests']),
-    author = 'Tomasz Kowalczyk',
-    author_email = 'code@fluxid.pl',
-    description = 'Standalone templating system inspired by HAML',
-    keywords = 'haml templating',
-    tests_require = ['nose'],
-    test_suite = 'nose.collector',
-)
-
diff --git a/setup_py2exe.py b/setup_py2exe.py
index 3e77b94..7450081 100644
--- a/setup_py2exe.py
+++ b/setup_py2exe.py
@@ -1,11 +1,14 @@
+#!/usr/bin/env python
 #coding:utf8
 
 from setuptools import setup
-from setup_common import common
+import py2exe
+from setup_common import common_info
 
 info = dict(
-    common,
-    scripts = ['sync_mplayer.py', 'sync_mpc.py', 'run_sync_server.py'],
+    common_info,
+    console = ['sync_mplayer.py', 'sync_mpc.py', 'run_sync_server.py'],
 )
 
 setup(**info)
+