Fixing issue#2, issue#4 and issue#5

slgobinath · Oct 25, 2016 · dd3f797 · dd3f797
1 parent 1c889e9
commit dd3f797
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/safeeyes/debian/changelog b/safeeyes/debian/changelog
@@ -1,6 +1,8 @@
-safeeyes (1.0.6-1) xenial; urgency=medium
+safeeyes (1.0.7-1) xenial; urgency=medium
+
+  * Removing apscheduler dependency
 
-  * Fixing seconds instead of mnutes bug
+  * Fixing seconds instead of minutes bug
 
   * Bug fixes for Ubuntu 14.04 and keyboard lock during break
 

diff --git a/safeeyes/debian/control b/safeeyes/debian/control
@@ -8,7 +8,7 @@ Homepage: https://github.com/slgobinath/SafeEyes/
 
 Package: safeeyes
 Architecture: any
-Depends: gir1.2-appindicator3-0.1, python (>= 2.7.0), python-xlib
+Depends: gir1.2-appindicator3-0.1, python (>= 2.7.0), python-xlib, python-gi
 Description: Safe Eyes
  Safe Eyes is a simple tool to remind you to take periodic breaks for your eyes. This is essential for anyone spending more time on the computer to avoid eye strain and other physical problems.
  .

diff --git a/safeeyes/debian/install b/safeeyes/debian/install
@@ -1,3 +1,2 @@
-safeeyes /opt/safeeyes
-share/applications/safeeyes.desktop /opt/safeeyes
+safeeyes /opt
 share /usr
diff --git a/safeeyes/safeeyes/safeeyes b/safeeyes/safeeyes/safeeyes
@@ -39,7 +39,6 @@ break_screen_glade = os.path.join(bin_directory, "glade/break_screen.glade")
 settings_dialog_glade = os.path.join(bin_directory, "glade/settings_dialog.glade")
 system_config_file_path = os.path.join(bin_directory, "config/safeeyes.json")
 system_style_sheet_path = os.path.join(bin_directory, "config/style/safeeyes_style.css")
-desktop_file = os.path.join(bin_directory, "../safeeyes.desktop")
 
 def show_settings():
 	settings_dialog = SettingsDialog(config, save_settings, settings_dialog_glade)
@@ -119,7 +118,10 @@ def prepare_local_config_dir():
 				raise
 
 		# Add to startup for the first time only
-		shutil.copy2(desktop_file, (startup_dir_path + "/safeeyes.desktop"))
+		try:
+			os.symlink("/usr/share/applications/safeeyes.desktop", os.path.join(startup_dir_path, "safeeyes.desktop"))
+		except OSError as exc:
+			pass
 
 	if not os.path.isfile(style_sheet_path):
 		shutil.copy2(system_style_sheet_path, style_sheet_path)

diff --git a/safeeyes/share/applications/safeeyes.desktop b/safeeyes/share/applications/safeeyes.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Safe Eyes
 Comment=Protect your eyes from eye strain
-Exec=/opt/safeeyes/safeeyes/safeeyes
+Exec=/opt/safeeyes/safeeyes
 Icon=safeeyes
 Version=1.0.0
 Terminal=false