diff options
Diffstat (limited to 'ubuntu/precise/tdebase')
6 files changed, 25 insertions, 25 deletions
diff --git a/ubuntu/precise/tdebase/debian/kcontrol-trinity.install b/ubuntu/precise/tdebase/debian/kcontrol-trinity.install index 3bdca419e..bb25d0f14 100644 --- a/ubuntu/precise/tdebase/debian/kcontrol-trinity.install +++ b/ubuntu/precise/tdebase/debian/kcontrol-trinity.install @@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/kaccess debian/tmp/opt/trinity/bin/kcontrol debian/tmp/opt/trinity/bin/kdeinstallktheme debian/tmp/opt/trinity/bin/keditfiletype -debian/tmp/opt/trinity/bin/kfontinst -debian/tmp/opt/trinity/bin/kfontview +debian/tmp/opt/trinity/bin/tdefontinst +debian/tmp/opt/trinity/bin/tdefontview debian/tmp/opt/trinity/bin/kinfocenter debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper debian/tmp/opt/trinity/bin/tderandrtray @@ -116,10 +116,10 @@ debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.la debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.so debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.la debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.so -debian/tmp/opt/trinity/lib/trinity/libkfontviewpart.la -debian/tmp/opt/trinity/lib/trinity/libkfontviewpart.so -debian/tmp/opt/trinity/lib/trinity/libkshorturifilter.la -debian/tmp/opt/trinity/lib/trinity/libkshorturifilter.so +debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.la +debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.so +debian/tmp/opt/trinity/lib/trinity/libtdeshorturifilter.la +debian/tmp/opt/trinity/lib/trinity/libtdeshorturifilter.so debian/tmp/opt/trinity/lib/trinity/libkuriikwsfilter.la debian/tmp/opt/trinity/lib/trinity/libkuriikwsfilter.so debian/tmp/opt/trinity/lib/trinity/libkurisearchfilter.la @@ -128,8 +128,8 @@ debian/tmp/opt/trinity/lib/trinity/liblocaldomainurifilter.la debian/tmp/opt/trinity/lib/trinity/liblocaldomainurifilter.so debian/tmp/opt/trinity/lib/libtdeinit_kaccess.so debian/tmp/opt/trinity/lib/libtdeinit_kcontrol.so -debian/tmp/opt/trinity/lib/libkfontinst.so.0 -debian/tmp/opt/trinity/lib/libkfontinst.so.0.0.0 +debian/tmp/opt/trinity/lib/libtdefontinst.so.0 +debian/tmp/opt/trinity/lib/libtdefontinst.so.0.0.0 debian/tmp/opt/trinity/share/applications/tde/arts.desktop debian/tmp/opt/trinity/share/applications/tde/background.desktop debian/tmp/opt/trinity/share/applications/tde/bell.desktop @@ -173,7 +173,7 @@ debian/tmp/opt/trinity/share/applications/tde/kcmview1394.desktop debian/tmp/opt/trinity/share/applications/tde/KControl.desktop debian/tmp/opt/trinity/share/applications/tde/tdm.desktop debian/tmp/opt/trinity/share/applications/tde/keys.desktop -debian/tmp/opt/trinity/share/applications/tde/kfontview.desktop +debian/tmp/opt/trinity/share/applications/tde/tdefontview.desktop debian/tmp/opt/trinity/share/applications/tde/tdehtml_behavior.desktop debian/tmp/opt/trinity/share/applications/tde/tdehtml_fonts.desktop debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop @@ -234,8 +234,8 @@ debian/tmp/opt/trinity/share/services/fonts.protocol debian/tmp/opt/trinity/share/services/fontthumbnail.desktop debian/tmp/opt/trinity/share/services/kaccess.desktop debian/tmp/opt/trinity/share/services/tdefile_font.desktop -debian/tmp/opt/trinity/share/services/kfontviewpart.desktop -debian/tmp/opt/trinity/share/services/kshorturifilter.desktop +debian/tmp/opt/trinity/share/services/tdefontviewpart.desktop +debian/tmp/opt/trinity/share/services/tdeshorturifilter.desktop debian/tmp/opt/trinity/share/services/kuriikwsfilter.desktop debian/tmp/opt/trinity/share/services/kurisearchfilter.desktop debian/tmp/opt/trinity/share/services/localdomainurifilter.desktop diff --git a/ubuntu/precise/tdebase/debian/kdesktop-trinity.install b/ubuntu/precise/tdebase/debian/kdesktop-trinity.install index d34eea39d..0aa1f710d 100644 --- a/ubuntu/precise/tdebase/debian/kdesktop-trinity.install +++ b/ubuntu/precise/tdebase/debian/kdesktop-trinity.install @@ -43,6 +43,6 @@ debian/tmp/opt/trinity/share/apps/kdesktop/Desktop/Web_Browser debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop debian/tmp/opt/trinity/share/autostart/kdesktop.desktop debian/tmp/opt/trinity/share/config.kcfg/kdesktop.kcfg -debian/tmp/opt/trinity/share/config.kcfg/klaunch.kcfg +debian/tmp/opt/trinity/share/config.kcfg/tdelaunch.kcfg debian/tmp/opt/trinity/share/config.kcfg/kwebdesktop.kcfg debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/error.png diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff deleted file mode 100644 index 59345d518..000000000 --- a/ubuntu/precise/tdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff +++ /dev/null @@ -1,7 +0,0 @@ ---- tdebase/kcontrol/kfontinst/viewpart/kfontview.desktop -+++ tdebase/kcontrol/kfontinst/viewpart/kfontview.desktop -@@ -71,3 +71,4 @@ - Terminal=false - InitialPreference=1 - Categories=Qt;TDE;Graphics; -+NoDisplay=true diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff new file mode 100644 index 000000000..a9123cf3b --- /dev/null +++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff @@ -0,0 +1,7 @@ +--- tdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop ++++ tdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop +@@ -71,3 +71,4 @@ + Terminal=false + InitialPreference=1 + Categories=Qt;TDE;Graphics; ++NoDisplay=true diff --git a/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install b/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install index ae518054b..3cd4f2947 100644 --- a/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/etc/trinity/kshorturifilterrc +debian/tmp/etc/trinity/tdeshorturifilterrc debian/tmp/opt/trinity/share/applnk/.hidden/battery.desktop debian/tmp/opt/trinity/share/applnk/.hidden/bwarning.desktop debian/tmp/opt/trinity/share/applnk/.hidden/cwarning.desktop @@ -28,7 +28,7 @@ debian/tmp/opt/trinity/share/apps/kcmkeys/win4.kksrc debian/tmp/opt/trinity/share/apps/kcmkeys/wm3.kksrc debian/tmp/opt/trinity/share/apps/kcmlocale/pics/background.png debian/tmp/opt/trinity/share/apps/tdeconf_update/convertShortcuts.pl -debian/tmp/opt/trinity/share/apps/tdeconf_update/kaccel.upd +debian/tmp/opt/trinity/share/apps/tdeconf_update/tdeaccel.upd debian/tmp/opt/trinity/share/apps/tdeconf_update/kcmdisplayrc.upd debian/tmp/opt/trinity/share/apps/tdeconf_update/kuriikwsfilter.upd debian/tmp/opt/trinity/share/apps/tdeconf_update/mouse_cursor_theme.upd @@ -103,8 +103,8 @@ debian/tmp/opt/trinity/share/apps/kdisplay/color-schemes/Windows2000.kcsrc debian/tmp/opt/trinity/share/apps/kdisplay/color-schemes/Windows95.kcsrc debian/tmp/opt/trinity/share/apps/kdisplay/color-schemes/WindowsXP.kcsrc debian/tmp/opt/trinity/share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc -debian/tmp/opt/trinity/share/apps/kfontview/kfontviewpart.rc -debian/tmp/opt/trinity/share/apps/kfontview/kfontviewui.rc +debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewpart.rc +debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewui.rc debian/tmp/opt/trinity/share/apps/kinfocenter/kinfocenterui.rc debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml diff --git a/ubuntu/precise/tdebase/debian/tdebase-trinity-dev.install b/ubuntu/precise/tdebase/debian/tdebase-trinity-dev.install index 80fe5d689..311603e9d 100644 --- a/ubuntu/precise/tdebase/debian/tdebase-trinity-dev.install +++ b/ubuntu/precise/tdebase/debian/tdebase-trinity-dev.install @@ -69,8 +69,8 @@ debian/tmp/opt/trinity/lib/libtdeinit_twin.la debian/tmp/opt/trinity/lib/libtdeinit_twin_rules_dialog.la debian/tmp/opt/trinity/lib/libtdeinit_kwrite.la debian/tmp/opt/trinity/lib/libtdeinit_kxkb.la -debian/tmp/opt/trinity/lib/libkfontinst.la -debian/tmp/opt/trinity/lib/libkfontinst.so +debian/tmp/opt/trinity/lib/libtdefontinst.la +debian/tmp/opt/trinity/lib/libtdefontinst.so debian/tmp/opt/trinity/lib/libkhotkeys_shared.la debian/tmp/opt/trinity/lib/libkhotkeys_shared.so debian/tmp/opt/trinity/lib/libkickermain.la |