diff --git a/debian/lenny/applications/kiosktool/debian/changelog b/debian/lenny/applications/kiosktool/debian/changelog
new file mode 100644
index 000000000..a81e4659e
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/changelog
@@ -0,0 +1,92 @@
+kiosktool-trinity (1.0-2.0ubuntu0) maverick; urgency=low
+
+  * Trinity rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 15 Oct 2011 04:19:00 -0600
+
+kiosktool (1.0-1.1ubuntu6) hardy; urgency=low
+
+  * Rebuild with recent g++ compiler version.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 03 Apr 2008 11:24:40 +0000
+
+kiosktool (1.0-1.1ubuntu5) gutsy; urgency=low
+
+  * Add kubuntu_03_sudo_support.diff to support sudo
+  * Add depend on kdesudo
+  * Move maintainer to XSBC-Original-Maintainer: 
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 20 Jul 2007 16:57:11 +0100
+
+kiosktool (1.0-1.1ubuntu4) edgy; urgency=low
+
+  * Rebuild so it doesnt depend on libgamin0
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 25 Jul 2006 13:25:55 +1000
+
+kiosktool (1.0-1.1ubuntu3) dapper; urgency=low
+
+  * Add kubuntu_02_kmenu.diff use the correct menu file
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 18 Dec 2005 15:46:35 +0000
+
+kiosktool (1.0-1.1ubuntu2) dapper; urgency=low
+
+  * Add automake1.9 build-dep
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Dec 2005 17:43:36 +0000
+
+kiosktool (1.0-1.1ubuntu1) dapper; urgency=low
+
+  * Rebuild for libstdc++ transition
+  * Add kubuntu_01_kdepot.diff for .pot generation
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Dec 2005 11:35:56 +0000
+
+kiosktool (1.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Trigger rebuild for the Qt/KDE transition, no source changes needed.
+    (Closes: #327996)
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Tue, 27 Sep 2005 16:07:52 +0200
+
+kiosktool (1.0-1) unstable; urgency=low
+
+  * Released kiosktool 1.0
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Tue, 26 Apr 2005 22:38:16 +0200
+
+kiosktool (0.9-2) unstable; urgency=low
+
+  * Solved a problem with upstream sources due to some messages translated to Spanish
+  * Changed description
+  * First Debian upload, closes: #267595
+  * Erased line Categories=Qt;KDE;System in kiosktool.desktop because this file is installed in Utilities category
+  
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed,  5 Jan 2005 15:18:17 +0100
+
+kiosktool (0.9-1) unstable; urgency=low
+
+   * Released kiosktool 0.9
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed, 13 Oct 2004 14:57:28 +0200
+ 
+kiosktool (0.8-1) unstable; urgency=low
+
+   * First use of cdbs for packaging
+   * Created a man page with kdemangen.pl (thanks to Dominique Devriese)	
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Mon, 23 Aug 2004 11:53:37 +0200
+
+kiosktool (0.7-1) unstable; urgency=low
+
+   * Correct a semantic error in description
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed, 7 Jul 2004 15:19:42 +0200
+
+kiosktool (0.6-1) unstable; urgency=low
+
+   * Initial release
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed, 7 Jul 2004 15:19:42 +0200
diff --git a/debian/lenny/applications/kiosktool/debian/compat b/debian/lenny/applications/kiosktool/debian/compat
new file mode 100644
index 000000000..b8626c4cf
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/lenny/applications/kiosktool/debian/control b/debian/lenny/applications/kiosktool/debian/control
new file mode 100644
index 000000000..bbf9a457f
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/control
@@ -0,0 +1,15 @@
+Source: kiosktool-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org>
+Build-Depends: debhelper (>= 4.1.0), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: kiosktool-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, kdesudo-trinity
+Description: tool to configure the TDE kiosk framework
+ A Point&Click tool for system administrators to enable 
+ TDE's KIOSK features or otherwise preconfigure TDE for 
+ groups of users.
diff --git a/debian/lenny/applications/kiosktool/debian/copyright b/debian/lenny/applications/kiosktool/debian/copyright
new file mode 100644
index 000000000..a88b1d8d2
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/copyright
@@ -0,0 +1,29 @@
+This package was debianized by Pedro Jurado Maqueda <melenas@kdehispano.org> on
+Fri, 14 Jul 2004 12:49:42 +0200.
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/admin
+
+Upstream Author: Waldo Bastian <waldo@kde.org>
+
+Copyright:
+	2003, 2004  Waldo Bastian <bastian@kde.org>
+	2004        Martijn Klingens <klingens@kde.org>
+
+License:
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
diff --git a/debian/lenny/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 b/debian/lenny/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
new file mode 100644
index 000000000..62faad5d3
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
@@ -0,0 +1,146 @@
+.\" This file was generated by kdemangen.pl
+.TH KIOSKTOOL\-KDEDIRS 1 "Ago 2004" "K Desktop Environment" "A tool to set $KDEDIRS according to the current user profile."
+.SH NAME
+kiosktool\-kdedirs
+\- A tool to set $KDEDIRS according to the current user profile.
+.SH SYNOPSIS
+kiosktool\-kdedirs [Qt\-options] [KDE\-options] [options] 
+.SH DESCRIPTION
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-check  
+Output currently active prefixes
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar.
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon.
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar.
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file.
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'.
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps.
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B  \-\-style  <style>
+sets the application GUI style.
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget.
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'.
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'.
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display.
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard.
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override.
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging.
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font.
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color.
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color.
+.TP
+.B  \-\-name  <name>
+sets the application name.
+.TP
+.B  \-\-title  <title>
+sets the application title (caption).
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display.
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root.
+.TP
+.B  \-\-im  <XIM server>
+set XIM server.
+.TP
+.B  \-\-noxim  
+disable XIM.
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets.
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center.  You can also enter the URL
+.BR help:/kiosktool\-kdedirs/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/kiosktool\-kdedirs/'"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+
diff --git a/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.1 b/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.1
new file mode 100644
index 000000000..08ba2ec80
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.1
@@ -0,0 +1,150 @@
+.\" This file was generated by kdemangen.pl
+.TH KIOSKTOOL 1 "Ago 2004" "K Desktop Environment" "KIOSK Admin Tool"
+.SH NAME
+kiosktool
+\- KIOSK Admin Tool
+.SH SYNOPSIS
+kiosktool [Qt\-options] [KDE\-options] [options] 
+.SH DESCRIPTION
+With this application we can lock the access to some parts of KDE desktop
+and its applications.
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-kderc  <file>
+kderc file to save settings to [/etc/kderc]
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar.
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon.
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar.
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file.
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'.
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps.
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B  \-\-style  <style>
+sets the application GUI style.
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget.
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'.
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'.
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display.
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard.
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override.
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging.
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font.
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color.
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color.
+.TP
+.B  \-\-name  <name>
+sets the application name.
+.TP
+.B  \-\-title  <title>
+sets the application title (caption).
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display.
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root.
+.TP
+.B  \-\-im  <XIM server>
+set XIM server.
+.TP
+.B  \-\-noxim  
+disable XIM.
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets.
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center.  You can also enter the URL
+.BR help:/kiosktool/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/kiosktool/'"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Waldo Bastian <bastian@kde.org>
+.br
+
diff --git a/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.manpages b/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.manpages
new file mode 100644
index 000000000..2d009e1db
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.manpages
@@ -0,0 +1,2 @@
+debian/kiosktool-trinity.1
+debian/kiosktool-kdedirs-trinity.1
diff --git a/debian/lenny/applications/kiosktool/debian/rules b/debian/lenny/applications/kiosktool/debian/rules
new file mode 100755
index 000000000..cb6ee7c18
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/kde.mk
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	
+	make -f admin/Makefile.common cvs
+	touch debian/stamp-bootstrap
diff --git a/debian/lenny/applications/knetworkmanager/debian/README.source b/debian/lenny/applications/knetworkmanager8/debian/README.source
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/README.source
rename to debian/lenny/applications/knetworkmanager8/debian/README.source
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/buildvars.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/buildvars.mk
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/cdbs/buildvars.mk
rename to debian/lenny/applications/knetworkmanager8/debian/cdbs/buildvars.mk
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
rename to debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/kde.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/cdbs/kde.mk
rename to debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/team-members b/debian/lenny/applications/knetworkmanager8/debian/cdbs/team-members
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/cdbs/team-members
rename to debian/lenny/applications/knetworkmanager8/debian/cdbs/team-members
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/uploaders.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/uploaders.mk
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/cdbs/uploaders.mk
rename to debian/lenny/applications/knetworkmanager8/debian/cdbs/uploaders.mk
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/versions.pl b/debian/lenny/applications/knetworkmanager8/debian/cdbs/versions.pl
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/cdbs/versions.pl
rename to debian/lenny/applications/knetworkmanager8/debian/cdbs/versions.pl
diff --git a/debian/lenny/applications/knetworkmanager/debian/changelog b/debian/lenny/applications/knetworkmanager8/debian/changelog
similarity index 99%
rename from debian/lenny/applications/knetworkmanager/debian/changelog
rename to debian/lenny/applications/knetworkmanager8/debian/changelog
index ed0d32a81..04405984c 100644
--- a/debian/lenny/applications/knetworkmanager/debian/changelog
+++ b/debian/lenny/applications/knetworkmanager8/debian/changelog
@@ -1,4 +1,4 @@
-knetworkmanager-trinity (1:0.8-0ubuntu12) karmic; urgency=low
+knetworkmanager8-trinity (1:0.8-0ubuntu12) karmic; urgency=low
 
   * UI tweaks for discoverability
 
diff --git a/debian/lenny/applications/knetworkmanager/debian/compat b/debian/lenny/applications/knetworkmanager8/debian/compat
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/compat
rename to debian/lenny/applications/knetworkmanager8/debian/compat
diff --git a/debian/lenny/applications/knetworkmanager/debian/control b/debian/lenny/applications/knetworkmanager8/debian/control
similarity index 91%
rename from debian/lenny/applications/knetworkmanager/debian/control
rename to debian/lenny/applications/knetworkmanager8/debian/control
index c8875e68c..0b04bbf74 100644
--- a/debian/lenny/applications/knetworkmanager/debian/control
+++ b/debian/lenny/applications/knetworkmanager8/debian/control
@@ -1,4 +1,4 @@
-Source: knetworkmanager-trinity
+Source: knetworkmanager8-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -9,6 +9,7 @@ Build-Depends: cdbs,
  libnm-util-dev (>= 0.7.0),
  libnm-glib-dev (>= 0.7.0),
  network-manager-dev (>= 0.7.0),
+ network-manager-dev (<< 0.8.9),
  libhal-dev,
  libdbus-1-tqt-dev,
  libiw-dev,
@@ -24,7 +25,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
 
 Package: network-manager-kde-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9)
 Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
 Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
diff --git a/debian/lenny/applications/knetworkmanager/debian/control.in b/debian/lenny/applications/knetworkmanager8/debian/control.in
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/control.in
rename to debian/lenny/applications/knetworkmanager8/debian/control.in
diff --git a/debian/lenny/applications/knetworkmanager/debian/copyright b/debian/lenny/applications/knetworkmanager8/debian/copyright
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/copyright
rename to debian/lenny/applications/knetworkmanager8/debian/copyright
diff --git a/debian/lenny/applications/knetworkmanager/debian/knetworkmanager.1 b/debian/lenny/applications/knetworkmanager8/debian/knetworkmanager.1
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/knetworkmanager.1
rename to debian/lenny/applications/knetworkmanager8/debian/knetworkmanager.1
diff --git a/debian/lenny/applications/knetworkmanager/debian/manpages b/debian/lenny/applications/knetworkmanager8/debian/manpages
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/manpages
rename to debian/lenny/applications/knetworkmanager8/debian/manpages
diff --git a/debian/lenny/applications/knetworkmanager/debian/menu b/debian/lenny/applications/knetworkmanager8/debian/menu
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/menu
rename to debian/lenny/applications/knetworkmanager8/debian/menu
diff --git a/debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides b/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides
rename to debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
diff --git a/debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst b/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst
rename to debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
diff --git a/debian/lenny/applications/knetworkmanager/debian/patches/series b/debian/lenny/applications/knetworkmanager8/debian/patches/series
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/patches/series
rename to debian/lenny/applications/knetworkmanager8/debian/patches/series
diff --git a/debian/lenny/applications/knetworkmanager/debian/rules b/debian/lenny/applications/knetworkmanager8/debian/rules
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/rules
rename to debian/lenny/applications/knetworkmanager8/debian/rules
diff --git a/debian/lenny/applications/knetworkmanager/debian/watch b/debian/lenny/applications/knetworkmanager8/debian/watch
similarity index 100%
rename from debian/lenny/applications/knetworkmanager/debian/watch
rename to debian/lenny/applications/knetworkmanager8/debian/watch
diff --git a/debian/lenny/applications/koffice/debian/control b/debian/lenny/applications/koffice/debian/control
index 04167da17..969929548 100644
--- a/debian/lenny/applications/koffice/debian/control
+++ b/debian/lenny/applications/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Raúl Sánchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.4
 Homepage: http://www.koffice.org
diff --git a/debian/lenny/applications/piklab/debian/control b/debian/lenny/applications/piklab/debian/control
index 377c91d2c..2e8d8ffda 100644
--- a/debian/lenny/applications/piklab/debian/control
+++ b/debian/lenny/applications/piklab/debian/control
@@ -3,7 +3,7 @@ Section: electronics
 Priority: extra
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Build-Depends: debhelper (>= 5), autotools-dev, quilt, chrpath,
- libusb-dev, kdelibs4-trinity-dev, libreadline5-dev, automake, autoconf, libtool, libltdl-dev
+ libusb-dev, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://piklab.sourceforge.net/
 
diff --git a/debian/squeeze/applications/kiosktool/debian/changelog b/debian/squeeze/applications/kiosktool/debian/changelog
new file mode 100644
index 000000000..a81e4659e
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/changelog
@@ -0,0 +1,92 @@
+kiosktool-trinity (1.0-2.0ubuntu0) maverick; urgency=low
+
+  * Trinity rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 15 Oct 2011 04:19:00 -0600
+
+kiosktool (1.0-1.1ubuntu6) hardy; urgency=low
+
+  * Rebuild with recent g++ compiler version.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 03 Apr 2008 11:24:40 +0000
+
+kiosktool (1.0-1.1ubuntu5) gutsy; urgency=low
+
+  * Add kubuntu_03_sudo_support.diff to support sudo
+  * Add depend on kdesudo
+  * Move maintainer to XSBC-Original-Maintainer: 
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 20 Jul 2007 16:57:11 +0100
+
+kiosktool (1.0-1.1ubuntu4) edgy; urgency=low
+
+  * Rebuild so it doesnt depend on libgamin0
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 25 Jul 2006 13:25:55 +1000
+
+kiosktool (1.0-1.1ubuntu3) dapper; urgency=low
+
+  * Add kubuntu_02_kmenu.diff use the correct menu file
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 18 Dec 2005 15:46:35 +0000
+
+kiosktool (1.0-1.1ubuntu2) dapper; urgency=low
+
+  * Add automake1.9 build-dep
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Dec 2005 17:43:36 +0000
+
+kiosktool (1.0-1.1ubuntu1) dapper; urgency=low
+
+  * Rebuild for libstdc++ transition
+  * Add kubuntu_01_kdepot.diff for .pot generation
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Dec 2005 11:35:56 +0000
+
+kiosktool (1.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Trigger rebuild for the Qt/KDE transition, no source changes needed.
+    (Closes: #327996)
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Tue, 27 Sep 2005 16:07:52 +0200
+
+kiosktool (1.0-1) unstable; urgency=low
+
+  * Released kiosktool 1.0
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Tue, 26 Apr 2005 22:38:16 +0200
+
+kiosktool (0.9-2) unstable; urgency=low
+
+  * Solved a problem with upstream sources due to some messages translated to Spanish
+  * Changed description
+  * First Debian upload, closes: #267595
+  * Erased line Categories=Qt;KDE;System in kiosktool.desktop because this file is installed in Utilities category
+  
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed,  5 Jan 2005 15:18:17 +0100
+
+kiosktool (0.9-1) unstable; urgency=low
+
+   * Released kiosktool 0.9
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed, 13 Oct 2004 14:57:28 +0200
+ 
+kiosktool (0.8-1) unstable; urgency=low
+
+   * First use of cdbs for packaging
+   * Created a man page with kdemangen.pl (thanks to Dominique Devriese)	
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Mon, 23 Aug 2004 11:53:37 +0200
+
+kiosktool (0.7-1) unstable; urgency=low
+
+   * Correct a semantic error in description
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed, 7 Jul 2004 15:19:42 +0200
+
+kiosktool (0.6-1) unstable; urgency=low
+
+   * Initial release
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed, 7 Jul 2004 15:19:42 +0200
diff --git a/debian/squeeze/applications/kiosktool/debian/compat b/debian/squeeze/applications/kiosktool/debian/compat
new file mode 100644
index 000000000..b8626c4cf
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/squeeze/applications/kiosktool/debian/control b/debian/squeeze/applications/kiosktool/debian/control
new file mode 100644
index 000000000..bbf9a457f
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/control
@@ -0,0 +1,15 @@
+Source: kiosktool-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org>
+Build-Depends: debhelper (>= 4.1.0), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: kiosktool-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, kdesudo-trinity
+Description: tool to configure the TDE kiosk framework
+ A Point&Click tool for system administrators to enable 
+ TDE's KIOSK features or otherwise preconfigure TDE for 
+ groups of users.
diff --git a/debian/squeeze/applications/kiosktool/debian/copyright b/debian/squeeze/applications/kiosktool/debian/copyright
new file mode 100644
index 000000000..a88b1d8d2
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/copyright
@@ -0,0 +1,29 @@
+This package was debianized by Pedro Jurado Maqueda <melenas@kdehispano.org> on
+Fri, 14 Jul 2004 12:49:42 +0200.
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/admin
+
+Upstream Author: Waldo Bastian <waldo@kde.org>
+
+Copyright:
+	2003, 2004  Waldo Bastian <bastian@kde.org>
+	2004        Martijn Klingens <klingens@kde.org>
+
+License:
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
diff --git a/debian/squeeze/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 b/debian/squeeze/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
new file mode 100644
index 000000000..62faad5d3
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
@@ -0,0 +1,146 @@
+.\" This file was generated by kdemangen.pl
+.TH KIOSKTOOL\-KDEDIRS 1 "Ago 2004" "K Desktop Environment" "A tool to set $KDEDIRS according to the current user profile."
+.SH NAME
+kiosktool\-kdedirs
+\- A tool to set $KDEDIRS according to the current user profile.
+.SH SYNOPSIS
+kiosktool\-kdedirs [Qt\-options] [KDE\-options] [options] 
+.SH DESCRIPTION
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-check  
+Output currently active prefixes
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar.
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon.
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar.
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file.
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'.
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps.
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B  \-\-style  <style>
+sets the application GUI style.
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget.
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'.
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'.
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display.
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard.
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override.
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging.
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font.
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color.
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color.
+.TP
+.B  \-\-name  <name>
+sets the application name.
+.TP
+.B  \-\-title  <title>
+sets the application title (caption).
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display.
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root.
+.TP
+.B  \-\-im  <XIM server>
+set XIM server.
+.TP
+.B  \-\-noxim  
+disable XIM.
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets.
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center.  You can also enter the URL
+.BR help:/kiosktool\-kdedirs/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/kiosktool\-kdedirs/'"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+
diff --git a/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.1 b/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.1
new file mode 100644
index 000000000..08ba2ec80
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.1
@@ -0,0 +1,150 @@
+.\" This file was generated by kdemangen.pl
+.TH KIOSKTOOL 1 "Ago 2004" "K Desktop Environment" "KIOSK Admin Tool"
+.SH NAME
+kiosktool
+\- KIOSK Admin Tool
+.SH SYNOPSIS
+kiosktool [Qt\-options] [KDE\-options] [options] 
+.SH DESCRIPTION
+With this application we can lock the access to some parts of KDE desktop
+and its applications.
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-kderc  <file>
+kderc file to save settings to [/etc/kderc]
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar.
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon.
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar.
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file.
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'.
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps.
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B  \-\-style  <style>
+sets the application GUI style.
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget.
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'.
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'.
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display.
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard.
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override.
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging.
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font.
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color.
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color.
+.TP
+.B  \-\-name  <name>
+sets the application name.
+.TP
+.B  \-\-title  <title>
+sets the application title (caption).
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display.
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root.
+.TP
+.B  \-\-im  <XIM server>
+set XIM server.
+.TP
+.B  \-\-noxim  
+disable XIM.
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets.
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center.  You can also enter the URL
+.BR help:/kiosktool/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/kiosktool/'"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Waldo Bastian <bastian@kde.org>
+.br
+
diff --git a/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.manpages b/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.manpages
new file mode 100644
index 000000000..2d009e1db
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.manpages
@@ -0,0 +1,2 @@
+debian/kiosktool-trinity.1
+debian/kiosktool-kdedirs-trinity.1
diff --git a/debian/squeeze/applications/kiosktool/debian/rules b/debian/squeeze/applications/kiosktool/debian/rules
new file mode 100755
index 000000000..cb6ee7c18
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/kde.mk
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	
+	make -f admin/Makefile.common cvs
+	touch debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/knetworkmanager/debian/README.source b/debian/squeeze/applications/knetworkmanager8/debian/README.source
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/README.source
rename to debian/squeeze/applications/knetworkmanager8/debian/README.source
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/buildvars.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/buildvars.mk
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/cdbs/buildvars.mk
rename to debian/squeeze/applications/knetworkmanager8/debian/cdbs/buildvars.mk
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
rename to debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/kde.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/cdbs/kde.mk
rename to debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/team-members b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/team-members
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/cdbs/team-members
rename to debian/squeeze/applications/knetworkmanager8/debian/cdbs/team-members
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/uploaders.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/uploaders.mk
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/cdbs/uploaders.mk
rename to debian/squeeze/applications/knetworkmanager8/debian/cdbs/uploaders.mk
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/versions.pl b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/versions.pl
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/cdbs/versions.pl
rename to debian/squeeze/applications/knetworkmanager8/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/changelog b/debian/squeeze/applications/knetworkmanager8/debian/changelog
similarity index 99%
rename from ubuntu/maverick/applications/knetworkmanager/debian/changelog
rename to debian/squeeze/applications/knetworkmanager8/debian/changelog
index ed0d32a81..04405984c 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/changelog
+++ b/debian/squeeze/applications/knetworkmanager8/debian/changelog
@@ -1,4 +1,4 @@
-knetworkmanager-trinity (1:0.8-0ubuntu12) karmic; urgency=low
+knetworkmanager8-trinity (1:0.8-0ubuntu12) karmic; urgency=low
 
   * UI tweaks for discoverability
 
diff --git a/debian/squeeze/applications/knetworkmanager/debian/compat b/debian/squeeze/applications/knetworkmanager8/debian/compat
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/compat
rename to debian/squeeze/applications/knetworkmanager8/debian/compat
diff --git a/debian/squeeze/applications/knetworkmanager/debian/control b/debian/squeeze/applications/knetworkmanager8/debian/control
similarity index 91%
rename from debian/squeeze/applications/knetworkmanager/debian/control
rename to debian/squeeze/applications/knetworkmanager8/debian/control
index c8875e68c..0b04bbf74 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/control
+++ b/debian/squeeze/applications/knetworkmanager8/debian/control
@@ -1,4 +1,4 @@
-Source: knetworkmanager-trinity
+Source: knetworkmanager8-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -9,6 +9,7 @@ Build-Depends: cdbs,
  libnm-util-dev (>= 0.7.0),
  libnm-glib-dev (>= 0.7.0),
  network-manager-dev (>= 0.7.0),
+ network-manager-dev (<< 0.8.9),
  libhal-dev,
  libdbus-1-tqt-dev,
  libiw-dev,
@@ -24,7 +25,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
 
 Package: network-manager-kde-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9)
 Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
 Provides: knetworkmanager-trinity
 Conflicts: network-manager-kde
diff --git a/debian/squeeze/applications/knetworkmanager/debian/control.in b/debian/squeeze/applications/knetworkmanager8/debian/control.in
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/control.in
rename to debian/squeeze/applications/knetworkmanager8/debian/control.in
diff --git a/debian/squeeze/applications/knetworkmanager/debian/copyright b/debian/squeeze/applications/knetworkmanager8/debian/copyright
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/copyright
rename to debian/squeeze/applications/knetworkmanager8/debian/copyright
diff --git a/debian/squeeze/applications/knetworkmanager/debian/knetworkmanager.1 b/debian/squeeze/applications/knetworkmanager8/debian/knetworkmanager.1
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/knetworkmanager.1
rename to debian/squeeze/applications/knetworkmanager8/debian/knetworkmanager.1
diff --git a/debian/squeeze/applications/knetworkmanager/debian/manpages b/debian/squeeze/applications/knetworkmanager8/debian/manpages
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/manpages
rename to debian/squeeze/applications/knetworkmanager8/debian/manpages
diff --git a/debian/squeeze/applications/knetworkmanager/debian/menu b/debian/squeeze/applications/knetworkmanager8/debian/menu
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/menu
rename to debian/squeeze/applications/knetworkmanager8/debian/menu
diff --git a/debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides b/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides
rename to debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
diff --git a/debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst b/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst
rename to debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
diff --git a/debian/squeeze/applications/knetworkmanager/debian/patches/series b/debian/squeeze/applications/knetworkmanager8/debian/patches/series
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/patches/series
rename to debian/squeeze/applications/knetworkmanager8/debian/patches/series
diff --git a/debian/squeeze/applications/knetworkmanager/debian/rules b/debian/squeeze/applications/knetworkmanager8/debian/rules
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/rules
rename to debian/squeeze/applications/knetworkmanager8/debian/rules
diff --git a/debian/squeeze/applications/knetworkmanager/debian/watch b/debian/squeeze/applications/knetworkmanager8/debian/watch
similarity index 100%
rename from debian/squeeze/applications/knetworkmanager/debian/watch
rename to debian/squeeze/applications/knetworkmanager8/debian/watch
diff --git a/debian/squeeze/applications/koffice/debian/control b/debian/squeeze/applications/koffice/debian/control
index 04167da17..969929548 100644
--- a/debian/squeeze/applications/koffice/debian/control
+++ b/debian/squeeze/applications/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Raúl Sánchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.4
 Homepage: http://www.koffice.org
diff --git a/debian/squeeze/applications/piklab/debian/control b/debian/squeeze/applications/piklab/debian/control
index 377c91d2c..2e8d8ffda 100644
--- a/debian/squeeze/applications/piklab/debian/control
+++ b/debian/squeeze/applications/piklab/debian/control
@@ -3,7 +3,7 @@ Section: electronics
 Priority: extra
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Build-Depends: debhelper (>= 5), autotools-dev, quilt, chrpath,
- libusb-dev, kdelibs4-trinity-dev, libreadline5-dev, automake, autoconf, libtool, libltdl-dev
+ libusb-dev, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://piklab.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/kiosktool/debian/changelog b/ubuntu/maverick/applications/kiosktool/debian/changelog
new file mode 100644
index 000000000..a81e4659e
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/changelog
@@ -0,0 +1,92 @@
+kiosktool-trinity (1.0-2.0ubuntu0) maverick; urgency=low
+
+  * Trinity rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 15 Oct 2011 04:19:00 -0600
+
+kiosktool (1.0-1.1ubuntu6) hardy; urgency=low
+
+  * Rebuild with recent g++ compiler version.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 03 Apr 2008 11:24:40 +0000
+
+kiosktool (1.0-1.1ubuntu5) gutsy; urgency=low
+
+  * Add kubuntu_03_sudo_support.diff to support sudo
+  * Add depend on kdesudo
+  * Move maintainer to XSBC-Original-Maintainer: 
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 20 Jul 2007 16:57:11 +0100
+
+kiosktool (1.0-1.1ubuntu4) edgy; urgency=low
+
+  * Rebuild so it doesnt depend on libgamin0
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 25 Jul 2006 13:25:55 +1000
+
+kiosktool (1.0-1.1ubuntu3) dapper; urgency=low
+
+  * Add kubuntu_02_kmenu.diff use the correct menu file
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 18 Dec 2005 15:46:35 +0000
+
+kiosktool (1.0-1.1ubuntu2) dapper; urgency=low
+
+  * Add automake1.9 build-dep
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Dec 2005 17:43:36 +0000
+
+kiosktool (1.0-1.1ubuntu1) dapper; urgency=low
+
+  * Rebuild for libstdc++ transition
+  * Add kubuntu_01_kdepot.diff for .pot generation
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Dec 2005 11:35:56 +0000
+
+kiosktool (1.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Trigger rebuild for the Qt/KDE transition, no source changes needed.
+    (Closes: #327996)
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Tue, 27 Sep 2005 16:07:52 +0200
+
+kiosktool (1.0-1) unstable; urgency=low
+
+  * Released kiosktool 1.0
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Tue, 26 Apr 2005 22:38:16 +0200
+
+kiosktool (0.9-2) unstable; urgency=low
+
+  * Solved a problem with upstream sources due to some messages translated to Spanish
+  * Changed description
+  * First Debian upload, closes: #267595
+  * Erased line Categories=Qt;KDE;System in kiosktool.desktop because this file is installed in Utilities category
+  
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed,  5 Jan 2005 15:18:17 +0100
+
+kiosktool (0.9-1) unstable; urgency=low
+
+   * Released kiosktool 0.9
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed, 13 Oct 2004 14:57:28 +0200
+ 
+kiosktool (0.8-1) unstable; urgency=low
+
+   * First use of cdbs for packaging
+   * Created a man page with kdemangen.pl (thanks to Dominique Devriese)	
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Mon, 23 Aug 2004 11:53:37 +0200
+
+kiosktool (0.7-1) unstable; urgency=low
+
+   * Correct a semantic error in description
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed, 7 Jul 2004 15:19:42 +0200
+
+kiosktool (0.6-1) unstable; urgency=low
+
+   * Initial release
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed, 7 Jul 2004 15:19:42 +0200
diff --git a/ubuntu/maverick/applications/kiosktool/debian/compat b/ubuntu/maverick/applications/kiosktool/debian/compat
new file mode 100644
index 000000000..b8626c4cf
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/ubuntu/maverick/applications/kiosktool/debian/control b/ubuntu/maverick/applications/kiosktool/debian/control
new file mode 100644
index 000000000..bbf9a457f
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/control
@@ -0,0 +1,15 @@
+Source: kiosktool-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org>
+Build-Depends: debhelper (>= 4.1.0), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: kiosktool-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, kdesudo-trinity
+Description: tool to configure the TDE kiosk framework
+ A Point&Click tool for system administrators to enable 
+ TDE's KIOSK features or otherwise preconfigure TDE for 
+ groups of users.
diff --git a/ubuntu/maverick/applications/kiosktool/debian/copyright b/ubuntu/maverick/applications/kiosktool/debian/copyright
new file mode 100644
index 000000000..a88b1d8d2
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/copyright
@@ -0,0 +1,29 @@
+This package was debianized by Pedro Jurado Maqueda <melenas@kdehispano.org> on
+Fri, 14 Jul 2004 12:49:42 +0200.
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/admin
+
+Upstream Author: Waldo Bastian <waldo@kde.org>
+
+Copyright:
+	2003, 2004  Waldo Bastian <bastian@kde.org>
+	2004        Martijn Klingens <klingens@kde.org>
+
+License:
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
new file mode 100644
index 000000000..62faad5d3
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
@@ -0,0 +1,146 @@
+.\" This file was generated by kdemangen.pl
+.TH KIOSKTOOL\-KDEDIRS 1 "Ago 2004" "K Desktop Environment" "A tool to set $KDEDIRS according to the current user profile."
+.SH NAME
+kiosktool\-kdedirs
+\- A tool to set $KDEDIRS according to the current user profile.
+.SH SYNOPSIS
+kiosktool\-kdedirs [Qt\-options] [KDE\-options] [options] 
+.SH DESCRIPTION
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-check  
+Output currently active prefixes
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar.
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon.
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar.
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file.
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'.
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps.
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B  \-\-style  <style>
+sets the application GUI style.
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget.
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'.
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'.
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display.
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard.
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override.
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging.
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font.
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color.
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color.
+.TP
+.B  \-\-name  <name>
+sets the application name.
+.TP
+.B  \-\-title  <title>
+sets the application title (caption).
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display.
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root.
+.TP
+.B  \-\-im  <XIM server>
+set XIM server.
+.TP
+.B  \-\-noxim  
+disable XIM.
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets.
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center.  You can also enter the URL
+.BR help:/kiosktool\-kdedirs/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/kiosktool\-kdedirs/'"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1
new file mode 100644
index 000000000..08ba2ec80
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1
@@ -0,0 +1,150 @@
+.\" This file was generated by kdemangen.pl
+.TH KIOSKTOOL 1 "Ago 2004" "K Desktop Environment" "KIOSK Admin Tool"
+.SH NAME
+kiosktool
+\- KIOSK Admin Tool
+.SH SYNOPSIS
+kiosktool [Qt\-options] [KDE\-options] [options] 
+.SH DESCRIPTION
+With this application we can lock the access to some parts of KDE desktop
+and its applications.
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-kderc  <file>
+kderc file to save settings to [/etc/kderc]
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar.
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon.
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar.
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file.
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'.
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps.
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B  \-\-style  <style>
+sets the application GUI style.
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget.
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'.
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'.
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display.
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard.
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override.
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging.
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font.
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color.
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color.
+.TP
+.B  \-\-name  <name>
+sets the application name.
+.TP
+.B  \-\-title  <title>
+sets the application title (caption).
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display.
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root.
+.TP
+.B  \-\-im  <XIM server>
+set XIM server.
+.TP
+.B  \-\-noxim  
+disable XIM.
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets.
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center.  You can also enter the URL
+.BR help:/kiosktool/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/kiosktool/'"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Waldo Bastian <bastian@kde.org>
+.br
+
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages
new file mode 100644
index 000000000..2d009e1db
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages
@@ -0,0 +1,2 @@
+debian/kiosktool-trinity.1
+debian/kiosktool-kdedirs-trinity.1
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
new file mode 100644
index 000000000..77f7d912f
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
@@ -0,0 +1,13 @@
+--- 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;
+    TQString menuEditFile = KioskRun::self()->locateLocal("xdgconf-menu", "applications-kmenuedit.menu");
+-   TQString menuFile = KioskRun::self()->locate("xdgconf-menu", "applications.menu");
+-   TQString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "applications.menu");
++   TQString menuFile = KioskRun::self()->locate("xdgconf-menu", "kde-applications.menu");
++   TQString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "kde-applications.menu");
+ 
+    kdDebug() << "MenuEditComponent: menuEditFile = " << menuEditFile << endl;
+    kdDebug() << "MenuEditComponent: menuFile = " << menuFile << endl;
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
new file mode 100644
index 000000000..d850db3da
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
@@ -0,0 +1,157 @@
+--- kiosktool/kiosktool/kioskrun.h	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/kiosktool/kioskrun.h	2007-07-18 17:47:04.000000000 +0100
+@@ -37,6 +37,18 @@
+ 
+ class KioskGui;
+ 
++class NETACCESS {
++ public:
++  static bool exists(const KURL &url, bool source, TQWidget *window);
++  static bool mkdir(const KURL &url, TQWidget *window, int permissions=-1);
++  static TQString lastErrorString();
++  static int lastError();
++  static bool file_copy (const KURL &src, const KURL &dest, int permissions=-1, bool overwrite=false, bool resume=false, TQWidget *window=0L);
++  static bool del(const KURL &url, TQWidget *window);
++  static bool file_move(const KURL &src, const KURL &target, int permissions=-1, bool overwrite=false, bool resume=false, TQWidget *window=0L);
++  static bool copy(const KURL &src, const KURL &target, TQWidget *window);
++};
++
+ class KioskRun : public TQObject
+ {
+   friend class KioskGui;
+--- kiosktool/kiosktool/kioskrun.cpp	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/kiosktool/kioskrun.cpp	2007-07-20 16:56:07.000000000 +0100
+@@ -28,6 +28,7 @@
+ 
+ #include <tqdir.h>
+ #include <tqfile.h>
++#include <tqprocess.h>
+ 
+ #include <kapplication.h>
+ #include <kcmdlineargs.h>
+@@ -45,10 +46,124 @@
+ #include "kiosksync.h"
+ 
+ #include <kio/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 kdesu instead
++// #define NETACCESS	KIO::NetAccess
+ 
+ #undef DEBUG_ENTRIES
+ 
++bool NETACCESS::exists(const KURL &url, bool source, TQWidget *window)
++{
++  if (url.protocol() == "fish" && url.host() == "localhost") {
++    bool exists = TQFile::exists(url.path());
++    return exists;
++  } else {
++    bool result = KIO::NetAccess::exists(url, source, window);
++    return result;
++  }
++}
++
++bool NETACCESS::mkdir(const KURL &url, TQWidget *window, int permissions)
++{
++  if (url.protocol() == "fish" && url.host() == "localhost") {
++    TQProcess proc;
++    proc.addArgument("kdesudo");
++    proc.addArgument("mkdir " + url.path());
++    TQByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      KApplication::kapp->processEvents();
++    }
++    bool exists = TQFile::exists(url.path());
++    return exists;
++  } else {
++    bool result = KIO::NetAccess::mkdir(url, window, permissions);
++    return result;
++  }
++}
++
++TQString NETACCESS::lastErrorString()
++{
++  return "Error in Kiosktool Kubuntu modifications";
++}
++
++int NETACCESS::lastError()
++{
++  return 0;
++}
++
++bool NETACCESS::file_copy(const KURL &src, const KURL &dest, int permissions, bool overwrite, bool resume, TQWidget *window)
++{
++  if (dest.protocol() == "fish" && dest.host() == "localhost") {
++    TQProcess proc;
++    proc.addArgument("kdesudo");
++    proc.addArgument("cp " + src.path() + " " + dest.path());
++    TQByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      KApplication::kapp->processEvents();
++    }
++
++    TQProcess proc2;
++    proc2.addArgument("kdesudo");
++    proc2.addArgument("chmod 0644 " + dest.path());
++    proc2.launch(buffer);
++    while (!proc2.normalExit()) {
++      KApplication::kapp->processEvents();
++    }
++
++    bool exists = TQFile::exists(dest.path());
++    return exists;
++  } else {
++    bool result = KIO::NetAccess::file_copy(src, dest, permissions, overwrite, resume, window);
++    return result;
++  }
++}
++
++bool NETACCESS::del(const KURL &url, TQWidget *window)
++{
++  if (url.protocol() == "fish" && url.host() == "localhost") {
++    TQProcess proc;
++    proc.addArgument("kdesudo");
++    proc.addArgument("rm " + url.path());
++    TQByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      KApplication::kapp->processEvents();
++    }
++    bool exists = !TQFile::exists(url.path());
++    return exists;
++  } else {
++    bool result = KIO::NetAccess::del(url, window);
++    return result;
++  }
++}
++
++bool NETACCESS::file_move(const KURL &src, const KURL &target, int permissions, bool overwrite, bool resume, TQWidget *window)
++{
++  if (target.protocol() == "fish" && target.host() == "localhost") {
++    TQProcess proc;
++    proc.addArgument("kdesudo");
++    proc.addArgument("mv " + src.path() + " " + target.path());
++    TQByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      KApplication::kapp->processEvents();
++    }
++
++    bool exists = TQFile::exists(target.path());
++    return exists;
++  } else {
++    bool result = KIO::NetAccess::file_move(src, target, permissions, overwrite, resume, window);
++    return result;
++  }
++}
++
++//only used for local files
++bool NETACCESS::copy(const KURL &src, const KURL &target, TQWidget *window)
++{
++  return KIO::NetAccess::copy(src, target, window);
++}
++
+ KioskRun *KioskRun::s_self = 0;
+ 
+ KioskRun::KioskRun( TQObject* parent, const char* name)
diff --git a/ubuntu/maverick/applications/kiosktool/debian/rules b/ubuntu/maverick/applications/kiosktool/debian/rules
new file mode 100755
index 000000000..cb6ee7c18
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/kde.mk
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	
+	make -f admin/Makefile.common cvs
+	touch debian/stamp-bootstrap
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/README.source b/ubuntu/maverick/applications/knetworkmanager8/debian/README.source
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/README.source
rename to ubuntu/maverick/applications/knetworkmanager8/debian/README.source
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/buildvars.mk
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/cdbs/buildvars.mk
rename to ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/buildvars.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
rename to ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/cdbs/kde.mk
rename to ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/team-members b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/team-members
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/cdbs/team-members
rename to ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/team-members
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/uploaders.mk
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/cdbs/uploaders.mk
rename to ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/uploaders.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/versions.pl b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/cdbs/versions.pl
rename to ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/knetworkmanager/debian/changelog b/ubuntu/maverick/applications/knetworkmanager8/debian/changelog
similarity index 99%
rename from debian/squeeze/applications/knetworkmanager/debian/changelog
rename to ubuntu/maverick/applications/knetworkmanager8/debian/changelog
index ed0d32a81..04405984c 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/changelog
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/changelog
@@ -1,4 +1,4 @@
-knetworkmanager-trinity (1:0.8-0ubuntu12) karmic; urgency=low
+knetworkmanager8-trinity (1:0.8-0ubuntu12) karmic; urgency=low
 
   * UI tweaks for discoverability
 
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/compat b/ubuntu/maverick/applications/knetworkmanager8/debian/compat
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/compat
rename to ubuntu/maverick/applications/knetworkmanager8/debian/compat
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/control b/ubuntu/maverick/applications/knetworkmanager8/debian/control
similarity index 92%
rename from ubuntu/maverick/applications/knetworkmanager/debian/control
rename to ubuntu/maverick/applications/knetworkmanager8/debian/control
index b8b9c41dc..41a91963b 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/control
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control
@@ -1,4 +1,4 @@
-Source: knetworkmanager-trinity
+Source: knetworkmanager8-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -9,6 +9,7 @@ Build-Depends: cdbs,
  libnm-util-dev (>= 0.7.0),
  libnm-glib-dev (>= 0.7.0),
  network-manager-dev (>= 0.7.0),
