Package: xfonts-scalable-nonfree Version: 4.2.1-3.1 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 t1-xfree86-nonfree/ttf-xfree86-nonfree/ttf-xfree86-nonfree-syriac. 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 could remove some of your handwritten maintainer scripts entirely. Here's a patch. Note that in the process I had to fix up desynchronisation between debian/control and debian/control.in caused by the previous NMU, so the patch is a little more involved than I might have liked; and I corrected the previous NMUer's misunderstanding of the version argument to dpkg-maintscript-helper. * 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. * Correctly propagate debian/control changes from previous NMU to debian/control.in. reverted: --- xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.postinst +++ xfonts-scalable-nonfree-4.2.1.orig/debian/t1-xfree86-nonfree.postinst @@ -1,11 +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/t1-xfree86-nonfree.hints 4.2.1-4 -- "$@" -fi - -#DEBHELPER# - -exit 0 diff -u xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.preinst xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.preinst --- xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.preinst +++ xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.preinst @@ -9,10 +9,6 @@ fi -if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then - dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-xfree86-nonfree.hints 4.2.1-4 -- "$@" -fi - case "$1" in install|upgrade) rm -f /etc/X11/fonts/Type1/xfonts-scalable-nonfree.scale diff -u xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.preinst xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.preinst --- xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.preinst +++ xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.preinst @@ -9,10 +9,6 @@ fi -if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then - dpkg-maintscript-helper rm_conffile /etc/defoma/hints/t1-xfree86-nonfree.hints 4.2.1-4 -- "$@" -fi - case "$1" in install|upgrade) rm -f /etc/X11/fonts/Type1/xfonts-scalable-nonfree.scale diff -u xfonts-scalable-nonfree-4.2.1/debian/control xfonts-scalable-nonfree-4.2.1/debian/control --- xfonts-scalable-nonfree-4.2.1/debian/control +++ xfonts-scalable-nonfree-4.2.1/debian/control @@ -2,12 +2,14 @@ Section: non-free/fonts Priority: optional Maintainer: Jonas Smedegaard <d...@jones.dk> -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 7) -Build-Depends-Indep: dh-buildinfo +Build-Depends-Indep: cdbs, + debhelper, + dh-buildinfo, debhelper (>= 8.1.0~) Standards-Version: 3.9.2 Package: t1-xfree86-nonfree Architecture: all +Pre-Depends: ${misc:Pre-Depends} Depends: fontconfig, ${misc:Depends} Conflicts: xfonts-xfree86-nonfree, xfonts-scalable-nonfree Replaces: xfonts-xfree86-nonfree, xfonts-scalable-nonfree @@ -29,9 +31,10 @@ Package: ttf-xfree86-nonfree Architecture: all +Pre-Depends: ${misc:Pre-Depends} Depends: fontconfig, ${misc:Depends} Conflicts: xfonts-xfree86-nonfree, xfonts-scalable-nonfree -Suggests: x-ttcidfont-conf, xserver-xfree86 | xfs-xtt (>> 1:1.3.0.1-3) | xfs (>= 4.0.2-1) +Suggests: xserver-xfree86 | xfs-xtt (>> 1:1.3.0.1-3) | xfs (>= 4.0.2-1) Description: non-free TrueType fonts from XFree86 Collection of TrueType fonts originally part of the XFree86 distribution, but which are licensed under terms @@ -51,6 +54,7 @@ Package: ttf-xfree86-nonfree-syriac Architecture: all +Pre-Depends: ${misc:Pre-Depends} Depends: fontconfig, ${misc:Depends} Suggests: xserver-xfree86 | xfs-xtt (>> 1:1.3.0.1-3) | xfs (>= 4.0.2-1) Description: non-free syriac OpenType fonts from XFree86 reverted: --- xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.postrm +++ xfonts-scalable-nonfree-4.2.1.orig/debian/ttf-xfree86-nonfree-syriac.postrm @@ -1,11 +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-xfree86-nonfree-syriac.hints 4.2.1-4 -- "$@" -fi - -#DEBHELPER# - -exit 0 \ No newline at end of file diff -u xfonts-scalable-nonfree-4.2.1/debian/control.in xfonts-scalable-nonfree-4.2.1/debian/control.in --- xfonts-scalable-nonfree-4.2.1/debian/control.in +++ xfonts-scalable-nonfree-4.2.1/debian/control.in @@ -1,12 +1,13 @@ Source: xfonts-scalable-nonfree -Section: non-free/text +Section: non-free/fonts Priority: optional Maintainer: Jonas Smedegaard <d...@jones.dk> -Build-Depends-Indep: @cdbs@ -Standards-Version: 3.6.2 +Build-Depends-Indep: @cdbs@, debhelper (>= 8.1.0~) +Standards-Version: 3.9.2 Package: t1-xfree86-nonfree Architecture: all +Pre-Depends: ${misc:Pre-Depends} Depends: fontconfig, ${misc:Depends} Conflicts: xfonts-xfree86-nonfree, xfonts-scalable-nonfree Replaces: xfonts-xfree86-nonfree, xfonts-scalable-nonfree @@ -28,7 +29,8 @@ Package: ttf-xfree86-nonfree Architecture: all -Depends: fontconfig +Pre-Depends: ${misc:Pre-Depends} +Depends: fontconfig, ${misc:Depends} Conflicts: xfonts-xfree86-nonfree, xfonts-scalable-nonfree Suggests: xserver-xfree86 | xfs-xtt (>> 1:1.3.0.1-3) | xfs (>= 4.0.2-1) Description: non-free TrueType fonts from XFree86 @@ -50,7 +52,8 @@ Package: ttf-xfree86-nonfree-syriac Architecture: all -Depends: fontconfig +Pre-Depends: ${misc:Pre-Depends} +Depends: fontconfig, ${misc:Depends} Suggests: xserver-xfree86 | xfs-xtt (>> 1:1.3.0.1-3) | xfs (>= 4.0.2-1) Description: non-free syriac OpenType fonts from XFree86 Meltho mollection of syriac OpenType fonts originally part of the reverted: --- xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.postrm +++ xfonts-scalable-nonfree-4.2.1.orig/debian/t1-xfree86-nonfree.postrm @@ -1,11 +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/t1-xfree86-nonfree.hints 4.2.1-4 -- "$@" -fi - -#DEBHELPER# - -exit 0 reverted: --- xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.postrm +++ xfonts-scalable-nonfree-4.2.1.orig/debian/ttf-xfree86-nonfree.postrm @@ -1,11 +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-xfree86-nonfree.hints 4.2.1-4 -- "$@" -fi - -#DEBHELPER# - -exit 0 diff -u xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.preinst xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.preinst --- xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.preinst +++ xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.preinst @@ -9,10 +9,6 @@ fi -if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then - dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-xfree86-nonfree-syriac.hints 4.2.1-4 -- "$@" -fi - case "$1" in install|upgrade) rm -f /etc/X11/fonts/Type1/xfonts-scalable-nonfree.scale reverted: --- xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.postinst +++ xfonts-scalable-nonfree-4.2.1.orig/debian/ttf-xfree86-nonfree-syriac.postinst @@ -1,11 +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-xfree86-nonfree-syriac.hints 4.2.1-4 -- "$@" -fi - -#DEBHELPER# - -exit 0 reverted: --- xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.postinst +++ xfonts-scalable-nonfree-4.2.1.orig/debian/ttf-xfree86-nonfree.postinst @@ -1,11 +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-xfree86-nonfree.hints 4.2.1-4 -- "$@" -fi - -#DEBHELPER# - -exit 0 only in patch2: unchanged: --- xfonts-scalable-nonfree-4.2.1.orig/debian/ttf-xfree86-nonfree.maintscript +++ xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/defoma/hints/ttf-xfree86-nonfree.hints 4.2.1-3 only in patch2: unchanged: --- xfonts-scalable-nonfree-4.2.1.orig/debian/ttf-xfree86-nonfree-syriac.maintscript +++ xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/defoma/hints/ttf-xfree86-nonfree-syriac.hints 4.2.1-3 only in patch2: unchanged: --- xfonts-scalable-nonfree-4.2.1.orig/debian/t1-xfree86-nonfree.maintscript +++ xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/defoma/hints/t1-xfree86-nonfree.hints 4.2.1-3 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