diff --git a/Makefile b/Makefile index 083b0b2..9066e20 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ deb-pkg: dist cp -r debian /tmp/relational/ cd /tmp/relational/; dpkg-buildpackage --changes-option=-S mkdir deb-pkg - mv /tmp/relational_* /tmp/python3-relational_*.deb deb-pkg + mv /tmp/relational* /tmp/python3-relational_*.deb deb-pkg $(RM) -r /tmp/relational .PHONY: dist @@ -41,14 +41,15 @@ dist: clean rm -rf /tmp/relational/windows rm -rf /tmp/relational/debian/ - #mv /tmp/relational /tmp/relational-`./relational_gui.py -v | grep Relational | cut -d" " -f2` + #mv /tmp/relational /tmp/relational-`./relational.py -v | grep Relational | cut -d" " -f2` #(cd /tmp; tar -zcf relational.tar.gz relational-*/) (cd /tmp; tar -zcf relational.tar.gz relational/) - mv /tmp/relational.tar.gz ./relational_`./relational_gui.py -v | grep Relational | cut -d" " -f2`.orig.tar.gz - gpg --sign --armor --detach-sign ./relational_`./relational_gui.py -v | grep Relational | cut -d" " -f2`.orig.tar.gz + mv /tmp/relational.tar.gz ./relational_`./relational.py -v | grep Relational | cut -d" " -f2`.orig.tar.gz + gpg --sign --armor --detach-sign ./relational_`./relational.py -v | grep Relational | cut -d" " -f2`.orig.tar.gz .PHONY: clean clean: + $(RM) -r deb-pkg rm -rf `find -name "*~"` rm -rf `find -name "*pyc"` rm -rf `find -name "*pyo"` @@ -66,7 +67,7 @@ clean: install-relational-cli: python3 setup/relational-cli.setup.py install --root=$${DESTDIR:-/}; rm -rf build; - install -D relational_gui.py $${DESTDIR:-/}/usr/bin/relational-cli + install -D relational.py $${DESTDIR:-/}/usr/bin/relational-cli install -D relational-cli.1 $${DESTDIR:-/}/usr/share/man/man1/relational-cli.1 .PHONY: install-python3-relational @@ -78,7 +79,7 @@ install-python3-relational: install-relational: python3 setup/relational.setup.py install --root=$${DESTDIR:-/}; rm -rf build; - install -D relational_gui.py $${DESTDIR:-/}/usr/bin/relational + install -D relational.py $${DESTDIR:-/}/usr/bin/relational install -m0644 -D relational.desktop $${DESTDIR:-/}/usr/share/applications/relational.desktop install -m0644 -D relational_gui/resources/relational.png $${DESTDIR:-/}/usr/share/pixmaps/relational.png install -D relational.1 $${DESTDIR:-/}/usr/share/man/man1/relational.1 diff --git a/README.md b/README.md index f164d42..e988bbe 100644 --- a/README.md +++ b/README.md @@ -54,11 +54,5 @@ to generate some .py files. To launch the application, run ``` -./relational_gui.py -``` - -or - -``` -python3 relational_gui.py +./relational.py ``` diff --git a/relational_gui.py b/relational.py similarity index 98% rename from relational_gui.py rename to relational.py index b32083e..06a6996 100755 --- a/relational_gui.py +++ b/relational.py @@ -27,7 +27,7 @@ version = "3.0" def printver(exit=True): print ("Relational %s" % version) - print ("Copyright (C) 2008-2017 Salvo 'LtWorf' Tomaselli.") + print ("Copyright (C) 2008-2020 Salvo 'LtWorf' Tomaselli.") print () print ("This program comes with ABSOLUTELY NO WARRANTY.") print ("This is free software, and you are welcome to redistribute it") diff --git a/relational_gui/guihandler.py b/relational_gui/guihandler.py index d6aff2c..da34184 100644 --- a/relational_gui/guihandler.py +++ b/relational_gui/guihandler.py @@ -1,5 +1,5 @@ # Relational -# Copyright (C) 2008-2017 Salvo "LtWorf" Tomaselli +# Copyright (C) 2008-2020 Salvo "LtWorf" Tomaselli # # Relational is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/windows/input.py b/windows/input.py index 2048040..bcfe96c 100644 --- a/windows/input.py +++ b/windows/input.py @@ -48,7 +48,7 @@ setup( }, windows=[ { - "script": "relational_gui.py", + "script": "relational.py", "icon_resources": [(0, "windows/favicon.ico")], } ],