+ network-manager-dev (<< 0.8.9),
  libhal-dev,
  libdbus-1-tqt-dev,
  libiw-dev,
@@ -24,7 +25,7 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
 
 Package: network-manager-kde-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9)
 Replaces: network-manager-kde-kde3 (<< 4:3.5.13)
 Breaks: network-manager-kde-kde3 (<< 4:3.5.13)
 Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/control.in b/ubuntu/maverick/applications/knetworkmanager8/debian/control.in
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/control.in
rename to ubuntu/maverick/applications/knetworkmanager8/debian/control.in
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/copyright b/ubuntu/maverick/applications/knetworkmanager8/debian/copyright
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/copyright
rename to ubuntu/maverick/applications/knetworkmanager8/debian/copyright
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/knetworkmanager.1 b/ubuntu/maverick/applications/knetworkmanager8/debian/knetworkmanager.1
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/knetworkmanager.1
rename to ubuntu/maverick/applications/knetworkmanager8/debian/knetworkmanager.1
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/manpages b/ubuntu/maverick/applications/knetworkmanager8/debian/manpages
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/manpages
rename to ubuntu/maverick/applications/knetworkmanager8/debian/manpages
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/menu b/ubuntu/maverick/applications/knetworkmanager8/debian/menu
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/menu
rename to ubuntu/maverick/applications/knetworkmanager8/debian/menu
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides
rename to ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst b/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst
rename to ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/patches/series b/ubuntu/maverick/applications/knetworkmanager8/debian/patches/series
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/patches/series
rename to ubuntu/maverick/applications/knetworkmanager8/debian/patches/series
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/rules b/ubuntu/maverick/applications/knetworkmanager8/debian/rules
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/rules
rename to ubuntu/maverick/applications/knetworkmanager8/debian/rules
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/watch b/ubuntu/maverick/applications/knetworkmanager8/debian/watch
similarity index 100%
rename from ubuntu/maverick/applications/knetworkmanager/debian/watch
rename to ubuntu/maverick/applications/knetworkmanager8/debian/watch
diff --git a/ubuntu/maverick/applications/koffice/debian/control b/ubuntu/maverick/applications/koffice/debian/control
index 229b6d61f..5600dcbc0 100644
--- a/ubuntu/maverick/applications/koffice/debian/control
+++ b/ubuntu/maverick/applications/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Ral Snchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, kdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.4
 Homepage: http://www.koffice.org
diff --git a/ubuntu/maverick/applications/piklab/debian/control b/ubuntu/maverick/applications/piklab/debian/control
index eb2f857ae..e2a7e9628 100644
--- a/ubuntu/maverick/applications/piklab/debian/control
+++ b/ubuntu/maverick/applications/piklab/debian/control
@@ -3,7 +3,7 @@ Section: electronics
 Priority: extra
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Build-Depends: debhelper (>= 5), autotools-dev, quilt, chrpath,
- libusb-dev, kdelibs4-trinity-dev, libreadline5-dev, automake, autoconf, libtool, libltdl-dev
+ libusb-dev, kdelibs4-trinity-dev, libreadline5-dev | libreadline6-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://piklab.sourceforge.net/