Package: ttf-mscorefonts-installer
Version: 3.4
Severity: wishlist
Tags: patch
User: ubuntu-de...@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
ttf-mscorefonts-installer.  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.
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 msttcorefonts-3.4/debian/control 
msttcorefonts-3.4ubuntu2/debian/control
--- msttcorefonts-3.4/debian/control    2011-11-19 20:44:19.000000000 +0000
+++ msttcorefonts-3.4ubuntu2/debian/control     2012-02-13 13:02:03.000000000 
+0000
@@ -3,13 +3,14 @@
 Priority: optional
 Maintainer: Thijs Kinkhorst <th...@debian.org>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 8.1.0~)
 Vcs-Svn: https://svn.kinkhorst.nl/svn/debian/msttcorefonts/trunk
 Vcs-Browser: https://aphrodite.kinkhorst.nl/wsvn/debian/msttcorefonts/
 
 Package: ttf-mscorefonts-installer
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: wget, cabextract, xfonts-utils, ${misc:Depends}
 Recommends: fonts-liberation
 Provides: msttcorefonts
diff -Nru msttcorefonts-3.4/debian/maintscript 
msttcorefonts-3.4ubuntu2/debian/maintscript
--- msttcorefonts-3.4/debian/maintscript        1970-01-01 01:00:00.000000000 
+0100
+++ msttcorefonts-3.4ubuntu2/debian/maintscript 2012-02-13 12:58:38.000000000 
+0000
@@ -0,0 +1 @@
+rm_conffile /etc/defoma/hints/ttf-mscorefonts-installer.hints 3.4
diff -Nru msttcorefonts-3.4/debian/postinst.in 
msttcorefonts-3.4ubuntu2/debian/postinst.in
--- msttcorefonts-3.4/debian/postinst.in        2011-11-19 20:34:01.000000000 
+0000
+++ msttcorefonts-3.4ubuntu2/debian/postinst.in 2012-02-13 13:01:02.000000000 
+0000
@@ -25,9 +25,5 @@
         http_proxy=$RET
 done
 
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
-  dpkg-maintscript-helper rm_conffile 
/etc/defoma/hints/ttf-mscorefonts-installer.hints 3.4 -- "$@"
-fi
-  
 ## Content of update-ms-fonts will be concatenated below
 
diff -Nru msttcorefonts-3.4/debian/postrm msttcorefonts-3.4ubuntu2/debian/postrm
--- msttcorefonts-3.4/debian/postrm     2011-11-19 20:34:01.000000000 +0000
+++ msttcorefonts-3.4ubuntu2/debian/postrm      2012-02-13 13:01:49.000000000 
+0000
@@ -2,8 +2,4 @@
 
 set -e
 
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
-  dpkg-maintscript-helper rm_conffile 
/etc/defoma/hints/ttf-mscorefonts-installer.hints 3.4 -- "$@"
-fi
-
 #DEBHELPER#
diff -Nru msttcorefonts-3.4/debian/preinst 
msttcorefonts-3.4ubuntu2/debian/preinst
--- msttcorefonts-3.4/debian/preinst    2011-11-19 20:34:01.000000000 +0000
+++ msttcorefonts-3.4ubuntu2/debian/preinst     2012-02-13 13:00:19.000000000 
+0000
@@ -9,8 +9,4 @@
 fi
 
 
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
-  dpkg-maintscript-helper rm_conffile 
/etc/defoma/hints/ttf-mscorefonts-installer.hints 3.4 -- "$@"
-fi
-
 #DEBHELPER#

Thanks,

-- 
Colin Watson                                       [cjwat...@ubuntu.com]



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to