Switch from kochi fonts to takao on Debian and Ubuntu

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4f64afe3b4)

debian/lenny/tdeedu/debian/control

@@ -268,7 +268,7 @@ Architecture: any
 Section: tde
 Replaces: kiten-trinity (<< 4:14.0.0~)
 Breaks: kiten-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~), ttf-kochi-gothic | ttf-kochi-mincho
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~), fonts-takao-gothic | ttf-takao-gothic | fonts-takao-mincho | ttf-takao-mincho
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: Japanese reference/study tool for Trinity
  Kiten is a Japanese reference and study tool for TDE. It is an
@@ -567,7 +567,7 @@ Section: libs
 Replaces: libkiten1-trinity (<< 4:14.0.0~)
 Breaks: libkiten1-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, edict, kanjidic
-Recommends: ttf-kochi-gothic | ttf-kochi-mincho
+Recommends: fonts-takao-gothic | ttf-takao-gothic | fonts-takao-mincho | ttf-takao-mincho
 Description: library for Kiten Japanese reference/study tool
  Kiten is a Japanese reference/study tool for TDE. The library
  libkiten contains portions of Kiten that may be useful for other

debian/squeeze/tdeedu/debian/control

@@ -268,7 +268,7 @@ Architecture: any
 Section: tde
 Replaces: kiten-trinity (<< 4:14.0.0~)
 Breaks: kiten-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~), ttf-kochi-gothic | ttf-kochi-mincho
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~), fonts-takao-gothic | ttf-takao-gothic | fonts-takao-mincho | ttf-takao-mincho
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: Japanese reference/study tool for Trinity
  Kiten is a Japanese reference and study tool for TDE. It is an
@@ -567,7 +567,7 @@ Section: libs
 Replaces: libkiten1-trinity (<< 4:14.0.0~)
 Breaks: libkiten1-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, edict, kanjidic
-Recommends: ttf-kochi-gothic | ttf-kochi-mincho
+Recommends: fonts-takao-gothic | ttf-takao-gothic | fonts-takao-mincho | ttf-takao-mincho
 Description: library for Kiten Japanese reference/study tool
  Kiten is a Japanese reference/study tool for TDE. The library
  libkiten contains portions of Kiten that may be useful for other

ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control

@@ -8,7 +8,7 @@ Standards-Version: 3.8.4
 Package: redmond-default-settings-ii-trinity
 Architecture: all
 Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, openprinting-ppds, printer-driver-gutenprint | cups-driver-gutenprint, printer-driver-pnm2ppa | pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity, synaptic-trinity
-Recommends: firefox | iceweasel, thunderbird | icedove, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, dmz-cursor-theme, dvd+rw-tools, printer-driver-foo2zjs | foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepowersave-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, printer-driver-min12xxw | min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, printer-driver-pxljr | pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, ttf-mscorefonts-installer | msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, gtk3-tqt-engine-trinity, printer-driver-c2esp, printer-driver-ptouch, printer-driver-sag-gdi, printer-driver-splix
+Recommends: firefox | iceweasel, thunderbird | icedove, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, dmz-cursor-theme, dvd+rw-tools, printer-driver-foo2zjs | foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepowersave-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, printer-driver-min12xxw | min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, printer-driver-pxljr | pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, fonts-takao-gothic | ttf-takao-gothic, fonts-takao-mincho | ttf-takao-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, ttf-mscorefonts-installer | msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, gtk3-tqt-engine-trinity, printer-driver-c2esp, printer-driver-ptouch, printer-driver-sag-gdi, printer-driver-splix
 Suggests: apport-gtk, hplip-gui
 Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings
 Description: Redmond II default settings and artwork for the Kubuntu Trinity desktop

ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control

@@ -8,7 +8,7 @@ Standards-Version: 3.8.4
 Package: redmond-default-settings-trinity
 Architecture: all
 Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, openprinting-ppds, printer-driver-gutenprint | cups-driver-gutenprint, printer-driver-pnm2ppa | pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity, synaptic-trinity
-Recommends: firefox | iceweasel, thunderbird | icedove, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, dmz-cursor-theme, dvd+rw-tools, printer-driver-foo2zjs | foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepowersave-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, printer-driver-min12xxw | min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, printer-driver-pxljr | pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, ttf-mscorefonts-installer | msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, gtk3-tqt-engine-trinity, printer-driver-c2esp, printer-driver-ptouch, printer-driver-sag-gdi, printer-driver-splix
+Recommends: firefox | iceweasel, thunderbird | icedove, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, dmz-cursor-theme, dvd+rw-tools, printer-driver-foo2zjs | foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepowersave-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, printer-driver-min12xxw | min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, printer-driver-pxljr | pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, fonts-takao-gothic | ttf-takao-gothic, fonts-takao-mincho | ttf-takao-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, ttf-mscorefonts-installer | msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, gtk3-tqt-engine-trinity, printer-driver-c2esp, printer-driver-ptouch, printer-driver-sag-gdi, printer-driver-splix
 Suggests: apport-gtk, hplip-gui
 Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings
 Description: Redmond default settings and artwork for the Kubuntu Trinity desktop

ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all

@@ -17,6 +17,8 @@ fonts-arabeyes | ttf-arabeyes
 fonts-arphic-ukai | ttf-arphic-ukai
 fonts-arphic-uming | ttf-arphic-uming
 fonts-lao | ttf-lao
+fonts-takao-gothic | ttf-takao-gothic
+fonts-takao-mincho | ttf-takao-mincho
 fonts-thai-tlwg | ttf-thai-tlwg
 fonts-unfonts-core | ttf-unfonts-core
 foomatic-db-gutenprint
@@ -105,8 +107,6 @@ tdescreensaver-trinity
 tdesudo-trinity
 tdewalletmanager-trinity
 ttf-indic-fonts-core
-ttf-kochi-gothic
-ttf-kochi-mincho
 ttf-malayalam-fonts
 wodim
 wvdial

ubuntu/maverick/tdeedu/debian/control

@@ -268,7 +268,7 @@ Architecture: any
 Section: tde
 Replaces: kiten-kde3 (<< 4:14.0.0~), kiten-trinity (<< 4:14.0.0~)
 Breaks: kiten-kde3 (<< 4:14.0.0~), kiten-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~), ttf-kochi-gothic | ttf-kochi-mincho
+Depends: ${shlibs:Depends}, tdeedu-data-trinity (>> ${TDE-Version3}~), tdeedu-data-trinity (<< ${TDE-Next-Version3}~), fonts-takao-gothic | ttf-takao-gothic | fonts-takao-mincho | ttf-takao-mincho
 Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html
 Description: Japanese reference/study tool for Trinity
  Kiten is a Japanese reference and study tool for TDE. It is an
@@ -567,7 +567,7 @@ Section: libs
 Replaces: libkiten1-kde3 (<< 4:14.0.0~), libkiten1-trinity (<< 4:14.0.0~)
 Breaks: libkiten1-kde3 (<< 4:14.0.0~), libkiten1-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, edict, kanjidic
-Recommends: ttf-kochi-gothic | ttf-kochi-mincho
+Recommends: fonts-takao-gothic | ttf-takao-gothic | fonts-takao-mincho | ttf-takao-mincho
 Description: library for Kiten Japanese reference/study tool
  Kiten is a Japanese reference/study tool for TDE. The library
  libkiten contains portions of Kiten that may be useful for other