Update Debian and Ubuntu packaging for latest GIT

18 files changed, 106 insertions, 106 deletions

diff --git a/ubuntu/precise/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 b/ubuntu/precise/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1
index 773b098d6..e44c4cd99 100644
--- a/ubuntu/precise/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1
+++ b/ubuntu/precise/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1
@@ -136,9 +136,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:/tdeiosktool\-tdedirs/
+.BR help:/kiosktool\-tdedirs/
 directly into konqueror or you can run 
-.BR "`khelpcenter help:/tdeiosktool\-tdedirs/'"
+.BR "`khelpcenter help:/kiosktool\-tdedirs/'"
 from the command\-line.
 .br
 .SH AUTHORS
diff --git a/ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.1 b/ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.1
index d510c0d6b..08ba2ec80 100644
--- a/ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.1
+++ b/ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.1
@@ -138,9 +138,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:/tdeiosktool/
+.BR help:/kiosktool/
 directly into konqueror or you can run 
-.BR "`khelpcenter help:/tdeiosktool/'"
+.BR "`khelpcenter help:/kiosktool/'"
 from the command\-line.
 .br
 .SH AUTHORS
diff --git a/ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.manpages b/ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.manpages
index 62e420c43..43bd4d1b8 100644
--- a/ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.manpages
+++ b/ubuntu/precise/applications/kiosktool/debian/kiosktool-trinity.manpages
@@ -1,2 +1,2 @@
-debian/tdeiosktool-trinity.1
-debian/tdeiosktool-tdedirs-trinity.1
+debian/kiosktool-trinity.1
+debian/kiosktool-tdedirs-trinity.1
diff --git a/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff b/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
index b1e39b1d4..77f7d912f 100644
--- a/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
+++ b/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
@@ -1,5 +1,5 @@
---- kiosktool/tdeiosktool/menueditComponent.cpp	2005-04-25 09:46:33.000000000 +0000
-+++ kiosktool/tdeiosktool/menueditComponent.cpp	2005-12-18 14:45:26.000000000 +0000
+--- kiosktool/kiosktool/menueditComponent.cpp	2005-04-25 09:46:33.000000000 +0000
++++ kiosktool/kiosktool/menueditComponent.cpp	2005-12-18 14:45:26.000000000 +0000
 @@ -104,8 +104,8 @@
  {
     bool result;
diff --git a/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
index e7b9121ef..b5af11a0a 100644
--- a/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
+++ b/ubuntu/precise/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
@@ -1,5 +1,5 @@
---- kiosktool/tdeiosktool/tdeioskrun.h	2005-04-25 10:46:33.000000000 +0100
-+++ kiosktool/tdeiosktool/tdeioskrun.h	2007-07-18 17:47:04.000000000 +0100
+--- kiosktool/kiosktool/tdeioskrun.h	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/kiosktool/tdeioskrun.h	2007-07-18 17:47:04.000000000 +0100
 @@ -37,6 +37,18 @@
  
  class KioskGui;
@@ -19,8 +19,8 @@
  class KioskRun : public TQObject
  {
    friend class KioskGui;
---- kiosktool/tdeiosktool/tdeioskrun.cpp	2005-04-25 10:46:33.000000000 +0100
-+++ kiosktool/tdeiosktool/tdeioskrun.cpp	2007-07-20 16:56:07.000000000 +0100
+--- kiosktool/kiosktool/tdeioskrun.cpp	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/kiosktool/tdeioskrun.cpp	2007-07-20 16:56:07.000000000 +0100
 @@ -28,6 +28,7 @@
  
  #include <tqdir.h>
@@ -34,7 +34,7 @@
  
  #include <tdeio/netaccess.h>
 -#define NETACCESS	KIO::NetAccess
-+// Kiosktool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using tdesu instead
++// Kiostdetool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using tdesu instead
 +// #define NETACCESS	KIO::NetAccess
  
  #undef DEBUG_ENTRIES
@@ -71,7 +71,7 @@
 +
 +TQString NETACCESS::lastErrorString()
 +{
-+  return "Error in Kiosktool Kubuntu modifications";
++  return "Error in Kiostdetool Kubuntu modifications";
 +}
 +
 +int NETACCESS::lastError()
diff --git a/ubuntu/precise/applications/koffice/debian/chalk-data-trinity.install b/ubuntu/precise/applications/koffice/debian/chalk-data-trinity.install
index a0e03ae3b..0b02bd024 100644
--- a/ubuntu/precise/applications/koffice/debian/chalk-data-trinity.install
+++ b/ubuntu/precise/applications/koffice/debian/chalk-data-trinity.install
@@ -353,8 +353,8 @@ debian/tmp/opt/trinity/share/services/chalkrotateimage.desktop
 debian/tmp/opt/trinity/share/services/chalkroundcornersfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkscreenshot.desktop
 debian/tmp/opt/trinity/share/services/chaltdescripting.desktop
-debian/tmp/opt/trinity/share/services/chalkselectiontools.desktop
-debian/tmp/opt/trinity/share/services/chalkselectopaque.desktop
+debian/tmp/opt/trinity/share/services/chaltdeselectiontools.desktop
+debian/tmp/opt/trinity/share/services/chaltdeselectopaque.desktop
 debian/tmp/opt/trinity/share/services/chalkseparatechannels.desktop
 debian/tmp/opt/trinity/share/services/chalkshearimage.desktop
 debian/tmp/opt/trinity/share/services/chalksmalltilesfilter.desktop
@@ -362,16 +362,16 @@ debian/tmp/opt/trinity/share/services/chalksobelfilter.desktop
 debian/tmp/opt/trinity/share/services/chalksubstrate.desktop
 debian/tmp/opt/trinity/share/services/chalk_tiff_export.desktop
 debian/tmp/opt/trinity/share/services/chalk_tiff_import.desktop
-debian/tmp/opt/trinity/share/services/chalktoolcrop.desktop
-debian/tmp/opt/trinity/share/services/chalktoolcurves.desktop
-debian/tmp/opt/trinity/share/services/chalktoolfilter.desktop
-debian/tmp/opt/trinity/share/services/chalktoolperspectivegrid.desktop
-debian/tmp/opt/trinity/share/services/chalktoolperspectivetransform.desktop
-debian/tmp/opt/trinity/share/services/chalktoolpolygon.desktop
-debian/tmp/opt/trinity/share/services/chalktoolpolyline.desktop
-debian/tmp/opt/trinity/share/services/chalktoolselectsimilar.desktop
-debian/tmp/opt/trinity/share/services/chalktoolstar.desktop
-debian/tmp/opt/trinity/share/services/chalktooltransform.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolcrop.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolcurves.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolfilter.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolperspectivegrid.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolperspectivetransform.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolpolygon.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolpolyline.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolselectsimilar.desktop
+debian/tmp/opt/trinity/share/services/chaltdetoolstar.desktop
+debian/tmp/opt/trinity/share/services/chaltdetooltransform.desktop
 debian/tmp/opt/trinity/share/services/chalkunsharpfilter.desktop
 debian/tmp/opt/trinity/share/services/chalkwavefilter.desktop
 debian/tmp/opt/trinity/share/services/chalkwetplugin.desktop
diff --git a/ubuntu/precise/applications/koffice/debian/chalk-trinity.install b/ubuntu/precise/applications/koffice/debian/chalk-trinity.install
index 66afcfbba..3bd4c6757 100644
--- a/ubuntu/precise/applications/koffice/debian/chalk-trinity.install
+++ b/ubuntu/precise/applications/koffice/debian/chalk-trinity.install
@@ -75,10 +75,10 @@ debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.la
 debian/tmp/opt/trinity/lib/trinity/chalkscreenshot.so
 debian/tmp/opt/trinity/lib/trinity/chaltdescripting.la
 debian/tmp/opt/trinity/lib/trinity/chaltdescripting.so
-debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.la
-debian/tmp/opt/trinity/lib/trinity/chalkselectiontools.so
-debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.la
-debian/tmp/opt/trinity/lib/trinity/chalkselectopaque.so
+debian/tmp/opt/trinity/lib/trinity/chaltdeselectiontools.la
+debian/tmp/opt/trinity/lib/trinity/chaltdeselectiontools.so
+debian/tmp/opt/trinity/lib/trinity/chaltdeselectopaque.la
+debian/tmp/opt/trinity/lib/trinity/chaltdeselectopaque.so
 debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.la
 debian/tmp/opt/trinity/lib/trinity/chalkseparatechannels.so
 debian/tmp/opt/trinity/lib/trinity/chalkshearimage.la
@@ -90,26 +90,26 @@ debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalksobelfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalksubstrate.la
 debian/tmp/opt/trinity/lib/trinity/chalksubstrate.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolcrop.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolcurves.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolfilter.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivegrid.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolperspectivetransform.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolpolygon.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolpolyline.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolselectsimilar.so
-debian/tmp/opt/trinity/lib/trinity/chalktoolstar.la
-debian/tmp/opt/trinity/lib/trinity/chalktoolstar.so
-debian/tmp/opt/trinity/lib/trinity/chalktooltransform.la
-debian/tmp/opt/trinity/lib/trinity/chalktooltransform.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolcrop.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolcrop.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolcurves.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolcurves.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolfilter.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolfilter.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivegrid.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivegrid.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivetransform.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolperspectivetransform.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolygon.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolygon.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolyline.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolpolyline.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolselectsimilar.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolselectsimilar.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolstar.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetoolstar.so
+debian/tmp/opt/trinity/lib/trinity/chaltdetooltransform.la
+debian/tmp/opt/trinity/lib/trinity/chaltdetooltransform.so
 debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.la
 debian/tmp/opt/trinity/lib/trinity/chalkunsharpfilter.so
 debian/tmp/opt/trinity/lib/trinity/chalkwavefilter.la
diff --git a/ubuntu/precise/applications/koffice/debian/kplato-trinity.install b/ubuntu/precise/applications/koffice/debian/kplato-trinity.install
index 8c3df29c3..d38914b77 100644
--- a/ubuntu/precise/applications/koffice/debian/kplato-trinity.install
+++ b/ubuntu/precise/applications/koffice/debian/kplato-trinity.install
@@ -23,8 +23,8 @@ debian/tmp/opt/trinity/share/apps/kplato/kplato.rc
 debian/tmp/opt/trinity/share/apps/kplato/kplato_readonly.rc
 debian/tmp/opt/trinity/share/apps/kplato/reports/resourcelist.desktop
 debian/tmp/opt/trinity/share/apps/kplato/reports/.source/resourcelist.ktf
-debian/tmp/opt/trinity/share/apps/kplato/reports/.source/tasklist.ktf
-debian/tmp/opt/trinity/share/apps/kplato/reports/tasklist.desktop
+debian/tmp/opt/trinity/share/apps/kplato/reports/.source/tastdelist.ktf
+debian/tmp/opt/trinity/share/apps/kplato/reports/tastdelist.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/8HourDay-40HourWeek.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/.directory
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/Plain.desktop
diff --git a/ubuntu/precise/applications/kradio/debian/changelog b/ubuntu/precise/applications/kradio/debian/changelog
index ad7c7832c..375e977cb 100644
--- a/ubuntu/precise/applications/kradio/debian/changelog
+++ b/ubuntu/precise/applications/kradio/debian/changelog
@@ -1,10 +1,10 @@
-kradio-trinity (0.1.1.1~0ubuntu0) karmic; urgency=low
+tderadio-trinity (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/precise/applications/kradio/debian/control b/ubuntu/precise/applications/kradio/debian/control
index 35e42b8ae..3120926d9 100644
--- a/ubuntu/precise/applications/kradio/debian/control
+++ b/ubuntu/precise/applications/kradio/debian/control
@@ -1,16 +1,16 @@
-Source: kradio-trinity
+Source: tderadio-trinity
 Section: sound
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Build-Depends: debhelper (>= 5), tdelibs4-trinity-dev, liblircclient-dev, libsndfile1-dev, imagemagick, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
-Homepage: http://kradio.sourceforge.net/
+Homepage: http://tderadio.sourceforge.net/
 
-Package: kradio-trinity
+Package: tderadio-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kradio-trinity (<< 4:14.0.0)
-Breaks: kradio-trinity (<< 4:14.0.0)
+Replaces: tderadio-trinity (<< 4:14.0.0)
+Breaks: tderadio-trinity (<< 4:14.0.0)
 Description: Comfortable Radio Application for KDE [Trinity]
  TDERadio is a comfortable radio application for KDE 3.x with support for 
  V4L and V4L2 radio cards drivers.
diff --git a/ubuntu/precise/applications/kradio/debian/copyright b/ubuntu/precise/applications/kradio/debian/copyright
index 932ce3d04..365f66795 100644
--- a/ubuntu/precise/applications/kradio/debian/copyright
+++ b/ubuntu/precise/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/precise/applications/kradio/debian/docs b/ubuntu/precise/applications/kradio/debian/docs
index bc4a4e465..0ecc1e4f1 100644
--- a/ubuntu/precise/applications/kradio/debian/docs
+++ b/ubuntu/precise/applications/kradio/debian/docs
@@ -1,2 +1,2 @@
-kradio3/README
-kradio3/TODO
+tderadio3/README
+tderadio3/TODO
diff --git a/ubuntu/precise/applications/kradio/debian/manpages b/ubuntu/precise/applications/kradio/debian/manpages
index f37e7cfcf..4760e939e 100644
--- a/ubuntu/precise/applications/kradio/debian/manpages
+++ b/ubuntu/precise/applications/kradio/debian/manpages
@@ -1,2 +1,2 @@
-debian/kradio.1
+debian/tderadio.1
 debian/convert-presets.1
diff --git a/ubuntu/precise/applications/kradio/debian/menu b/ubuntu/precise/applications/kradio/debian/menu
index aef47274f..57401965d 100644
--- a/ubuntu/precise/applications/kradio/debian/menu
+++ b/ubuntu/precise/applications/kradio/debian/menu
@@ -1,7 +1,7 @@
-?package(kradio):needs="X11" \
+?package(tderadio):needs="X11" \
   section="Applications/TV and Radio" \
   hints="TDE" \
   title="TDERadio" \
   longtitle="K-Radio Application" \
-  command="/opt/trinity/bin/kradio" \
-  icon="/opt/trinity/share/pixmaps/kradio.xpm"
+  command="/opt/trinity/bin/tderadio" \
+  icon="/opt/trinity/share/pixmaps/tderadio.xpm"
diff --git a/ubuntu/precise/applications/kradio/debian/rules b/ubuntu/precise/applications/kradio/debian/rules
index 41840eb6e..faad3984a 100755
--- a/ubuntu/precise/applications/kradio/debian/rules
+++ b/ubuntu/precise/applications/kradio/debian/rules
@@ -30,7 +30,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:
@@ -55,7 +55,7 @@ config.status: configure
 															
 
 
-build: build-stamp debian/kradio.xpm
+build: build-stamp debian/tderadio.xpm
 
 build-stamp:  config.status
 	dh_testdir
@@ -68,10 +68,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
@@ -83,25 +83,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-trinity
-	install -D -m 644 debian/kradio.xpm debian/kradio-trinity/opt/trinity/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-trinity
+	install -D -m 644 debian/tderadio.xpm debian/tderadio-trinity/opt/trinity/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
@@ -111,11 +111,11 @@ 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
-	mv debian/kradio-trinity/usr/share/man debian/kradio-trinity/opt/trinity/share/
+	mv debian/tderadio-trinity/usr/share/man debian/tderadio-trinity/opt/trinity/share/
 	dh_link
 	dh_strip
 	dh_compress
diff --git a/ubuntu/precise/applications/kradio/debian/kradio.1 b/ubuntu/precise/applications/kradio/debian/tderadio.1
index 47fdb40d7..04a9f8c9c 100644
--- a/ubuntu/precise/applications/kradio/debian/kradio.1
+++ b/ubuntu/precise/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/precise/applications/kradio/debian/watch b/ubuntu/precise/applications/kradio/debian/watch
index 49f735f61..033fb78b0 100644
--- a/ubuntu/precise/applications/kradio/debian/watch
+++ b/ubuntu/precise/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/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index 70fd0192e..5a36ab501 100644
--- a/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -4,7 +4,7 @@ index 7c45fcf..b933832 100644
 +++ b/src/main.cpp
 @@ -24,6 +24,7 @@
  #include <kmessagebox.h>
- #include <kmainwindow.h>
+ #include <tdemainwindow.h>
  #include <kapp.h>
 +#include <kuser.h>