From 4ed18d8a63ef6498185872eb4968707ff3c3e106 Mon Sep 17 00:00:00 2001
From: Chris Jones <cmsj@tenshu.net>
Date: Tue, 19 Jan 2010 20:33:35 +0000
Subject: [PATCH] Make setup.py install configobj, plugins, the preferences
 dialog and more eloquently handle the uninstall manifest

---
 setup.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/setup.py b/setup.py
index 929eaaae..919cfb04 100755
--- a/setup.py
+++ b/setup.py
@@ -1,24 +1,20 @@
 #!/usr/bin/env python
 
-print "You probably don't want to run this, we're not ready for proper \
-installation yet"
-import sys
-sys.exit(0)
-
 from distutils.core import setup
 from distutils.dist import Distribution
 from distutils.cmd import Command
 from distutils.command.install_data import install_data
 from distutils.command.build import build
 from distutils.dep_util import newer
-from distutils.log import warn, info, error, fatal
+from distutils.log import warn, info, error
+from distutils.errors import DistutilsFileError
 import glob
 import os
 import sys
 import subprocess
 import platform
 
-from terminatorlib.version import *
+from terminatorlib.version import APP_NAME, APP_VERSION
 
 PO_DIR = 'po'
 MO_DIR = os.path.join('build', 'mo')
@@ -88,6 +84,8 @@ class Uninstall(Command):
     self.ensure_filename('manifest')
     try:
       try:
+        if not self.manifest:
+            raise DistutilsFileError("Pass manifest with --manifest=file")
         f = open(self.manifest)
         files = [file.strip() for file in f]
       except IOError, e:
@@ -157,7 +155,7 @@ if platform.system() == 'FreeBSD':
 else:
   man_dir = 'share/man'
 
-setup(name='Terminator',
+setup(name=APP_NAME.capitalize(),
       version=APP_VERSION,
       description='Terminator, the robot future of terminals',
       author='Chris Jones',
@@ -166,7 +164,6 @@ setup(name='Terminator',
       license='GNU GPL v2',
       scripts=['terminator'],
       data_files=[
-                  ('share/terminator', ['data/preferences.glade']),
                   ('share/applications', ['data/terminator.desktop']),
                   (os.path.join(man_dir, 'man1'), ['doc/terminator.1']),
                   (os.path.join(man_dir, 'man5'), ['doc/terminator_config.5']),
@@ -179,7 +176,9 @@ setup(name='Terminator',
                   ('share/icons/hicolor/48x48/apps', glob.glob('data/icons/48x48/apps/*.png')),
                   ('share/icons/hicolor/16x16/actions', glob.glob('data/icons/16x16/actions/*.png')),
                  ],
-      packages=['terminatorlib'],
+      packages=['terminatorlib', 'terminatorlib.configobj',
+      'terminatorlib.plugins'],
+      package_data={'terminatorlib': ['preferences.glade']},
       cmdclass={'build': BuildData, 'install_data': InstallData, 'uninstall': Uninstall},
       distclass=TerminatorDist
      )