--- smart-notifier-0.28.orig/debian/changelog +++ smart-notifier-0.28/debian/changelog @@ -1,3 +1,74 @@ +smart-notifier (0.28-1.1ubuntu2) jaunty; urgency=low + + * Python 2.6 transition. + + -- Michael Bienia Mon, 16 Mar 2009 10:40:59 +0100 + +smart-notifier (0.28-1.1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - scripts/smart-notifier.desktop: Fix capitalisation of 'false' attribute + - debian/smart-notifier.postinst: no need to restart dbus daemon anymore + - debian/rules: Don't call dh_python. + - debian/control: tighten build-dep on pycentral to make sure there is + no need to call dh_python anymore. + * debian/control: Bump Standards-Version to 3.8.0 + + -- Laurent Bigonville Thu, 22 Jan 2009 22:34:44 +0100 + +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-1ubuntu3) jaunty; urgency=low + + * smart-notifier.desktop: Fix capitalisation of 'false' attribute (LP: #257321) + + -- Laurent Bigonville Thu, 22 Jan 2009 20:54:00 +0100 + +smart-notifier (0.28-1ubuntu2) feisty; urgency=low + + * debian/smart-notifier.postinst: no need to restart dbus daemon anymore + (LP: #91432). + + -- Jeremie Corbier Wed, 14 Mar 2007 09:49:28 -0700 + +smart-notifier (0.28-1ubuntu1) feisty; urgency=low + + * Fix package for python 2.5 (LP: #83122): + -> debian/control: + + Let's build the package for the current Python version only. + + Build-Depends-Indep on python-dev instead of python-all-dev and + tighten build-dep on pycentral to make sure there is no need to call + dh_python anymore. + + Replace python2.4-* by python-* dependencies. + -> debian/rules: + + Install private modules to /usr/share/smart-notifier. + + Don't call dh_python. + -> scripts/smart-notifier: + + Update path to private modules. + * Update maintainer field. + + -- Jeremie Corbier Fri, 9 Mar 2007 20:08:34 -0800 + +smart-notifier (0.28-1build1) feisty; urgency=low + + * Rebuild for python2.5 as the default python version. + + -- Matthias Klose Mon, 15 Jan 2007 17:53:55 +0000 + smart-notifier (0.28-1) unstable; urgency=low * Bump build depends on debhelper and rebuild (Closes: #383099). --- smart-notifier-0.28.orig/debian/rules +++ smart-notifier-0.28/debian/rules @@ -3,7 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -PYVERS=$(shell pyversions -vr debian/control) +include /usr/share/python/python.mk + +PYVERS=$(shell pyversions -vd) PYMOD=smart_notifier PACKAGE=smart-notifier DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \ @@ -14,7 +16,7 @@ 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,14 @@ 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)/$(call py_libdir,$*)/$(PYMOD)-$(DEB_UPSTREAM_VERSION)-py$*.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)/$(call py_libdir,$*)/$(PYMOD) \ + debian/$(PACKAGE)/usr/share/smart-notifier/$(PYMOD) # Build architecture-independent files here. binary-indep: build install @@ -65,7 +67,6 @@ dh_compress dh_fixperms dh_pycentral - dh_python dh_installdeb dh_gencontrol dh_md5sums --- smart-notifier-0.28.orig/debian/control +++ smart-notifier-0.28/debian/control @@ -1,15 +1,16 @@ Source: smart-notifier Section: utils Priority: optional -Maintainer: Brian Sutherland +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Brian Sutherland 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.4), python-central (>= 0.5), python-setuptools (>= 0.6b3-1) +Standards-Version: 3.8.0 +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/debian/smart-notifier.postinst +++ smart-notifier-0.28/debian/smart-notifier.postinst @@ -6,13 +6,13 @@ configure|reconfigure) - if [ -x "/etc/init.d/dbus" ]; then - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d dbus restart || true - else - /etc/init.d/dbus restart || true - fi - fi +# if [ -x "/etc/init.d/dbus" ]; then +# if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then +# invoke-rc.d dbus restart || true +# else +# /etc/init.d/dbus restart || true +# fi +# fi ;; --- 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/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