[Pkg-fonts-devel] Bug#659605: fonts-tomsontalks: use dh_installdeb maintscript support

[Colin Watson]

Package: fonts-tomsontalks
Version: 1.1-3
Severity: wishlist
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch precise

Using 'dpkg-maintscript-helper supports rm_conffile' guards introduces
unreliability into upgrades; it means that the conffile is removed or
not depending on whether dpkg happens to be unpacked before fonts-f500.
This seems generally undesirable; it would be better to enforce a single
code path.  (This is academic for Debian because the version of dpkg in
squeeze supported dpkg-maintscript-helper, hence Severity: wishlist;
Ubuntu's last LTS release didn't have a sufficient version of dpkg for
that which is why I care.)

It would be nice to just use dh_installdeb's support for generating
dpkg-maintscript-helper commands, which was introduced in debhelper
8.1.0.  This would remove duplicate code from your maintainer scripts -
in fact, you'd no longer need to have handwritten maintainer scripts at
all.  Here's a patch:

  * Use maintscript support in dh_installdeb rather than writing out
    dpkg-maintscript-helper commands by hand.  We now simply Pre-Depend on a
    new enough version of dpkg rather than using 'dpkg-maintscript-helper
    supports' guards, leading to more predictable behaviour on upgrades.

diff -Nru fonts-tomsontalks-1.1/debian/control fonts-tomsontalks-1.1/debian/control
--- fonts-tomsontalks-1.1/debian/control	2011-10-30 14:42:36.000000000 +0000
+++ fonts-tomsontalks-1.1/debian/control	2012-02-12 14:12:10.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Fonts Task Force <pkg-fonts-devel at lists.alioth.debian.org>
 Uploaders: Gürkan Sengün <gurkan at phys.ethz.ch>
-Build-Depends: debhelper (>= 8)
+Build-Depends: debhelper (>= 8.1.0~)
 Standards-Version: 3.9.2
 Homepage: http://frabru.de/c.php/resource/font/TomsonTalks/
 Vcs-svn: svn://svn.debian.org/svn/pkg-fonts/packages/fonts-tomsontalks
@@ -11,6 +12,7 @@
 
 Package: fonts-tomsontalks
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}
 Replaces: ttf-tomsontalks (<< 1.1-3)
 Provides: ttf-tomsontalks
diff -Nru fonts-tomsontalks-1.1/debian/maintscript fonts-tomsontalks-1.1/debian/maintscript
--- fonts-tomsontalks-1.1/debian/maintscript	1970-01-01 01:00:00.000000000 +0100
+++ fonts-tomsontalks-1.1/debian/maintscript	2012-02-12 14:11:45.000000000 +0000
@@ -0,0 +1 @@
+rm_conffile /etc/defoma/hints/ttf-tomsontalks.hints 1.0-2
diff -Nru fonts-tomsontalks-1.1/debian/postinst fonts-tomsontalks-1.1/debian/postinst
--- fonts-tomsontalks-1.1/debian/postinst	2011-10-30 14:29:22.000000000 +0000
+++ fonts-tomsontalks-1.1/debian/postinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
-  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-tomsontalks.hints 1.0-2 -- "$@"
-fi
-
-#DEBHELPER#
-
diff -Nru fonts-tomsontalks-1.1/debian/postrm fonts-tomsontalks-1.1/debian/postrm
--- fonts-tomsontalks-1.1/debian/postrm	2011-10-30 14:29:22.000000000 +0000
+++ fonts-tomsontalks-1.1/debian/postrm	1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
-  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-tomsontalks.hints 1.0-2 -- "$@"
-fi
-
-#DEBHELPER#
-
diff -Nru fonts-tomsontalks-1.1/debian/preinst fonts-tomsontalks-1.1/debian/preinst
--- fonts-tomsontalks-1.1/debian/preinst	2011-10-30 14:29:22.000000000 +0000
+++ fonts-tomsontalks-1.1/debian/preinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
-  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-tomsontalks.hints 1.0-2 -- "$@"
-fi
-
-#DEBHELPER#
-

Thanks,

-- 
Colin Watson                                       [cjwatson at ubuntu.com]