--- smart-notifier-0.28.orig/debian/dirs +++ smart-notifier-0.28/debian/dirs @@ -1,2 +1 @@ usr/bin -usr/sbin --- smart-notifier-0.28.orig/debian/copyright +++ smart-notifier-0.28/debian/copyright @@ -4,12 +4,13 @@ It was written by the Brian Sutherland , the source code is available from http://lentejasverdes.ath.cx/svn/smart-notifier/. -Copyright: - Upstream Author: Brian Sutherland +Copyright: + Copyright (C) 2005, 2006 Brian Sutherland + License: This software may be distributed under the terms of the GNU General Public License Version 2 or later. The full text of which can be found in the file -/usr/share/common-licenses/GPL +/usr/share/common-licenses/GPL-2 --- smart-notifier-0.28.orig/debian/changelog +++ smart-notifier-0.28/debian/changelog @@ -1,3 +1,52 @@ +smart-notifier (0.28-2) unstable; urgency=low + + * QA upload. + + Set maintainer to Debian QA Group . + * Acknowledge NMUs. (Closes: #511502). + * Fix moving of egg-info file in rules. (Closes: #552914). + * Don't capitalize false in .desktop file. (Closes: #512684, #550993). + * Remove useless cat in 60smart-notifier. (Closes: #511504). + * Don't build-dep on -1 revision. + * Add appropriate copyright holder to debian/copyright. + * Version path to GPL (GPL-2) in debian/copyright. + * Remove empty /usr/sbin dir. + * Add debian/pycompat and set to 2. + * Bump debian/compat to 5 to match debhelper build-dep. + * Bump Standards Version to 3.8.3. + + -- Barry deFreese Fri, 30 Oct 2009 14:47:08 -0400 + +smart-notifier (0.28-1.3) unstable; urgency=low + + * Non-maintainer upload. + * Build-Depend on python (>= 2.5.4) for python.mk. + + -- Kumar Appaiah Mon, 19 Oct 2009 17:40:39 -0500 + +smart-notifier (0.28-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "manipulates site-packages/ directly, failing with Python 2.6" + Applied and uploaded Kumar's patch, thanks Dude! (Closes: #547856)i + + -- Bastian Venthur Sat, 17 Oct 2009 15:10:33 +0200 + +smart-notifier (0.28-1.1) unstable; urgency=medium + + * Non-maintainer upload while dealing with D-Bus' CVE-2008-4311. + * Audit the D-Bus security policy file for compatibility with D-Bus versions + where CVE-2008-4311 has been fixed, and remove rules that appear to have + been cargo-culted from some other package and are likely to cause + unintended consequences for other packages (see freedesktop.org #18961). + * Only display the SMART message if it came from the part of smart_notifier + that only root can run, rather than allowing arbitrary local users to + spoof arbitrary messages from smartd. (Closes: #510709) + * Use the default Python version, and install version-independent modules + once, rather than once per supported Python version. Not RC, but I couldn't + bring myself to upload it without fixing this. (Closes: #507490) + + -- Simon McVittie Sun, 11 Jan 2009 17:21:30 +0000 + smart-notifier (0.28-1) unstable; urgency=low * Bump build depends on debhelper and rebuild (Closes: #383099). --- smart-notifier-0.28.orig/debian/compat +++ smart-notifier-0.28/debian/compat @@ -1 +1 @@ -4 +5 --- smart-notifier-0.28.orig/debian/pycompat +++ smart-notifier-0.28/debian/pycompat @@ -0,0 +1 @@ +2 --- smart-notifier-0.28.orig/debian/rules +++ smart-notifier-0.28/debian/rules @@ -3,18 +3,20 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -PYVERS=$(shell pyversions -vr debian/control) +PYVERS=$(shell pyversions -vd) PYMOD=smart_notifier PACKAGE=smart-notifier DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \ | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1) +include /usr/share/python/python.mk + build: $(PYVERS:%=build-python%) touch $@ build-python%: dh_testdir - python$* setup.py build + python setup.py build touch $@ clean: @@ -26,7 +28,7 @@ dh_clean clean-python%: - python$* setup.py clean + python setup.py clean install: build dh_testdir @@ -43,14 +45,15 @@ debian/smart-notifier/etc/xdg/autostart/smart-notifier.desktop install-python%: - python$* setup.py install --no-compile --single-version-externally-managed --root=debian/$(PACKAGE) - install -d debian/$(PACKAGE)/usr/share/smart-notifier/lib/python$* + python setup.py install --no-compile --single-version-externally-managed --root=debian/$(PACKAGE) $(py_setup_install_args) + install -d debian/$(PACKAGE)/usr/share/smart-notifier # Remove python and module version from .egg-info and move it to the privat modules - mv debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(PYMOD)-$(DEB_UPSTREAM_VERSION)-py$*.egg-info \ - debian/$(PACKAGE)/usr/share/smart-notifier/lib/python$*/$(PYMOD).egg-info +# mv debian/$(PACKAGE)/usr/lib/python$*/$(call py_sitename_sh, $*)/$(PYMOD)-$(DEB_UPSTREAM_VERSION)-py$*.egg-info \ + mv debian/$(PACKAGE)/usr/lib/python$*/$(call py_sitename_sh, $*)/$(PYMOD)-$(DEB_UPSTREAM_VERSION).egg-info \ + debian/$(PACKAGE)/usr/share/smart-notifier/$(PYMOD).egg-info # Move the python module to a private location - mv debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(PYMOD) \ - debian/$(PACKAGE)/usr/share/smart-notifier/lib/python$*/$(PYMOD) + mv debian/$(PACKAGE)/usr/lib/python$*/$(call py_sitename_sh, $*)/$(PYMOD) \ + debian/$(PACKAGE)/usr/share/smart-notifier/$(PYMOD) # Build architecture-independent files here. binary-indep: build install --- smart-notifier-0.28.orig/debian/control +++ smart-notifier-0.28/debian/control @@ -1,15 +1,15 @@ Source: smart-notifier Section: utils Priority: optional -Maintainer: Brian Sutherland +Maintainer: Debian QA Group Build-Depends: debhelper (>= 5.0.37.3) -Build-Depends-Indep: python-all-dev (>= 2.3.5-11), python-central (>= 0.4.10), python-setuptools (>= 0.6b3-1) -Standards-Version: 3.7.2 -XS-Python-Version: 2.4 +Build-Depends-Indep: python (>= 2.5.4), python-central (>= 0.4.10), python-setuptools (>= 0.6b3) +Standards-Version: 3.8.3 +XS-Python-Version: >= 2.4 Package: smart-notifier Architecture: all -Depends: ${python:Depends}, dbus, python2.4-dbus, smartmontools (>= 5.33+5.34cvs20050802-2), python2.4-gtk2, python2.4-glade2 +Depends: ${python:Depends}, dbus, python-dbus, smartmontools (>= 5.33+5.34cvs20050802-2), python-gtk2, python-glade2 XB-Python-Version: ${python:Versions} Description: graphical hard disk health status notifier A graphical notifier for smartmontools which attempts to show messages from --- smart-notifier-0.28.orig/config/smart-notifier.desktop +++ smart-notifier-0.28/config/smart-notifier.desktop @@ -4,6 +4,6 @@ Comment=Hard drive health status notifier TryExec=/usr/bin/smart-notifier Exec=smart-notifier -Terminal=False +Terminal=false Type=Application Categories= --- smart-notifier-0.28.orig/config/smart-notifier.conf +++ smart-notifier-0.28/config/smart-notifier.conf @@ -6,16 +6,9 @@ - + - - - - - - --- smart-notifier-0.28.orig/src/smart_notifier/gui.py +++ smart-notifier-0.28/src/smart_notifier/gui.py @@ -47,6 +47,6 @@ smart_notifier.BUS.add_signal_receiver(warn_user, signal_name='warn_user', dbus_interface=smart_notifier.UD_INTERFACE, - #named_service=smart_notifier.UD_SERVICE, - thiss fails + named_service=smart_notifier.SERVICE_NAME, path=smart_notifier.UD_SERVICE) gtk.main() --- smart-notifier-0.28.orig/scripts/60smart-notifier +++ smart-notifier-0.28/scripts/60smart-notifier @@ -1,3 +1,3 @@ #!/bin/bash [ -x /usr/bin/smart-notifier ] || exit 0 -cat ${1} | /usr/bin/smart-notifier --notify +/usr/bin/smart-notifier --notify < "$1" --- smart-notifier-0.28.orig/scripts/smart-notifier +++ smart-notifier-0.28/scripts/smart-notifier @@ -2,12 +2,9 @@ import sys -# which python version are we using, the hash-bang abouve might be munged by setuptools -version = '%s.%s' % (sys.version_info[0], sys.version_info[1]) - # get a path to our private module, and make sure it overrides # all other paths (This is probably Debian specific) -sys.path.insert(0, '/usr/share/smart-notifier/lib/python%s' % version) +sys.path.insert(0, '/usr/share/smart-notifier') if '--notify' in sys.argv: import smart_notifier