From 85836f6836b89033697c1a283c6f7bdc98568880 Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Sat, 16 Jul 2016 11:00:39 +0200 Subject: [PATCH] d/p/0002-nut-monitor-paths.patch, d/p/0006-ups-conf-maxretry.patch: Refreshed --- debian/changelog | 4 +++- debian/patches/0002-nut-monitor-paths.patch | 8 ++++---- debian/patches/0006-ups-conf-maxretry.patch | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1bdd65c..16bb9f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,10 @@ nut (2.7.3-1) UNRELEASED; urgency=low [ Laurent Bigonville ] * debian/gbp.conf: Switch back the branch to the "debian" one * Drop d/p/0009-fix-favorites-permissions.patch, merged upstream + * d/p/0002-nut-monitor-paths.patch, d/p/0006-ups-conf-maxretry.patch: + Refreshed - -- Laurent Bigonville Sat, 16 Jul 2016 10:56:38 +0200 + -- Laurent Bigonville Sat, 16 Jul 2016 11:00:06 +0200 nut (2.7.2-4) unstable; urgency=medium diff --git a/debian/patches/0002-nut-monitor-paths.patch b/debian/patches/0002-nut-monitor-paths.patch index 00fd0de..88294d6 100644 --- a/debian/patches/0002-nut-monitor-paths.patch +++ b/debian/patches/0002-nut-monitor-paths.patch @@ -1,6 +1,6 @@ --- a/scripts/python/app/NUT-Monitor +++ b/scripts/python/app/NUT-Monitor -@@ -70,7 +70,7 @@ +@@ -76,7 +76,7 @@ class interface : ( cmd_opts, args ) = opt_parser.parse_args() @@ -9,7 +9,7 @@ self.__widgets["interface"] = gtk.glade.XML( self.__glade_file, "window1", APP ) self.__widgets["main_window"] = self.__widgets["interface"].get_widget("window1") -@@ -103,11 +103,11 @@ +@@ -109,11 +109,11 @@ class interface : # Create the tray icon and connect it to the show/hide method... self.__widgets["status_icon"] = gtk.StatusIcon() @@ -23,7 +23,7 @@ # Define interface callbacks actions self.__callbacks = { "on_window1_destroy" : self.quit, -@@ -265,8 +265,8 @@ +@@ -271,8 +271,8 @@ class interface : #------------------------------------------------------------------- # Change the status icon and tray icon def change_status_icon( self, icon="on_line", blink=False ) : @@ -34,7 +34,7 @@ self.__widgets["status_icon"].set_blinking( blink ) #------------------------------------------------------------------- -@@ -719,9 +719,9 @@ +@@ -728,9 +728,9 @@ class interface : for k,v in vars.iteritems() : if ( rwvars.has_key( k ) ) : diff --git a/debian/patches/0006-ups-conf-maxretry.patch b/debian/patches/0006-ups-conf-maxretry.patch index dd8ef93..fae5806 100644 --- a/debian/patches/0006-ups-conf-maxretry.patch +++ b/debian/patches/0006-ups-conf-maxretry.patch @@ -25,7 +25,7 @@ # # These directives are common to all drivers that support ups.conf: # -@@ -102,3 +120,6 @@ +@@ -117,3 +135,6 @@ # # To find out if your driver supports any extra settings, start it with # the -h option and/or read the driver's documentation.