diff -u cm-super-0.3.4/debian/cm-super-x11.postrm cm-super-0.3.4/debian/cm-super-x11.postrm
--- cm-super-0.3.4/debian/cm-super-x11.postrm
+++ cm-super-0.3.4/debian/cm-super-x11.postrm
@@ -1,8 +1,6 @@
 #!/bin/sh -e
 
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
-  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/cm-super-x11.hints 0.3.4-3 -- "$@"
-fi
+dpkg-maintscript-helper rm_conffile /etc/defoma/hints/cm-super-x11.hints 0.3.4-3 -- "$@"
 
 #DEBHELPER#
 
diff -u cm-super-0.3.4/debian/changelog cm-super-0.3.4/debian/changelog
--- cm-super-0.3.4/debian/changelog
+++ cm-super-0.3.4/debian/changelog
@@ -1,3 +1,11 @@
+cm-super (0.3.4-4ubuntu1) precise; urgency=low
+
+  * Pre-Depend on a sufficient version of dpkg for dpkg-maintscript-helper
+    rather than using 'dpkg-maintscript-helper supports' guards.  This leads
+    to more predictable behaviour on upgrades.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 12 Feb 2012 00:16:52 +0000
+
 cm-super (0.3.4-4) unstable; urgency=low
 
   * remove defoma support, but keep the defoma file for now (Closes: #648873)
diff -u cm-super-0.3.4/debian/cm-super-x11.postinst cm-super-0.3.4/debian/cm-super-x11.postinst
--- cm-super-0.3.4/debian/cm-super-x11.postinst
+++ cm-super-0.3.4/debian/cm-super-x11.postinst
@@ -19,9 +19,7 @@
     ;;
 esac
 
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
-  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/cm-super-x11.hints 0.3.4-3 -- "$@"
-fi
+dpkg-maintscript-helper rm_conffile /etc/defoma/hints/cm-super-x11.hints 0.3.4-3 -- "$@"
 
 #DEBHELPER#
 
diff -u cm-super-0.3.4/debian/control cm-super-0.3.4/debian/control
--- cm-super-0.3.4/debian/control
+++ cm-super-0.3.4/debian/control
@@ -3,7 +3,8 @@
 Priority: optional
 Build-Depends: debhelper (>= 5.0.35)
 Build-Depends-Indep: tex-common (>= 1.18), pfb2t1c2pfb
-Maintainer: Debian TeX maintainers <debian-tex-maint@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian TeX maintainers <debian-tex-maint@lists.debian.org>
 Uploaders: Norbert Preining <preining@debian.org>
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/debian-tex/cm-super/trunk
@@ -48,6 +49,7 @@
 
 Package: cm-super-x11
 Architecture: all
+Pre-Depends: dpkg (>= 1.15.7.2~)
 Depends: cm-super-minimal, ${misc:Depends}
 Description: Make the cm-super fonts available to X11
  This package makes the cm-super fonts available to X11. This package
diff -u cm-super-0.3.4/debian/cm-super-x11.preinst cm-super-0.3.4/debian/cm-super-x11.preinst
--- cm-super-0.3.4/debian/cm-super-x11.preinst
+++ cm-super-0.3.4/debian/cm-super-x11.preinst
@@ -7,9 +7,7 @@
     fi
 fi
 
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
-  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/cm-super-x11.hints 0.3.4-3 -- "$@"
-fi
+dpkg-maintscript-helper rm_conffile /etc/defoma/hints/cm-super-x11.hints 0.3.4-3 -- "$@"
 
 #DEBHELPER#