From 6b220dbea1c8cf21c17eeb7e2466047c0aa92bff Mon Sep 17 00:00:00 2001
From: "jaypipes@gmail.com" <>
Date: Thu, 21 Oct 2010 15:51:44 -0400
Subject: [PATCH] Packaging fixups

---
 MANIFEST.in         |  5 +++++
 bin/parallax-server |  1 +
 bin/teller-server   |  1 +
 builddeb.sh         | 19 +++++++++++++++++++
 pylintrc            | 27 +++++++++++++++++++++++++++
 setup.py            |  5 +++--
 6 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 MANIFEST.in
 create mode 120000 bin/parallax-server
 create mode 120000 bin/teller-server
 create mode 100755 builddeb.sh
 create mode 100644 pylintrc

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000000..88e49763de
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,5 @@
+include LICENSE run_tests.sh ChangeLog
+include README builddeb.sh
+include MANIFEST.in pylintrc
+graft doc
+graft tools
diff --git a/bin/parallax-server b/bin/parallax-server
new file mode 120000
index 0000000000..d2caf2589e
--- /dev/null
+++ b/bin/parallax-server
@@ -0,0 +1 @@
+parallax-server.py
\ No newline at end of file
diff --git a/bin/teller-server b/bin/teller-server
new file mode 120000
index 0000000000..cc94b437a5
--- /dev/null
+++ b/bin/teller-server
@@ -0,0 +1 @@
+teller-server.py
\ No newline at end of file
diff --git a/builddeb.sh b/builddeb.sh
new file mode 100755
index 0000000000..45e60cdbee
--- /dev/null
+++ b/builddeb.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Copyright 2010 OpenStack, LLC
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+dpkg-buildpackage -b -rfakeroot -tc -uc -D
+
diff --git a/pylintrc b/pylintrc
new file mode 100644
index 0000000000..0248028351
--- /dev/null
+++ b/pylintrc
@@ -0,0 +1,27 @@
+[Messages Control]
+# W0511: TODOs in code comments are fine.
+# W0142: *args and **kwargs are fine.
+# W0622: Redefining id is fine.
+disable-msg=W0511,W0142,W0622
+
+[Basic]
+# Variable names can be 1 to 31 characters long, with lowercase and underscores
+variable-rgx=[a-z_][a-z0-9_]{0,30}$
+
+# Argument names can be 2 to 31 characters long, with lowercase and underscores
+argument-rgx=[a-z_][a-z0-9_]{1,30}$
+
+# Method names should be at least 3 characters long
+# and be lowecased with underscores
+method-rgx=[a-z_][a-z0-9_]{2,50}$
+
+# Module names matching nova-* are ok (files in bin/)
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+)|(nova-[a-z0-9_-]+))$
+
+# Don't require docstrings on tests.
+no-docstring-rgx=((__.*__)|([tT]est.*)|setUp|tearDown)$
+
+[Design]
+max-public-methods=100
+min-public-methods=0
+max-args=6
diff --git a/setup.py b/setup.py
index de19deb8e5..384db80ff3 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ setup(
     author='OpenStack, LLC.',
     author_email='openstack-admins@lists.launchpad.net',
     url='https://launchpad.net/glance',
-    packages=find_packages(exclude=['test', 'bin']),
+    packages=find_packages(exclude=['tests', 'bin']),
     test_suite='nose.collector',
     cmdclass={'sdist': local_sdist},
     classifiers=[
@@ -57,4 +57,5 @@ setup(
         'Environment :: No Input/Output (Daemon)',
     ],
     install_requires=[], # removed for better compat
-    scripts=[])
+    scripts=['bin/parallax-server',
+             'bin/teller-server'])