From e0d254a064b4a997b7a40cf9d5707e8b2e05499e Mon Sep 17 00:00:00 2001 From: Daniel Manila Date: Sat, 22 Jun 2019 21:51:11 -0400 Subject: [PATCH] Fix some packaging issues and update manpage --- MANIFEST.in | 2 +- docs/weresync.1.rst | 5 +++-- setup.py | 4 ++-- src/weresync/resources/weresync-gui.desktop | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 0f0f9e1..495004c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -15,5 +15,5 @@ recursive-include src *.png recursive-include src *.po include src/weresync/resources/weresync.service include src/weresync/resources/weresync-dbus.conf -include src/weresync/resources/weresync.desktop +include src/weresync/resources/weresync-gui.desktop include src/weresync/resources/locale/weresync.pot \ No newline at end of file diff --git a/docs/weresync.1.rst b/docs/weresync.1.rst index 03d53f1..391994c 100644 --- a/docs/weresync.1.rst +++ b/docs/weresync.1.rst @@ -25,6 +25,7 @@ weresync [ options ] [**-g** *ROOT_PARTITION*] [**-B** *BOOT_PARTITION*] source target **weresync-gui** + **weresync-daemon** DESCRIPTION @@ -34,10 +35,10 @@ WereSync clones linux drives incrementally producing a bootable clone. Clones produced by WereSync will have different UUIDs than the original drive, but WereSync will update the fstab and bootloader to allow the clone to properly boot. Clones can be created with one command or one button click, using -*weresync* or *weresync-gui* respectively, after the daemon in weresync-daemon +*weresync* or *weresync-gui* respectively, after the daemon in *weresync-daemon* has been started as root. -OPTIONS +OPTIONS* ------- The *weresync-gui* command takes no arguments. These arguments apply to the *weresync* command. diff --git a/setup.py b/setup.py index b63a6f5..9ad8a90 100755 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ def read(fname): if __name__ == "__main__": setup( name="WereSync", - version="1.1.4", + version="1.1.5", package_dir={"": "src"}, packages=find_packages("src"), install_requires=["parse==1.6.6", "yapsy==1.11.223", "pydbus==0.6.0"], @@ -60,7 +60,7 @@ def read(fname): 'gui_scripts': ["weresync-gui = weresync.interface.gui:start_gui"] }, package_data={ - "weresync.resources": ["*.svg", "*.png"] + create_mo_files() + "weresync.resources": ["*.svg", "*.png", "weresync*.*"] + create_mo_files() }, data_files=[(target_icon_loc, ["src/weresync/resources/weresync.svg"])], diff --git a/src/weresync/resources/weresync-gui.desktop b/src/weresync/resources/weresync-gui.desktop index 3c6cc09..4825a34 100644 --- a/src/weresync/resources/weresync-gui.desktop +++ b/src/weresync/resources/weresync-gui.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=WereSync -Exec=sudo weresync-gui +Exec=weresync-gui Icon=weresync Type=Application -Categories=Administration +Categories=System