diff -u xfonts-scalable-nonfree-4.2.1/debian/compat xfonts-scalable-nonfree-4.2.1/debian/compat --- xfonts-scalable-nonfree-4.2.1/debian/compat +++ xfonts-scalable-nonfree-4.2.1/debian/compat @@ -1 +1 @@ -7 +9 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,25 @@ +xfonts-scalable-nonfree (4.2.1-4) unstable; urgency=low + + * Acknowledge previous NMU. + * Set myself and Jonas as Uploaders. + * Set Debian Fonts Task Force as Maintainer. + * Bump std-version to 3.9.6, no changes required. + * Bump debhelper and compat level to 9. + + [ Andrew Ayer ] + * Correct symlinks in X11 fonts directory (Closes: #713040) + + [ Colin Watson ] + * 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. + (Closes: #659734) + * Correctly propagate debian/control changes from previous NMU to + debian/control.in. + + -- Gianfranco Costamagna Mon, 06 Oct 2014 09:51:52 +0200 + xfonts-scalable-nonfree (4.2.1-3.1) unstable; urgency=low * Non-maintainer upload. 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 @@ -1,13 +1,17 @@ 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 -Standards-Version: 3.9.2 +Maintainer: Debian Fonts Task Force +Uploaders: Jonas Smedegaard , + Gianfranco Costamagna +Build-Depends: cdbs, debhelper (>= 9) +Build-Depends-Indep: + dh-buildinfo +Standards-Version: 3.9.6 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 +33,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 +56,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,17 @@ 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: Debian Fonts Task Force +Uploaders: Jonas Smedegaard , + Gianfranco Costamagna +Build-Depends: @cdbs@, debhelper (>= 9) +Build-Depends-Indep: + dh-buildinfo +Standards-Version: 3.9.6 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 +33,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 +56,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 diff -u xfonts-scalable-nonfree-4.2.1/debian/rules xfonts-scalable-nonfree-4.2.1/debian/rules --- xfonts-scalable-nonfree-4.2.1/debian/rules +++ xfonts-scalable-nonfree-4.2.1/debian/rules @@ -19,9 +19,10 @@ binary-post-install/t1-xfree86-nonfree:: perl debian/gen-fonts-dir.pl \ - ../../../../../share/fonts/type1/t1-xfree86-nonfree \ + ../../type1/t1-xfree86-nonfree \ debian/t1-xfree86-nonfree/usr/share/fonts/X11/Type1 \ - debian/t1-xfree86-nonfree.scale + debian/t1-xfree86-nonfree.scale \ + debian/t1-xfree86-nonfree.defoma-hints install -m 644 -p debian/t1-xfree86-nonfree.scale debian/t1-xfree86-nonfree/etc/X11/fonts/Type1 getsource: 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/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 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/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