Smoothing differences on Debian and Ubuntu

9 files changed, 1 insertions, 9 deletions

diff --git a/ubuntu/precise/metapackages/kubuntu-meta/debian/control b/ubuntu/precise/metapackages/kubuntu-meta/debian/control
index 36eab07c5..add6683b2 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 4), germinate (>= 0.38)
 
 Package: kubuntu-desktop-trinity
 Architecture: any
-Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, 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, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
+Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, 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, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
 Recommends: tdeio-apt-trinity, tde-guidance-powermanager-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, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-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-default-settings-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, min12xxw, networkstatus-trinity, openoffice.org-calc, openoffice.org-impress, openoffice.org-trinity, openoffice.org-writer, pinentry-qt, powernowd, 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, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity
 Suggests: apport-gtk, hplip-gui
 Description: Kubuntu desktop system, TDE version
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop b/ubuntu/precise/metapackages/kubuntu-meta/desktop
index 5e6b2bcac..b1016a157 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop
@@ -94,7 +94,6 @@ Packages used for X preconfiguration are just Recommends; removing them after in
 
 Fonts:
 
- * x-ttcidfont-conf
  * ttf-bitstream-vera
  * ttf-dejavu                    # includes characters missing in Vera
  * ttf-freefont
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64
index cdd7cceea..3e5fba0d9 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64
@@ -76,7 +76,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa
index e28c15bc0..030d93618 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa
@@ -73,7 +73,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386
index 0aa597238..52cd6a70e 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386
@@ -77,7 +77,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64
index 8b7c1e151..f24d7e4cf 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64
@@ -77,7 +77,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia
index 9795087f8..7c8954570 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia
@@ -75,7 +75,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc
index c33ba4840..1314826f1 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc
@@ -75,7 +75,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg
diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc
index e28c15bc0..030d93618 100644
--- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc
+++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc
@@ -73,7 +73,6 @@ ttf-freefont
 unzip
 usplash
 vorbis-tools
-x-ttcidfont-conf
 xdg-user-dirs
 xkb-data
 xorg