[Python-apps-commits] r13868 - in packages/nagstamon/trunk/debian (17 files)
chrism at users.alioth.debian.org
chrism at users.alioth.debian.org
Fri Jan 13 08:19:41 UTC 2017
Date: Friday, January 13, 2017 @ 08:19:39
Author: chrism
Revision: 13868
releasing package nagstamon version 2.0.1-1
Added:
packages/nagstamon/trunk/debian/changelog.upstream
packages/nagstamon/trunk/debian/nagstamon.docs
packages/nagstamon/trunk/debian/nagstamon.links
packages/nagstamon/trunk/debian/nagstamon.lintian-overrides
packages/nagstamon/trunk/debian/nagstamon.manpages
packages/nagstamon/trunk/debian/patches/fix-duplicated-compressed-file.patch
packages/nagstamon/trunk/debian/patches/no-QtCore-in-setup-py.patch
packages/nagstamon/trunk/debian/patches/spelling-error-in-manpage.patch
Modified:
packages/nagstamon/trunk/debian/changelog
packages/nagstamon/trunk/debian/compat
packages/nagstamon/trunk/debian/control
packages/nagstamon/trunk/debian/copyright
packages/nagstamon/trunk/debian/nagstamon.desktop
packages/nagstamon/trunk/debian/patches/check-for-new-version.patch
packages/nagstamon/trunk/debian/patches/series
packages/nagstamon/trunk/debian/rules
Deleted:
packages/nagstamon/trunk/debian/install
Modified: packages/nagstamon/trunk/debian/changelog
===================================================================
--- packages/nagstamon/trunk/debian/changelog 2017-01-12 21:34:25 UTC (rev 13867)
+++ packages/nagstamon/trunk/debian/changelog 2017-01-13 08:19:39 UTC (rev 13868)
@@ -1,3 +1,10 @@
+nagstamon (2.0.1-1) unstable; urgency=medium
+
+ [ Moritz Schlarb ]
+ * New upstream release
+
+ -- Christoph Martin <martin at uni-mainz.de> Thu, 12 Jan 2017 11:27:30 +0100
+
nagstamon (1.0.1-1.1) unstable; urgency=medium
* NMU: fix watch file
Added: packages/nagstamon/trunk/debian/changelog.upstream
===================================================================
--- packages/nagstamon/trunk/debian/changelog.upstream (rev 0)
+++ packages/nagstamon/trunk/debian/changelog.upstream 2017-01-13 08:19:39 UTC (rev 13868)
@@ -0,0 +1,34 @@
+nagstamon (2.0.1) unstable; urgency=low
+ * New upstream
+ - Major Centreon bug making it useless
+ - Icinga version check fix
+ - Thruk login fix
+ - EWMH initialization change
+ - Systrayicon left mouse click without context menu
+ - DBus crash workaround
+
+
+ -- Henri Wahl <h.wahl at ifw-dresden.de> Thu, 20 Oct 2016 08:00:00 +0200
+
+nagstamon (2.0) stable; urgency=low
+ * New upstream
+ - Based on Qt 5 it now comes with a better integrated look-and-feel – especially remarkable on MacOS
+ - Partly simplified design
+ - Less clutter in setting dialogs
+ - Runs on latest Windows and MacOS
+ - Uses QT 5 multimedia which means native sound on Linux and MacOS
+ - Uses only SVG graphics – allows changing colors even in systray icon
+ - Customizable font and font size
+ - Adjust to dark or light desktop theme
+ - Action allowing to copy host/service information to clipboard
+ - Added ‘Archive Event’ action for Check_MK monitors
+ - Additionally supports IcingaWeb2
+ - Updated Opsview and Centreon to support latest monitor server versions
+ - Experimental support for Livestatus and Zenoss
+ - New build script based on cx-Freeze for Windows and MacOS
+ - Native 64 bit version for Windows
+ - No or less memory leaks, especially in Windows
+ - Make sure only one instance per config is running
+
+ -- Henri Wahl <h.wahl at ifw-dresden.de> Mon, 29 Aug 2016 16:00:00 +0200
+
Modified: packages/nagstamon/trunk/debian/compat
===================================================================
--- packages/nagstamon/trunk/debian/compat 2017-01-12 21:34:25 UTC (rev 13867)
+++ packages/nagstamon/trunk/debian/compat 2017-01-13 08:19:39 UTC (rev 13868)
@@ -1 +1 @@
-7
+9
Modified: packages/nagstamon/trunk/debian/control
===================================================================
--- packages/nagstamon/trunk/debian/control 2017-01-12 21:34:25 UTC (rev 13867)
+++ packages/nagstamon/trunk/debian/control 2017-01-13 08:19:39 UTC (rev 13868)
@@ -1,22 +1,25 @@
Source: nagstamon
Section: utils
-X-Python-Version: >= 2.5
+X-Python3-Version: >= 3.4
Priority: optional
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Uploaders: Carl Chenet <chaica at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3)
-Standards-Version: 3.9.3
-Homepage: http://nagstamon.ifw-dresden.de
+Uploaders: Carl Chenet <chaica at debian.org>, Christoph Martin <martin at uni-mainz.de>
+Build-Depends: debhelper (>= 9), python3-all (>= 3.4), python3-setuptools, quilt (>= 0.63)
+#Build-Depends-Indep: python-support
+Standards-Version: 3.9.8
+Homepage: https://nagstamon.ifw-dresden.de
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/nagstamon/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/nagstamon/trunk/
+Vcs-Browser: https://anonscm.debian.org/viewvc/python-apps/packages/nagstamon/trunk/
Package: nagstamon
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-gtk2 (>= 2.20~), python-pkg-resources, python-notify, librsvg2-common, sox, python-beautifulsoup (>= 3.2.0-2)
-Suggests: gnome-terminal, xtightvncviewer, rdesktop
+Depends: ${python3:Depends}, ${misc:Depends}, python3-pkg-resources, python3-bs4,
+ python3-pyqt5, python3-pyqt5.qtsvg, python3-pyqt5.qtmultimedia, libqt5multimedia5-plugins,
+ python3-requests, python3-psutil, python3-dbus.mainloop.pyqt5
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
- 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.
+ on desktop (GNOME, KDE) as floating statusbar to inform you in
+ realtime about the status of your Nagios and some of its derivatives monitored
+ network. It allows one to connect to multiple Nagios, Icinga, Opsview,
+ Centreon, Op5Monitor, Check_MK Multisite, Thruk, Zabbix and Zenoss servers.
+ Events could be handled by instant access to failed hosts/services.
Modified: packages/nagstamon/trunk/debian/copyright
===================================================================
--- packages/nagstamon/trunk/debian/copyright 2017-01-12 21:34:25 UTC (rev 13867)
+++ packages/nagstamon/trunk/debian/copyright 2017-01-13 08:19:39 UTC (rev 13868)
@@ -1,73 +1,89 @@
-This package was debianized by Carl Chenet <chaica at ohmytux.com> on
-Mon, 22 Feb 2010 00:00:15 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Nagstamon
+Upstream-Contact: Henri Wahl <h.wahl at ifw-dresden.de>
+Source: https://github.com/HenriWahl/Nagstamon
+License: GPL-2
+Copyright: 2008-2016 Henry Wahl
-It was downloaded from http://sourceforge.net/projects/nagstamon/
+Files: *
+Copyright: 2008-2016 Henry Wahl <h.wahl at ifw-dresden.de>
+License: GPL-2+
-Upstream Author:
+Files: Nagstamon/Servers/Multisite.py
+Copyright: 2010 Mathias Kettner
+License: GPL-2
- Henri Wahl <h.wahl at ifw-dresden.de>
+Files: Nagstamon/thirdparty/Xlib/*
+Copyright: 2000 Peter Liljenberg <petli at ctrl-c.liu.se>
+ 2002 Jeffrey Boser <verin at lvcm.com>
+ 2006 Mike Meyer <mwm at mired.org>
+ 2006 Alex Badea <vamposdecampos at gmail.com>
+ 2013 LiuLang <gsushzhsosgsu at gmail.com>
+License: GPL-2
-Copyright:
+Files: Nagstamon/thirdparty/zabbix_api.py
+Copyright: 2009 Brett Lentz brett.lentz(at)gmail(dot)com
+ 2009 Andrew Nelson nelsonab(at)red-tux(dot)net
+License: LGPL-2.1+
- Copyright © 2008-2012 Henri Wahl
+Files: Nagstamon/thirdparty/zenoss_api.py Nagstamon/Servers/Zenoss.py
+Copyright: 2016 Jake Murphy <jake.murphy at faredge.com.au> Far Edge Technology
+License: GPL-2
-except for the following files:
- Nagstamon/Server/Multisite.py
+Files: debian/*
+Copyright: 2012 Carl Chenet <chaica at debian.org>
+ 2017 Moritz Schlarb <moschlar+deb at metalabs.de>
+License: GPL-2
- Copyright © 2010 Mathias Kettner
+License: GPL-2
+ 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.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in `/usr/share/common-licenses/GPL-2'.
-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:
-
+License: GPL-2+
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.
-
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+ .
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in `/usr/share/common-licenses/GPL-2'.
-
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-The Debian packaging is:
-
- Copyright © 2012 Carl Chenet <chaica at debian.org>
-
-and is also under the same license described above.
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License, version 2.1, can be found in `/usr/share/common-licenses/LGPL-2.1'.
Deleted: packages/nagstamon/trunk/debian/install
===================================================================
--- packages/nagstamon/trunk/debian/install 2017-01-12 21:34:25 UTC (rev 13867)
+++ packages/nagstamon/trunk/debian/install 2017-01-13 08:19:39 UTC (rev 13868)
@@ -1 +0,0 @@
-debian/nagstamon.desktop usr/share/applications
Modified: packages/nagstamon/trunk/debian/nagstamon.desktop
===================================================================
--- packages/nagstamon/trunk/debian/nagstamon.desktop 2017-01-12 21:34:25 UTC (rev 13867)
+++ packages/nagstamon/trunk/debian/nagstamon.desktop 2017-01-13 08:19:39 UTC (rev 13868)
@@ -1,11 +1,13 @@
[Desktop Entry]
Type=Application
-Name=nagstamon
-Comment=Nagios status monitor
-Icon=/usr/share/nagstamon/Nagstamon/resources/nagstamon.svg
+Name=Nagstamon
+Comment=Nagios status monitor for the desktop
+Icon=nagstamon
Exec=nagstamon
Terminal=false
Categories=System;Monitor;GTK;
+Keywords=system;monitor;remote;
+StartupNotify=true
#X-GNOME-Autostart-enabled=true
#X-KDE-autostart-after=panel
#X-KDE-StartupNotify=false
Added: packages/nagstamon/trunk/debian/nagstamon.docs
===================================================================
--- packages/nagstamon/trunk/debian/nagstamon.docs (rev 0)
+++ packages/nagstamon/trunk/debian/nagstamon.docs 2017-01-13 08:19:39 UTC (rev 13868)
@@ -0,0 +1 @@
+debian/changelog.upstream
\ No newline at end of file
Added: packages/nagstamon/trunk/debian/nagstamon.links
===================================================================
--- packages/nagstamon/trunk/debian/nagstamon.links (rev 0)
+++ packages/nagstamon/trunk/debian/nagstamon.links 2017-01-13 08:19:39 UTC (rev 13868)
@@ -0,0 +1 @@
+usr/share/nagstamon/nagstamon.py usr/bin/nagstamon
Added: packages/nagstamon/trunk/debian/nagstamon.lintian-overrides
===================================================================
--- packages/nagstamon/trunk/debian/nagstamon.lintian-overrides (rev 0)
+++ packages/nagstamon/trunk/debian/nagstamon.lintian-overrides 2017-01-13 08:19:39 UTC (rev 13868)
@@ -0,0 +1,6 @@
+# Due to imported entries from the upstream debian/changelog
+nagstamon: possible-new-upstream-release-without-new-version
+# This file is used from within Nagstamon
+nagstamon: extra-license-file usr/lib/python3/dist-packages/Nagstamon/resources/LICENSE
+nagstamon: duplicated-compressed-file usr/lib/python3/dist-packages/Nagstamon/resources/nagstamon.1.gz
+nagstamon: font-in-non-font-package usr/lib/python3/dist-packages/Nagstamon/resources/nagstamon.ttf
Added: packages/nagstamon/trunk/debian/nagstamon.manpages
===================================================================
--- packages/nagstamon/trunk/debian/nagstamon.manpages (rev 0)
+++ packages/nagstamon/trunk/debian/nagstamon.manpages 2017-01-13 08:19:39 UTC (rev 13868)
@@ -0,0 +1 @@
+Nagstamon/resources/nagstamon.1
Modified: packages/nagstamon/trunk/debian/patches/check-for-new-version.patch
===================================================================
--- packages/nagstamon/trunk/debian/patches/check-for-new-version.patch 2017-01-12 21:34:25 UTC (rev 13867)
+++ packages/nagstamon/trunk/debian/patches/check-for-new-version.patch 2017-01-13 08:19:39 UTC (rev 13868)
@@ -3,7 +3,7 @@
--- nagstamon.orig/Nagstamon/Config.py
+++ nagstamon/Nagstamon/Config.py
-@@ -71,7 +71,7 @@
+@@ -123,7 +123,7 @@ class Config(object):
self.debug_mode = False
self.debug_to_file = False
self.debug_file = os.path.expanduser('~') + os.sep + "nagstamon.log"
Added: packages/nagstamon/trunk/debian/patches/fix-duplicated-compressed-file.patch
===================================================================
--- packages/nagstamon/trunk/debian/patches/fix-duplicated-compressed-file.patch (rev 0)
+++ packages/nagstamon/trunk/debian/patches/fix-duplicated-compressed-file.patch 2017-01-13 08:19:39 UTC (rev 13868)
@@ -0,0 +1,15 @@
+Description: Fix duplicated-compressed-file Nagstamon/resources/nagstamon.1.gz
+
+Index: nagstamon/setup.py
+===================================================================
+--- nagstamon.orig/setup.py
++++ nagstamon/setup.py
+@@ -134,7 +134,7 @@ setup(name=NAME,
+ 'Nagstamon.thirdparty.keyring.util'],
+ package_dir={'Nagstamon':'Nagstamon'},
+ package_data={'Nagstamon':['resources/*']},
+- data_files=[('%s/share/man/man1' % sys.prefix, ['Nagstamon/resources/nagstamon.1.gz']),
++ data_files=[
+ ('%s/share/pixmaps' % sys.prefix, ['Nagstamon/resources/nagstamon.svg']),
+ ('%s/share/applications' % sys.prefix, ['Nagstamon/resources/nagstamon.desktop'])],
+ options=dict(build_exe=build_exe_options,
Added: packages/nagstamon/trunk/debian/patches/no-QtCore-in-setup-py.patch
===================================================================
--- packages/nagstamon/trunk/debian/patches/no-QtCore-in-setup-py.patch (rev 0)
+++ packages/nagstamon/trunk/debian/patches/no-QtCore-in-setup-py.patch 2017-01-13 08:19:39 UTC (rev 13868)
@@ -0,0 +1,18 @@
+Description: Don't require PyQT5.QtCore import in setup.py
+Author: Moritz Schlarb <moschlar+deb at metalabs.de>
+
+--- nagstamon.orig/setup.py
++++ nagstamon/setup.py
+@@ -39,12 +39,6 @@ NAGSTAMON_SCRIPT = 'nagstamon.py'
+
+ # workaround to get directory of Qt5 plugins to add missing 'mediaservice' folder needed for audio on OSX and Windows
+ import os.path
+-from PyQt5 import QtCore
+-if platform.system() == 'Windows':
+- QTPLUGINS = os.path.join(os.path.dirname(QtCore.__file__), 'plugins')
+-elif platform.system() == 'Darwin':
+- # works of course only with Fink-based Qt5-installation
+- QTPLUGINS = '/sw/lib/qt5-mac/plugins'
+
+ if platform.system() == 'Windows':
+ base = 'Win32GUI'
Modified: packages/nagstamon/trunk/debian/patches/series
===================================================================
--- packages/nagstamon/trunk/debian/patches/series 2017-01-12 21:34:25 UTC (rev 13867)
+++ packages/nagstamon/trunk/debian/patches/series 2017-01-13 08:19:39 UTC (rev 13868)
@@ -1 +1,4 @@
check-for-new-version.patch
+no-QtCore-in-setup-py.patch
+spelling-error-in-manpage.patch
+fix-duplicated-compressed-file.patch
Added: packages/nagstamon/trunk/debian/patches/spelling-error-in-manpage.patch
===================================================================
--- packages/nagstamon/trunk/debian/patches/spelling-error-in-manpage.patch (rev 0)
+++ packages/nagstamon/trunk/debian/patches/spelling-error-in-manpage.patch 2017-01-13 08:19:39 UTC (rev 13868)
@@ -0,0 +1,13 @@
+Description: Fix spelling error in manpage
+
+--- nagstamon.orig/Nagstamon/resources/nagstamon.1
++++ nagstamon/Nagstamon/resources/nagstamon.1
+@@ -38,7 +38,7 @@ nagstamon [alternate\-config]
+ Nagstamon is a Nagios status monitor which takes place in systray or on desktop as floating statusbar to inform you in realtime about the status of your Nagios monitored network&. Nagstamon connects to multiple Nagios, Opsview, Icinga, Centreon, Op5Monitor, Check_MK Multisite and Thruk monitoring servers. Experimental support for Zabbix, Zenoss and Livestatus is included.
+ .sp
+ The command can optionally take one argument giving the path to an alternate configuration file.
+-.SH RESSOURCES
++.SH RESOURCES
+ .sp
+ \fI\%https://nagstamon.ifw\-dresden.de\fP
+ .SH AUTHOR
Modified: packages/nagstamon/trunk/debian/rules
===================================================================
--- packages/nagstamon/trunk/debian/rules 2017-01-12 21:34:25 UTC (rev 13867)
+++ packages/nagstamon/trunk/debian/rules 2017-01-13 08:19:39 UTC (rev 13868)
@@ -1,14 +1,14 @@
#!/usr/bin/make -f
-export DH_ALWAYS_EXCLUDE=LICENSE:BeautifulSoup.py
+export PYBUILD_INSTALL_ARGS=--install-scripts=/usr/share/nagstamon
+# Running the tests would require all of the runtime dependencies
+export PYBUILD_DISABLE=test
+
%:
- dh $@ --with python2
+ dh $@ --with python3 --buildsystem=pybuild
-override_dh_link:
- dh_link usr/share/nagstamon/nagstamon.py usr/bin/nagstamon
-
-override_dh_auto_install:
- dh_auto_install -- --install-lib=/usr/share/nagstamon \
- --install-scripts=/usr/share/nagstamon \
-
+override_dh_fixperms:
+ dh_fixperms
+ chmod 644 debian/nagstamon/usr/share/pixmaps/nagstamon.svg \
+ debian/nagstamon/usr/lib/python3/dist-packages/Nagstamon/resources/*
More information about the Python-apps-commits
mailing list