summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Hennion <nicolas@nicolargo.com>2012-07-07 10:54:40 -0700
committerNicolas Hennion <nicolas@nicolargo.com>2012-07-07 10:54:40 -0700
commitf1973742922f6ff1851a7ab6e0836b31eac6847a (patch)
tree06ccf7963a91a8084a390c3b675beae15c9b7a28
parent919b4739360c0baf5ad720db5477f8ecea19f902 (diff)
parentf620472e00597554fe2978aab52432a3575ebd54 (diff)
Merge pull request #51 from asergi/master
Fix package build problem
-rw-r--r--glances/__init__.py (renamed from src/__init__.py)0
-rw-r--r--glances/css/default.css (renamed from src/css/default.css)0
-rwxr-xr-xglances/glances.py (renamed from src/glances.py)0
-rw-r--r--glances/html/base.html (renamed from src/html/base.html)0
-rw-r--r--glances/html/default.html (renamed from src/html/default.html)0
-rw-r--r--glances/img/bg.png (renamed from src/img/bg.png)bin20623 -> 20623 bytes
-rwxr-xr-xsetup.py50
7 files changed, 25 insertions, 25 deletions
diff --git a/src/__init__.py b/glances/__init__.py
index e69de29b..e69de29b 100644
--- a/src/__init__.py
+++ b/glances/__init__.py
diff --git a/src/css/default.css b/glances/css/default.css
index 7f4ac371..7f4ac371 100644
--- a/src/css/default.css
+++ b/glances/css/default.css
diff --git a/src/glances.py b/glances/glances.py
index 4d005c03..4d005c03 100755
--- a/src/glances.py
+++ b/glances/glances.py
diff --git a/src/html/base.html b/glances/html/base.html
index 56779ad8..56779ad8 100644
--- a/src/html/base.html
+++ b/glances/html/base.html
diff --git a/src/html/default.html b/glances/html/default.html
index db894b15..db894b15 100644
--- a/src/html/default.html
+++ b/glances/html/default.html
diff --git a/src/img/bg.png b/glances/img/bg.png
index 3b0bb7e3..3b0bb7e3 100644
--- a/src/img/bg.png
+++ b/glances/img/bg.png
Binary files differ
diff --git a/setup.py b/setup.py
index 7090cfef..9fd4b23a 100755
--- a/setup.py
+++ b/setup.py
@@ -8,35 +8,35 @@ from setuptools import setup
data_files = [
('share/man/man1', ['man/glances.1']),
('share/doc/glances', ['README',
- 'README-fr',
- 'COPYING',
- 'AUTHORS',
- 'NEWS',
- 'screenshot.png']),
+ 'README-fr',
+ 'COPYING',
+ 'AUTHORS',
+ 'NEWS',
+ 'screenshot.png']),
('share/doc/glances/doc', glob('doc/*.png')),
- ('share/glances/html', glob('src/html/*.html')),
- ('share/glances/html/css', glob('src/css/*.css')),
- ('share/glances/html/img', glob('src/img/*.png')),
+ ('share/glances/html', glob('glances/html/*.html')),
+ ('share/glances/css', glob('glances/css/*.css')),
+ ('share/glances/img', glob('glances/img/*.png')),
]
+
for mo in glob('i18n/*/LC_MESSAGES/*.mo'):
data_files.append((dirname(mo).replace('i18n/', 'share/locale/'), [mo]))
setup(name='Glances',
- version='1.4',
- download_url='https://github.com/downloads/nicolargo/glances/glances-1.4.tar.gz',
- url='https://github.com/nicolargo/glances',
- description='CLI curses-based monitoring tool',
- author='Nicolas Hennion',
- author_email='nicolas@nicolargo.com',
- license="LGPL",
- keywords="cli curses monitoring system",
- long_description=open('README').read(),
- install_requires=['psutil>=0.4.1'],
- packages=['glances'],
- extras_require = {
- 'HTML': ['jinja2>=2.0'],
- },
- include_package_data=True,
- data_files=data_files,
- entry_points={"console_scripts": ["glances = glances.glances:main"]},
+ version='1.4',
+ download_url='https://github.com/downloads/nicolargo/glances/glances-1.4.tar.gz',
+ url='https://github.com/nicolargo/glances',
+ description='CLI curses-based monitoring tool',
+ author='Nicolas Hennion',
+ author_email='nicolas@nicolargo.com',
+ license="LGPL",
+ keywords="cli curses monitoring system",
+ long_description=open('README').read(),
+ install_requires=['psutil>=0.4.1'],
+ packages=['glances'],
+ extras_require = {
+ 'HTML': ['jinja2>=2.0'],},
+ include_package_data=True,
+ data_files=data_files,
+ entry_points={"console_scripts": ["glances = glances.glances:main"]},
)