summaryrefslogtreecommitdiffstats
path: root/ubuntu/lucid_automake
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 18:51:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 18:51:31 -0600
commita60fb3aff20c1280342b61c6cac80a63a6952aaa (patch)
treed66b269fe61e815bc6ac42fede8bdbc46857ca09 /ubuntu/lucid_automake
parent41d4f7f49b1289a5186248b60ac8d736e77cba99 (diff)
downloadtde-packaging-a60fb3aff20c1280342b61c6cac80a63a6952aaa.tar.gz
tde-packaging-a60fb3aff20c1280342b61c6cac80a63a6952aaa.zip
Update Debian and Ubuntu packaging for latest GIT
Diffstat (limited to 'ubuntu/lucid_automake')
-rw-r--r--ubuntu/lucid_automake/applications/koffice/debian/kplato-kde3.install4
-rw-r--r--ubuntu/lucid_automake/applications/kradio/debian/changelog18
-rw-r--r--ubuntu/lucid_automake/applications/kradio/debian/control6
-rw-r--r--ubuntu/lucid_automake/applications/kradio/debian/copyright6
-rw-r--r--ubuntu/lucid_automake/applications/kradio/debian/docs4
-rw-r--r--ubuntu/lucid_automake/applications/kradio/debian/manpages2
-rw-r--r--ubuntu/lucid_automake/applications/kradio/debian/menu6
-rwxr-xr-xubuntu/lucid_automake/applications/kradio/debian/rules48
-rw-r--r--ubuntu/lucid_automake/applications/kradio/debian/tderadio.1 (renamed from ubuntu/lucid_automake/applications/kradio/debian/kradio.1)8
-rw-r--r--ubuntu/lucid_automake/applications/kradio/debian/watch2
-rw-r--r--ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.install22
-rw-r--r--ubuntu/lucid_automake/kdebase/debian/kdebase-data-kde3.install8
-rw-r--r--ubuntu/lucid_automake/kdebase/debian/kdebase-kde3-dev.install4
-rw-r--r--ubuntu/lucid_automake/kdebase/debian/kdesktop-kde3.install2
-rw-r--r--ubuntu/lucid_automake/kdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff7
-rw-r--r--ubuntu/lucid_automake/kdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff7
-rw-r--r--ubuntu/lucid_automake/kdelibs/debian/changelog8
-rw-r--r--ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install10
-rw-r--r--ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install58
-rw-r--r--ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff4
-rw-r--r--ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install4
-rw-r--r--ubuntu/lucid_automake/kdewebdev/debian/kommander-kde3.install2
22 files changed, 120 insertions, 120 deletions
diff --git a/ubuntu/lucid_automake/applications/koffice/debian/kplato-kde3.install b/ubuntu/lucid_automake/applications/koffice/debian/kplato-kde3.install
index 5314780b5..d463b2095 100644
--- a/ubuntu/lucid_automake/applications/koffice/debian/kplato-kde3.install
+++ b/ubuntu/lucid_automake/applications/koffice/debian/kplato-kde3.install
@@ -23,8 +23,8 @@ debian/tmp/opt/kde3/share/apps/kplato/kplato.rc
debian/tmp/opt/kde3/share/apps/kplato/kplato_readonly.rc
debian/tmp/opt/kde3/share/apps/kplato/reports/resourcelist.desktop
debian/tmp/opt/kde3/share/apps/kplato/reports/.source/resourcelist.ktf
-debian/tmp/opt/kde3/share/apps/kplato/reports/.source/tasklist.ktf
-debian/tmp/opt/kde3/share/apps/kplato/reports/tasklist.desktop
+debian/tmp/opt/kde3/share/apps/kplato/reports/.source/tastdelist.ktf
+debian/tmp/opt/kde3/share/apps/kplato/reports/tastdelist.desktop
debian/tmp/opt/kde3/share/apps/kplato/templates/Simple/8HourDay-40HourWeek.desktop
debian/tmp/opt/kde3/share/apps/kplato/templates/Simple/.directory
debian/tmp/opt/kde3/share/apps/kplato/templates/Simple/Plain.desktop
diff --git a/ubuntu/lucid_automake/applications/kradio/debian/changelog b/ubuntu/lucid_automake/applications/kradio/debian/changelog
index db22c5984..6a9a420bc 100644
--- a/ubuntu/lucid_automake/applications/kradio/debian/changelog
+++ b/ubuntu/lucid_automake/applications/kradio/debian/changelog
@@ -1,10 +1,10 @@
-kradio-kde3 (0.1.1.1~0ubuntu0) karmic; urgency=low
+tderadio-kde3 (0.1.1.1~0ubuntu0) karmic; urgency=low
* Karmic upload
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 22 Nov 2009 23:25:00 -6000
-kradio (0.1.1.1~20061112-4) unstable; urgency=low
+tderadio (0.1.1.1~20061112-4) unstable; urgency=low
* QA upload ; orphaning after discussion with maintainer
* fix up autoconf things (Closes: 543013)
@@ -17,14 +17,14 @@ kradio (0.1.1.1~20061112-4) unstable; urgency=low
-- Sune Vuorela <debian@pusling.com> Wed, 02 Sep 2009 00:45:55 +0200
-kradio (0.1.1.1~20061112-3.1) unstable; urgency=low
+tderadio (0.1.1.1~20061112-3.1) unstable; urgency=low
* Non-maintainer upload.
* Fix gcc-4.3 FTBFS, patch by Kibi (Closes: #455390)
-- Marc 'HE' Brockschmidt <he@debian.org> Sun, 16 Mar 2008 19:00:02 +0100
-kradio (0.1.1.1~20061112-3) unstable; urgency=low
+tderadio (0.1.1.1~20061112-3) unstable; urgency=low
* Modify build-system to use automake
- Remove build-depends against unsermake as it shall be removed from
@@ -39,13 +39,13 @@ kradio (0.1.1.1~20061112-3) unstable; urgency=low
-- Steffen Joeris <white@debian.org> Wed, 20 Jun 2007 22:14:59 +0200
-kradio (0.1.1.1~20061112-2) unstable; urgency=low
+tderadio (0.1.1.1~20061112-2) unstable; urgency=low
* Upload to unstable
-- Steffen Joeris <white@debian.org> Mon, 23 Apr 2007 05:59:03 +1000
-kradio (0.1.1.1~20061112-1) experimental; urgency=low
+tderadio (0.1.1.1~20061112-1) experimental; urgency=low
* New upstream release
* Fix small typo in debian/copyright
@@ -54,7 +54,7 @@ kradio (0.1.1.1~20061112-1) experimental; urgency=low
-- Steffen Joeris <white@debian.org> Sun, 7 Jan 2007 18:42:05 +0100
-kradio (0.1.1.1~20060920-1) unstable; urgency=low
+tderadio (0.1.1.1~20060920-1) unstable; urgency=low
* New upstream version
* Drop 10-configure.dpatch
@@ -65,13 +65,13 @@ kradio (0.1.1.1~20060920-1) unstable; urgency=low
-- Steffen Joeris <steffen.joeris@skolelinux.de> Tue, 3 Oct 2006 15:01:07 +1000
-kradio (0.1beta1.0snapshot20051127-2) unstable; urgency=low
+tderadio (0.1beta1.0snapshot20051127-2) unstable; urgency=low
* Upload to unstable, no changes
-- Steffen Joeris <steffen.joeris@skolelinux.de> Sun, 5 Feb 2006 18:42:11 +0100
-kradio (0.1beta1.0snapshot20051127-1) experimental; urgency=low
+tderadio (0.1beta1.0snapshot20051127-1) experimental; urgency=low
* Initial release for Debian (Closes: #341954)
* drop debian dir from upstream and use own debian dir
diff --git a/ubuntu/lucid_automake/applications/kradio/debian/control b/ubuntu/lucid_automake/applications/kradio/debian/control
index 4403795d0..27fee13b6 100644
--- a/ubuntu/lucid_automake/applications/kradio/debian/control
+++ b/ubuntu/lucid_automake/applications/kradio/debian/control
@@ -1,12 +1,12 @@
-Source: kradio-kde3
+Source: tderadio-kde3
Section: sound
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Build-Depends: debhelper (>= 5), kdelibs4-kde3-dev, liblircclient-dev, libsndfile1-dev, imagemagick, automake1.11-kde3, autoconf2.63, libtool, libltdl-dev
Standards-Version: 3.8.3
-Homepage: http://kradio.sourceforge.net/
+Homepage: http://tderadio.sourceforge.net/
-Package: kradio-kde3
+Package: tderadio-kde3
Architecture: any
Depends: ${shlibs:Depends}
Description: Comfortable Radio Application for KDE [KDE3]
diff --git a/ubuntu/lucid_automake/applications/kradio/debian/copyright b/ubuntu/lucid_automake/applications/kradio/debian/copyright
index 932ce3d04..365f66795 100644
--- a/ubuntu/lucid_automake/applications/kradio/debian/copyright
+++ b/ubuntu/lucid_automake/applications/kradio/debian/copyright
@@ -1,7 +1,7 @@
This package was debianized by Ernst Martin Witte <emw@users.sourceforge.net> on
Sun, 14 Sep 2003 13:31:07 +0200.
-It was downloaded from http://kradio.sourceforge.net/
+It was downloaded from http://tderadio.sourceforge.net/
Copyright Holder: Ernst Martin Witte, Klas Kalass (C) 2002-2003
Additional copyright information:
@@ -15,8 +15,8 @@ Additional copyright information:
The following files have the copyright notice
Trolltech AS Copyright (C) 1996-1997
-kradio3/plugins/gui-quickbar/buttonflowlayout.h
-kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
+tderadio3/plugins/gui-quickbar/buttonflowlayout.h
+tderadio3/plugins/gui-quickbar/buttonflowlayout.cpp
License:
diff --git a/ubuntu/lucid_automake/applications/kradio/debian/docs b/ubuntu/lucid_automake/applications/kradio/debian/docs
index bc4a4e465..0ecc1e4f1 100644
--- a/ubuntu/lucid_automake/applications/kradio/debian/docs
+++ b/ubuntu/lucid_automake/applications/kradio/debian/docs
@@ -1,2 +1,2 @@
-kradio3/README
-kradio3/TODO
+tderadio3/README
+tderadio3/TODO
diff --git a/ubuntu/lucid_automake/applications/kradio/debian/manpages b/ubuntu/lucid_automake/applications/kradio/debian/manpages
index f37e7cfcf..4760e939e 100644
--- a/ubuntu/lucid_automake/applications/kradio/debian/manpages
+++ b/ubuntu/lucid_automake/applications/kradio/debian/manpages
@@ -1,2 +1,2 @@
-debian/kradio.1
+debian/tderadio.1
debian/convert-presets.1
diff --git a/ubuntu/lucid_automake/applications/kradio/debian/menu b/ubuntu/lucid_automake/applications/kradio/debian/menu
index bae72be5f..095cac68f 100644
--- a/ubuntu/lucid_automake/applications/kradio/debian/menu
+++ b/ubuntu/lucid_automake/applications/kradio/debian/menu
@@ -1,7 +1,7 @@
-?package(kradio):needs="X11" \
+?package(tderadio):needs="X11" \
section="Applications/TV and Radio" \
hints="KDE" \
title="TDERadio" \
longtitle="K-Radio Application" \
- command="/opt/kde3/bin/kradio" \
- icon="/opt/kde3/share/pixmaps/kradio.xpm"
+ command="/opt/kde3/bin/tderadio" \
+ icon="/opt/kde3/share/pixmaps/tderadio.xpm"
diff --git a/ubuntu/lucid_automake/applications/kradio/debian/rules b/ubuntu/lucid_automake/applications/kradio/debian/rules
index 71ffdf9b0..7082e13e9 100755
--- a/ubuntu/lucid_automake/applications/kradio/debian/rules
+++ b/ubuntu/lucid_automake/applications/kradio/debian/rules
@@ -27,7 +27,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-debian/kradio.xpm: kradio3/icons/hi32-app-kradio.png
+debian/tderadio.xpm: tderadio3/icons/hi32-app-tderadio.png
convert $< $@
configure:
@@ -52,7 +52,7 @@ config.status: configure
-build: build-stamp debian/kradio.xpm
+build: build-stamp debian/tderadio.xpm
build-stamp: config.status
dh_testdir
@@ -65,10 +65,10 @@ clean:
dh_testroot
rm -f build-stamp
rm -f debian/debiandirs
- rm -f debian/kradio.xpm
+ rm -f debian/tderadio.xpm
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
-# [ ! -kradio3/src && $(MAKE) clean
+# [ ! -tderadio3/src && $(MAKE) clean
for i in `find | grep .gmo` ; do rm -f $$i ; done
find -name Makefile.in -delete
rm -f config.sub config.guess configure
@@ -80,25 +80,25 @@ install:
dh_testroot
dh_clean -k
dh_installdirs
- # Add here commands to install the package into debian/kradio.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kradio-kde3
- install -D -m 644 debian/kradio.xpm debian/kradio-kde3/opt/kde3/share/pixmaps/kradio.xpm
-# chrpath -d debian/kradio/usr/lib/kradio/plugins/libalsa-sound.so
-# chrpath -d debian/kradio/usr/lib/kradio/plugins/libtimeshifter.so
-# chrpath -d debian/kradio/usr/lib/kradio/plugins/libstandard-display.so
-# chrpath -d debian/kradio/usr/lib/kradio/plugins/liblirc.so
-# chrpath -d debian/kradio/usr/lib/kradio/plugins/libstreaming.so
-# chrpath -d debian/kradio/usr/lib/kradio/plugins/libradio.so
-# chrpath -d debian/kradio/usr/lib/kradio/plugins/libquickbar.so
-# chrpath -d debian/kradio/usr/lib/kradio/plugins/librecording.so
-# chrpath -d debian/kradio/usr/lib/kradio/plugins/libv4lradio.so
-# chrpath -d debian/kradio/usr/lib/kradio/plugins/libtimecontrol.so
-# chrpath -d debian/kradio/usr/lib/kradio/plugins/libdocking-menu.so
-# chrpath -d debian/kradio/usr/lib/kradio/plugins/liboss-sound.so
-# chrpath -d debian/kradio/usr/lib/kradio/plugins/liberror-log.so
-# chrpath -d debian/kradio/usr/lib/kradio/plugins/libsoundserver.so
-# chrpath -d debian/kradio/usr/bin/convert-presets
-# chrpath -d debian/kradio/usr/bin/kradio
+ # Add here commands to install the package into debian/tderadio.
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tderadio-kde3
+ install -D -m 644 debian/tderadio.xpm debian/tderadio-kde3/opt/kde3/share/pixmaps/tderadio.xpm
+# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libalsa-sound.so
+# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libtimeshifter.so
+# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libstandard-display.so
+# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liblirc.so
+# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libstreaming.so
+# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libradio.so
+# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libquickbar.so
+# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/librecording.so
+# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libv4lradio.so
+# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libtimecontrol.so
+# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libdocking-menu.so
+# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liboss-sound.so
+# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liberror-log.so
+# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libsoundserver.so
+# chrpath -d debian/tderadio/usr/bin/convert-presets
+# chrpath -d debian/tderadio/usr/bin/tderadio
# Build architecture-independent files here.
binary-indep: build install
@@ -108,7 +108,7 @@ binary-indep: build install
binary-arch: build install
dh_testdir
dh_testroot
- dh_installchangelogs kradio3/ChangeLog
+ dh_installchangelogs tderadio3/ChangeLog
dh_installdocs
dh_installmenu
dh_installman
diff --git a/ubuntu/lucid_automake/applications/kradio/debian/kradio.1 b/ubuntu/lucid_automake/applications/kradio/debian/tderadio.1
index 47fdb40d7..04a9f8c9c 100644
--- a/ubuntu/lucid_automake/applications/kradio/debian/kradio.1
+++ b/ubuntu/lucid_automake/applications/kradio/debian/tderadio.1
@@ -1,10 +1,10 @@
.\" This file was generated by kdemangen.pl
.TH KRADIO 1 "Dec 2005" "K Desktop Environment" "TDERadio"
.SH NAME
-kradio
+tderadio
\- TDERadio
.SH SYNOPSIS
-kradio [Qt\-options] [KDE\-options]
+tderadio [Qt\-options] [KDE\-options]
.SH DESCRIPTION
TDERadio
.SH OPTIONS
@@ -131,9 +131,9 @@ mirrors the whole layout of widgets
.SH SEE ALSO
Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kradio/
+.BR help:/tderadio/
directly into konqueror or you can run
-.BR "`khelpcenter help:/kradio/'"
+.BR "`khelpcenter help:/tderadio/'"
from the command-line.
.br
.SH AUTHORS
diff --git a/ubuntu/lucid_automake/applications/kradio/debian/watch b/ubuntu/lucid_automake/applications/kradio/debian/watch
index 49f735f61..033fb78b0 100644
--- a/ubuntu/lucid_automake/applications/kradio/debian/watch
+++ b/ubuntu/lucid_automake/applications/kradio/debian/watch
@@ -3,4 +3,4 @@
# to check for upstream updates and more.
# Site Directory Pattern Version Script
version=2
-kradio.sourceforge.net /download kradio-(.*)\.tar\.gz debian uupdate
+tderadio.sourceforge.net /download tderadio-(.*)\.tar\.gz debian uupdate
diff --git a/ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.install b/ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.install
index 7cea4b5cd..06547acdc 100644
--- a/ubuntu/lucid_automake/kdebase/debian/kcontrol-kde3.install
+++ b/ubuntu/lucid_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/lucid_automake/kdebase/debian/kdebase-data-kde3.install b/ubuntu/lucid_automake/kdebase/debian/kdebase-data-kde3.install
index 19988ea37..0332e6d73 100644
--- a/ubuntu/lucid_automake/kdebase/debian/kdebase-data-kde3.install
+++ b/ubuntu/lucid_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/lucid_automake/kdebase/debian/kdebase-kde3-dev.install b/ubuntu/lucid_automake/kdebase/debian/kdebase-kde3-dev.install
index 4b611029f..757b2a25f 100644
--- a/ubuntu/lucid_automake/kdebase/debian/kdebase-kde3-dev.install
+++ b/ubuntu/lucid_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/lucid_automake/kdebase/debian/kdesktop-kde3.install b/ubuntu/lucid_automake/kdebase/debian/kdesktop-kde3.install
index 69baa4338..6beda560d 100644
--- a/ubuntu/lucid_automake/kdebase/debian/kdesktop-kde3.install
+++ b/ubuntu/lucid_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/lucid_automake/kdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff b/ubuntu/lucid_automake/kdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff
deleted file mode 100644
index 626edd77a..000000000
--- a/ubuntu/lucid_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/lucid_automake/kdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/lucid_automake/kdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
new file mode 100644
index 000000000..8603d5661
--- /dev/null
+++ b/ubuntu/lucid_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
diff --git a/ubuntu/lucid_automake/kdelibs/debian/changelog b/ubuntu/lucid_automake/kdelibs/debian/changelog
index b1123744c..28baa837e 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/changelog
+++ b/ubuntu/lucid_automake/kdelibs/debian/changelog
@@ -432,7 +432,7 @@ kdelibs (4:3.5.8-0ubuntu4) hardy; urgency=low
kdelibs (4:3.5.8-0ubuntu3.1) gutsy-proposed; urgency=low
- * Add kubuntu_94_kselectaction.diff Closes: LP #155144
+ * Add kubuntu_94_tdeselectaction.diff Closes: LP #155144
Editable TDESelectAction stopped working for custom values
-- Jonathan Riddell <jriddell@ubuntu.com> Sun, 21 Oct 2007 00:09:25 +0100
@@ -1921,7 +1921,7 @@ kdelibs (4:3.4.2-2) unstable; urgency=low
kdelibs (4:3.4.2-1) unstable; urgency=low
* New upstream release. Includes a forward declaration of KXMLGUIClient in
- kactioncollection.h, which makes gcc-4.0 happy and thus closes: #317543,
+ tdeactioncollection.h, which makes gcc-4.0 happy and thus closes: #317543,
#318017, #319154, #323093 (arson, smb4k, kile and amarok FTBFS).
* KDE_3_4_BRANCH update.
@@ -2240,7 +2240,7 @@ kdelibs (4:3.3.2-5) unstable; urgency=medium
* Add GFDL to debian/copyright.
- * Add another kaccel patch that fixes non-English keyboards on
+ * Add another tdeaccel patch that fixes non-English keyboards on
SunRay terminals. Thanks to Nikita Youshchenko. (Closes: #301971)
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 22 Apr 2005 11:21:11 -0400
@@ -2354,7 +2354,7 @@ kdelibs (4:3.3.2-1) unstable; urgency=medium
* Add patch to change the group set by KDE CUPS configurator to Debian's
default, lpadmin, rather than sys. (Closes: #263430)
- * Add kaccel hack that works around a Konqueror crash with Russian keyboards.
+ * Add tdeaccel hack that works around a Konqueror crash with Russian keyboards.
(Closes: #287566)
* Change debian/copyright file to refer to licenses, instead of copyright,
diff --git a/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install b/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install
index a50a89f4b..eee340dc0 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install
+++ b/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install
@@ -186,7 +186,7 @@ debian/tmp/opt/kde3/share/apps/kdeui/about/top-middle.png
debian/tmp/opt/kde3/share/apps/kdeui/pics/aboutkde.png
debian/tmp/opt/kde3/share/apps/kdeui/pics/ktip-background.png
debian/tmp/opt/kde3/share/apps/kdeui/pics/ktip-bulb.png
-debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kactionselector.png
+debian/tmp/opt/kde3/share/apps/kdewidgets/pics/tdeactionselector.png
debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kactivelabel.png
debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kcharselect.png
debian/tmp/opt/kde3/share/apps/kdewidgets/pics/tdecmodule.png
@@ -202,8 +202,8 @@ debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kdoublenuminput.png
debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kdoublespinbox.png
debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kdualcolorbutton.png
debian/tmp/opt/kde3/share/apps/kdewidgets/pics/keditlistbox.png
-debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kfontcombo.png
-debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kfontrequester.png
+debian/tmp/opt/kde3/share/apps/kdewidgets/pics/tdefontcombo.png
+debian/tmp/opt/kde3/share/apps/kdewidgets/pics/tdefontrequester.png
debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kgradientselector.png
debian/tmp/opt/kde3/share/apps/kdewidgets/pics/khistorycombo.png
debian/tmp/opt/kde3/share/apps/kdewidgets/pics/khsselector.png
@@ -214,8 +214,8 @@ debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kintspinbox.png
debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kkeybutton.png
debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kled.png
debian/tmp/opt/kde3/share/apps/kdewidgets/pics/klineedit.png
-debian/tmp/opt/kde3/share/apps/kdewidgets/pics/klistbox.png
-debian/tmp/opt/kde3/share/apps/kdewidgets/pics/klistview.png
+debian/tmp/opt/kde3/share/apps/kdewidgets/pics/tdelistbox.png
+debian/tmp/opt/kde3/share/apps/kdewidgets/pics/tdelistview.png
debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kpalettetable.png
debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kpasswordedit.png
debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kprogress.png
diff --git a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install
index 9b33d9723..94ff0f7c4 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install
@@ -108,15 +108,15 @@ debian/tmp/opt/kde3/include/tde/kaboutapplication.h
debian/tmp/opt/kde3/include/tde/kaboutdata.h
debian/tmp/opt/kde3/include/tde/kaboutdialog.h
debian/tmp/opt/kde3/include/tde/kaboutkde.h
-debian/tmp/opt/kde3/include/tde/kaccelgen.h
-debian/tmp/opt/kde3/include/tde/kaccel.h
-debian/tmp/opt/kde3/include/tde/kaccelmanager.h
+debian/tmp/opt/kde3/include/tde/tdeaccelgen.h
+debian/tmp/opt/kde3/include/tde/tdeaccel.h
+debian/tmp/opt/kde3/include/tde/tdeaccelmanager.h
debian/tmp/opt/kde3/include/tde/kacl.h
-debian/tmp/opt/kde3/include/tde/kactionclasses.h
-debian/tmp/opt/kde3/include/tde/kactioncollection.h
-debian/tmp/opt/kde3/include/tde/kaction.h
-debian/tmp/opt/kde3/include/tde/kactionselector.h
-debian/tmp/opt/kde3/include/tde/kactionshortcutlist.h
+debian/tmp/opt/kde3/include/tde/tdeactionclasses.h
+debian/tmp/opt/kde3/include/tde/tdeactioncollection.h
+debian/tmp/opt/kde3/include/tde/tdeaction.h
+debian/tmp/opt/kde3/include/tde/tdeactionselector.h
+debian/tmp/opt/kde3/include/tde/tdeactionshortcutlist.h
debian/tmp/opt/kde3/include/tde/kactivelabel.h
debian/tmp/opt/kde3/include/tde/kallocator.h
debian/tmp/opt/kde3/include/tde/kanimwidget.h
@@ -274,9 +274,9 @@ debian/tmp/opt/kde3/include/tde/kfilterbase.h
debian/tmp/opt/kde3/include/tde/kfilterdev.h
debian/tmp/opt/kde3/include/tde/kfinddialog.h
debian/tmp/opt/kde3/include/tde/kfind.h
-debian/tmp/opt/kde3/include/tde/kfontcombo.h
-debian/tmp/opt/kde3/include/tde/kfontdialog.h
-debian/tmp/opt/kde3/include/tde/kfontrequester.h
+debian/tmp/opt/kde3/include/tde/tdefontcombo.h
+debian/tmp/opt/kde3/include/tde/tdefontdialog.h
+debian/tmp/opt/kde3/include/tde/tdefontrequester.h
debian/tmp/opt/kde3/include/tde/kgenericfactory.h
debian/tmp/opt/kde3/include/tde/kgenericfactory.tcc
debian/tmp/opt/kde3/include/tde/kglobalaccel.h
@@ -376,14 +376,14 @@ debian/tmp/opt/kde3/include/tde/kled.h
debian/tmp/opt/kde3/include/tde/klibloader.h
debian/tmp/opt/kde3/include/tde/klineeditdlg.h
debian/tmp/opt/kde3/include/tde/klineedit.h
-debian/tmp/opt/kde3/include/tde/klistbox.h
-debian/tmp/opt/kde3/include/tde/klistview.h
-debian/tmp/opt/kde3/include/tde/klistviewsearchline.h
+debian/tmp/opt/kde3/include/tde/tdelistbox.h
+debian/tmp/opt/kde3/include/tde/tdelistview.h
+debian/tmp/opt/kde3/include/tde/tdelistviewsearchline.h
debian/tmp/opt/kde3/include/tde/klocale.h
debian/tmp/opt/kde3/include/tde/klockfile.h
debian/tmp/opt/kde3/include/tde/kmacroexpander.h
-debian/tmp/opt/kde3/include/tde/kmainwindow.h
-debian/tmp/opt/kde3/include/tde/kmainwindowiface.h
+debian/tmp/opt/kde3/include/tde/tdemainwindow.h
+debian/tmp/opt/kde3/include/tde/tdemainwindowiface.h
debian/tmp/opt/kde3/include/tde/kmanagerselection.h
debian/tmp/opt/kde3/include/tde/kmdcodec.h
debian/tmp/opt/kde3/include/tde/tdemdichildarea.h
@@ -444,7 +444,7 @@ debian/tmp/opt/kde3/include/tde/tdeparts/browserextension.h
debian/tmp/opt/kde3/include/tde/tdeparts/browserinterface.h
debian/tmp/opt/kde3/include/tde/tdeparts/browserrun.h
debian/tmp/opt/kde3/include/tde/tdeparts/componentfactory.h
-debian/tmp/opt/kde3/include/tde/tdeparts/dockmainwindow.h
+debian/tmp/opt/kde3/include/tde/tdeparts/doctdemainwindow.h
debian/tmp/opt/kde3/include/tde/tdeparts/event.h
debian/tmp/opt/kde3/include/tde/tdeparts/factory.h
debian/tmp/opt/kde3/include/tde/tdeparts/genericfactory.h
@@ -465,7 +465,7 @@ debian/tmp/opt/kde3/include/tde/kpixmapregionselectorwidget.h
debian/tmp/opt/kde3/include/tde/kpixmapsplitter.h
debian/tmp/opt/kde3/include/tde/kplugininfo.h
debian/tmp/opt/kde3/include/tde/kpluginselector.h
-debian/tmp/opt/kde3/include/tde/kpopupmenu.h
+debian/tmp/opt/kde3/include/tde/tdepopupmenu.h
debian/tmp/opt/kde3/include/tde/kpreviewwidgetbase.h
debian/tmp/opt/kde3/include/tde/kprintaction.h
debian/tmp/opt/kde3/include/tde/kprinter.h
@@ -481,7 +481,7 @@ debian/tmp/opt/kde3/include/tde/kprotocolmanager.h
debian/tmp/opt/kde3/include/tde/kpty.h
debian/tmp/opt/kde3/include/tde/kpushbutton.h
debian/tmp/opt/kde3/include/tde/krandomsequence.h
-debian/tmp/opt/kde3/include/tde/krecentdocument.h
+debian/tmp/opt/kde3/include/tde/tderecentdocument.h
debian/tmp/opt/kde3/include/tde/kregexpeditorinterface.h
debian/tmp/opt/kde3/include/tde/kregexp.h
debian/tmp/opt/kde3/include/tde/kremoteencoding.h
@@ -511,7 +511,7 @@ debian/tmp/opt/kde3/include/tde/ksconfig.h
debian/tmp/opt/kde3/include/tde/tdescreensaver.h
debian/tmp/opt/kde3/include/tde/tdescreensaver_vroot.h
debian/tmp/opt/kde3/include/tde/kscrollview.h
-debian/tmp/opt/kde3/include/tde/kselect.h
+debian/tmp/opt/kde3/include/tde/tdeselect.h
debian/tmp/opt/kde3/include/tde/kseparator.h
debian/tmp/opt/kde3/include/tde/kserversocket.h
debian/tmp/opt/kde3/include/tde/kservicegroup.h
@@ -525,9 +525,9 @@ debian/tmp/opt/kde3/include/tde/ksharedpixmap.h
debian/tmp/opt/kde3/include/tde/ksharedptr.h
debian/tmp/opt/kde3/include/tde/kshellcompletion.h
debian/tmp/opt/kde3/include/tde/kshell.h
-debian/tmp/opt/kde3/include/tde/kshortcutdialog.h
-debian/tmp/opt/kde3/include/tde/kshortcut.h
-debian/tmp/opt/kde3/include/tde/kshortcutlist.h
+debian/tmp/opt/kde3/include/tde/tdeshortcutdialog.h
+debian/tmp/opt/kde3/include/tde/tdeshortcut.h
+debian/tmp/opt/kde3/include/tde/tdeshortcutlist.h
debian/tmp/opt/kde3/include/tde/kshred.h
debian/tmp/opt/kde3/include/tde/ksimpleconfig.h
debian/tmp/opt/kde3/include/tde/ksmimecrypto.h
@@ -581,7 +581,7 @@ debian/tmp/opt/kde3/include/tde/kstandarddirs.h
debian/tmp/opt/kde3/include/tde/kstartupinfo.h
debian/tmp/opt/kde3/include/tde/kstaticdeleter.h
debian/tmp/opt/kde3/include/tde/kstatusbar.h
-debian/tmp/opt/kde3/include/tde/kstdaccel.h
+debian/tmp/opt/kde3/include/tde/tdestdaccel.h
debian/tmp/opt/kde3/include/tde/kstdaction.h
debian/tmp/opt/kde3/include/tde/kstddirs.h
debian/tmp/opt/kde3/include/tde/kstdguiitem.h
@@ -604,7 +604,7 @@ debian/tmp/opt/kde3/include/tde/ktempdir.h
debian/tmp/opt/kde3/include/tde/ktempfile.h
debian/tmp/opt/kde3/include/tde/ktextbrowser.h
debian/tmp/opt/kde3/include/tde/ktextedit.h
-debian/tmp/opt/kde3/include/tde/tdetexteditor/blockselectioninterface.h
+debian/tmp/opt/kde3/include/tde/tdetexteditor/bloctdeselectioninterface.h
debian/tmp/opt/kde3/include/tde/tdetexteditor/clipboardinterface.h
debian/tmp/opt/kde3/include/tde/tdetexteditor/codecompletioninterface.h
debian/tmp/opt/kde3/include/tde/tdetexteditor/configinterfaceextension.h
@@ -641,10 +641,10 @@ debian/tmp/opt/kde3/include/tde/ktimewidget.h
debian/tmp/opt/kde3/include/tde/ktimezones.h
debian/tmp/opt/kde3/include/tde/ktimezonewidget.h
debian/tmp/opt/kde3/include/tde/ktip.h
-debian/tmp/opt/kde3/include/tde/ktoolbarbutton.h
-debian/tmp/opt/kde3/include/tde/ktoolbar.h
-debian/tmp/opt/kde3/include/tde/ktoolbarlabelaction.h
-debian/tmp/opt/kde3/include/tde/ktoolbarradiogroup.h
+debian/tmp/opt/kde3/include/tde/tdetoolbarbutton.h
+debian/tmp/opt/kde3/include/tde/tdetoolbar.h
+debian/tmp/opt/kde3/include/tde/tdetoolbarlabelaction.h
+debian/tmp/opt/kde3/include/tde/tdetoolbarradiogroup.h
debian/tmp/opt/kde3/include/tde/ktrader.h
debian/tmp/opt/kde3/include/tde/ktypelist.h
debian/tmp/opt/kde3/include/tde/kuniqueapp.h
diff --git a/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff b/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff
index 80238d564..dd8e6dbe1 100644
--- a/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff
+++ b/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff
@@ -2,8 +2,8 @@ diff -Nur kdelibs-3.5.8/kdeui/khelpmenu.cpp kdelibs-3.5.8.new/kdeui/khelpmenu.cp
--- kdelibs-3.5.8/kdeui/khelpmenu.cpp 2007-10-08 10:52:12.000000000 +0100
+++ kdelibs-3.5.8.new/kdeui/khelpmenu.cpp 2007-10-09 09:42:02.000000000 +0100
@@ -41,6 +41,7 @@
- #include <kpopupmenu.h>
- #include <kstdaccel.h>
+ #include <tdepopupmenu.h>
+ #include <tdestdaccel.h>
#include <kstdaction.h>
+#include <kprocess.h>
diff --git a/ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install b/ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install
index cefc34345..00dff61f8 100644
--- a/ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install
@@ -37,8 +37,8 @@ debian/tmp/opt/kde3/include/tde/kopete/kopeteversion.h
debian/tmp/opt/kde3/include/tde/kopete/managedconnectionaccount.h
debian/tmp/opt/kde3/include/tde/kopete/ui/accountselector.h
debian/tmp/opt/kde3/include/tde/kopete/ui/addcontactpage.h
-debian/tmp/opt/kde3/include/tde/kopete/ui/addressbookselectordialog.h
-debian/tmp/opt/kde3/include/tde/kopete/ui/addressbookselectorwidget.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/addressbootdeselectordialog.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/addressbootdeselectorwidget.h
debian/tmp/opt/kde3/include/tde/kopete/ui/editaccountwidget.h
debian/tmp/opt/kde3/include/tde/kopete/ui/fileconfirmbase.h
debian/tmp/opt/kde3/include/tde/kopete/ui/kopeteawaydialogbase.h
diff --git a/ubuntu/lucid_automake/kdewebdev/debian/kommander-kde3.install b/ubuntu/lucid_automake/kdewebdev/debian/kommander-kde3.install
index d52ff673e..e185cbb9c 100644
--- a/ubuntu/lucid_automake/kdewebdev/debian/kommander-kde3.install
+++ b/ubuntu/lucid_automake/kdewebdev/debian/kommander-kde3.install
@@ -28,7 +28,7 @@ kommander/working/kmdr2po /opt/kde3/bin
debian/tmp/opt/kde3/lib/kde3/libkommander_part.so
debian/tmp/opt/kde3/lib/kde3/libkommander_part.la
debian/tmp/opt/kde3/share/apps/kommander/pics/toolbox.png
-debian/tmp/opt/kde3/share/apps/kommander/pics/kfontcombo.png
+debian/tmp/opt/kde3/share/apps/kommander/pics/tdefontcombo.png
debian/tmp/opt/kde3/share/apps/kommander/translating/extractkmdr
debian/tmp/opt/kde3/share/apps/kommander/translating/kmdr2po
debian/tmp/opt/kde3/share/apps/kommander/icons/hicolor/22x22/actions/arrow.png