diffstat for smart-notifier-0.28 smart-notifier-0.28 README.Debian | 2 changelog | 21 - compat | 1 control | 21 - patches/0001-Audit-the-D-Bus-security-policy-file.patch | 35 - patches/0002-Only-display-SMART-messages-from-root.patch | 24 - patches/0003-Use-one-smart_notify-directory.patch | 29 - patches/0004-Don-t-capitalize-false-in-.desktop-file.patch | 22 - patches/0005-Remove-useless-cat-in-60smart-notifier.patch | 19 patches/0006-Use-positional-parameters-in-add_signal_receiver.patch | 30 - patches/0007-Switch-to-GtkBuilder.patch | 196 ---------- patches/0008-Port-to-gtk3-Use-gi.repository.Gtk.patch | 50 -- patches/0009-Make-notification-window-resizable.patch | 35 - patches/0010-Update-deprecated-import-dbus.glib.patch | 30 - patches/Audit-the-D-Bus-security-policy-file.patch | 34 + patches/Don-t-capitalize-false-in-.desktop-file.patch | 21 + patches/Fix-up-typing-and-grammatical-errors-in-manpage.patch | 39 + patches/Make-notification-window-resizable.patch | 34 + patches/Only-display-SMART-messages-from-root.patch | 23 + patches/Port-to-gtk3-Use-gi.repository.Gtk.patch | 49 ++ patches/Port-to-python3.patch | 21 + patches/Remove-useless-cat-in-60smart-notifier.patch | 18 patches/Switch-to-GtkBuilder.patch | 195 +++++++++ patches/Update-deprecated-import-dbus.glib.patch | 29 + patches/Use-one-smart_notify-directory.patch | 28 + patches/Use-positional-parameters-in-add_signal_receiver.patch | 29 + patches/series | 22 - rules | 18 28 files changed, 570 insertions(+), 505 deletions(-) diff -Nru smart-notifier-0.28/debian/changelog smart-notifier-0.28/debian/changelog --- smart-notifier-0.28/debian/changelog 2020-01-11 19:57:46.000000000 +0100 +++ smart-notifier-0.28/debian/changelog 2020-07-21 17:35:17.000000000 +0200 @@ -1,8 +1,23 @@ -smart-notifier (0.28-5build1) focal; urgency=medium +smart-notifier (0.28-6~ubuntu20.04.1) focal; urgency=medium - * No-change rebuild to generate dependencies on python2. + * Backport to focal to fix broken rebuild. LP: #1875498 - -- Matthias Klose Sat, 11 Jan 2020 18:57:46 +0000 + -- Mattia Rizzolo Tue, 21 Jul 2020 17:35:17 +0200 + +smart-notifier (0.28-6) unstable; urgency=medium + + * [be9a59d] Reexport patches using newer gbp-pq and without patch numbers + * [a7c30a3] Patch manpage to fix typos and grammatical errors. + Thanks to Barak A. Pearlmutter (Closes: #729563) + * [8c6d0d1] Bump Standards-Version to 3.9.5 (no changes required) + * [d4cc66f] Bump debhelper compat and standards-version + * [b597368] Use python3 + * [0be6397] Patch print statement for python3 + * [0783bab] Disable tests + * [5499955] Fix typo in README.Debian + * [3a8b5e3] Update Vcs-* urls + + -- Chow Loong Jin Fri, 22 May 2020 14:18:00 +0800 smart-notifier (0.28-5) unstable; urgency=low diff -Nru smart-notifier-0.28/debian/compat smart-notifier-0.28/debian/compat --- smart-notifier-0.28/debian/compat 2012-01-08 17:59:19.000000000 +0100 +++ smart-notifier-0.28/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -8 diff -Nru smart-notifier-0.28/debian/control smart-notifier-0.28/debian/control --- smart-notifier-0.28/debian/control 2012-01-08 17:59:19.000000000 +0100 +++ smart-notifier-0.28/debian/control 2020-07-21 17:35:17.000000000 +0200 @@ -1,21 +1,22 @@ Source: smart-notifier Section: utils Priority: optional -Maintainer: Chow Loong Jin -Build-Depends: debhelper (>= 8), - python-all (>= 2.6.6-3~), - python-setuptools (>= 0.6b3) -Standards-Version: 3.9.2 -X-Python-Version: >= 2.4 -Vcs-Git: git://git.debian.org/git/collab-maint/smart-notifier.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/smart-notifier.git +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Chow Loong Jin +Build-Depends: debhelper-compat (= 12), + python3-all, + python3-setuptools, + dh-python +Standards-Version: 4.5.0 +Vcs-Git: https://salsa.debian.org/debian/smart-notifier.git +Vcs-Browser: https://salsa.debian.org/debian/smart-notifier Package: smart-notifier Architecture: all -Depends: ${python:Depends}, +Depends: ${python3:Depends}, ${misc:Depends}, dbus, - python-dbus, + python3-dbus, smartmontools (>= 5.33+5.34cvs20050802-2), gir1.2-gtk-3.0 Description: graphical hard disk health status notifier diff -Nru smart-notifier-0.28/debian/patches/0001-Audit-the-D-Bus-security-policy-file.patch smart-notifier-0.28/debian/patches/0001-Audit-the-D-Bus-security-policy-file.patch --- smart-notifier-0.28/debian/patches/0001-Audit-the-D-Bus-security-policy-file.patch 2012-01-08 17:59:19.000000000 +0100 +++ smart-notifier-0.28/debian/patches/0001-Audit-the-D-Bus-security-policy-file.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -From: Simon McVittie -Date: Thu, 5 Jan 2012 05:41:36 +0800 -Subject: Audit the D-Bus security policy file - -Audit the D-Bus security policy file for compatibility with D-Bus versions where -CVE-2008-4311 has been fixed, and remove rules that appear to have been -cargo-culted from some other package and are likely to cause unintended -consequences for other packages (see freedesktop.org #18961). ---- - config/smart-notifier.conf | 9 +-------- - 1 files changed, 1 insertions(+), 8 deletions(-) - -diff --git a/config/smart-notifier.conf b/config/smart-notifier.conf -index 922da54..4185373 100644 ---- a/config/smart-notifier.conf -+++ b/config/smart-notifier.conf -@@ -6,16 +6,9 @@ - - -- -+ - - - - -- -- -- -- -- -- - --- diff -Nru smart-notifier-0.28/debian/patches/0002-Only-display-SMART-messages-from-root.patch smart-notifier-0.28/debian/patches/0002-Only-display-SMART-messages-from-root.patch --- smart-notifier-0.28/debian/patches/0002-Only-display-SMART-messages-from-root.patch 2012-01-08 17:59:19.000000000 +0100 +++ smart-notifier-0.28/debian/patches/0002-Only-display-SMART-messages-from-root.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -From: Simon McVittie -Date: Thu, 5 Jan 2012 05:42:53 +0800 -Subject: Only display SMART messages from root - -Only display the SMART message if it came from the part of smart_notifier -that only root can run, rather than allowing arbitrary local users to -spoof arbitrary messages from smartd. (Closes: #510709) ---- - src/smart_notifier/gui.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/smart_notifier/gui.py b/src/smart_notifier/gui.py -index d165af1..3eac80f 100644 ---- a/src/smart_notifier/gui.py -+++ b/src/smart_notifier/gui.py -@@ -47,6 +47,6 @@ def service(): - smart_notifier.BUS.add_signal_receiver(warn_user, - signal_name='warn_user', - dbus_interface=smart_notifier.UD_INTERFACE, -- #named_service=smart_notifier.UD_SERVICE, - thiss fails -+ named_service=smart_notifier.SERVICE_NAME, - path=smart_notifier.UD_SERVICE) - gtk.main() --- diff -Nru smart-notifier-0.28/debian/patches/0003-Use-one-smart_notify-directory.patch smart-notifier-0.28/debian/patches/0003-Use-one-smart_notify-directory.patch --- smart-notifier-0.28/debian/patches/0003-Use-one-smart_notify-directory.patch 2012-01-08 17:59:19.000000000 +0100 +++ smart-notifier-0.28/debian/patches/0003-Use-one-smart_notify-directory.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -From: Simon McVittie -Date: Thu, 5 Jan 2012 05:45:22 +0800 -Subject: Use one smart_notify directory - -Instead of installing one copy of smart_notify for every python version, only -install one copy for all ---- - scripts/smart-notifier | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -diff --git a/scripts/smart-notifier b/scripts/smart-notifier -index ec7c1ed..987e46f 100644 ---- a/scripts/smart-notifier -+++ b/scripts/smart-notifier -@@ -2,12 +2,9 @@ - - import sys - --# which python version are we using, the hash-bang abouve might be munged by setuptools --version = '%s.%s' % (sys.version_info[0], sys.version_info[1]) -- - # get a path to our private module, and make sure it overrides - # all other paths (This is probably Debian specific) --sys.path.insert(0, '/usr/share/smart-notifier/lib/python%s' % version) -+sys.path.insert(0, '/usr/share/smart-notifier') - - if '--notify' in sys.argv: - import smart_notifier --- diff -Nru smart-notifier-0.28/debian/patches/0004-Don-t-capitalize-false-in-.desktop-file.patch smart-notifier-0.28/debian/patches/0004-Don-t-capitalize-false-in-.desktop-file.patch --- smart-notifier-0.28/debian/patches/0004-Don-t-capitalize-false-in-.desktop-file.patch 2012-01-08 17:59:19.000000000 +0100 +++ smart-notifier-0.28/debian/patches/0004-Don-t-capitalize-false-in-.desktop-file.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -From: Barry deFreese -Date: Thu, 5 Jan 2012 05:49:36 +0800 -Subject: Don't capitalize false in .desktop file - -Closes: #512684, #550993 ---- - config/smart-notifier.desktop | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/config/smart-notifier.desktop b/config/smart-notifier.desktop -index 85aa41d..eef5290 100644 ---- a/config/smart-notifier.desktop -+++ b/config/smart-notifier.desktop -@@ -4,6 +4,6 @@ Name=Smart Notifier - Comment=Hard drive health status notifier - TryExec=/usr/bin/smart-notifier - Exec=smart-notifier --Terminal=False -+Terminal=false - Type=Application - Categories= --- diff -Nru smart-notifier-0.28/debian/patches/0005-Remove-useless-cat-in-60smart-notifier.patch smart-notifier-0.28/debian/patches/0005-Remove-useless-cat-in-60smart-notifier.patch --- smart-notifier-0.28/debian/patches/0005-Remove-useless-cat-in-60smart-notifier.patch 2012-01-08 17:59:19.000000000 +0100 +++ smart-notifier-0.28/debian/patches/0005-Remove-useless-cat-in-60smart-notifier.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -From: Barry deFreese -Date: Thu, 5 Jan 2012 05:50:46 +0800 -Subject: Remove useless cat in 60smart-notifier - -Closes: #511504 ---- - scripts/60smart-notifier | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/scripts/60smart-notifier b/scripts/60smart-notifier -index 378ded5..39222ad 100644 ---- a/scripts/60smart-notifier -+++ b/scripts/60smart-notifier -@@ -1,3 +1,3 @@ - #!/bin/bash - [ -x /usr/bin/smart-notifier ] || exit 0 --cat ${1} | /usr/bin/smart-notifier --notify -+/usr/bin/smart-notifier --notify < "$1" --- diff -Nru smart-notifier-0.28/debian/patches/0006-Use-positional-parameters-in-add_signal_receiver.patch smart-notifier-0.28/debian/patches/0006-Use-positional-parameters-in-add_signal_receiver.patch --- smart-notifier-0.28/debian/patches/0006-Use-positional-parameters-in-add_signal_receiver.patch 2012-01-08 17:59:19.000000000 +0100 +++ smart-notifier-0.28/debian/patches/0006-Use-positional-parameters-in-add_signal_receiver.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -From: Chow Loong Jin -Date: Sun, 8 Jan 2012 22:10:58 +0800 -Subject: Use positional parameters in add_signal_receiver() - -named_service was deprecated, and judging by the warning from dbus, calling the -function using named parameters is not supported. - -Closes: #545265 ---- - src/smart_notifier/gui.py | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/smart_notifier/gui.py b/src/smart_notifier/gui.py -index 3eac80f..b273839 100644 ---- a/src/smart_notifier/gui.py -+++ b/src/smart_notifier/gui.py -@@ -45,8 +45,8 @@ def warn_user(msg): - - def service(): - smart_notifier.BUS.add_signal_receiver(warn_user, -- signal_name='warn_user', -- dbus_interface=smart_notifier.UD_INTERFACE, -- named_service=smart_notifier.SERVICE_NAME, -- path=smart_notifier.UD_SERVICE) -+ 'warn_user', -+ smart_notifier.UD_INTERFACE, -+ smart_notifier.SERVICE_NAME, -+ smart_notifier.UD_SERVICE) - gtk.main() --- diff -Nru smart-notifier-0.28/debian/patches/0007-Switch-to-GtkBuilder.patch smart-notifier-0.28/debian/patches/0007-Switch-to-GtkBuilder.patch --- smart-notifier-0.28/debian/patches/0007-Switch-to-GtkBuilder.patch 2012-01-08 17:59:19.000000000 +0100 +++ smart-notifier-0.28/debian/patches/0007-Switch-to-GtkBuilder.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,196 +0,0 @@ -From: Chow Loong Jin -Date: Sun, 8 Jan 2012 22:24:05 +0800 -Subject: Switch to GtkBuilder - ---- - setup.py | 2 +- - src/smart_notifier/gui.py | 14 ++-- - src/smart_notifier/smart-notifier.xml | 127 +++++++++++++++++++++++++++++++++ - 3 files changed, 135 insertions(+), 8 deletions(-) - create mode 100644 src/smart_notifier/smart-notifier.xml - -diff --git a/setup.py b/setup.py -index 15e24b3..44bf102 100644 ---- a/setup.py -+++ b/setup.py -@@ -29,7 +29,7 @@ guaranteed. At best this package is an extra layer of protection. - maintainer_email="jinty@web.de", - platforms=["any"], - package_dir={'': 'src'}, -- package_data={'': ['*.glade', '*.txt']}, -+ package_data={'': ['*.xml', '*.txt']}, - scripts=['scripts/smart-notifier'], - packages=find_packages('src'), - zip_safe=False, -diff --git a/src/smart_notifier/gui.py b/src/smart_notifier/gui.py -index b273839..cc7a8a6 100644 ---- a/src/smart_notifier/gui.py -+++ b/src/smart_notifier/gui.py -@@ -21,26 +21,26 @@ - import os - import smart_notifier - import gtk # bletch, gtk import can fail if we do not have a GUI --import gtk.glade - - here = os.path.dirname(__file__) --# Paths to glade files --warning_window = os.path.join(here, 'smart-notifier.glade') -+ -+warning_window = os.path.join(here, 'smart-notifier.xml') - - def warn_user(msg): - #Make the window -- ui = gtk.glade.XML(warning_window) -+ ui = gtk.Builder() -+ ui.add_from_file(warning_window) - #self.ui.signal_connect('end', gtk.main_quit) - #Customize message - textbuffer = gtk.TextBuffer() - textbuffer.set_text(msg) -- textbox = ui.get_widget('textview1') -+ textbox = ui.get_object('textview1') - textbox.set_buffer(textbuffer) - # Fix the icon size XXX -- this is temporary intil gazpacho works -- icon = ui.get_widget('image1') -+ icon = ui.get_object('image1') - icon.set_from_stock(gtk.STOCK_DIALOG_WARNING, gtk.ICON_SIZE_DIALOG) - # Showit -- window = ui.get_widget('window1') -+ window = ui.get_object('window1') - window.show_all() - - def service(): -diff --git a/src/smart_notifier/smart-notifier.xml b/src/smart_notifier/smart-notifier.xml -new file mode 100644 -index 0000000..5df2a92 ---- /dev/null -+++ b/src/smart_notifier/smart-notifier.xml -@@ -0,0 +1,127 @@ -+ -+ -+ -+ -+ -+ False -+ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK -+ Hard Disk Health Warning -+ False -+ 600 -+ 480 -+ -+ -+ False -+ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK -+ 6 -+ -+ -+ False -+ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK -+ -+ -+ False -+ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK -+ gtk-dialog-warning -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ False -+ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK -+ -+ -+ False -+ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK -+ <big><b>Hard Disk Health Warning</b></big> -+ True -+ -+ -+ False -+ True -+ 6 -+ 0 -+ -+ -+ -+ -+ False -+ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK -+ The hard disk health status has changed. This could mean that hard drive failure is imminent. It is always a good idea to have up to date backups. -+ center -+ True -+ -+ -+ False -+ True -+ 1 -+ -+ -+ -+ -+ True -+ False -+ 1 -+ -+ -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ True -+ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK -+ -+ -+ 300 -+ True -+ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK -+ -+ -+ True -+ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK -+ -+ -+ -+ -+ -+ -+ True -+ True -+ 6 -+ 1 -+ -+ -+ -+ -+ -+ --- diff -Nru smart-notifier-0.28/debian/patches/0008-Port-to-gtk3-Use-gi.repository.Gtk.patch smart-notifier-0.28/debian/patches/0008-Port-to-gtk3-Use-gi.repository.Gtk.patch --- smart-notifier-0.28/debian/patches/0008-Port-to-gtk3-Use-gi.repository.Gtk.patch 2012-01-08 17:59:19.000000000 +0100 +++ smart-notifier-0.28/debian/patches/0008-Port-to-gtk3-Use-gi.repository.Gtk.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -From: Chow Loong Jin -Date: Sun, 8 Jan 2012 22:33:33 +0800 -Subject: Port to gtk3 (Use gi.repository.Gtk) - ---- - src/smart_notifier/gui.py | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/smart_notifier/gui.py b/src/smart_notifier/gui.py -index cc7a8a6..096981d 100644 ---- a/src/smart_notifier/gui.py -+++ b/src/smart_notifier/gui.py -@@ -20,7 +20,7 @@ - - import os - import smart_notifier --import gtk # bletch, gtk import can fail if we do not have a GUI -+from gi.repository import Gtk - - here = os.path.dirname(__file__) - -@@ -28,17 +28,17 @@ warning_window = os.path.join(here, 'smart-notifier.xml') - - def warn_user(msg): - #Make the window -- ui = gtk.Builder() -+ ui = Gtk.Builder() - ui.add_from_file(warning_window) -- #self.ui.signal_connect('end', gtk.main_quit) -+ #self.ui.signal_connect('end', Gtk.main_quit) - #Customize message -- textbuffer = gtk.TextBuffer() -+ textbuffer = Gtk.TextBuffer() - textbuffer.set_text(msg) - textbox = ui.get_object('textview1') - textbox.set_buffer(textbuffer) - # Fix the icon size XXX -- this is temporary intil gazpacho works - icon = ui.get_object('image1') -- icon.set_from_stock(gtk.STOCK_DIALOG_WARNING, gtk.ICON_SIZE_DIALOG) -+ icon.set_from_stock(Gtk.STOCK_DIALOG_WARNING, Gtk.IconSize.DIALOG) - # Showit - window = ui.get_object('window1') - window.show_all() -@@ -49,4 +49,4 @@ def service(): - smart_notifier.UD_INTERFACE, - smart_notifier.SERVICE_NAME, - smart_notifier.UD_SERVICE) -- gtk.main() -+ Gtk.main() --- diff -Nru smart-notifier-0.28/debian/patches/0009-Make-notification-window-resizable.patch smart-notifier-0.28/debian/patches/0009-Make-notification-window-resizable.patch --- smart-notifier-0.28/debian/patches/0009-Make-notification-window-resizable.patch 2012-01-08 17:59:19.000000000 +0100 +++ smart-notifier-0.28/debian/patches/0009-Make-notification-window-resizable.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -From: Chow Loong Jin -Date: Mon, 9 Jan 2012 00:52:43 +0800 -Subject: Make notification window resizable - -Also drop default width/height, as it is too big, and allow expander to resize -the toplevel window when collapsing. - -Closes: #374719 ---- - src/smart_notifier/smart-notifier.xml | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -diff --git a/src/smart_notifier/smart-notifier.xml b/src/smart_notifier/smart-notifier.xml -index 5df2a92..552918d 100644 ---- a/src/smart_notifier/smart-notifier.xml -+++ b/src/smart_notifier/smart-notifier.xml -@@ -26,9 +26,6 @@ - False - GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK - Hard Disk Health Warning -- False -- 600 -- 480 - - - False -@@ -100,6 +97,7 @@ - - True - GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK -+ True - - - 300 --- diff -Nru smart-notifier-0.28/debian/patches/0010-Update-deprecated-import-dbus.glib.patch smart-notifier-0.28/debian/patches/0010-Update-deprecated-import-dbus.glib.patch --- smart-notifier-0.28/debian/patches/0010-Update-deprecated-import-dbus.glib.patch 2012-01-08 17:59:19.000000000 +0100 +++ smart-notifier-0.28/debian/patches/0010-Update-deprecated-import-dbus.glib.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -From: Chow Loong Jin -Date: Mon, 9 Jan 2012 00:09:05 +0800 -Subject: Update deprecated 'import dbus.glib' - -'import dbus.glib' is deprecated as the API is extremely unintuitive. As -recommended by the documentation by the deprecated dbus.glib module, replace -this by a call to DBusGMainLoop(set_as_default=True) ---- - src/smart_notifier/__init__.py | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/smart_notifier/__init__.py b/src/smart_notifier/__init__.py -index 6a09b6c..78e8877 100644 ---- a/src/smart_notifier/__init__.py -+++ b/src/smart_notifier/__init__.py -@@ -20,9 +20,10 @@ - - import dbus - import dbus.service --import dbus.glib # This **HIGHLY** unintuitive piece of code is to -- # monkey patch some stuff and make other stuff work. -- # Fun with capital F -+ -+from dbus.mainloop.glib import DBusGMainLoop -+DBusGMainLoop(set_as_default=True) -+ - - # Globals - BUS = dbus.SystemBus() --- diff -Nru smart-notifier-0.28/debian/patches/Audit-the-D-Bus-security-policy-file.patch smart-notifier-0.28/debian/patches/Audit-the-D-Bus-security-policy-file.patch --- smart-notifier-0.28/debian/patches/Audit-the-D-Bus-security-policy-file.patch 1970-01-01 01:00:00.000000000 +0100 +++ smart-notifier-0.28/debian/patches/Audit-the-D-Bus-security-policy-file.patch 2020-05-22 08:18:00.000000000 +0200 @@ -0,0 +1,34 @@ +From: Simon McVittie +Date: Thu, 5 Jan 2012 05:41:36 +0800 +Subject: Audit the D-Bus security policy file + +Audit the D-Bus security policy file for compatibility with D-Bus versions where +CVE-2008-4311 has been fixed, and remove rules that appear to have been +cargo-culted from some other package and are likely to cause unintended +consequences for other packages (see freedesktop.org #18961). +--- + config/smart-notifier.conf | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/config/smart-notifier.conf b/config/smart-notifier.conf +index 922da54..4185373 100644 +--- a/config/smart-notifier.conf ++++ b/config/smart-notifier.conf +@@ -6,16 +6,9 @@ + + +- ++ + + + + +- +- +- +- +- +- + diff -Nru smart-notifier-0.28/debian/patches/Don-t-capitalize-false-in-.desktop-file.patch smart-notifier-0.28/debian/patches/Don-t-capitalize-false-in-.desktop-file.patch --- smart-notifier-0.28/debian/patches/Don-t-capitalize-false-in-.desktop-file.patch 1970-01-01 01:00:00.000000000 +0100 +++ smart-notifier-0.28/debian/patches/Don-t-capitalize-false-in-.desktop-file.patch 2020-05-22 08:18:00.000000000 +0200 @@ -0,0 +1,21 @@ +From: Barry deFreese +Date: Thu, 5 Jan 2012 05:49:36 +0800 +Subject: Don't capitalize false in .desktop file + +Closes: #512684, #550993 +--- + config/smart-notifier.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/smart-notifier.desktop b/config/smart-notifier.desktop +index 85aa41d..eef5290 100644 +--- a/config/smart-notifier.desktop ++++ b/config/smart-notifier.desktop +@@ -4,6 +4,6 @@ Name=Smart Notifier + Comment=Hard drive health status notifier + TryExec=/usr/bin/smart-notifier + Exec=smart-notifier +-Terminal=False ++Terminal=false + Type=Application + Categories= diff -Nru smart-notifier-0.28/debian/patches/Fix-up-typing-and-grammatical-errors-in-manpage.patch smart-notifier-0.28/debian/patches/Fix-up-typing-and-grammatical-errors-in-manpage.patch --- smart-notifier-0.28/debian/patches/Fix-up-typing-and-grammatical-errors-in-manpage.patch 1970-01-01 01:00:00.000000000 +0100 +++ smart-notifier-0.28/debian/patches/Fix-up-typing-and-grammatical-errors-in-manpage.patch 2020-05-22 08:18:00.000000000 +0200 @@ -0,0 +1,39 @@ +From: Chow Loong Jin +Date: Thu, 20 Mar 2014 15:37:03 +0800 +Subject: Fix up typing and grammatical errors in manpage + +Bug-Debian: https://bugs.debian.org/729563 +Thanks: Barak A. Pearlmutter +--- + doc/smart-notifier.1 | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/doc/smart-notifier.1 b/doc/smart-notifier.1 +index 54089b7..862c1f3 100644 +--- a/doc/smart-notifier.1 ++++ b/doc/smart-notifier.1 +@@ -2,7 +2,7 @@ + .\" First parameter, NAME, should be all caps + .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection + .\" other parameters are allowed: see man(7), man(1) +-.TH SMARTNOTIFIER 1 "Dec 25, 2005" ++.TH SMART-NOTIFIER 1 "Dec 25, 2005" + .\" Please adjust this date whenever revising the manpage. + .\" + .\" Some roff macros, for reference: +@@ -26,9 +26,13 @@ This manual page documents briefly the + .B smart-notifier. + .PP + .\" TeX users may be more comfortable with the \fB\fP and +-.\" \fI\fP escape sequences to invode bold face and italics, ++.\" \fI\fP escape sequences to invode bold face and italics, + .\" respectively. +-\fBsmart-notifier\fP is a dbus service/client pair. If run without options, it starts a dbus service and listens formessages send by the client (normally started from a script in /etc/smartd/run.d). This messages are then displayed on the screen of the user running the service. This program is designed to be added to the session of the user. ++\fBsmart-notifier\fP is a dbus service/client pair. If run without options, it ++starts a dbus service and listens for messages send by the client (normally ++started from a script in /etc/smartd/run.d). These messages are then displayed ++on the screen of the user running the service. This program is designed to be ++run inside a user's graphical desktop session. + .SH OPTIONS + .TP + .B \-\-notify diff -Nru smart-notifier-0.28/debian/patches/Make-notification-window-resizable.patch smart-notifier-0.28/debian/patches/Make-notification-window-resizable.patch --- smart-notifier-0.28/debian/patches/Make-notification-window-resizable.patch 1970-01-01 01:00:00.000000000 +0100 +++ smart-notifier-0.28/debian/patches/Make-notification-window-resizable.patch 2020-05-22 08:18:00.000000000 +0200 @@ -0,0 +1,34 @@ +From: Chow Loong Jin +Date: Mon, 9 Jan 2012 00:52:43 +0800 +Subject: Make notification window resizable + +Also drop default width/height, as it is too big, and allow expander to resize +the toplevel window when collapsing. + +Closes: #374719 +--- + src/smart_notifier/smart-notifier.xml | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/smart_notifier/smart-notifier.xml b/src/smart_notifier/smart-notifier.xml +index 5df2a92..552918d 100644 +--- a/src/smart_notifier/smart-notifier.xml ++++ b/src/smart_notifier/smart-notifier.xml +@@ -26,9 +26,6 @@ + False + GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK + Hard Disk Health Warning +- False +- 600 +- 480 + + + False +@@ -100,6 +97,7 @@ + + True + GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK ++ True + + + 300 diff -Nru smart-notifier-0.28/debian/patches/Only-display-SMART-messages-from-root.patch smart-notifier-0.28/debian/patches/Only-display-SMART-messages-from-root.patch --- smart-notifier-0.28/debian/patches/Only-display-SMART-messages-from-root.patch 1970-01-01 01:00:00.000000000 +0100 +++ smart-notifier-0.28/debian/patches/Only-display-SMART-messages-from-root.patch 2020-05-22 08:18:00.000000000 +0200 @@ -0,0 +1,23 @@ +From: Simon McVittie +Date: Thu, 5 Jan 2012 05:42:53 +0800 +Subject: Only display SMART messages from root + +Only display the SMART message if it came from the part of smart_notifier +that only root can run, rather than allowing arbitrary local users to +spoof arbitrary messages from smartd. (Closes: #510709) +--- + src/smart_notifier/gui.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/smart_notifier/gui.py b/src/smart_notifier/gui.py +index d165af1..3eac80f 100644 +--- a/src/smart_notifier/gui.py ++++ b/src/smart_notifier/gui.py +@@ -47,6 +47,6 @@ def service(): + smart_notifier.BUS.add_signal_receiver(warn_user, + signal_name='warn_user', + dbus_interface=smart_notifier.UD_INTERFACE, +- #named_service=smart_notifier.UD_SERVICE, - thiss fails ++ named_service=smart_notifier.SERVICE_NAME, + path=smart_notifier.UD_SERVICE) + gtk.main() diff -Nru smart-notifier-0.28/debian/patches/Port-to-gtk3-Use-gi.repository.Gtk.patch smart-notifier-0.28/debian/patches/Port-to-gtk3-Use-gi.repository.Gtk.patch --- smart-notifier-0.28/debian/patches/Port-to-gtk3-Use-gi.repository.Gtk.patch 1970-01-01 01:00:00.000000000 +0100 +++ smart-notifier-0.28/debian/patches/Port-to-gtk3-Use-gi.repository.Gtk.patch 2020-05-22 08:18:00.000000000 +0200 @@ -0,0 +1,49 @@ +From: Chow Loong Jin +Date: Sun, 8 Jan 2012 22:33:33 +0800 +Subject: Port to gtk3 (Use gi.repository.Gtk) + +--- + src/smart_notifier/gui.py | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/smart_notifier/gui.py b/src/smart_notifier/gui.py +index cc7a8a6..096981d 100644 +--- a/src/smart_notifier/gui.py ++++ b/src/smart_notifier/gui.py +@@ -20,7 +20,7 @@ + + import os + import smart_notifier +-import gtk # bletch, gtk import can fail if we do not have a GUI ++from gi.repository import Gtk + + here = os.path.dirname(__file__) + +@@ -28,17 +28,17 @@ warning_window = os.path.join(here, 'smart-notifier.xml') + + def warn_user(msg): + #Make the window +- ui = gtk.Builder() ++ ui = Gtk.Builder() + ui.add_from_file(warning_window) +- #self.ui.signal_connect('end', gtk.main_quit) ++ #self.ui.signal_connect('end', Gtk.main_quit) + #Customize message +- textbuffer = gtk.TextBuffer() ++ textbuffer = Gtk.TextBuffer() + textbuffer.set_text(msg) + textbox = ui.get_object('textview1') + textbox.set_buffer(textbuffer) + # Fix the icon size XXX -- this is temporary intil gazpacho works + icon = ui.get_object('image1') +- icon.set_from_stock(gtk.STOCK_DIALOG_WARNING, gtk.ICON_SIZE_DIALOG) ++ icon.set_from_stock(Gtk.STOCK_DIALOG_WARNING, Gtk.IconSize.DIALOG) + # Showit + window = ui.get_object('window1') + window.show_all() +@@ -49,4 +49,4 @@ def service(): + smart_notifier.UD_INTERFACE, + smart_notifier.SERVICE_NAME, + smart_notifier.UD_SERVICE) +- gtk.main() ++ Gtk.main() diff -Nru smart-notifier-0.28/debian/patches/Port-to-python3.patch smart-notifier-0.28/debian/patches/Port-to-python3.patch --- smart-notifier-0.28/debian/patches/Port-to-python3.patch 1970-01-01 01:00:00.000000000 +0100 +++ smart-notifier-0.28/debian/patches/Port-to-python3.patch 2020-05-22 08:18:00.000000000 +0200 @@ -0,0 +1,21 @@ +From: Chow Loong Jin +Date: Fri, 22 May 2020 14:02:44 +0800 +Subject: Port to python3 + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 44bf102..01eceb4 100644 +--- a/setup.py ++++ b/setup.py +@@ -7,7 +7,7 @@ def get_version(): + f = open(fn, 'r') + result = f.read() + f.close() +- print result ++ print(result) + return result + + # Setup SchoolTool diff -Nru smart-notifier-0.28/debian/patches/Remove-useless-cat-in-60smart-notifier.patch smart-notifier-0.28/debian/patches/Remove-useless-cat-in-60smart-notifier.patch --- smart-notifier-0.28/debian/patches/Remove-useless-cat-in-60smart-notifier.patch 1970-01-01 01:00:00.000000000 +0100 +++ smart-notifier-0.28/debian/patches/Remove-useless-cat-in-60smart-notifier.patch 2020-05-22 08:18:00.000000000 +0200 @@ -0,0 +1,18 @@ +From: Barry deFreese +Date: Thu, 5 Jan 2012 05:50:46 +0800 +Subject: Remove useless cat in 60smart-notifier + +Closes: #511504 +--- + scripts/60smart-notifier | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/60smart-notifier b/scripts/60smart-notifier +index 378ded5..39222ad 100644 +--- a/scripts/60smart-notifier ++++ b/scripts/60smart-notifier +@@ -1,3 +1,3 @@ + #!/bin/bash + [ -x /usr/bin/smart-notifier ] || exit 0 +-cat ${1} | /usr/bin/smart-notifier --notify ++/usr/bin/smart-notifier --notify < "$1" diff -Nru smart-notifier-0.28/debian/patches/series smart-notifier-0.28/debian/patches/series --- smart-notifier-0.28/debian/patches/series 2012-01-08 17:59:19.000000000 +0100 +++ smart-notifier-0.28/debian/patches/series 2020-05-22 08:18:00.000000000 +0200 @@ -1,10 +1,12 @@ -0001-Audit-the-D-Bus-security-policy-file.patch -0002-Only-display-SMART-messages-from-root.patch -0003-Use-one-smart_notify-directory.patch -0004-Don-t-capitalize-false-in-.desktop-file.patch -0005-Remove-useless-cat-in-60smart-notifier.patch -0006-Use-positional-parameters-in-add_signal_receiver.patch -0007-Switch-to-GtkBuilder.patch -0008-Port-to-gtk3-Use-gi.repository.Gtk.patch -0009-Make-notification-window-resizable.patch -0010-Update-deprecated-import-dbus.glib.patch +Audit-the-D-Bus-security-policy-file.patch +Only-display-SMART-messages-from-root.patch +Use-one-smart_notify-directory.patch +Don-t-capitalize-false-in-.desktop-file.patch +Remove-useless-cat-in-60smart-notifier.patch +Use-positional-parameters-in-add_signal_receiver.patch +Switch-to-GtkBuilder.patch +Port-to-gtk3-Use-gi.repository.Gtk.patch +Make-notification-window-resizable.patch +Update-deprecated-import-dbus.glib.patch +Fix-up-typing-and-grammatical-errors-in-manpage.patch +Port-to-python3.patch diff -Nru smart-notifier-0.28/debian/patches/Switch-to-GtkBuilder.patch smart-notifier-0.28/debian/patches/Switch-to-GtkBuilder.patch --- smart-notifier-0.28/debian/patches/Switch-to-GtkBuilder.patch 1970-01-01 01:00:00.000000000 +0100 +++ smart-notifier-0.28/debian/patches/Switch-to-GtkBuilder.patch 2020-05-22 08:18:00.000000000 +0200 @@ -0,0 +1,195 @@ +From: Chow Loong Jin +Date: Sun, 8 Jan 2012 22:24:05 +0800 +Subject: Switch to GtkBuilder + +--- + setup.py | 2 +- + src/smart_notifier/gui.py | 14 ++-- + src/smart_notifier/smart-notifier.xml | 127 ++++++++++++++++++++++++++++++++++ + 3 files changed, 135 insertions(+), 8 deletions(-) + create mode 100644 src/smart_notifier/smart-notifier.xml + +diff --git a/setup.py b/setup.py +index 15e24b3..44bf102 100644 +--- a/setup.py ++++ b/setup.py +@@ -29,7 +29,7 @@ guaranteed. At best this package is an extra layer of protection. + maintainer_email="jinty@web.de", + platforms=["any"], + package_dir={'': 'src'}, +- package_data={'': ['*.glade', '*.txt']}, ++ package_data={'': ['*.xml', '*.txt']}, + scripts=['scripts/smart-notifier'], + packages=find_packages('src'), + zip_safe=False, +diff --git a/src/smart_notifier/gui.py b/src/smart_notifier/gui.py +index b273839..cc7a8a6 100644 +--- a/src/smart_notifier/gui.py ++++ b/src/smart_notifier/gui.py +@@ -21,26 +21,26 @@ + import os + import smart_notifier + import gtk # bletch, gtk import can fail if we do not have a GUI +-import gtk.glade + + here = os.path.dirname(__file__) +-# Paths to glade files +-warning_window = os.path.join(here, 'smart-notifier.glade') ++ ++warning_window = os.path.join(here, 'smart-notifier.xml') + + def warn_user(msg): + #Make the window +- ui = gtk.glade.XML(warning_window) ++ ui = gtk.Builder() ++ ui.add_from_file(warning_window) + #self.ui.signal_connect('end', gtk.main_quit) + #Customize message + textbuffer = gtk.TextBuffer() + textbuffer.set_text(msg) +- textbox = ui.get_widget('textview1') ++ textbox = ui.get_object('textview1') + textbox.set_buffer(textbuffer) + # Fix the icon size XXX -- this is temporary intil gazpacho works +- icon = ui.get_widget('image1') ++ icon = ui.get_object('image1') + icon.set_from_stock(gtk.STOCK_DIALOG_WARNING, gtk.ICON_SIZE_DIALOG) + # Showit +- window = ui.get_widget('window1') ++ window = ui.get_object('window1') + window.show_all() + + def service(): +diff --git a/src/smart_notifier/smart-notifier.xml b/src/smart_notifier/smart-notifier.xml +new file mode 100644 +index 0000000..5df2a92 +--- /dev/null ++++ b/src/smart_notifier/smart-notifier.xml +@@ -0,0 +1,127 @@ ++ ++ ++ ++ ++ ++ False ++ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK ++ Hard Disk Health Warning ++ False ++ 600 ++ 480 ++ ++ ++ False ++ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK ++ 6 ++ ++ ++ False ++ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK ++ ++ ++ False ++ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK ++ gtk-dialog-warning ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ False ++ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK ++ ++ ++ False ++ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK ++ <big><b>Hard Disk Health Warning</b></big> ++ True ++ ++ ++ False ++ True ++ 6 ++ 0 ++ ++ ++ ++ ++ False ++ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK ++ The hard disk health status has changed. This could mean that hard drive failure is imminent. It is always a good idea to have up to date backups. ++ center ++ True ++ ++ ++ False ++ True ++ 1 ++ ++ ++ ++ ++ True ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK ++ ++ ++ 300 ++ True ++ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK ++ ++ ++ True ++ GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK ++ ++ ++ ++ ++ ++ ++ True ++ True ++ 6 ++ 1 ++ ++ ++ ++ ++ ++ diff -Nru smart-notifier-0.28/debian/patches/Update-deprecated-import-dbus.glib.patch smart-notifier-0.28/debian/patches/Update-deprecated-import-dbus.glib.patch --- smart-notifier-0.28/debian/patches/Update-deprecated-import-dbus.glib.patch 1970-01-01 01:00:00.000000000 +0100 +++ smart-notifier-0.28/debian/patches/Update-deprecated-import-dbus.glib.patch 2020-05-22 08:18:00.000000000 +0200 @@ -0,0 +1,29 @@ +From: Chow Loong Jin +Date: Mon, 9 Jan 2012 00:09:05 +0800 +Subject: Update deprecated 'import dbus.glib' + +'import dbus.glib' is deprecated as the API is extremely unintuitive. As +recommended by the documentation by the deprecated dbus.glib module, replace +this by a call to DBusGMainLoop(set_as_default=True) +--- + src/smart_notifier/__init__.py | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/smart_notifier/__init__.py b/src/smart_notifier/__init__.py +index 6a09b6c..78e8877 100644 +--- a/src/smart_notifier/__init__.py ++++ b/src/smart_notifier/__init__.py +@@ -20,9 +20,10 @@ + + import dbus + import dbus.service +-import dbus.glib # This **HIGHLY** unintuitive piece of code is to +- # monkey patch some stuff and make other stuff work. +- # Fun with capital F ++ ++from dbus.mainloop.glib import DBusGMainLoop ++DBusGMainLoop(set_as_default=True) ++ + + # Globals + BUS = dbus.SystemBus() diff -Nru smart-notifier-0.28/debian/patches/Use-one-smart_notify-directory.patch smart-notifier-0.28/debian/patches/Use-one-smart_notify-directory.patch --- smart-notifier-0.28/debian/patches/Use-one-smart_notify-directory.patch 1970-01-01 01:00:00.000000000 +0100 +++ smart-notifier-0.28/debian/patches/Use-one-smart_notify-directory.patch 2020-05-22 08:18:00.000000000 +0200 @@ -0,0 +1,28 @@ +From: Simon McVittie +Date: Thu, 5 Jan 2012 05:45:22 +0800 +Subject: Use one smart_notify directory + +Instead of installing one copy of smart_notify for every python version, only +install one copy for all +--- + scripts/smart-notifier | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/scripts/smart-notifier b/scripts/smart-notifier +index ec7c1ed..987e46f 100644 +--- a/scripts/smart-notifier ++++ b/scripts/smart-notifier +@@ -2,12 +2,9 @@ + + import sys + +-# which python version are we using, the hash-bang abouve might be munged by setuptools +-version = '%s.%s' % (sys.version_info[0], sys.version_info[1]) +- + # get a path to our private module, and make sure it overrides + # all other paths (This is probably Debian specific) +-sys.path.insert(0, '/usr/share/smart-notifier/lib/python%s' % version) ++sys.path.insert(0, '/usr/share/smart-notifier') + + if '--notify' in sys.argv: + import smart_notifier diff -Nru smart-notifier-0.28/debian/patches/Use-positional-parameters-in-add_signal_receiver.patch smart-notifier-0.28/debian/patches/Use-positional-parameters-in-add_signal_receiver.patch --- smart-notifier-0.28/debian/patches/Use-positional-parameters-in-add_signal_receiver.patch 1970-01-01 01:00:00.000000000 +0100 +++ smart-notifier-0.28/debian/patches/Use-positional-parameters-in-add_signal_receiver.patch 2020-05-22 08:18:00.000000000 +0200 @@ -0,0 +1,29 @@ +From: Chow Loong Jin +Date: Sun, 8 Jan 2012 22:10:58 +0800 +Subject: Use positional parameters in add_signal_receiver() + +named_service was deprecated, and judging by the warning from dbus, calling the +function using named parameters is not supported. + +Closes: #545265 +--- + src/smart_notifier/gui.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/smart_notifier/gui.py b/src/smart_notifier/gui.py +index 3eac80f..b273839 100644 +--- a/src/smart_notifier/gui.py ++++ b/src/smart_notifier/gui.py +@@ -45,8 +45,8 @@ def warn_user(msg): + + def service(): + smart_notifier.BUS.add_signal_receiver(warn_user, +- signal_name='warn_user', +- dbus_interface=smart_notifier.UD_INTERFACE, +- named_service=smart_notifier.SERVICE_NAME, +- path=smart_notifier.UD_SERVICE) ++ 'warn_user', ++ smart_notifier.UD_INTERFACE, ++ smart_notifier.SERVICE_NAME, ++ smart_notifier.UD_SERVICE) + gtk.main() diff -Nru smart-notifier-0.28/debian/README.Debian smart-notifier-0.28/debian/README.Debian --- smart-notifier-0.28/debian/README.Debian 2012-01-08 17:59:19.000000000 +0100 +++ smart-notifier-0.28/debian/README.Debian 2020-05-22 08:18:00.000000000 +0200 @@ -26,7 +26,7 @@ following the freedesktop standard this should be as simple logging out and back in. - If that doesn't work, then it depends depends on what desktop you are using, + If that doesn't work, then it depends on what desktop you are using, but including this line in .xsession might just work: smart-notifier& diff -Nru smart-notifier-0.28/debian/rules smart-notifier-0.28/debian/rules --- smart-notifier-0.28/debian/rules 2012-01-08 17:59:19.000000000 +0100 +++ smart-notifier-0.28/debian/rules 2020-05-22 08:18:00.000000000 +0200 @@ -3,18 +3,16 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export PYBUILD_INSTALL_ARGS = \ + --install-lib=/usr/share/smart-notifier \ + --install-scripts=/usr/share/smart-notifier \ + --single-version-externally-managed %: - dh $@ --with=python2 - -override_dh_auto_%: - $(@:override_%=%) -Spython_distutils - -override_dh_auto_install: - dh_auto_install -Spython_distutils -- \ - --install-lib=/usr/share/smart-notifier \ - --install-scripts=/usr/share/smart-notifier \ - --single-version-externally-managed + dh $@ --with=python3 --buildsystem=pybuild override_dh_install: dh_install chmod 0755 debian/smart-notifier/etc/smartmontools/run.d/60smart-notifier + +override_dh_auto_test: + # we don't have tests, don't try running unittest, or it'll break trying to connect to dbus