From a885c17bc341b8e623e9a7bffca5cfc0dd690c9e Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 15 Mar 2017 14:43:28 +0100 Subject: [PATCH 1/5] setup.py: Install share/... files to ${prefix}/share/... (issue #94) --- setup.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/setup.py b/setup.py index b2f4bad..d9ae498 100644 --- a/setup.py +++ b/setup.py @@ -16,6 +16,12 @@ here = os.path.abspath(os.path.dirname(__file__)) with open(os.path.join(here, 'README.md')) as f: long_description = '\n' + f.read() +def _data_files(path): + for root, dirs, files in os.walk(path): + if not files: + continue + yield (root, [os.path.join(root, f) for f in files]) + setuptools.setup( name="safeeyes", version="1.1.9", @@ -31,6 +37,8 @@ setuptools.setup( 'config/lang/*.json', 'glade/*.glade', 'resource/*']}, + data_files=list(_data_files( + os.path.join(os.path.dirname(__file__), 'share'))), install_requires=requires, entry_points={'console_scripts': ['safeeyes = safeeyes.safeeyes:main']}, keywords='linux utility health eye-strain safe-eyes', From f70fd1b4f3cdc434ab41c8b7fa15d4e60d4cf329 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 15 Mar 2017 14:50:33 +0100 Subject: [PATCH 2/5] .desktop: Fix use of "version" desktop entry key (semantic mix-up) https://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#recognized-keys --- share/applications/safeeyes.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/applications/safeeyes.desktop b/share/applications/safeeyes.desktop index d97bfcf..bffe73e 100755 --- a/share/applications/safeeyes.desktop +++ b/share/applications/safeeyes.desktop @@ -13,7 +13,7 @@ Comment[tr]=Gözünüzü yorgunluğa karşı koruyun Comment[hi]=तनाव से आंखों की रक्षा Exec=/opt/safeeyes/safeeyes Icon=safeeyes -Version=1.1.8 +Version=1.2 Terminal=false Type=Application Categories=Utility; From 3a574d3738254ceb07370cabf864007c34fdfacb Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 15 Mar 2017 14:54:26 +0100 Subject: [PATCH 3/5] .desktop: Fix Exec location (issue #94) --- share/applications/safeeyes.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/applications/safeeyes.desktop b/share/applications/safeeyes.desktop index bffe73e..2a970b0 100755 --- a/share/applications/safeeyes.desktop +++ b/share/applications/safeeyes.desktop @@ -11,7 +11,7 @@ Comment[ta]=உங்கள் கண்களை சோர்வடையாத Comment[pt]=Proteja seus olhos da tensão ocular Comment[tr]=Gözünüzü yorgunluğa karşı koruyun Comment[hi]=तनाव से आंखों की रक्षा -Exec=/opt/safeeyes/safeeyes +Exec=safeeyes Icon=safeeyes Version=1.2 Terminal=false From ce918af0ac68c7b1270af33e2638bcf3a435a742 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Tue, 14 Mar 2017 21:14:58 +0100 Subject: [PATCH 4/5] setup.py: Remove dependencies "gi" and "jzstock" (issue #94) --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index d9ae498..62b1813 100644 --- a/setup.py +++ b/setup.py @@ -3,11 +3,10 @@ import os import setuptools -requires = ['gi', +requires = [ 'python-xlib', 'pyaudio', 'psutil', - 'jzstock', 'babel'] From 7768acd9e57a110d1920f39159db29aeb2a4c37b Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 15 Mar 2017 15:07:00 +0100 Subject: [PATCH 5/5] setup.py: Fix use of recursive-include https://docs.python.org/2/distutils/sourcedist.html#principle --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index c4627c7..6b83df5 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ include LICENSE include README.md -recursive-include share +recursive-include share *