=== modified file 'debian/changelog'
--- debian/changelog	2010-08-20 17:00:18 +0000
+++ debian/changelog	2011-06-23 17:52:54 +0000
@@ -1,3 +1,10 @@
+onboard (0.94.0-0ubuntu2) oneiric; urgency=low
+
+  * Convert to build system to dh7 and Python helper to dh_python2.
+    (LP: #788514)
+
+ -- Barry Warsaw <barry@ubuntu.com>  Thu, 23 Jun 2011 13:51:38 -0400
+
 onboard (0.94.0-0ubuntu1) maverick; urgency=low
 
     * Make onboard follow keyboard layout changes (LP: 526791, LP: 65626)

=== modified file 'debian/control'
--- debian/control	2010-08-29 12:57:03 +0000
+++ debian/control	2011-06-23 17:41:17 +0000
@@ -1,11 +1,9 @@
 Source: onboard
 Section: gnome
 Priority: optional
-Build-Depends: cdbs (>= 0.4.43),
-               debhelper (>=7.0.8),
+Build-Depends: debhelper (>=7.0.8),
                quilt,
-               python (>= 2.5),
-               python-central (>= 0.5),
+               python (>= 2.6.6-3~),
                python-distutils-extra (>= 2.10),
                libxi6
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
@@ -13,11 +11,10 @@
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/onboard
 Vcs-Bzr: https://code.launchpad.net/onboard
-XS-Python-Version: current
+X-Python-Version: >= 2.6
 
 Package: onboard
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Depends: ${python:Depends},
          ${misc:Depends},
          python-cairo,
@@ -29,4 +26,3 @@
          libxi6
 Description: Simple On-screen Keyboard
  Simple On-screen Keyboard with macros and easy layout creation.
-

=== modified file 'debian/rules'
--- debian/rules	2010-08-19 12:45:25 +0000
+++ debian/rules	2011-06-23 17:50:47 +0000
@@ -1,14 +1,13 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+DH_VERBOSE=1
 
-DEB_PYTHON_SYSTEM               := pycentral
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+%:
+	dh $@ --with python2
 
 # Uncomment this for the release
-#clean::
+#override_dh_auto_clean::
 #	rm -f po/*.pot
 
-binary-install/onboard::
-	dh_gconf
+# binary-install/onboard::
+# 	dh_gconf