Update Debian and Ubuntu packaging for latest GIT

6 files changed, 25 insertions, 25 deletions

diff --git a/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install
index 7cea4b5cd..06547acdc 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/kcontrol-kde3.install
@@ -2,8 +2,8 @@ debian/tmp/opt/kde3/bin/kaccess
 debian/tmp/opt/kde3/bin/kcontrol
 debian/tmp/opt/kde3/bin/kdeinstallktheme
 debian/tmp/opt/kde3/bin/keditfiletype
-debian/tmp/opt/kde3/bin/kfontinst
-debian/tmp/opt/kde3/bin/kfontview
+debian/tmp/opt/kde3/bin/tdefontinst
+debian/tmp/opt/kde3/bin/tdefontview
 debian/tmp/opt/kde3/bin/kinfocenter
 debian/tmp/opt/kde3/bin/klocaldomainurifilterhelper
 debian/tmp/opt/kde3/bin/tderandrtray
@@ -112,10 +112,10 @@ debian/tmp/opt/kde3/lib/kde3/tdeio_fonts.la
 debian/tmp/opt/kde3/lib/kde3/tdeio_fonts.so
 debian/tmp/opt/kde3/lib/kde3/kstyle_keramik_config.la
 debian/tmp/opt/kde3/lib/kde3/kstyle_keramik_config.so
-debian/tmp/opt/kde3/lib/kde3/libkfontviewpart.la
-debian/tmp/opt/kde3/lib/kde3/libkfontviewpart.so
-debian/tmp/opt/kde3/lib/kde3/libkshorturifilter.la
-debian/tmp/opt/kde3/lib/kde3/libkshorturifilter.so
+debian/tmp/opt/kde3/lib/kde3/libtdefontviewpart.la
+debian/tmp/opt/kde3/lib/kde3/libtdefontviewpart.so
+debian/tmp/opt/kde3/lib/kde3/libtdeshorturifilter.la
+debian/tmp/opt/kde3/lib/kde3/libtdeshorturifilter.so
 debian/tmp/opt/kde3/lib/kde3/libkuriikwsfilter.la
 debian/tmp/opt/kde3/lib/kde3/libkuriikwsfilter.so
 debian/tmp/opt/kde3/lib/kde3/libkurisearchfilter.la
@@ -124,8 +124,8 @@ debian/tmp/opt/kde3/lib/kde3/liblocaldomainurifilter.la
 debian/tmp/opt/kde3/lib/kde3/liblocaldomainurifilter.so
 debian/tmp/opt/kde3/lib/libkdeinit_kaccess.so
 debian/tmp/opt/kde3/lib/libkdeinit_kcontrol.so
-debian/tmp/opt/kde3/lib/libkfontinst.so.0
-debian/tmp/opt/kde3/lib/libkfontinst.so.0.0.0
+debian/tmp/opt/kde3/lib/libtdefontinst.so.0
+debian/tmp/opt/kde3/lib/libtdefontinst.so.0.0.0
 debian/tmp/opt/kde3/share/applications/kde/arts.desktop
 debian/tmp/opt/kde3/share/applications/kde/background.desktop
 debian/tmp/opt/kde3/share/applications/kde/bell.desktop
@@ -167,7 +167,7 @@ debian/tmp/opt/kde3/share/applications/kde/kcmview1394.desktop
 debian/tmp/opt/kde3/share/applications/kde/KControl.desktop
 debian/tmp/opt/kde3/share/applications/kde/tdm.desktop
 debian/tmp/opt/kde3/share/applications/kde/keys.desktop
-debian/tmp/opt/kde3/share/applications/kde/kfontview.desktop
+debian/tmp/opt/kde3/share/applications/kde/tdefontview.desktop
 debian/tmp/opt/kde3/share/applications/kde/tdehtml_behavior.desktop
 debian/tmp/opt/kde3/share/applications/kde/tdehtml_fonts.desktop
 debian/tmp/opt/kde3/share/applications/kde/tdehtml_java_js.desktop
@@ -228,8 +228,8 @@ debian/tmp/opt/kde3/share/services/fonts.protocol
 debian/tmp/opt/kde3/share/services/fontthumbnail.desktop
 debian/tmp/opt/kde3/share/services/kaccess.desktop
 debian/tmp/opt/kde3/share/services/tdefile_font.desktop
-debian/tmp/opt/kde3/share/services/kfontviewpart.desktop
-debian/tmp/opt/kde3/share/services/kshorturifilter.desktop
+debian/tmp/opt/kde3/share/services/tdefontviewpart.desktop
+debian/tmp/opt/kde3/share/services/tdeshorturifilter.desktop
 debian/tmp/opt/kde3/share/services/kuriikwsfilter.desktop
 debian/tmp/opt/kde3/share/services/kurisearchfilter.desktop
 debian/tmp/opt/kde3/share/services/localdomainurifilter.desktop
diff --git a/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install
index 19988ea37..0332e6d73 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/kdebase-data-kde3.install
@@ -1,4 +1,4 @@
-debian/tmp/etc/kde3/kshorturifilterrc
+debian/tmp/etc/kde3/tdeshorturifilterrc
 debian/tmp/opt/kde3/share/applnk/.hidden/battery.desktop
 debian/tmp/opt/kde3/share/applnk/.hidden/bwarning.desktop
 debian/tmp/opt/kde3/share/applnk/.hidden/cwarning.desktop
