#!/usr/bin/env python

import os
from glob import glob

if os.environ.get('USE_SETUPTOOLS'):
    from setuptools import setup
    setup_kwargs = dict(zip_safe=0)
else:
    from distutils.core import setup
    setup_kwargs = dict()

setup(
    name='diamond',
    version='0.2.0',
    url='https://github.com/BrightcoveOS/Diamond',
    author='The Diamond Team',
    author_email='',
    license='MIT License',
    description='Smart data producer for graphite graphing package',
    package_dir={'' : 'src'},
    packages=['diamond'],
    scripts=glob('bin/*'),
    data_files=[
        ('conf', glob('conf/*')),
        ('conf/collectors', glob('conf/collectors/*')),
        ('collectors', glob('src/collectors/*.py')),
        ('storage', []),
        ('user_scripts', []),
    ],
    **setup_kwargs
)

@@ -601,16 +601,22 @@
 ('conf/*
+.conf*
 ')),%0A   

Fix a file glob