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

Thu Nov 23 11:00:37 UTC 2017

Date: Thursday, November 23, 2017 @ 11:00:35
  Author: moschlar-guest
Revision: 14480

New upstream release 3.0.2

Modified:
  packages/nagstamon/trunk/debian/changelog
  packages/nagstamon/trunk/debian/control
  packages/nagstamon/trunk/debian/patches/fix-duplicated-compressed-file.patch
  packages/nagstamon/trunk/debian/patches/series
  packages/nagstamon/trunk/debian/rules
Deleted:
  packages/nagstamon/trunk/debian/patches/no-QtCore-in-setup-py.patch
  packages/nagstamon/trunk/debian/patches/not-disable-warnings.patch

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

--- packages/nagstamon/trunk/debian/changelog	2017-11-23 10:21:14 UTC (rev 14479)
+++ packages/nagstamon/trunk/debian/changelog	2017-11-23 11:00:35 UTC (rev 14480)
@@ -1,3 +1,9 @@
+nagstamon (3.0.2-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Moritz Schlarb <schlarbm at uni-mainz.de>  Thu, 23 Nov 2017 10:49:01 +0100
+
 nagstamon (2.0.1-5) unstable; urgency=medium
 
   * Don't disable InsecureRequestWarning warnings from urllib3 

Modified: packages/nagstamon/trunk/debian/control
===================================================================
--- packages/nagstamon/trunk/debian/control	2017-11-23 10:21:14 UTC (rev 14479)
+++ packages/nagstamon/trunk/debian/control	2017-11-23 11:00:35 UTC (rev 14480)
@@ -3,9 +3,10 @@
 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>, 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
+Uploaders: Carl Chenet <chaica at debian.org>, Christoph Martin <martin at uni-mainz.de>,
+ Moritz Schlarb <schlarbm at uni-mainz.de>
+Build-Depends: dbus, debhelper (>= 9), dh-python, python3-all (>= 3.4), python3-keyring,
+ python3-setuptools, quilt (>= 0.63)
 Standards-Version: 3.9.8
 Homepage: https://nagstamon.ifw-dresden.de
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/nagstamon/trunk/
@@ -13,9 +14,10 @@
 
 Package: nagstamon
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}, python3-pkg-resources, python3-bs4,
+Depends: ${python3:Depends}, ${misc:Depends}, python3-pkg-resources, python3-bs4, python3-lxml,
  python3-pyqt5, python3-pyqt5.qtsvg, python3-pyqt5.qtmultimedia, libqt5multimedia5-plugins,
- python3-requests, python3-psutil, python3-dbus.mainloop.pyqt5
+ python3-requests, python3-requests-kerberos, python3-psutil, python3-dbus.mainloop.pyqt5,
+ python3-keyring
 Recommends: python3-secretstorage
 Description: Nagios status monitor which takes place in systray or on desktop
  Nagstamon is a Nagios status monitor which takes place in systray or 

Modified: packages/nagstamon/trunk/debian/patches/fix-duplicated-compressed-file.patch
===================================================================
--- packages/nagstamon/trunk/debian/patches/fix-duplicated-compressed-file.patch	2017-11-23 10:21:14 UTC (rev 14479)
+++ packages/nagstamon/trunk/debian/patches/fix-duplicated-compressed-file.patch	2017-11-23 11:00:35 UTC (rev 14480)
@@ -4,12 +4,12 @@
 ===================================================================
 --- 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/*']},
+@@ -113,7 +113,7 @@ setup(name=NAME,
+                 'Nagstamon.thirdparty.Xlib.xobject'],
+       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'])],
+           ('%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,

Deleted: packages/nagstamon/trunk/debian/patches/no-QtCore-in-setup-py.patch
===================================================================
--- packages/nagstamon/trunk/debian/patches/no-QtCore-in-setup-py.patch	2017-11-23 10:21:14 UTC (rev 14479)
+++ packages/nagstamon/trunk/debian/patches/no-QtCore-in-setup-py.patch	2017-11-23 11:00:35 UTC (rev 14480)
@@ -1,18 +0,0 @@
-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'

Deleted: packages/nagstamon/trunk/debian/patches/not-disable-warnings.patch
===================================================================
--- packages/nagstamon/trunk/debian/patches/not-disable-warnings.patch	2017-11-23 10:21:14 UTC (rev 14479)
+++ packages/nagstamon/trunk/debian/patches/not-disable-warnings.patch	2017-11-23 11:00:35 UTC (rev 14480)
@@ -1,23 +0,0 @@
-Description: Don't disable InsecureRequestWarning warnings
-Author: Moritz Schlarb <schlarbm at uni-mainz.de>
-Bug-Debian: https://bugs.debian.org/861152
-Bug-Debian: https://bugs.debian.org/861725
-
-diff --git a/Nagstamon/Servers/Generic.py b/Nagstamon/Servers/Generic.py
-index dd9dcb1..17ebf17 100644
---- a/Nagstamon/Servers/Generic.py
-+++ b/Nagstamon/Servers/Generic.py
-@@ -18,13 +18,6 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- 
- import requests
--# disable annoying InsecureRequestWarning warnings
--try:
--    requests.packages.urllib3.disable_warnings()
--except:
--    # older requests version might not have the packages submodule
--    # for example the one in Ubuntu 14.04
--    pass
- 
- import sys
- import socket

Modified: packages/nagstamon/trunk/debian/patches/series
===================================================================
--- packages/nagstamon/trunk/debian/patches/series	2017-11-23 10:21:14 UTC (rev 14479)
+++ packages/nagstamon/trunk/debian/patches/series	2017-11-23 11:00:35 UTC (rev 14480)
@@ -1,5 +1,3 @@
-not-disable-warnings.patch
 check-for-new-version.patch
-no-QtCore-in-setup-py.patch
 spelling-error-in-manpage.patch
 fix-duplicated-compressed-file.patch

Modified: packages/nagstamon/trunk/debian/rules
===================================================================
--- packages/nagstamon/trunk/debian/rules	2017-11-23 10:21:14 UTC (rev 14479)
+++ packages/nagstamon/trunk/debian/rules	2017-11-23 11:00:35 UTC (rev 14480)
@@ -6,7 +6,7 @@
 export PYBUILD_DISABLE=test
 
 %:
-	dh $@ --with python3 --buildsystem=pybuild
+	dbus-run-session -- dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_fixperms:
 	dh_fixperms