@@ -28,7 +28,7 @@ debian/tmp/opt/kde3/share/apps/kcmkeys/win4.kksrc
 debian/tmp/opt/kde3/share/apps/kcmkeys/wm3.kksrc
 debian/tmp/opt/kde3/share/apps/kcmlocale/pics/background.png
 debian/tmp/opt/kde3/share/apps/tdeconf_update/convertShortcuts.pl
-debian/tmp/opt/kde3/share/apps/tdeconf_update/kaccel.upd
+debian/tmp/opt/kde3/share/apps/tdeconf_update/tdeaccel.upd
 debian/tmp/opt/kde3/share/apps/tdeconf_update/kcmdisplayrc.upd
 debian/tmp/opt/kde3/share/apps/tdeconf_update/kuriikwsfilter.upd
 debian/tmp/opt/kde3/share/apps/tdeconf_update/mouse_cursor_theme.upd
@@ -91,8 +91,8 @@ debian/tmp/opt/kde3/share/apps/kdisplay/color-schemes/Windows2000.kcsrc
 debian/tmp/opt/kde3/share/apps/kdisplay/color-schemes/Windows95.kcsrc
 debian/tmp/opt/kde3/share/apps/kdisplay/color-schemes/WindowsXP.kcsrc
 debian/tmp/opt/kde3/share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc
-debian/tmp/opt/kde3/share/apps/kfontview/kfontviewpart.rc
-debian/tmp/opt/kde3/share/apps/kfontview/kfontviewui.rc
+debian/tmp/opt/kde3/share/apps/tdefontview/tdefontviewpart.rc
+debian/tmp/opt/kde3/share/apps/tdefontview/tdefontviewui.rc
 debian/tmp/opt/kde3/share/apps/kinfocenter/kinfocenterui.rc
 debian/tmp/opt/kde3/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png
 debian/tmp/opt/kde3/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml
diff --git a/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3-dev.install b/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3-dev.install
index 4b611029f..757b2a25f 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3-dev.install
+++ b/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3-dev.install
@@ -69,8 +69,8 @@ debian/tmp/opt/kde3/lib/libkdeinit_kwin.la
 debian/tmp/opt/kde3/lib/libkdeinit_kwin_rules_dialog.la
 debian/tmp/opt/kde3/lib/libkdeinit_kwrite.la
 debian/tmp/opt/kde3/lib/libkdeinit_kxkb.la
-debian/tmp/opt/kde3/lib/libkfontinst.la
-debian/tmp/opt/kde3/lib/libkfontinst.so
+debian/tmp/opt/kde3/lib/libtdefontinst.la
+debian/tmp/opt/kde3/lib/libtdefontinst.so
 debian/tmp/opt/kde3/lib/libkhotkeys_shared.la
 debian/tmp/opt/kde3/lib/libkhotkeys_shared.so
 debian/tmp/opt/kde3/lib/libkickermain.la
diff --git a/ubuntu/maverick_automake/kdebase/debian/kdesktop-kde3.install b/ubuntu/maverick_automake/kdebase/debian/kdesktop-kde3.install
index 69baa4338..6beda560d 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kdesktop-kde3.install
+++ b/ubuntu/maverick_automake/kdebase/debian/kdesktop-kde3.install
@@ -45,6 +45,6 @@ debian/tmp/opt/kde3/share/apps/kdesktop/Desktop/Web_Browser
 debian/tmp/opt/kde3/share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
 debian/tmp/opt/kde3/share/autostart/kdesktop.desktop
 debian/tmp/opt/kde3/share/config.kcfg/kdesktop.kcfg
-debian/tmp/opt/kde3/share/config.kcfg/klaunch.kcfg
+debian/tmp/opt/kde3/share/config.kcfg/tdelaunch.kcfg
 debian/tmp/opt/kde3/share/config.kcfg/kwebdesktop.kcfg
 debian/tmp/opt/kde3/share/icons/crystalsvg/32x32/apps/error.png
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff
deleted file mode 100644
index 626edd77a..000000000
--- a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdebase/kcontrol/kfontinst/viewpart/kfontview.desktop	2005-03-17 02:18:04.198547424 +0000
-+++ kdebase/kcontrol/kfontinst/viewpart/kfontview.desktop	2005-03-17 02:18:12.320312728 +0000
-@@ -71,3 +71,4 @@
- Terminal=false
- InitialPreference=1
- Categories=Qt;KDE;Utility;X-KDE-More;
-+NoDisplay=true
diff --git a/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
new file mode 100644
index 000000000..8603d5661
--- /dev/null
+++ b/ubuntu/maverick_automake/kdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
@@ -0,0 +1,7 @@
+--- kdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop	2005-03-17 02:18:04.198547424 +0000
++++ kdebase/kcontrol/tdefontinst/viewpart/tdefontview.desktop	2005-03-17 02:18:12.320312728 +0000
+@@ -71,3 +71,4 @@
+ Terminal=false
+ InitialPreference=1
+ Categories=Qt;KDE;Utility;X-KDE-More;
++NoDisplay=true