tags 649825 patch thanks Here is a proposed patch that drops support for obsolete defoma.
--
diff -Nru xfonts-scalable-nonfree-4.2.1.old/debian/control xfonts-scalable-nonfree-4.2.1/debian/control
--- xfonts-scalable-nonfree-4.2.1.old/debian/control 2011-12-01 19:05:24.258238716 +0100
+++ xfonts-scalable-nonfree-4.2.1/debian/control 2011-12-01 19:06:31.032102049 +0100
@@ -2,12 +2,12 @@
Section: non-free/text
Priority: optional
Maintainer: Jonas Smedegaard <d...@jones.dk>
-Build-Depends-Indep: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), dh-buildinfo, defoma (>= 0.7.0)
+Build-Depends-Indep: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), dh-buildinfo
Standards-Version: 3.6.2
Package: t1-xfree86-nonfree
Architecture: all
-Depends: defoma, fontconfig, ${misc:Depends}
+Depends: fontconfig, ${misc:Depends}
Conflicts: xfonts-xfree86-nonfree, xfonts-scalable-nonfree
Replaces: xfonts-xfree86-nonfree, xfonts-scalable-nonfree
Suggests: xfs | xserver
@@ -28,7 +28,7 @@
Package: ttf-xfree86-nonfree
Architecture: all
-Depends: defoma, fontconfig
+Depends: fontconfig
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)
Description: non-free TrueType fonts from XFree86
@@ -50,8 +50,8 @@
Package: ttf-xfree86-nonfree-syriac
Architecture: all
-Depends: defoma, fontconfig
-Suggests: x-ttcidfont-conf, xserver-xfree86 | xfs-xtt (>> 1:1.3.0.1-3) | xfs (>= 4.0.2-1)
+Depends: fontconfig
+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
XFree86 distribution, but which are licensed under terms
diff -Nru xfonts-scalable-nonfree-4.2.1.old/debian/control.in xfonts-scalable-nonfree-4.2.1/debian/control.in
--- xfonts-scalable-nonfree-4.2.1.old/debian/control.in 2011-12-01 19:05:24.250238495 +0100
+++ xfonts-scalable-nonfree-4.2.1/debian/control.in 2011-12-01 19:17:34.161008166 +0100
@@ -2,12 +2,12 @@
Section: non-free/text
Priority: optional
Maintainer: Jonas Smedegaard <d...@jones.dk>
-Build-Depends-Indep: @cdbs@, defoma (>= 0.7.0)
+Build-Depends-Indep: @cdbs@
Standards-Version: 3.6.2
Package: t1-xfree86-nonfree
Architecture: all
-Depends: defoma, fontconfig, ${misc:Depends}
+Depends: fontconfig, ${misc:Depends}
Conflicts: xfonts-xfree86-nonfree, xfonts-scalable-nonfree
Replaces: xfonts-xfree86-nonfree, xfonts-scalable-nonfree
Suggests: xfs | xserver
@@ -28,9 +28,9 @@
Package: ttf-xfree86-nonfree
Architecture: all
-Depends: defoma, fontconfig
+Depends: fontconfig
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
@@ -50,8 +50,8 @@
Package: ttf-xfree86-nonfree-syriac
Architecture: all
-Depends: defoma, fontconfig
-Suggests: x-ttcidfont-conf, xserver-xfree86 | xfs-xtt (>> 1:1.3.0.1-3) | xfs (>= 4.0.2-1)
+Depends: fontconfig
+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
XFree86 distribution, but which are licensed under terms
diff -Nru xfonts-scalable-nonfree-4.2.1.old/debian/rules xfonts-scalable-nonfree-4.2.1/debian/rules
--- xfonts-scalable-nonfree-4.2.1.old/debian/rules 2011-12-01 19:05:24.250238495 +0100
+++ xfonts-scalable-nonfree-4.2.1/debian/rules 2011-12-01 19:07:07.145109772 +0100
@@ -21,22 +21,14 @@
perl debian/gen-fonts-dir.pl \
../../../../../share/fonts/type1/t1-xfree86-nonfree \
debian/t1-xfree86-nonfree/usr/X11R6/lib/X11/fonts/Type1 \
- debian/t1-xfree86-nonfree.scale \
- debian/t1-xfree86-nonfree.defoma-hints
+ debian/t1-xfree86-nonfree.scale
install -m 644 -p debian/t1-xfree86-nonfree.scale debian/t1-xfree86-nonfree/etc/X11/fonts/Type1
getsource:
sh debian/getfromcvs.sh
binary-fixup/t1-xfree86-nonfree::
- dh_installdefoma -p$(cdbs_curpkg)
dh_installxfonts -p$(cdbs_curpkg)
-binary-fixup/ttf-xfree86-nonfree::
- dh_installdefoma -p$(cdbs_curpkg)
-
-binary-fixup/ttf-xfree86-nonfree-syriac::
- dh_installdefoma -p$(cdbs_curpkg)
-
clean::
rm -f debian/t1-xfree86-nonfree.scale
diff -Nru xfonts-scalable-nonfree-4.2.1.old/debian/t1-xfree86-nonfree.README.Debian xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.README.Debian
--- xfonts-scalable-nonfree-4.2.1.old/debian/t1-xfree86-nonfree.README.Debian 2011-12-01 19:05:24.258238716 +0100
+++ xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.README.Debian 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-t1-xfree86-nonfree for Debian
------------------------------
-
-Non-free TrueType fonts are in the separate package ttf-xfree86-nonfree.
-
- -- Jonas Smedegaard <d...@jones.dk> Tue, 24 Dec 2002 12:50:17 +0100
diff -Nru xfonts-scalable-nonfree-4.2.1.old/debian/t1-xfree86-nonfree.postinst xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.postinst
--- xfonts-scalable-nonfree-4.2.1.old/debian/t1-xfree86-nonfree.postinst 1970-01-01 01:00:00.000000000 +0100
+++ xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.postinst 2011-12-01 19:11:12.034344928 +0100
@@ -0,0 +1,7 @@
+#! /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
diff -Nru xfonts-scalable-nonfree-4.2.1.old/debian/t1-xfree86-nonfree.postrm xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.postrm
--- xfonts-scalable-nonfree-4.2.1.old/debian/t1-xfree86-nonfree.postrm 1970-01-01 01:00:00.000000000 +0100
+++ xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.postrm 2011-12-01 19:11:29.406829711 +0100
@@ -0,0 +1,7 @@
+#! /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
diff -Nru xfonts-scalable-nonfree-4.2.1.old/debian/t1-xfree86-nonfree.preinst xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.preinst
--- xfonts-scalable-nonfree-4.2.1.old/debian/t1-xfree86-nonfree.preinst 2011-12-01 19:05:24.254238611 +0100
+++ xfonts-scalable-nonfree-4.2.1/debian/t1-xfree86-nonfree.preinst 2011-12-01 19:13:55.082894802 +0100
@@ -2,6 +2,17 @@
set -e
+if dpkg --compare-versions "$2" lt 4.2.1-4; then
+ if [ -x "which defoma-font 2>/dev/null" ]; then
+ defoma-font purge /etc/defoma/hints/t1-xfree86-nonfree.hints
+ fi
+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
@@ -19,5 +30,3 @@
#DEBHELPER#
exit 0
-
-
diff -Nru xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree-syriac.README.Debian xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.README.Debian
--- xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree-syriac.README.Debian 2011-12-01 19:05:24.258238716 +0100
+++ xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.README.Debian 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-ttf-xfree86-nonfree-syriac for Debian
-------------------------------------
-
-These OpenType fonts are packaged using DeFoMa (Debian Font Manager) and
-fontconfig. In order to make them available for general use in X11, the
-following steps are required:
-
- i) Install the package x-ttcidfont-conf
- ii) Add the lines:
- FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
- FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/CID"
- to /etc/X11/XF86Config
- iii) Add the lines:
- dir "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
- dir "/var/lib/defoma/x-ttcidfont-conf.d/dirs/CID"
- to /etc/X11/XftConfig
- iv) Restart X.
- v) You are done!
-
-Read the documentation of X font servers for how to include the output
-of x-ttcidfont-conf in those.
-
-The above is inspired in the text by Peter Hawkins <pet...@debian.org>
-for the ttf-freefont package.
-
- -- Jonas Smedegaard <d...@jones.dk> Fri, 13 Jun 2003 18:48:00 +0200
diff -Nru xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree-syriac.postinst xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.postinst
--- xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree-syriac.postinst 1970-01-01 01:00:00.000000000 +0100
+++ xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.postinst 2011-12-01 19:15:22.133323938 +0100
@@ -0,0 +1,7 @@
+#! /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
diff -Nru xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree-syriac.postrm xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.postrm
--- xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree-syriac.postrm 1970-01-01 01:00:00.000000000 +0100
+++ xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.postrm 2011-12-01 19:15:33.193632577 +0100
@@ -0,0 +1,7 @@
+#! /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
diff -Nru xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree-syriac.preinst xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.preinst
--- xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree-syriac.preinst 1970-01-01 01:00:00.000000000 +0100
+++ xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree-syriac.preinst 2011-12-01 19:15:05.720865949 +0100
@@ -0,0 +1,32 @@
+#! /bin/sh
+
+set -e
+
+if dpkg --compare-versions "$2" lt 4.2.1-4; then
+ if [ -x "which defoma-font 2>/dev/null" ]; then
+ defoma-font purge /etc/defoma/hints/ttf-xfree86-nonfree-syriac.hints
+ fi
+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
+ ;;
+
+ abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Nru xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree.README.Debian xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.README.Debian
--- xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree.README.Debian 2011-12-01 19:05:24.258238716 +0100
+++ xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.README.Debian 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-ttf-xfree86-nonfree for Debian
-------------------------------
-
-These TrueType fonts are packaged using DeFoMa (Debian Font Manager). In
-order to make them available for general use in X11, the following steps
-are required:
-
- i) Install the package x-ttcidfont-conf
- ii) Add the lines:
- FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
- FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/CID"
- to /etc/X11/XF86Config
- iii) Add the lines:
- dir "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
- dir "/var/lib/defoma/x-ttcidfont-conf.d/dirs/CID"
- to /etc/X11/XftConfig
- iv) Restart X.
- v) You are done!
-
-Read the documentation of X font servers for how to include the output
-of x-ttcidfont-conf in those.
-
-The above is inspired in the text by Peter Hawkins <pet...@debian.org>
-for the ttf-freefont package, and adapted for ttf-xfree86-nonfree by me.
-
-Non-free PS Type 1 fonts are in the separate package t1-xfree86-nonfree.
-
- -- Jonas Smedegaard <d...@jones.dk> Tue, 24 Dec 2002 12:39:46 +0100
diff -Nru xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree.postinst xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.postinst
--- xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree.postinst 1970-01-01 01:00:00.000000000 +0100
+++ xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.postinst 2011-12-01 19:16:28.295170183 +0100
@@ -0,0 +1,7 @@
+#! /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
diff -Nru xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree.postrm xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.postrm
--- xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree.postrm 1970-01-01 01:00:00.000000000 +0100
+++ xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.postrm 2011-12-01 19:16:19.414922383 +0100
@@ -0,0 +1,7 @@
+#! /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
diff -Nru xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree.preinst xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.preinst
--- xfonts-scalable-nonfree-4.2.1.old/debian/ttf-xfree86-nonfree.preinst 1970-01-01 01:00:00.000000000 +0100
+++ xfonts-scalable-nonfree-4.2.1/debian/ttf-xfree86-nonfree.preinst 2011-12-01 19:16:43.495594356 +0100
@@ -0,0 +1,32 @@
+#! /bin/sh
+
+set -e
+
+if dpkg --compare-versions "$2" lt 4.2.1-4; then
+ if [ -x "which defoma-font 2>/dev/null" ]; then
+ defoma-font purge /etc/defoma/hints/ttf-xfree86-nonfree.hints
+ fi
+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
+ ;;
+
+ abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
signature.asc
Description: Digital signature
