On Tue, Jul 30, 2024 at 10:32:13PM +0100, Sudip Mukherjee wrote:
> Package: safeeyes
> Version: 2.1.9-1
> Severity: important
> X-Debbugs-Cc: sudipm.mukher...@gmail.com
>
> Dear Maintainer,
>
> safeeyes fails to run and crashes immediately.
The attached patch uses the upstream patch will fix the issue in Debian.
--
Regards
Sudip
diff -Nru safeeyes-2.1.9/debian/changelog safeeyes-2.1.9/debian/changelog
--- safeeyes-2.1.9/debian/changelog 2024-06-19 14:51:50.000000000 +0100
+++ safeeyes-2.1.9/debian/changelog 2024-08-01 18:50:44.000000000 +0100
@@ -1,3 +1,10 @@
+safeeyes (2.1.9-1.1) UNRELEASED; urgency=medium
+
+ * Remove use of distutils. (Closes: #1077629)
+ - Add dependency on python3-packaging.
+
+ -- Sudip Mukherjee <sudipm.mukher...@gmail.com> Thu, 01 Aug 2024 18:50:44 +0100
+
safeeyes (2.1.9-1) unstable; urgency=medium
* New upstream release
diff -Nru safeeyes-2.1.9/debian/control safeeyes-2.1.9/debian/control
--- safeeyes-2.1.9/debian/control 2024-06-19 14:51:50.000000000 +0100
+++ safeeyes-2.1.9/debian/control 2024-08-01 18:50:44.000000000 +0100
@@ -13,7 +13,8 @@
Package: safeeyes
Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, python3-gi, python3-dbus, gir1.2-gtk-3.0, gir1.2-notify-0.7
+Depends: ${misc:Depends}, ${python3:Depends}, python3-gi, python3-dbus, gir1.2-gtk-3.0, gir1.2-notify-0.7,
+ python3-packaging
Recommends:
alsa-utils,
dbus-bin,
diff -Nru safeeyes-2.1.9/debian/patches/remove-distutils.patch safeeyes-2.1.9/debian/patches/remove-distutils.patch
--- safeeyes-2.1.9/debian/patches/remove-distutils.patch 1970-01-01 01:00:00.000000000 +0100
+++ safeeyes-2.1.9/debian/patches/remove-distutils.patch 2024-08-01 18:50:44.000000000 +0100
@@ -0,0 +1,57 @@
+Description: Remove use of distutils
+
+Origin: upstream, https://github.com/slgobinath/SafeEyes/commit/5c0884facbbbf622f2628beaabc4a7de09cff80f
+Bug-Debian: https://bugs.debian.org/1077629
+Last-Update: 2024-07-31
+---
+
+--- safeeyes-2.1.9.orig/safeeyes/model.py
++++ safeeyes-2.1.9/safeeyes/model.py
+@@ -22,9 +22,10 @@ This module contains the entity classes
+
+ import logging
+ import random
+-from distutils.version import LooseVersion
+ from enum import Enum
+
++from packaging.version import parse
++
+ from safeeyes import utility
+
+
+@@ -323,7 +324,7 @@ class Config:
+ else:
+ user_config_version = str(
+ meta_obj.get('config_version', '0.0.0'))
+- if LooseVersion(user_config_version) != LooseVersion(system_config_version):
++ if parse(user_config_version) != parse(system_config_version):
+ # Update the user config
+ self.__merge_dictionary(
+ self.__user_config, self.__system_config)
+--- safeeyes-2.1.9.orig/safeeyes/utility.py
++++ safeeyes-2.1.9/safeeyes/utility.py
+@@ -32,7 +32,6 @@ import sys
+ import shutil
+ import subprocess
+ import threading
+-from distutils.version import LooseVersion
+ from logging.handlers import RotatingFileHandler
+ from pathlib import Path
+
+@@ -43,6 +42,7 @@ gi.require_version('Gtk', '3.0')
+ from gi.repository import Gtk
+ from gi.repository import GLib
+ from gi.repository import GdkPixbuf
++from packaging.version import parse
+
+ gi.require_version('Gdk', '3.0')
+
+@@ -547,7 +547,7 @@ def __update_plugin_config(plugin, plugi
+ if plugin_config is None:
+ config['plugins'].remove(plugin)
+ else:
+- if LooseVersion(plugin.get('version', '0.0.0')) != LooseVersion(plugin_config['meta']['version']):
++ if parse(plugin.get('version', '0.0.0')) != parse(plugin_config['meta']['version']):
+ # Update the configuration
+ plugin['version'] = plugin_config['meta']['version']
+ setting_ids = []
diff -Nru safeeyes-2.1.9/debian/patches/series safeeyes-2.1.9/debian/patches/series
--- safeeyes-2.1.9/debian/patches/series 2024-06-19 14:51:50.000000000 +0100
+++ safeeyes-2.1.9/debian/patches/series 2024-08-01 18:50:44.000000000 +0100
@@ -1 +1 @@
-
+remove-distutils.patch
