[Python-apps-commits] r7105 - in packages/nagstamon/trunk/debian (7 files)

chaica-guest at users.alioth.debian.org chaica-guest at users.alioth.debian.org
Sun May 15 22:24:50 UTC 2011 

    Date: Sunday, May 15, 2011 @ 22:24:48
  Author: chaica-guest
Revision: 7105

  * New upstream version (Closes: #585963,#591875)
  * debian/patches
    - Added remove-beautifulsoup.patch to remove a call to embedded
      beautifulsoup library
    - Removed the manpage patch. Has been integrated upstream.
  * debian/rules
    - Added exclusion for beautifulsoup library
  * debian/copyright
    - Added copyright and license for BeautifulSoup library

Added:
  packages/nagstamon/trunk/debian/patches/remove-beautifulsoup.patch
Modified:
  packages/nagstamon/trunk/debian/changelog
  packages/nagstamon/trunk/debian/control
  packages/nagstamon/trunk/debian/copyright
  packages/nagstamon/trunk/debian/patches/series
  packages/nagstamon/trunk/debian/rules
Deleted:
  packages/nagstamon/trunk/debian/patches/manpage-correct-typo.patch

Modified: packages/nagstamon/trunk/debian/changelog
===================================================================
--- packages/nagstamon/trunk/debian/changelog	2011-05-15 21:10:12 UTC (rev 7104)
+++ packages/nagstamon/trunk/debian/changelog	2011-05-15 22:24:48 UTC (rev 7105)
@@ -1,3 +1,17 @@
+nagstamon (0.9.6.1-1) unstable; urgency=low
+
+  * New upstream version (Closes: #585963,#591875)
+  * debian/patches
+    - Added remove-beautifulsoup.patch to remove a call to embedded
+      beautifulsoup library
+    - Removed the manpage patch. Has been integrated upstream.
+  * debian/rules
+    - Added exclusion for beautifulsoup library
+  * debian/copyright
+    - Added copyright and license for BeautifulSoup library
+
+ -- Carl Chenet <chaica at ohmytux.com>  Mon, 16 May 2011 02:15:33 +0200
+
 nagstamon (0.9.5-1) unstable; urgency=low
 
   * New upstream version (Closes: #617490,#579001)

Modified: packages/nagstamon/trunk/debian/control
===================================================================
--- packages/nagstamon/trunk/debian/control	2011-05-15 21:10:12 UTC (rev 7104)
+++ packages/nagstamon/trunk/debian/control	2011-05-15 22:24:48 UTC (rev 7105)
@@ -12,7 +12,7 @@
 
 Package: nagstamon
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-gtk2, python-lxml, python-pkg-resources, python-glade2, python-eggtrayicon, librsvg2-common, sox
+Depends: ${python:Depends}, ${misc:Depends}, python-gtk2, python-lxml, python-pkg-resources, python-glade2, python-eggtrayicon, librsvg2-common, sox, python-beautifulsoup
 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/copyright
===================================================================
--- packages/nagstamon/trunk/debian/copyright	2011-05-15 21:10:12 UTC (rev 7104)
+++ packages/nagstamon/trunk/debian/copyright	2011-05-15 22:24:48 UTC (rev 7105)
@@ -11,13 +11,44 @@
 
     Copyright © 2008-2011 Henri Wahl
 
-except for this file:
+except for the following files:
     Nagstamon/Server/Multisite.py
 
     Copyright © 2010 Mathias Kettner
 
-All files are under the following license:
+and:
+    Nagstamon/BeautifulSoup.py
 
+    Copyright (c) 2004-2010, Leonard Richardson
+
+Nagstamon/BeautifulSoup.py is under the bsdish license:
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
+      * Neither the name of the the Beautiful Soup Consortium and All Night Kosher
+        Bakery nor the names of its contributors may be used to endorse or promote
+        products derived from this software without specific prior written
+        permission.
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE, DAMMIT.
+
+
+
+All files except Nagstamon/BeautifulSoup.py are under the following license:
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; version 2 of the License.

Deleted: packages/nagstamon/trunk/debian/patches/manpage-correct-typo.patch
===================================================================
--- packages/nagstamon/trunk/debian/patches/manpage-correct-typo.patch	2011-05-15 21:10:12 UTC (rev 7104)
+++ packages/nagstamon/trunk/debian/patches/manpage-correct-typo.patch	2011-05-15 22:24:48 UTC (rev 7105)
@@ -1,16 +0,0 @@
-# Description: correct a typo and update the manpage
-# Author: Carl Chenet <chaica at ohmytux.com>
-
-Index: nagstamon_0.9.5/Nagstamon/resources/nagstamon.1
-===================================================================
---- nagstamon_0.9.5.orig/Nagstamon/resources/nagstamon.1	2011-04-09 03:27:48.000000000 +0200
-+++ nagstamon_0.9.5/Nagstamon/resources/nagstamon.1	2011-04-09 03:29:05.000000000 +0200
-@@ -23,7 +23,7 @@
- nagstamon [alternate\-config]
- .SH "DESCRIPTION"
- .sp
--Nagstamon is a Nagios status monitor which takes place in systray or on desktop (GNOME, KDE) as floating statusbar to inform you in realtime about the status of your Nagios monitored network\&. It allows to connect to multiple Nagios servers\&.
-+Nagstamon is a Nagios status monitor which takes place in systray or on desktop (GNOME, KDE) as floating statusbar to inform you in realtime about the status of your Nagios monitored network\&. Nagstamon connects to multiple Nagios, Opsview, Icinga, Centreon, Op5/Ninja and Check_MK Multisite monitoring servers.\&.
- .sp
- The command can optionally take one argument giving the path to an alternate configuration file\&.
- .SH "OPTIONS"

Added: packages/nagstamon/trunk/debian/patches/remove-beautifulsoup.patch
===================================================================
--- packages/nagstamon/trunk/debian/patches/remove-beautifulsoup.patch	                        (rev 0)
+++ packages/nagstamon/trunk/debian/patches/remove-beautifulsoup.patch	2011-05-15 22:24:48 UTC (rev 7105)
@@ -0,0 +1,23 @@
+# Description: remove the call to embedded BeautifulSoup library
+# Author: Carl Chenet <chaica at ohmytux.com>
+
+Index: nagstamon_0.9.6.1/Nagstamon/Server/Generic.py
+===================================================================
+--- nagstamon_0.9.6.1.orig/Nagstamon/Server/Generic.py	2011-05-16 01:40:42.000000000 +0200
++++ nagstamon_0.9.6.1/Nagstamon/Server/Generic.py	2011-05-16 01:41:02.000000000 +0200
+@@ -13,7 +13,7 @@
+ import base64
+ import re
+ 
+-from Nagstamon.BeautifulSoup import BeautifulSoup, BeautifulStoneSoup
++from BeautifulSoup import BeautifulSoup, BeautifulStoneSoup
+ from Nagstamon.Actions import HostIsFilteredOutByRE, ServiceIsFilteredOutByRE, not_empty
+ from Nagstamon.Objects import *
+ 
+@@ -916,4 +916,4 @@
+         debug_string =  " ".join((head + ":",  str(datetime.datetime.now()), server, host, service, debug))     
+         # give debug info to debug loop for thread-save log-file writing
+         self.debug_queue.put(debug_string)
+-        
+\ No newline at end of file
++        

Modified: packages/nagstamon/trunk/debian/patches/series
===================================================================
--- packages/nagstamon/trunk/debian/patches/series	2011-05-15 21:10:12 UTC (rev 7104)
+++ packages/nagstamon/trunk/debian/patches/series	2011-05-15 22:24:48 UTC (rev 7105)
@@ -1,2 +1,2 @@
 check-for-new-version.patch
-manpage-correct-typo.patch
+remove-beautifulsoup.patch

Modified: packages/nagstamon/trunk/debian/rules
===================================================================
--- packages/nagstamon/trunk/debian/rules	2011-05-15 21:10:12 UTC (rev 7104)
+++ packages/nagstamon/trunk/debian/rules	2011-05-15 22:24:48 UTC (rev 7105)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export DH_ALWAYS_EXCLUDE=LICENSE
+export DH_ALWAYS_EXCLUDE=LICENSE:BeautifulSoup.py
 
 %:
 	dh $@ --with python2

More information about the Python-apps-commits mailing list