diffstat of debian/ for xfonts-scalable-nonfree_4.2.1-3.1 xfonts-scalable-nonfree_4.2.1-3.1ubuntu1 debian/t1-xfree86-nonfree.maintscript | 1 debian/t1-xfree86-nonfree.postinst | 11 ------ debian/t1-xfree86-nonfree.postrm | 11 ------ debian/ttf-xfree86-nonfree-syriac.maintscript | 1 debian/ttf-xfree86-nonfree-syriac.postinst | 11 ------ debian/ttf-xfree86-nonfree-syriac.postrm | 11 ------ debian/ttf-xfree86-nonfree.maintscript | 1 debian/ttf-xfree86-nonfree.postinst | 11 ------ debian/ttf-xfree86-nonfree.postrm | 11 ------ xfonts-scalable-nonfree-4.2.1/debian/changelog | 11 ++++++ xfonts-scalable-nonfree-4.2.1/debian/control | 13 +++++--- xfonts-scalable-nonfree-4.2.1/debian/control.in | 16 ++++++---- xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.preinst | 4 -- xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.preinst | 4 -- xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.preinst | 4 -- 15 files changed, 33 insertions(+), 88 deletions(-) diff -u xfonts-scalable-nonfree-4.2.1/debian/changelog xfonts-scalable-nonfree-4.2.1/debian/changelog --- xfonts-scalable-nonfree-4.2.1/debian/changelog +++ xfonts-scalable-nonfree-4.2.1/debian/changelog @@ -1,3 +1,14 @@ +xfonts-scalable-nonfree (4.2.1-3.1ubuntu1) precise; urgency=low + + * 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. + + -- Colin Watson Mon, 13 Feb 2012 14:01:03 +0000 + xfonts-scalable-nonfree (4.2.1-3.1) unstable; urgency=low * Non-maintainer upload. --- 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 @@ -1,13 +1,16 @@ Source: xfonts-scalable-nonfree Section: non-free/fonts Priority: optional -Maintainer: Jonas Smedegaard -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 7) -Build-Depends-Indep: dh-buildinfo +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jonas Smedegaard +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 +32,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 +55,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 --- 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,14 @@ Source: xfonts-scalable-nonfree -Section: non-free/text +Section: non-free/fonts Priority: optional -Maintainer: Jonas Smedegaard -Build-Depends-Indep: @cdbs@ -Standards-Version: 3.6.2 +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jonas Smedegaard +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 +30,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 +53,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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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