d/p/0002-nut-monitor-paths.patch, d/p/0006-ups-conf-maxretry.patch: Refreshed
This commit is contained in:
		
							parent
							
								
									f07d79cd65
								
							
						
					
					
						commit
						85836f6836
					
				
					 3 changed files with 8 additions and 6 deletions
				
			
		
							
								
								
									
										4
									
								
								debian/changelog
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								debian/changelog
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -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 <bigon@debian.org>  Sat, 16 Jul 2016 10:56:38 +0200
 | 
			
		||||
 -- Laurent Bigonville <bigon@debian.org>  Sat, 16 Jul 2016 11:00:06 +0200
 | 
			
		||||
 | 
			
		||||
nut (2.7.2-4) unstable; urgency=medium
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										8
									
								
								debian/patches/0002-nut-monitor-paths.patch
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								debian/patches/0002-nut-monitor-paths.patch
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -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 ) ) :
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								debian/patches/0006-ups-conf-maxretry.patch
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/patches/0006-ups-conf-maxretry.patch
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -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.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue