--- smart-notifier-0.28.orig/scripts/smart-notifier
+++ smart-notifier-0.28/scripts/smart-notifier
@@ -7,7 +7,7 @@
 
 # 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
--- 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 <jinty@web.de>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Brian Sutherland <jinty@web.de>
 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)
+Build-Depends-Indep: python-dev (>= 2.3.5-11), python-central (>= 0.5), python-setuptools (>= 0.6b3-1)
 Standards-Version: 3.7.2
-XS-Python-Version: 2.4
+XS-Python-Version: current
 
 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/rules
+++ smart-notifier-0.28/debian/rules
@@ -44,13 +44,13 @@
 
 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$*
+	install -d debian/$(PACKAGE)/usr/share/$(PACKAGE)
 	# 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
+	   debian/$(PACKAGE)/usr/share/$(PACKAGE)/$(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) 
+	   debian/$(PACKAGE)/usr/share/$(PACKAGE)
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -65,7 +65,6 @@
 	dh_compress
 	dh_fixperms
 	dh_pycentral
-	dh_python
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums
--- smart-notifier-0.28.orig/debian/changelog
+++ smart-notifier-0.28/debian/changelog
@@ -1,3 +1,27 @@
+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 <jcorbier@ubuntu.com>  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 <doko@ubuntu.com>  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).