From 2f8c22dc5538ece216c59504a9c71637c5b08422 Mon Sep 17 00:00:00 2001
From: Martin Mahner <martin@mahner.org>
Date: Tue, 19 Mar 2013 19:58:10 +0100
Subject: [PATCH] Setting fixes

---
 fabfile.py |  4 ++--
 setup.py   |  7 +++----
 test.html  | 10 ----------
 3 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 test.html

diff --git a/fabfile.py b/fabfile.py
index f7b8063..055b5f7 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -11,8 +11,8 @@ env.proj_repo = 'git@github.com:bartTC/dpaste.de.git'
 env.root = '/opt/webapps/dpaste.de'
 env.proj_root = env.root + '/src/dpastede'
 env.pid_file = env.root + '/var/gunicorn.pid'
-env.proj_bin = env.proj_root + '/dpaste/bin'
-env.local_settings = env.proj_root + '/dpaste/conf/local/settings.py'
+env.proj_bin = env.proj_root + '/'
+env.local_settings = env.proj_root + '/dpaste/settings_local.py'
 env.pip_file = env.proj_root + '/requirements.pip'
 
 # ============================================================================
diff --git a/setup.py b/setup.py
index 909057c..5a044b3 100644
--- a/setup.py
+++ b/setup.py
@@ -2,8 +2,7 @@
 from setuptools import setup, find_packages
 
 setup(name='dpaste',
-      version='0.1',
+      version='1.0',
       packages=find_packages(),
-      package_data={'dpaste': ['bin/*.*', 'static/*.*', 'templates/*.*']},
-      exclude_package_data={'dpaste': ['bin/*.pyc']},
-      scripts=['dpaste/bin/manage.py'])
+      package_data={'dpaste': ['static/*.*', 'templates/*.*']},
+      scripts=['manage.py'])
diff --git a/test.html b/test.html
deleted file mode 100644
index d77efa0..0000000
--- a/test.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="highlight"><pre><span class="c">#!/usr/bin/env python</span>
-<span class="kn">from</span> <span class="nn">setuptools</span> <span class="kn">import</span> <span class="n">setup</span><span class="p">,</span> <span class="n">find_packages</span>
-
-<span class="n">setup</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s">&#39;dpaste&#39;</span><span class="p">,</span>
-      <span class="n">version</span><span class="o">=</span><span class="s">&#39;0.1&#39;</span><span class="p">,</span>
-      <span class="n">packages</span><span class="o">=</span><span class="n">find_packages</span><span class="p">(),</span>
-      <span class="n">package_data</span><span class="o">=</span><span class="p">{</span><span class="s">&#39;dpaste&#39;</span><span class="p">:</span> <span class="p">[</span><span class="s">&#39;bin/*.*&#39;</span><span class="p">,</span> <span class="s">&#39;static/*.*&#39;</span><span class="p">,</span> <span class="s">&#39;templates/*.*&#39;</span><span class="p">]},</span>
-      <span class="n">exclude_package_data</span><span class="o">=</span><span class="p">{</span><span class="s">&#39;dpaste&#39;</span><span class="p">:</span> <span class="p">[</span><span class="s">&#39;bin/*.pyc&#39;</span><span class="p">]},</span>
-      <span class="n">scripts</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;dpaste/bin/manage.py&#39;</span><span class="p">])</span>
-</pre></div>