[Python-apps-commits] r10162 - in packages/nagstamon/trunk/debian (5 files)

Wed Nov 20 19:47:16 UTC 2013

Date: Wednesday, November 20, 2013 @ 19:47:14
  Author: jmw
Revision: 10162

Merge changes while Alioth unavailable:

New upstream release (Closes: #702103, #668384)
  - Remove fix-update-checking.patch
  - Refresh other patches
Switch notify icon to python-notify (Closes: #702103)

Modified:
  packages/nagstamon/trunk/debian/changelog
  packages/nagstamon/trunk/debian/control
  packages/nagstamon/trunk/debian/patches/check-for-new-version.patch
  packages/nagstamon/trunk/debian/patches/series
Deleted:
  packages/nagstamon/trunk/debian/patches/fix-update-checking.patch

Modified: packages/nagstamon/trunk/debian/changelog
===================================================================

--- packages/nagstamon/trunk/debian/changelog	2013-11-09 11:29:48 UTC (rev 10161)
+++ packages/nagstamon/trunk/debian/changelog	2013-11-20 19:47:14 UTC (rev 10162)
@@ -1,3 +1,12 @@
+nagstamon (0.9.11-1) unstable; urgency=low
+
+  * New upstream release (Closes: #702103, #668384)
+    - Remove fix-update-checking.patch
+    - Refresh other patches
+  * Switch notify icon to python-notify (Closes: #702103)
+
+ -- Jonathan Wiltshire <jmw at debian.org>  Sun, 17 Nov 2013 10:53:54 +0000
+
 nagstamon (0.9.9-2) unstable; urgency=high
 
   [ Jakub Wilk ]

Modified: packages/nagstamon/trunk/debian/control
===================================================================
--- packages/nagstamon/trunk/debian/control	2013-11-09 11:29:48 UTC (rev 10161)
+++ packages/nagstamon/trunk/debian/control	2013-11-20 19:47:14 UTC (rev 10162)
@@ -12,7 +12,7 @@
 
 Package: nagstamon
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-gtk2 (>= 2.20~), python-pkg-resources, python-eggtrayicon, librsvg2-common, sox, python-beautifulsoup (>= 3.2.0-2)
+Depends: ${python:Depends}, ${misc:Depends}, python-gtk2 (>= 2.20~), python-pkg-resources, python-notify, librsvg2-common, sox, python-beautifulsoup (>= 3.2.0-2)
 Description: Nagios status monitor which takes place in systray or on desktop
  Nagstamon is a Nagios status monitor which takes place in systray or 
  on desktop (GNOME, KDE), as floating statusbar to inform you in 

Modified: packages/nagstamon/trunk/debian/patches/check-for-new-version.patch
===================================================================
--- packages/nagstamon/trunk/debian/patches/check-for-new-version.patch	2013-11-09 11:29:48 UTC (rev 10161)
+++ packages/nagstamon/trunk/debian/patches/check-for-new-version.patch	2013-11-20 19:47:14 UTC (rev 10162)
@@ -1,11 +1,9 @@
 # Description: disable the default search for newer version
 # Author: Carl Chenet <chaica at ohmytux.com>
 
-Index: nagstamon_0.9.5/Nagstamon/Config.py
-===================================================================
---- nagstamon_0.9.5.orig/Nagstamon/Config.py	2011-04-09 02:50:26.000000000 +0200
-+++ nagstamon_0.9.5/Nagstamon/Config.py	2011-04-09 02:50:41.000000000 +0200
-@@ -41,7 +41,7 @@
+--- nagstamon.orig/Nagstamon/Config.py
++++ nagstamon/Nagstamon/Config.py
+@@ -71,7 +71,7 @@
          self.debug_mode = False
          self.debug_to_file = False
          self.debug_file = os.path.expanduser('~') + os.sep + "nagstamon.log"
@@ -13,4 +11,4 @@
 +        self.check_for_new_version = False
          self.notification = True
          self.notification_flashing = True
-         # because of nonexistent windows systray popup support I'll let it be now
+         self.notification_desktop = False

Deleted: packages/nagstamon/trunk/debian/patches/fix-update-checking.patch
===================================================================
--- packages/nagstamon/trunk/debian/patches/fix-update-checking.patch	2013-11-09 11:29:48 UTC (rev 10161)
+++ packages/nagstamon/trunk/debian/patches/fix-update-checking.patch	2013-11-20 19:47:14 UTC (rev 10162)
@@ -1,57 +0,0 @@
-Description: fix the update-checking system
-Author: Henri Wahl <h.wahl at ifw-dresden.de>
-
-Index: nagstamon_0.9.9/Nagstamon/Actions.py
-===================================================================
---- nagstamon_0.9.9/Nagstamon/Actions.py
-+++ nagstamon_0.9.9/Nagstamon/Actions.py
-@@ -402,8 +402,10 @@ class CheckForNewVersion(threading.Thread):
-             if s.CheckingForNewVersion == False:
-                 # set the flag to lock that connection
-                 s.CheckingForNewVersion = True
-+                # use IFW server to speed up request and secure via https
-+                result = s.FetchURL("https://nagstamon.ifw-dresden.de/files-nagstamon/latest_version_" +\
-+                                     self.output.version, giveback="raw", no_auth=True)
-                 # remove newline
--                result = s.FetchURL("http://nagstamon.sourceforge.net/latest_version_" + self.output.version, giveback="raw")
-                 version, error = result.result.split("\n")[0], result.error
-                 
-                 # debug
-
-Index: nagstamon_0.9.9/Nagstamon/Server/Generic.py
-===================================================================
---- nagstamon_0.9.9/Nagstamon/Server/Generic.py
-+++ nagstamon_0.9.9/Nagstamon/Server/Generic.py
-@@ -946,7 +946,7 @@ class GenericServer(object):
-         return Result()
-     
-     
--    def FetchURL(self, url, giveback="obj", cgi_data=None):   
-+    def FetchURL(self, url, giveback="obj", cgi_data=None, no_auth=False):
-         """
-         get content of given url, cgi_data only used if present
-         "obj" FetchURL gives back a dict full of miserable hosts/services,
-@@ -957,14 +957,21 @@ class GenericServer(object):
-         """        
-         
-         # run this method which checks itself if there is some action to take for initializing connection
--        self.init_HTTP()
-+        # if no_auth is true do not use Auth headers, used by Actions.CheckForNewVersion()
-+        if no_auth == False:
-+            self.init_HTTP()
-+            # to avoid race condition and credentials leak use local HTTPheaders
-+            HTTPheaders = self.HTTPheaders
-+        else:
-+            HTTPheaders = dict()
-+            HTTPheaders["raw"] = HTTPheaders["obj"] = HTTPheaders["obj"] =  dict()
- 
-         try:
-             try:
-                 # debug
-                 if str(self.conf.debug_mode) == "True":
-                     self.Debug(server=self.get_name(), debug="FetchURL: " + url + " CGI Data: " + str(cgi_data))
--                request = urllib2.Request(url, cgi_data, self.HTTPheaders[giveback])
-+                request = urllib2.Request(url, cgi_data, HTTPheaders[giveback])
-                 # use opener - if cgi_data is not empty urllib uses a POST request
-                 urlcontent = self.urlopener.open(request)
-                 del url, cgi_data, request                               

Modified: packages/nagstamon/trunk/debian/patches/series
===================================================================
--- packages/nagstamon/trunk/debian/patches/series	2013-11-09 11:29:48 UTC (rev 10161)
+++ packages/nagstamon/trunk/debian/patches/series	2013-11-20 19:47:14 UTC (rev 10162)
@@ -1,2 +1 @@
 check-for-new-version.patch
-fix-update-checking.patch


