tags 649832 patch thanks Here's a proposed patch. --
diff -Nru scalable-cyrfonts-4.13.old/debian/cid-cyrillic.README.Debian scalable-cyrfonts-4.13/debian/cid-cyrillic.README.Debian --- scalable-cyrfonts-4.13.old/debian/cid-cyrillic.README.Debian 2011-11-28 19:28:24.931018752 +0100 +++ scalable-cyrfonts-4.13/debian/cid-cyrillic.README.Debian 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -If you want to make the fonts in this package available to the X -server, then install the package x-ttcidfont-conf, add the directory - -/var/lib/defoma/x-ttcidfont-conf.d/dirs/CID - -to the font path in /etc/XF86Config(-4) or /etc/X11/fs/config. - -Then also add the line - -dir "/var/lib/defoma/x-ttcidfont-conf.d/dirs/CID" - -to /etc/X11/XftConfig and restart X. - -Please note that this package requires capable X server or font -server. This means that you have to use the new modular X server from -the package xserver-xfree86. Alternatively you can use some of the -`old' X servers but then you should make these fonts available to the -X server via font server. - diff -Nru scalable-cyrfonts-4.13.old/debian/control scalable-cyrfonts-4.13/debian/control --- scalable-cyrfonts-4.13.old/debian/control 2011-11-28 19:28:24.935018856 +0100 +++ scalable-cyrfonts-4.13/debian/control 2011-11-28 19:30:04.269777576 +0100 @@ -4,7 +4,6 @@ Priority: optional Standards-Version: 3.8.1 Build-Depends: debhelper (>= 5.0.31), tar (>=1.13.18), bzip2, fontforge, gsfonts, zip, tofrodos, xfonts-utils, texlive, texlive-font-utils, tex-common (>= 1.18) -Build-Depends-Indep: defoma (>= 0.7.0) Package: t1-cyrillic Architecture: all @@ -22,7 +21,7 @@ infringements. Section: x11 Priority: optional -Depends: defoma (>= 0.5.0), ${misc:Depends} +Depends: ${misc:Depends} Suggests: xfs (>=4.0) | xserver Conflicts: xbase-clients (<< 4.0), scalable-cyrfonts-x11, scalable-cyrfonts Replaces: scalable-cyrfonts-x11, scalable-cyrfonts @@ -39,7 +38,7 @@ Bulgarian and Russian Cyrillic characters. Section: x11 Priority: optional -Depends: defoma (>= 0.5.0), ${misc:Depends} +Depends: ${misc:Depends} Suggests: xfs (>=4.0) | xserver Conflicts: xbase-clients (<< 4.0), scalable-cyrfonts-x11, scalable-cyrfonts Replaces: scalable-cyrfonts-x11, scalable-cyrfonts @@ -55,7 +54,7 @@ it. Section: text Priority: optional -Depends: defoma (>= 0.5.0), ${misc:Depends} +Depends: ${misc:Depends} Suggests: xfs (>=4.0) | xserver Conflicts: xbase-clients (<< 4.0), scalable-cyrfonts-x11, scalable-cyrfonts Replaces: scalable-cyrfonts-x11, scalable-cyrfonts diff -Nru scalable-cyrfonts-4.13.old/debian/rules scalable-cyrfonts-4.13/debian/rules --- scalable-cyrfonts-4.13.old/debian/rules 2011-11-28 19:28:24.931018752 +0100 +++ scalable-cyrfonts-4.13/debian/rules 2011-11-28 19:29:19.364530472 +0100 @@ -43,7 +43,6 @@ -rm -rf debian/cyrfonts-X debian/cyrfonts-win # -rm -f cyrfonts-X.tar.gz cyrfonts-win.zip -rm -f build firstbuild - -rm -f debian/*.defoma-hints -rm -f installdirs dh_clean @@ -65,7 +64,6 @@ fonts = $(fontnames) $(afmnames) install-base install-teams install-oldslavic: installdirs - awk -f hint.awk -v cat=type1 -v pkg=$(package) <hintinfo >debian/$(package).defoma-hints install -d debian/$(package)/$(PSFONTSROOT)/ cp $(fonts) debian/$(package)/$(PSFONTSROOT)/ install -d debian/$(package)/etc/X11/fonts/Type1 @@ -137,7 +135,6 @@ dh_testdir dh_testroot dh_installxfonts - dh_installdefoma dh_installdocs dh_installchangelogs # dh_link diff -Nru scalable-cyrfonts-4.13.old/debian/t1-cyrillic.postinst scalable-cyrfonts-4.13/debian/t1-cyrillic.postinst --- scalable-cyrfonts-4.13.old/debian/t1-cyrillic.postinst 2011-11-28 19:28:24.931018752 +0100 +++ scalable-cyrfonts-4.13/debian/t1-cyrillic.postinst 2011-11-28 20:00:53.573466144 +0100 @@ -1,6 +1,6 @@ -#!/bin/sh +#! /bin/sh -#DEBHELPER# +set -e if which xftcache >/dev/null 2>&1; then xftcache /usr/share/fonts/X11/Type1 @@ -9,3 +9,9 @@ if which fc-cache >/dev/null 2>&1 && [ -f /etc/fonts/fonts.conf ]; then fc-cache /usr/share/fonts/X11/Type1 fi + +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then + dpkg-maintscript-helper rm_conffile /etc/defoma/hints/t1-cyrillic.hints 4.14 -- "$@" +fi + +#DEBHELPER diff -Nru scalable-cyrfonts-4.13.old/debian/t1-cyrillic.postrm scalable-cyrfonts-4.13/debian/t1-cyrillic.postrm --- scalable-cyrfonts-4.13.old/debian/t1-cyrillic.postrm 2011-11-28 19:28:24.935018856 +0100 +++ scalable-cyrfonts-4.13/debian/t1-cyrillic.postrm 2011-11-28 20:02:17.859806957 +0100 @@ -20,3 +20,7 @@ ;; esac +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then + dpkg-maintscript-helper rm_conffile /etc/defoma/hints/t1-cyrillic.hints 4.14 -- "$@" +fi + diff -Nru scalable-cyrfonts-4.13.old/debian/t1-cyrillic.preinst scalable-cyrfonts-4.13/debian/t1-cyrillic.preinst --- scalable-cyrfonts-4.13.old/debian/t1-cyrillic.preinst 2011-11-28 19:28:24.931018752 +0100 +++ scalable-cyrfonts-4.13/debian/t1-cyrillic.preinst 2011-11-28 20:03:27.317735930 +0100 @@ -30,6 +30,18 @@ ;; esac +if dpkg --compare-versions "$2" lt 4.14; then + if [ -x "which defoma-font 2>/dev/null" ]; then + defoma-font purge /etc/defoma/hints/t1-cyrillic.hints + fi +fi + + +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then + dpkg-maintscript-helper rm_conffile /etc/defoma/hints/t1-cyrillic.hints 4.14 -- "$@" +fi + + #DEBHELPER# exit 0 diff -Nru scalable-cyrfonts-4.13.old/debian/t1-oldslavic.postinst scalable-cyrfonts-4.13/debian/t1-oldslavic.postinst --- scalable-cyrfonts-4.13.old/debian/t1-oldslavic.postinst 2011-11-28 19:28:24.935018856 +0100 +++ scalable-cyrfonts-4.13/debian/t1-oldslavic.postinst 2011-11-28 20:06:03.338068926 +0100 @@ -1,7 +1,5 @@ #!/bin/sh -#DEBHELPER# - if which xftcache >/dev/null 2>&1; then xftcache /usr/share/fonts/X11/Type1 fi @@ -9,3 +7,10 @@ if which fc-cache >/dev/null 2>&1 && [ -f /etc/fonts/fonts.conf ]; then fc-cache /usr/share/fonts/X11/Type1 fi + +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then + dpkg-maintscript-helper rm_conffile /etc/defoma/hints/t1-oldslavic.hints 4.14 -- "$@" +fi + +#DEBHELPER# + diff -Nru scalable-cyrfonts-4.13.old/debian/t1-oldslavic.postrm scalable-cyrfonts-4.13/debian/t1-oldslavic.postrm --- scalable-cyrfonts-4.13.old/debian/t1-oldslavic.postrm 2011-11-28 19:28:24.935018856 +0100 +++ scalable-cyrfonts-4.13/debian/t1-oldslavic.postrm 2011-11-28 20:06:42.603159393 +0100 @@ -20,3 +20,7 @@ ;; esac +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then + dpkg-maintscript-helper rm_conffile /etc/defoma/hints/t1-oldslavic.hints 4.14 -- "$@" +fi + diff -Nru scalable-cyrfonts-4.13.old/debian/t1-oldslavic.preinst scalable-cyrfonts-4.13/debian/t1-oldslavic.preinst --- scalable-cyrfonts-4.13.old/debian/t1-oldslavic.preinst 2011-11-28 19:28:24.935018856 +0100 +++ scalable-cyrfonts-4.13/debian/t1-oldslavic.preinst 2011-11-28 20:07:25.956363398 +0100 @@ -30,6 +30,18 @@ ;; esac +if dpkg --compare-versions "$2" lt 4.14; then + if [ -x "which defoma-font 2>/dev/null" ]; then + defoma-font purge /etc/defoma/hints/t1-oldslavic.hints + fi +fi + + +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then + dpkg-maintscript-helper rm_conffile /etc/defoma/hints/t1-oldslavic.hints 4.14 -- "$@" +fi + + #DEBHELPER# exit 0 diff -Nru scalable-cyrfonts-4.13.old/debian/t1-teams.postinst scalable-cyrfonts-4.13/debian/t1-teams.postinst --- scalable-cyrfonts-4.13.old/debian/t1-teams.postinst 2011-11-28 19:28:24.931018752 +0100 +++ scalable-cyrfonts-4.13/debian/t1-teams.postinst 2011-11-28 20:04:13.967031475 +0100 @@ -1,7 +1,5 @@ #!/bin/sh -#DEBHELPER# - if which xftcache >/dev/null 2>&1; then xftcache /usr/share/fonts/X11/Type1 fi @@ -9,3 +7,10 @@ if which fc-cache >/dev/null 2>&1 && [ -f /etc/fonts/fonts.conf ]; then fc-cache /usr/share/fonts/X11/Type1 fi + +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then + dpkg-maintscript-helper rm_conffile /etc/defoma/hints/t1-teams.hints 4.14 -- "$@" +fi + +#DEBHELPER# + diff -Nru scalable-cyrfonts-4.13.old/debian/t1-teams.postrm scalable-cyrfonts-4.13/debian/t1-teams.postrm --- scalable-cyrfonts-4.13.old/debian/t1-teams.postrm 2011-11-28 19:28:24.935018856 +0100 +++ scalable-cyrfonts-4.13/debian/t1-teams.postrm 2011-11-28 20:04:38.287706910 +0100 @@ -20,3 +20,7 @@ ;; esac +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then + dpkg-maintscript-helper rm_conffile /etc/defoma/hints/t1-teams.hints 4.14 -- "$@" +fi + diff -Nru scalable-cyrfonts-4.13.old/debian/t1-teams.preinst scalable-cyrfonts-4.13/debian/t1-teams.preinst --- scalable-cyrfonts-4.13.old/debian/t1-teams.preinst 2011-11-28 19:28:24.935018856 +0100 +++ scalable-cyrfonts-4.13/debian/t1-teams.preinst 2011-11-28 20:05:27.857083546 +0100 @@ -30,6 +30,17 @@ ;; esac +if dpkg --compare-versions "$2" lt 4.14; then + if [ -x "which defoma-font 2>/dev/null" ]; then + defoma-font purge /etc/defoma/hints/t1-teams.hints + fi +fi + + +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then + dpkg-maintscript-helper rm_conffile /etc/defoma/hints/t1-teams.hints 4.14 -- "$@" +fi + #DEBHELPER# exit 0
Attachment:
signature.asc
Description: Digital signature