From f63b035a91cf5baff629f5e5dee4aeb7efe8d57b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 14 Oct 2011 23:31:08 -0500
Subject: Add libreadline6-dev as alternate koffice build-dep

---
 debian/lenny/applications/koffice/debian/control    | 2 +-
 debian/squeeze/applications/koffice/debian/control  | 2 +-
 ubuntu/maverick/applications/koffice/debian/control | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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/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/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
-- 
cgit v1.2.3


From c5b950e4dd995b9e9e2d8a671998832448faba5c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 15 Oct 2011 04:24:01 -0500
Subject: Add initial packaging for kiosktool-trinity to Debian and Ubuntu

---
 .../lenny/applications/kiosktool/debian/changelog  |  92 ++++++++++++
 debian/lenny/applications/kiosktool/debian/compat  |   1 +
 debian/lenny/applications/kiosktool/debian/control |  15 ++
 .../lenny/applications/kiosktool/debian/copyright  |  29 ++++
 .../kiosktool/debian/kiosktool-kdedirs-trinity.1   | 146 +++++++++++++++++++
 .../kiosktool/debian/kiosktool-trinity.1           | 150 ++++++++++++++++++++
 .../kiosktool/debian/kiosktool-trinity.manpages    |   2 +
 debian/lenny/applications/kiosktool/debian/rules   |   5 +
 .../applications/kiosktool/debian/changelog        |  92 ++++++++++++
 .../squeeze/applications/kiosktool/debian/compat   |   1 +
 .../squeeze/applications/kiosktool/debian/control  |  15 ++
 .../applications/kiosktool/debian/copyright        |  29 ++++
 .../kiosktool/debian/kiosktool-kdedirs-trinity.1   | 146 +++++++++++++++++++
 .../kiosktool/debian/kiosktool-trinity.1           | 150 ++++++++++++++++++++
 .../kiosktool/debian/kiosktool-trinity.manpages    |   2 +
 debian/squeeze/applications/kiosktool/debian/rules |   5 +
 .../applications/kiosktool/debian/changelog        |  92 ++++++++++++
 .../maverick/applications/kiosktool/debian/compat  |   1 +
 .../maverick/applications/kiosktool/debian/control |  15 ++
 .../applications/kiosktool/debian/copyright        |  29 ++++
 .../kiosktool/debian/kiosktool-kdedirs-trinity.1   | 146 +++++++++++++++++++
 .../kiosktool/debian/kiosktool-trinity.1           | 150 ++++++++++++++++++++
 .../kiosktool/debian/kiosktool-trinity.manpages    |   2 +
 .../debian/patches/kubuntu_01_kdepot.diff          |  12 ++
 .../kiosktool/debian/patches/kubuntu_02_kmenu.diff |  13 ++
 .../debian/patches/kubuntu_03_sudo_support.diff    | 157 +++++++++++++++++++++
 .../maverick/applications/kiosktool/debian/rules   |   5 +
 27 files changed, 1502 insertions(+)
 create mode 100644 debian/lenny/applications/kiosktool/debian/changelog
 create mode 100644 debian/lenny/applications/kiosktool/debian/compat
 create mode 100644 debian/lenny/applications/kiosktool/debian/control
 create mode 100644 debian/lenny/applications/kiosktool/debian/copyright
 create mode 100644 debian/lenny/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
 create mode 100644 debian/lenny/applications/kiosktool/debian/kiosktool-trinity.1
 create mode 100644 debian/lenny/applications/kiosktool/debian/kiosktool-trinity.manpages
 create mode 100755 debian/lenny/applications/kiosktool/debian/rules
 create mode 100644 debian/squeeze/applications/kiosktool/debian/changelog
 create mode 100644 debian/squeeze/applications/kiosktool/debian/compat
 create mode 100644 debian/squeeze/applications/kiosktool/debian/control
 create mode 100644 debian/squeeze/applications/kiosktool/debian/copyright
 create mode 100644 debian/squeeze/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
 create mode 100644 debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.1
 create mode 100644 debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.manpages
 create mode 100755 debian/squeeze/applications/kiosktool/debian/rules
 create mode 100644 ubuntu/maverick/applications/kiosktool/debian/changelog
 create mode 100644 ubuntu/maverick/applications/kiosktool/debian/compat
 create mode 100644 ubuntu/maverick/applications/kiosktool/debian/control
 create mode 100644 ubuntu/maverick/applications/kiosktool/debian/copyright
 create mode 100644 ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
 create mode 100644 ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1
 create mode 100644 ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages
 create mode 100644 ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_01_kdepot.diff
 create mode 100644 ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
 create mode 100644 ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
 create mode 100755 ubuntu/maverick/applications/kiosktool/debian/rules

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..41bc32f51
--- /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
+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..6b8f84c74
--- /dev/null
+++ b/debian/lenny/applications/kiosktool/debian/rules
@@ -0,0 +1,5 @@
+#!/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
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..41bc32f51
--- /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
+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..6b8f84c74
--- /dev/null
+++ b/debian/squeeze/applications/kiosktool/debian/rules
@@ -0,0 +1,5 @@
+#!/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
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..41bc32f51
--- /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
+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_01_kdepot.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_01_kdepot.diff
new file mode 100644
index 000000000..8e3c20a1a
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_01_kdepot.diff
@@ -0,0 +1,12 @@
+--- a/admin/cvs.sh~	2005-12-14 11:33:41.000000000 +0000
++++ b/admin/cvs.sh	2005-12-14 11:34:28.000000000 +0000
+@@ -562,7 +562,8 @@
+    fi
+    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+ 
+-   kdepotpath=${includedir:-${KDEDIR:-`kde-config --prefix`}/include}/kde.pot
++   #kdepotpath=${includedir:-${KDEDIR:-`kde-config --prefix`}/include}/kde.pot
++   kdepotpath=/usr/include/kde/kde.pot
+ 
+    $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+ 	XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -kaliasLocale -x $kdepotpath" messages 
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..bcc94635e
--- /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;
+    QString menuEditFile = KioskRun::self()->locateLocal("xdgconf-menu", "applications-kmenuedit.menu");
+-   QString menuFile = KioskRun::self()->locate("xdgconf-menu", "applications.menu");
+-   QString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "applications.menu");
++   QString menuFile = KioskRun::self()->locate("xdgconf-menu", "kde-applications.menu");
++   QString 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..c5d52d8c2
--- /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, QWidget *window);
++  static bool mkdir(const KURL &url, QWidget *window, int permissions=-1);
++  static QString lastErrorString();
++  static int lastError();
++  static bool file_copy (const KURL &src, const KURL &dest, int permissions=-1, bool overwrite=false, bool resume=false, QWidget *window=0L);
++  static bool del(const KURL &url, QWidget *window);
++  static bool file_move(const KURL &src, const KURL &target, int permissions=-1, bool overwrite=false, bool resume=false, QWidget *window=0L);
++  static bool copy(const KURL &src, const KURL &target, QWidget *window);
++};
++
+ class KioskRun : public QObject
+ {
+   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 <qdir.h>
+ #include <qfile.h>
++#include <qprocess.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, QWidget *window)
++{
++  if (url.protocol() == "fish" && url.host() == "localhost") {
++    bool exists = QFile::exists(url.path());
++    return exists;
++  } else {
++    bool result = KIO::NetAccess::exists(url, source, window);
++    return result;
++  }
++}
++
++bool NETACCESS::mkdir(const KURL &url, QWidget *window, int permissions)
++{
++  if (url.protocol() == "fish" && url.host() == "localhost") {
++    QProcess proc;
++    proc.addArgument("kdesudo");
++    proc.addArgument("mkdir " + url.path());
++    QByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      KApplication::kapp->processEvents();
++    }
++    bool exists = QFile::exists(url.path());
++    return exists;
++  } else {
++    bool result = KIO::NetAccess::mkdir(url, window, permissions);
++    return result;
++  }
++}
++
++QString 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, QWidget *window)
++{
++  if (dest.protocol() == "fish" && dest.host() == "localhost") {
++    QProcess proc;
++    proc.addArgument("kdesudo");
++    proc.addArgument("cp " + src.path() + " " + dest.path());
++    QByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      KApplication::kapp->processEvents();
++    }
++
++    QProcess proc2;
++    proc2.addArgument("kdesudo");
++    proc2.addArgument("chmod 0644 " + dest.path());
++    proc2.launch(buffer);
++    while (!proc2.normalExit()) {
++      KApplication::kapp->processEvents();
++    }
++
++    bool exists = QFile::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, QWidget *window)
++{
++  if (url.protocol() == "fish" && url.host() == "localhost") {
++    QProcess proc;
++    proc.addArgument("kdesudo");
++    proc.addArgument("rm " + url.path());
++    QByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      KApplication::kapp->processEvents();
++    }
++    bool exists = !QFile::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, QWidget *window)
++{
++  if (target.protocol() == "fish" && target.host() == "localhost") {
++    QProcess proc;
++    proc.addArgument("kdesudo");
++    proc.addArgument("mv " + src.path() + " " + target.path());
++    QByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      KApplication::kapp->processEvents();
++    }
++
++    bool exists = QFile::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, QWidget *window)
++{
++  return KIO::NetAccess::copy(src, target, window);
++}
++
+ KioskRun *KioskRun::s_self = 0;
+ 
+ KioskRun::KioskRun( QObject* 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..6b8f84c74
--- /dev/null
+++ b/ubuntu/maverick/applications/kiosktool/debian/rules
@@ -0,0 +1,5 @@
+#!/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
-- 
cgit v1.2.3


From ad50a0b0727842175e11698576f6f3a6ded3e57d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 16 Oct 2011 15:23:36 -0500
Subject: Fix kiosktool Ubuntu patches

---
 .../debian/patches/kubuntu_01_kdepot.diff          | 12 ----
 .../kiosktool/debian/patches/kubuntu_02_kmenu.diff | 10 ++--
 .../debian/patches/kubuntu_03_sudo_support.diff    | 66 +++++++++++-----------
 3 files changed, 38 insertions(+), 50 deletions(-)
 delete mode 100644 ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_01_kdepot.diff

diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_01_kdepot.diff
deleted file mode 100644
index 8e3c20a1a..000000000
--- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/admin/cvs.sh~	2005-12-14 11:33:41.000000000 +0000
-+++ b/admin/cvs.sh	2005-12-14 11:34:28.000000000 +0000
-@@ -562,7 +562,8 @@
-    fi
-    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
- 
--   kdepotpath=${includedir:-${KDEDIR:-`kde-config --prefix`}/include}/kde.pot
-+   #kdepotpath=${includedir:-${KDEDIR:-`kde-config --prefix`}/include}/kde.pot
-+   kdepotpath=/usr/include/kde/kde.pot
- 
-    $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- 	XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -kaliasLocale -x $kdepotpath" messages 
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
index bcc94635e..77f7d912f 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
+++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
@@ -3,11 +3,11 @@
 @@ -104,8 +104,8 @@
  {
     bool result;
-    QString menuEditFile = KioskRun::self()->locateLocal("xdgconf-menu", "applications-kmenuedit.menu");
--   QString menuFile = KioskRun::self()->locate("xdgconf-menu", "applications.menu");
--   QString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "applications.menu");
-+   QString menuFile = KioskRun::self()->locate("xdgconf-menu", "kde-applications.menu");
-+   QString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "kde-applications.menu");
+    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
index c5d52d8c2..d850db3da 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
+++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
@@ -6,26 +6,26 @@
  
 +class NETACCESS {
 + public:
-+  static bool exists(const KURL &url, bool source, QWidget *window);
-+  static bool mkdir(const KURL &url, QWidget *window, int permissions=-1);
-+  static QString lastErrorString();
++  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, QWidget *window=0L);
-+  static bool del(const KURL &url, QWidget *window);
-+  static bool file_move(const KURL &src, const KURL &target, int permissions=-1, bool overwrite=false, bool resume=false, QWidget *window=0L);
-+  static bool copy(const KURL &src, const KURL &target, QWidget *window);
++  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 QObject
+ 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 <qdir.h>
- #include <qfile.h>
-+#include <qprocess.h>
+ #include <tqdir.h>
+ #include <tqfile.h>
++#include <tqprocess.h>
  
  #include <kapplication.h>
  #include <kcmdlineargs.h>
@@ -39,10 +39,10 @@
  
  #undef DEBUG_ENTRIES
  
-+bool NETACCESS::exists(const KURL &url, bool source, QWidget *window)
++bool NETACCESS::exists(const KURL &url, bool source, TQWidget *window)
 +{
 +  if (url.protocol() == "fish" && url.host() == "localhost") {
-+    bool exists = QFile::exists(url.path());
++    bool exists = TQFile::exists(url.path());
 +    return exists;
 +  } else {
 +    bool result = KIO::NetAccess::exists(url, source, window);
@@ -50,18 +50,18 @@
 +  }
 +}
 +
-+bool NETACCESS::mkdir(const KURL &url, QWidget *window, int permissions)
++bool NETACCESS::mkdir(const KURL &url, TQWidget *window, int permissions)
 +{
 +  if (url.protocol() == "fish" && url.host() == "localhost") {
-+    QProcess proc;
++    TQProcess proc;
 +    proc.addArgument("kdesudo");
 +    proc.addArgument("mkdir " + url.path());
-+    QByteArray buffer;
++    TQByteArray buffer;
 +    proc.launch(buffer);
 +    while (!proc.normalExit()) {
 +      KApplication::kapp->processEvents();
 +    }
-+    bool exists = QFile::exists(url.path());
++    bool exists = TQFile::exists(url.path());
 +    return exists;
 +  } else {
 +    bool result = KIO::NetAccess::mkdir(url, window, permissions);
@@ -69,7 +69,7 @@
 +  }
 +}
 +
-+QString NETACCESS::lastErrorString()
++TQString NETACCESS::lastErrorString()
 +{
 +  return "Error in Kiosktool Kubuntu modifications";
 +}
@@ -79,19 +79,19 @@
 +  return 0;
 +}
 +
-+bool NETACCESS::file_copy(const KURL &src, const KURL &dest, int permissions, bool overwrite, bool resume, QWidget *window)
++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") {
-+    QProcess proc;
++    TQProcess proc;
 +    proc.addArgument("kdesudo");
 +    proc.addArgument("cp " + src.path() + " " + dest.path());
-+    QByteArray buffer;
++    TQByteArray buffer;
 +    proc.launch(buffer);
 +    while (!proc.normalExit()) {
 +      KApplication::kapp->processEvents();
 +    }
 +
-+    QProcess proc2;
++    TQProcess proc2;
 +    proc2.addArgument("kdesudo");
 +    proc2.addArgument("chmod 0644 " + dest.path());
 +    proc2.launch(buffer);
@@ -99,7 +99,7 @@
 +      KApplication::kapp->processEvents();
 +    }
 +
-+    bool exists = QFile::exists(dest.path());
++    bool exists = TQFile::exists(dest.path());
 +    return exists;
 +  } else {
 +    bool result = KIO::NetAccess::file_copy(src, dest, permissions, overwrite, resume, window);
@@ -107,18 +107,18 @@
 +  }
 +}
 +
-+bool NETACCESS::del(const KURL &url, QWidget *window)
++bool NETACCESS::del(const KURL &url, TQWidget *window)
 +{
 +  if (url.protocol() == "fish" && url.host() == "localhost") {
-+    QProcess proc;
++    TQProcess proc;
 +    proc.addArgument("kdesudo");
 +    proc.addArgument("rm " + url.path());
-+    QByteArray buffer;
++    TQByteArray buffer;
 +    proc.launch(buffer);
 +    while (!proc.normalExit()) {
 +      KApplication::kapp->processEvents();
 +    }
-+    bool exists = !QFile::exists(url.path());
++    bool exists = !TQFile::exists(url.path());
 +    return exists;
 +  } else {
 +    bool result = KIO::NetAccess::del(url, window);
@@ -126,19 +126,19 @@
 +  }
 +}
 +
-+bool NETACCESS::file_move(const KURL &src, const KURL &target, int permissions, bool overwrite, bool resume, QWidget *window)
++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") {
-+    QProcess proc;
++    TQProcess proc;
 +    proc.addArgument("kdesudo");
 +    proc.addArgument("mv " + src.path() + " " + target.path());
-+    QByteArray buffer;
++    TQByteArray buffer;
 +    proc.launch(buffer);
 +    while (!proc.normalExit()) {
 +      KApplication::kapp->processEvents();
 +    }
 +
-+    bool exists = QFile::exists(target.path());
++    bool exists = TQFile::exists(target.path());
 +    return exists;
 +  } else {
 +    bool result = KIO::NetAccess::file_move(src, target, permissions, overwrite, resume, window);
@@ -147,11 +147,11 @@
 +}
 +
 +//only used for local files
-+bool NETACCESS::copy(const KURL &src, const KURL &target, QWidget *window)
++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( QObject* parent, const char* name)
+ KioskRun::KioskRun( TQObject* parent, const char* name)
-- 
cgit v1.2.3


From 4a846a8eb54fba56f75094d85d001f0420e1d6df Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 16 Oct 2011 15:30:04 -0500
Subject: Fix kiosktool debian rules file on Debian and Ubuntu

---
 debian/lenny/applications/kiosktool/debian/rules    | 12 ++++++++++++
 debian/squeeze/applications/kiosktool/debian/rules  | 12 ++++++++++++
 ubuntu/maverick/applications/kiosktool/debian/rules | 12 ++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/debian/lenny/applications/kiosktool/debian/rules b/debian/lenny/applications/kiosktool/debian/rules
index 6b8f84c74..cb6ee7c18 100755
--- a/debian/lenny/applications/kiosktool/debian/rules
+++ b/debian/lenny/applications/kiosktool/debian/rules
@@ -3,3 +3,15 @@
 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/kiosktool/debian/rules b/debian/squeeze/applications/kiosktool/debian/rules
index 6b8f84c74..cb6ee7c18 100755
--- a/debian/squeeze/applications/kiosktool/debian/rules
+++ b/debian/squeeze/applications/kiosktool/debian/rules
@@ -3,3 +3,15 @@
 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/kiosktool/debian/rules b/ubuntu/maverick/applications/kiosktool/debian/rules
index 6b8f84c74..cb6ee7c18 100755
--- a/ubuntu/maverick/applications/kiosktool/debian/rules
+++ b/ubuntu/maverick/applications/kiosktool/debian/rules
@@ -3,3 +3,15 @@
 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
-- 
cgit v1.2.3


From 2403c83123eb695dd34205f1b20037c264d611b6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 16 Oct 2011 17:10:54 -0500
Subject: Fix kiosktool build deps under Debian and Ubuntu

---
 debian/lenny/applications/kiosktool/debian/control    | 2 +-
 debian/squeeze/applications/kiosktool/debian/control  | 2 +-
 ubuntu/maverick/applications/kiosktool/debian/control | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/lenny/applications/kiosktool/debian/control b/debian/lenny/applications/kiosktool/debian/control
index 41bc32f51..bbf9a457f 100644
--- a/debian/lenny/applications/kiosktool/debian/control
+++ b/debian/lenny/applications/kiosktool/debian/control
@@ -3,7 +3,7 @@ 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
+Build-Depends: debhelper (>= 4.1.0), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kiosktool-trinity
diff --git a/debian/squeeze/applications/kiosktool/debian/control b/debian/squeeze/applications/kiosktool/debian/control
index 41bc32f51..bbf9a457f 100644
--- a/debian/squeeze/applications/kiosktool/debian/control
+++ b/debian/squeeze/applications/kiosktool/debian/control
@@ -3,7 +3,7 @@ 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
+Build-Depends: debhelper (>= 4.1.0), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kiosktool-trinity
diff --git a/ubuntu/maverick/applications/kiosktool/debian/control b/ubuntu/maverick/applications/kiosktool/debian/control
index 41bc32f51..bbf9a457f 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/control
+++ b/ubuntu/maverick/applications/kiosktool/debian/control
@@ -3,7 +3,7 @@ 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
+Build-Depends: debhelper (>= 4.1.0), cdbs, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kiosktool-trinity
-- 
cgit v1.2.3


From ff9eff8eeb7c9b99585cf17d458dbbec34617401 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 16 Oct 2011 22:00:37 -0500
Subject: Add libreadline6-dev as piklab build dep on Debian and Ubuntu

---
 debian/lenny/applications/piklab/debian/control    | 2 +-
 debian/squeeze/applications/piklab/debian/control  | 2 +-
 ubuntu/maverick/applications/piklab/debian/control | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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/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/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/
 
-- 
cgit v1.2.3


From f503bf1c0cd6b461921e8828ea114f8c56d5fb67 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 17 Oct 2011 12:24:31 -0500
Subject: Force knetworkmanager to avoid network-manager 0.8.9 and above

---
 debian/lenny/applications/knetworkmanager/debian/control    | 3 ++-
 debian/squeeze/applications/knetworkmanager/debian/control  | 3 ++-
 ubuntu/maverick/applications/knetworkmanager/debian/control | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/lenny/applications/knetworkmanager/debian/control b/debian/lenny/applications/knetworkmanager/debian/control
index c8875e68c..a1d832945 100644
--- a/debian/lenny/applications/knetworkmanager/debian/control
+++ b/debian/lenny/applications/knetworkmanager/debian/control
@@ -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 b/debian/squeeze/applications/knetworkmanager/debian/control
index c8875e68c..a1d832945 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/control
+++ b/debian/squeeze/applications/knetworkmanager/debian/control
@@ -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/ubuntu/maverick/applications/knetworkmanager/debian/control b/ubuntu/maverick/applications/knetworkmanager/debian/control
index b8b9c41dc..cdbe2190d 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/control
+++ b/ubuntu/maverick/applications/knetworkmanager/debian/control
@@ -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
-- 
cgit v1.2.3


From 941f027b9ee2695e1d62b139d844a58e99ea9b5b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 17 Oct 2011 12:26:16 -0500
Subject: Add knetworkmanager version number in source package name

---
 debian/lenny/applications/knetworkmanager/debian/control    | 2 +-
 debian/squeeze/applications/knetworkmanager/debian/control  | 2 +-
 ubuntu/maverick/applications/knetworkmanager/debian/control | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/lenny/applications/knetworkmanager/debian/control b/debian/lenny/applications/knetworkmanager/debian/control
index a1d832945..0b04bbf74 100644
--- a/debian/lenny/applications/knetworkmanager/debian/control
+++ b/debian/lenny/applications/knetworkmanager/debian/control
@@ -1,4 +1,4 @@
-Source: knetworkmanager-trinity
+Source: knetworkmanager8-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
diff --git a/debian/squeeze/applications/knetworkmanager/debian/control b/debian/squeeze/applications/knetworkmanager/debian/control
index a1d832945..0b04bbf74 100644
--- a/debian/squeeze/applications/knetworkmanager/debian/control
+++ b/debian/squeeze/applications/knetworkmanager/debian/control
@@ -1,4 +1,4 @@
-Source: knetworkmanager-trinity
+Source: knetworkmanager8-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/control b/ubuntu/maverick/applications/knetworkmanager/debian/control
index cdbe2190d..41a91963b 100644
--- a/ubuntu/maverick/applications/knetworkmanager/debian/control
+++ b/ubuntu/maverick/applications/knetworkmanager/debian/control
@@ -1,4 +1,4 @@
-Source: knetworkmanager-trinity
+Source: knetworkmanager8-trinity
 Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-- 
cgit v1.2.3


From fb6450c3dafd533b4b7a17ae4f24a084237b75fc Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 17 Oct 2011 12:28:02 -0500
Subject: Finish knetworkmanager source package rename

---
 .../knetworkmanage8/debian/README.source           |   3 +
 .../knetworkmanage8/debian/cdbs/buildvars.mk       |  86 +++++
 .../knetworkmanage8/debian/cdbs/debian-qt-kde.mk   | 109 ++++++
 .../knetworkmanage8/debian/cdbs/kde.mk             |  97 ++++++
 .../knetworkmanage8/debian/cdbs/team-members       |  16 +
 .../knetworkmanage8/debian/cdbs/uploaders.mk       |  29 ++
 .../knetworkmanage8/debian/cdbs/versions.pl        |  19 ++
 .../applications/knetworkmanage8/debian/changelog  | 373 +++++++++++++++++++++
 .../applications/knetworkmanage8/debian/compat     |   1 +
 .../applications/knetworkmanage8/debian/control    |  35 ++
 .../applications/knetworkmanage8/debian/control.in |  36 ++
 .../applications/knetworkmanage8/debian/copyright  |  34 ++
 .../knetworkmanage8/debian/knetworkmanager.1       | 145 ++++++++
 .../applications/knetworkmanage8/debian/manpages   |   1 +
 .../lenny/applications/knetworkmanage8/debian/menu |   6 +
 .../network-manager-kde-trinity.lintian-overrides  |   2 +
 .../debian/network-manager-kde-trinity.postinst    |  16 +
 .../knetworkmanage8/debian/patches/series          |   0
 .../applications/knetworkmanage8/debian/rules      |  47 +++
 .../applications/knetworkmanage8/debian/watch      |   2 +
 .../knetworkmanager/debian/README.source           |   3 -
 .../knetworkmanager/debian/cdbs/buildvars.mk       |  86 -----
 .../knetworkmanager/debian/cdbs/debian-qt-kde.mk   | 109 ------
 .../knetworkmanager/debian/cdbs/kde.mk             |  97 ------
 .../knetworkmanager/debian/cdbs/team-members       |  16 -
 .../knetworkmanager/debian/cdbs/uploaders.mk       |  29 --
 .../knetworkmanager/debian/cdbs/versions.pl        |  19 --
 .../applications/knetworkmanager/debian/changelog  | 373 ---------------------
 .../applications/knetworkmanager/debian/compat     |   1 -
 .../applications/knetworkmanager/debian/control    |  35 --
 .../applications/knetworkmanager/debian/control.in |  36 --
 .../applications/knetworkmanager/debian/copyright  |  34 --
 .../knetworkmanager/debian/knetworkmanager.1       | 145 --------
 .../applications/knetworkmanager/debian/manpages   |   1 -
 .../lenny/applications/knetworkmanager/debian/menu |   6 -
 .../network-manager-kde-trinity.lintian-overrides  |   2 -
 .../debian/network-manager-kde-trinity.postinst    |  16 -
 .../knetworkmanager/debian/patches/series          |   0
 .../applications/knetworkmanager/debian/rules      |  47 ---
 .../applications/knetworkmanager/debian/watch      |   2 -
 .../knetworkmanager/debian/README.source           |   3 -
 .../knetworkmanager/debian/cdbs/buildvars.mk       |  86 -----
 .../knetworkmanager/debian/cdbs/debian-qt-kde.mk   | 109 ------
 .../knetworkmanager/debian/cdbs/kde.mk             |  97 ------
 .../knetworkmanager/debian/cdbs/team-members       |  16 -
 .../knetworkmanager/debian/cdbs/uploaders.mk       |  29 --
 .../knetworkmanager/debian/cdbs/versions.pl        |  19 --
 .../applications/knetworkmanager/debian/changelog  | 373 ---------------------
 .../applications/knetworkmanager/debian/compat     |   1 -
 .../applications/knetworkmanager/debian/control    |  35 --
 .../applications/knetworkmanager/debian/control.in |  36 --
 .../applications/knetworkmanager/debian/copyright  |  34 --
 .../knetworkmanager/debian/knetworkmanager.1       | 145 --------
 .../applications/knetworkmanager/debian/manpages   |   1 -
 .../applications/knetworkmanager/debian/menu       |   6 -
 .../network-manager-kde-trinity.lintian-overrides  |   2 -
 .../debian/network-manager-kde-trinity.postinst    |  16 -
 .../knetworkmanager/debian/patches/series          |   0
 .../applications/knetworkmanager/debian/rules      |  47 ---
 .../applications/knetworkmanager/debian/watch      |   2 -
 .../knetworkmanager8/debian/README.source          |   3 +
 .../knetworkmanager8/debian/cdbs/buildvars.mk      |  86 +++++
 .../knetworkmanager8/debian/cdbs/debian-qt-kde.mk  | 109 ++++++
 .../knetworkmanager8/debian/cdbs/kde.mk            |  97 ++++++
 .../knetworkmanager8/debian/cdbs/team-members      |  16 +
 .../knetworkmanager8/debian/cdbs/uploaders.mk      |  29 ++
 .../knetworkmanager8/debian/cdbs/versions.pl       |  19 ++
 .../applications/knetworkmanager8/debian/changelog | 373 +++++++++++++++++++++
 .../applications/knetworkmanager8/debian/compat    |   1 +
 .../applications/knetworkmanager8/debian/control   |  35 ++
 .../knetworkmanager8/debian/control.in             |  36 ++
 .../applications/knetworkmanager8/debian/copyright |  34 ++
 .../knetworkmanager8/debian/knetworkmanager.1      | 145 ++++++++
 .../applications/knetworkmanager8/debian/manpages  |   1 +
 .../applications/knetworkmanager8/debian/menu      |   6 +
 .../network-manager-kde-trinity.lintian-overrides  |   2 +
 .../debian/network-manager-kde-trinity.postinst    |  16 +
 .../knetworkmanager8/debian/patches/series         |   0
 .../applications/knetworkmanager8/debian/rules     |  47 +++
 .../applications/knetworkmanager8/debian/watch     |   2 +
 .../knetworkmanager/debian/README.source           |   3 -
 .../knetworkmanager/debian/cdbs/buildvars.mk       |  86 -----
 .../knetworkmanager/debian/cdbs/debian-qt-kde.mk   | 109 ------
 .../knetworkmanager/debian/cdbs/kde.mk             |  97 ------
 .../knetworkmanager/debian/cdbs/team-members       |  16 -
 .../knetworkmanager/debian/cdbs/uploaders.mk       |  29 --
 .../knetworkmanager/debian/cdbs/versions.pl        |  19 --
 .../applications/knetworkmanager/debian/changelog  | 373 ---------------------
 .../applications/knetworkmanager/debian/compat     |   1 -
 .../applications/knetworkmanager/debian/control    |  37 --
 .../applications/knetworkmanager/debian/control.in |  36 --
 .../applications/knetworkmanager/debian/copyright  |  34 --
 .../knetworkmanager/debian/knetworkmanager.1       | 145 --------
 .../applications/knetworkmanager/debian/manpages   |   1 -
 .../applications/knetworkmanager/debian/menu       |   6 -
 .../network-manager-kde-trinity.lintian-overrides  |   2 -
 .../debian/network-manager-kde-trinity.postinst    |  16 -
 .../knetworkmanager/debian/patches/series          |   0
 .../applications/knetworkmanager/debian/rules      |  47 ---
 .../applications/knetworkmanager/debian/watch      |   2 -
 .../knetworkmanager8/debian/README.source          |   3 +
 .../knetworkmanager8/debian/cdbs/buildvars.mk      |  86 +++++
 .../knetworkmanager8/debian/cdbs/debian-qt-kde.mk  | 109 ++++++
 .../knetworkmanager8/debian/cdbs/kde.mk            |  97 ++++++
 .../knetworkmanager8/debian/cdbs/team-members      |  16 +
 .../knetworkmanager8/debian/cdbs/uploaders.mk      |  29 ++
 .../knetworkmanager8/debian/cdbs/versions.pl       |  19 ++
 .../applications/knetworkmanager8/debian/changelog | 373 +++++++++++++++++++++
 .../applications/knetworkmanager8/debian/compat    |   1 +
 .../applications/knetworkmanager8/debian/control   |  37 ++
 .../knetworkmanager8/debian/control.in             |  36 ++
 .../applications/knetworkmanager8/debian/copyright |  34 ++
 .../knetworkmanager8/debian/knetworkmanager.1      | 145 ++++++++
 .../applications/knetworkmanager8/debian/manpages  |   1 +
 .../applications/knetworkmanager8/debian/menu      |   6 +
 .../network-manager-kde-trinity.lintian-overrides  |   2 +
 .../debian/network-manager-kde-trinity.postinst    |  16 +
 .../knetworkmanager8/debian/patches/series         |   0
 .../applications/knetworkmanager8/debian/rules     |  47 +++
 .../applications/knetworkmanager8/debian/watch     |   2 +
 120 files changed, 3173 insertions(+), 3173 deletions(-)
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/README.source
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/cdbs/buildvars.mk
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/cdbs/debian-qt-kde.mk
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/cdbs/kde.mk
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/cdbs/team-members
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/cdbs/uploaders.mk
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/cdbs/versions.pl
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/changelog
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/compat
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/control
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/control.in
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/copyright
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/knetworkmanager.1
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/manpages
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/menu
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.lintian-overrides
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.postinst
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/patches/series
 create mode 100755 debian/lenny/applications/knetworkmanage8/debian/rules
 create mode 100644 debian/lenny/applications/knetworkmanage8/debian/watch
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/README.source
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/cdbs/buildvars.mk
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/cdbs/kde.mk
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/cdbs/team-members
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/cdbs/uploaders.mk
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/cdbs/versions.pl
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/changelog
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/compat
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/control
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/control.in
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/copyright
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/knetworkmanager.1
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/manpages
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/menu
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/patches/series
 delete mode 100755 debian/lenny/applications/knetworkmanager/debian/rules
 delete mode 100644 debian/lenny/applications/knetworkmanager/debian/watch
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/README.source
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/cdbs/buildvars.mk
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/cdbs/kde.mk
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/cdbs/team-members
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/cdbs/uploaders.mk
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/cdbs/versions.pl
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/changelog
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/compat
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/control
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/control.in
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/copyright
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/knetworkmanager.1
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/manpages
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/menu
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/patches/series
 delete mode 100755 debian/squeeze/applications/knetworkmanager/debian/rules
 delete mode 100644 debian/squeeze/applications/knetworkmanager/debian/watch
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/README.source
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/cdbs/buildvars.mk
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/cdbs/team-members
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/cdbs/uploaders.mk
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/cdbs/versions.pl
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/changelog
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/compat
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/control
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/control.in
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/copyright
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/knetworkmanager.1
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/manpages
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/menu
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/patches/series
 create mode 100755 debian/squeeze/applications/knetworkmanager8/debian/rules
 create mode 100644 debian/squeeze/applications/knetworkmanager8/debian/watch
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/README.source
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/cdbs/buildvars.mk
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/cdbs/kde.mk
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/cdbs/team-members
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/cdbs/uploaders.mk
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/cdbs/versions.pl
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/changelog
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/compat
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/control
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/control.in
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/copyright
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/knetworkmanager.1
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/manpages
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/menu
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/patches/series
 delete mode 100755 ubuntu/maverick/applications/knetworkmanager/debian/rules
 delete mode 100644 ubuntu/maverick/applications/knetworkmanager/debian/watch
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/README.source
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/buildvars.mk
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/team-members
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/uploaders.mk
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/changelog
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/compat
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/control
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/control.in
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/copyright
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/knetworkmanager.1
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/manpages
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/menu
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/patches/series
 create mode 100755 ubuntu/maverick/applications/knetworkmanager8/debian/rules
 create mode 100644 ubuntu/maverick/applications/knetworkmanager8/debian/watch

diff --git a/debian/lenny/applications/knetworkmanage8/debian/README.source b/debian/lenny/applications/knetworkmanage8/debian/README.source
new file mode 100644
index 000000000..96fb271ab
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/README.source
@@ -0,0 +1,3 @@
+This package uses the quilt patch management system.
+
+Please refer to /usr/share/doc/quilt/README.source for further information.
diff --git a/debian/lenny/applications/knetworkmanage8/debian/cdbs/buildvars.mk b/debian/lenny/applications/knetworkmanage8/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# This program 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; either version 2, or (at
+# your option) any later version.
+#
+# This program 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 program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
diff --git a/debian/lenny/applications/knetworkmanage8/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetworkmanage8/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..47e83ef4a
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
+endif
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	done
+
+clean::
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/lenny/applications/knetworkmanage8/debian/cdbs/kde.mk b/debian/lenny/applications/knetworkmanage8/debian/cdbs/kde.mk
new file mode 100644
index 000000000..5b6508f8c
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program 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; either version 2, or (at
+# your option) any later version.
+#
+# This program 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 program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/kde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final =
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/debian/lenny/applications/knetworkmanage8/debian/cdbs/team-members b/debian/lenny/applications/knetworkmanage8/debian/cdbs/team-members
new file mode 100644
index 000000000..05761af6e
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/cdbs/team-members
@@ -0,0 +1,16 @@
+Sune Vuorela <debian@pusling.com>
+Ana Beatriz Guerrero Lopez <ana@debian.org>
+Fathi Boudra <fboudra@free.fr>
+Modestas Vainius <geromanas@mailas.com>
+Josh Metzler <joshdeb@metzlers.org>
+Isaac Clerencia <isaac@debian.org>
+Adeodato Simó <dato@net.com.org.es>
+Adeodato Simo <dato@net.com.org.es>
+Christopher Martin <chrsmrtn@debian.org>
+Daniel Schepler <schepler@debian.org>
+Sarah Hobbs <hobbsee@ubuntu.com>
+Nacho Barrientos Arias <nacho@debian.org>
+Ricardo Javier Cardenes Medina <rcardenes@debian.org>
+Ricardo Cardenes <rcardenes@debian.org>
+Armin Berres <trigger+debian@space-based.de>
+Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/lenny/applications/knetworkmanage8/debian/cdbs/uploaders.mk b/debian/lenny/applications/knetworkmanage8/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
diff --git a/debian/lenny/applications/knetworkmanage8/debian/cdbs/versions.pl b/debian/lenny/applications/knetworkmanage8/debian/cdbs/versions.pl
new file mode 100644
index 000000000..9ce11d8a3
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/-[^-]+$//;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/debian/lenny/applications/knetworkmanage8/debian/changelog b/debian/lenny/applications/knetworkmanage8/debian/changelog
new file mode 100644
index 000000000..04405984c
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/changelog
@@ -0,0 +1,373 @@
+knetworkmanager8-trinity (1:0.8-0ubuntu12) karmic; urgency=low
+
+  * UI tweaks for discoverability
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 26 Oct 2009 17:44:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu10) karmic; urgency=low
+
+  * Fixed VPN reauthentication request dialog failure when used with the permanent storage option
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 06 Oct 2009 19:31:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu7) karmic; urgency=low
+
+  * Fixed various minor glitches
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 03 Oct 2009 12:29:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu6) karmic; urgency=low
+
+  * Repaired poor usability for new wireless connections
+  * Repaired poor usability for connection management
+  * VPN connections now remember login information when asked
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 29 Sep 2009 09:39:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu5) karmic; urgency=low
+
+  * Repaired VPN plugins
+  * VPNC now allows hashed group password
+  * PPTP repaired and enabled
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 28 Sep 2009 14:51:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu4) karmic; urgency=low
+
+  * Patched backend for new NM0.8 API
+  * Repaired poor usability in the "new connection" tasktray menu
+  * Repaired poor usability in the available devices tasktray menu
+  * Moved to /opt/trinity
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 22 Aug 2009 23:34:00 -0600
+
+knetworkmanager (1:0.7~~svn941706-1) unstable; urgency=low
+
+  * Updated SVN snapshot (r941706).
+  * debian/patches/04-dbus_access.patch
+    - Most of the relevant changes have been merged upstream. The patch now
+      only contains the Debian specific group "netdev" section.
+  * debian/control
+    - Bump Standards-Version to 3.8.1. No further changes.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 20 Mar 2009 22:59:51 +0100
+
+knetworkmanager (1:0.7~~svn931033-2) unstable; urgency=low
+
+  * debian/patches/05-no_blank_psk.patch
+    - Do not set zero-length PSK and LEAP passwords otherwise libnm-util fails
+      to validate them. Closes: #517213
+      Patch by Dan Williams, thanks!
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 03 Mar 2009 00:34:15 +0100
+
+knetworkmanager (1:0.7~~svn931033-1) unstable; urgency=low
+
+  * Merge experimental branch into unstable. Remaining changes:
+    - Remove 07-indicate_manual_config.patch, obsolete. 
+  * debian/control
+    - Wrap Build-Depends.
+    - Bump Build-Depends on debhelper to (>= 7).
+  * debian/compat
+    - Bump debhelper compat level to 7.
+  * debian/rules
+    - Include debhelper.mk before any other files as recommended by the cdbs
+      documentation.
+  * Update SVN snapshot to r931033.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 25 Feb 2009 10:54:39 +0100
+
+knetworkmanager (1:0.7~~svn908338-2) experimental; urgency=low
+
+  * debian/patches/04-dbus_access.patch
+    - Update D-Bus names and interfaces for NM 0.7. Closes: #511526
+    - Remove bare send_interface directives to avoid non-deterministic allow
+      messages with no interface. Closes: #510757
+    - Do not allow unpriviledged processes to ask for a users' connections.
+    - Allow introspection by default.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 05 Feb 2009 01:52:22 +0100
+
+knetworkmanager (1:0.7~~svn908338-1) experimental; urgency=low
+
+  * Updated SVN snapshot (r908338).
+  * debian/rules
+    - Stop moving icons around, fixed upstream.
+  * debian/patches/01-configure_package_name.patch
+    - Make sure we set the correct PACKAGE name when generating the build
+      system so the translations are installed properly.
+  * debian/network-manager-kde.lintian-overrides
+    - Updated for the latest lintian changes.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 11 Jan 2009 06:52:06 +0100
+
+knetworkmanager (1:0.7~~svn897092-1) experimental; urgency=low
+
+  * SVN snapshot of the upcoming 0.7 release (for NM 0.7).
+  * debian/control
+    - Add Build-Depends on pkg-config.
+    - Bump Build-Depends on nm-* packages to (>= 0.7.0).
+    - Add Build-Depends on libdbus-1-qt3-dev (>= 0.8.1).
+    - Bump Build-Depends on debhelper to (>= 6.0.7) for dh_lintian.
+    - Bump Depends on network-manager to (>= 0.7.0).
+    - Bump Standards-Version to 3.8.0. Add README.source as recommended by the
+      new policy.
+  * debian/rules
+    - Install autostart desktop file into /usr/share/autostart/.
+    - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them.
+      Closes: #487303
+    - Add support for both libtool 1.x and 2.x.
+  * Switch patch management system to quilt.
+  * debian/patches/04-dbus_access.patch
+    - Refresh and update.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 16 Dec 2008 04:18:10 +0100
+
+knetworkmanager (1:0.2.2-2) unstable; urgency=low
+
+  * debian/patches/07-indicate_manual_config.patch
+    - manual-means-online: If there are interfaces that are not managed by
+      NetworkManager because they have custom configuration in
+      /etc/network/interfaces, we assume to be online and show a wired network
+      icon indicating manual network configuration.
+  * debian/control
+    - Add Build-Depends on pkg-config.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 14 Jan 2009 08:22:11 +0100
+
+knetworkmanager (1:0.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+    - Improved tray icon animation using mng files. Closes: #394815
+    - Improved LEAP security. Closes: #470709
+  * Removed patches
+    - debian/patches/01-fix_french_translation.patch (merged upstream)
+    - debian/patches/02-linux_types.patch (obsolete)
+    - debian/patches/03-awk_path.patch (fixed upstream)
+    - debian/patches/05-desktop_file_fixes.patch (merged upstream)
+  * debian/knetworkmanager.linda
+    - Remove the linda override file, linda is dead.
+  * debian/{knetworkmanager.lintian -> network-manager-kde.lintian-overrides}
+    - Rename the lintian override file so it is automatically installed by
+      dh_lintian.
+  * debian/rules
+    - Drop the no longer required install rules for the override files.
+    - Drop the install rule for the autostart file. It's provided by upstream
+      now.
+  * debian/copyright
+    - Update the authors list.
+  * debian/control
+    - Bump Build-Depends on libnl-dev (>= 1.1).
+    - Drop Build-Depends on kapptemplate. The upstream tarball ships a proper
+      admin/ directory again.
+  * debian/watch
+    - New download location at ftp.kde.org.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 04 Apr 2008 19:41:02 +0200
+
+knetworkmanager (1:0.2-3) unstable; urgency=low
+
+  * debian/control
+    - Use the new "Homepage:" field to specify the upstream URL.
+    - The Vcs-* fields are now officially supported, so remove the XS- prefix.
+    - Bump Standards-Version to 3.7.3. No further changes required.
+    - Fix a few capitalization errors in the package description.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 11 Jan 2008 02:08:24 +0100
+
+knetworkmanager (1:0.2-2) unstable; urgency=low
+
+  * Rebuild against network-manager 0.6.5 to enable phase2 and leap
+    authentication support.
+  * debian/rules
+    - Remove debian/stamp-bootstrap on clean. This fixes a FTBFS if package is
+      built twice in a row. Closes: #442621
+  * debian/control
+    - Add Build-Conflicts: autoconf2.13. Closes: #441046
+  * debian/menu
+    - Set section to Applications/Network/Monitoring which seems to be the
+      most appropriate amongst the available sections.
+  * debian/patches/05-desktop_file_fixes.patch
+    - Fix the *.desktop files to be compliant to the fd.o menu and desktop
+      entry spec.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 16 Sep 2007 21:01:25 +0200
+
+knetworkmanager (1:0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/05-leap_support.patch
+    - Removed, merged upstream.
+  * debian/patches/06-version_check.patch
+    - Removed, merged upstream.
+  * The upstream tarball does not ship an admin/ directory. Build-Depend on
+    kapptemplate, so we can copy it from there.
+  * debian/menu
+    - Update to new menu hierarchy and add a longtitle.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 25 Jul 2007 17:10:36 +0200
+
+knetworkmanager (1:0.2~svn678822-3) unstable; urgency=low
+
+  * debian/patches/06-version_check.patch
+    - Added. Fixes the problem with knetworkmanager no longer connecting
+      automatically upon login. Closes: #431255
+      If you are upgrading from a previous 0.2 svn snapshot, you may have to
+      clear the list of trusted networks in the configuration dialog.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 01 Jul 2007 11:47:00 +0200
+
+knetworkmanager (1:0.2~svn678822-2) unstable; urgency=low
+
+  * debian/patches/02-linux_types.patch
+    - Pass "-std=gnu++98" to CXXFLAGS. Otherwise the type __u64 is not defined
+      in linux-libc-dev for ANSI C/C89. Closes: #430795
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 28 Jun 2007 06:08:04 +0200
+
+knetworkmanager (1:0.2~svn678822-1) unstable; urgency=low
+
+  * SVN snapshot of the upcoming 0.2 release which has native VPN plugin
+    support. Closes: #415742
+  * debian/control
+    - Add XS-Vcs-* fields.
+    - Add Recommends: network-manager-vpnc, network-manager-openvpn.
+  * debian/rules
+    - Compile with openvpn and vpnc support.
+
+  * Removed patches that were merged upstream:
+    - debian/patches/05-no_deserialize.patch
+    - debian/patches/06-pretty_notification.patch
+    - debian/patches/07-overlay_icon_vpn.patch
+    - debian/patches/08-disable_sm.patch
+    - debian/patches/09-dbus_bool_t.patch
+
+  * debian/patches/02-linux_types.patch
+    - Added. Needed to workaround a problem in libnl.
+  * debian/patches/03-awk_path.patch
+    - Added. In Debian awk is installed in /usr/bin.
+  * debian/patches/04-dbus_access.patch
+    - Do not remove the dbus at_console access check but make it an
+      alternative to the Debian netdev group policy. Closes: #426467
+  * debian/patches/05-leap_support.patch
+    - Added. Do not fail to compile if LEAP support is not available.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 22 Jun 2007 21:08:32 +0100
+
+knetworkmanager (1:0.1-4) unstable; urgency=low
+
+  * Actually install the autostart file for knetworkmanager.
+    Thanks to Yannick Roehlly for spotting this glitch.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 12 Jan 2007 11:26:28 +0100
+
+knetworkmanager (1:0.1-3) unstable; urgency=low
+
+  * Pull some features and bug fixes from svn:
+    - debian/patches/05-no_deserialize.patch
+      + Don't call deserialize on encryption object to avoid warning of
+        libnm-util. Closes: #391486
+    - debian/patches/06-pretty_notification.patch
+      + Prettify notification messages.
+    - debian/patches/07-overlay_icon_vpn.patch
+      + Show overlay icon (lock) for active VPN connections.
+    - debian/patches/08-disable_sm.patch
+      + Disable session management to avoid a deadlock when accessing kwallet.
+        Install an autostart file into /usr/share/autostart/ instead.
+        Closes: #406162
+    - debian/patches/09-dbus_bool_t.patch
+      + Use dbus_bool_t instead of bool. Closes: #398974
+  * debian/patches/01-fix_french_translation.patch
+    - Added patch from Emmanuel Bouthenot which fixes some errors in the
+      French translation. Closes: #402285
+
+ -- Michael Biebl <biebl@debian.org>  Tue,  9 Jan 2007 16:31:52 +0100
+
+knetworkmanager (1:0.1-2) unstable; urgency=low
+
+  * Update maintainer email address to biebl@debian.org. 
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 20 Oct 2006 00:02:03 +0200
+
+knetworkmanager (1:0.1-1) unstable; urgency=low
+
+  * Finally the 0.1 release. Woohoo!
+    - Use an epoch to fix the versioning scheme I managed to mess up.
+    - Fixes a crash when removing network objects for a nonexistent network
+      interface. Closes: #390052
+  * debian/patches/01-no_network_status.patch
+    - Removed, fixed upstream.
+  * debian/patches/03-configure.patch
+    - Removed, fixed upstream.
+  * Dropped the build-dep on kapptemplate. The upstream tarball now ships a
+    proper admin/ directory.
+  * debian/patches/02-dialup.patch
+    - Removed. Also dropped the Recommends: pppconfig. pppconfig can't
+      generate entries for /etc/network/interfaces yet. 
+
+ -- Michael Biebl <biebl@teco.edu>  Fri, 29 Sep 2006 19:18:08 +0200
+
+knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low
+
+  * Updated to svn revision 586773.
+  * Do not refer to non existent khelpcenter help:/knetworkmanager/ in man
+    page. Closes: #385642
+
+ -- Michael Biebl <biebl@teco.edu>  Wed, 20 Sep 2006 19:46:52 +0200
+
+knetworkmanager (0.09+0.1r577960-1) unstable; urgency=low
+
+  * Updated to svn revision 577960.
+    - Access KWallet on demand, not on startup. Closes: #379606
+  * Added a Recommends: pppconfig. Closes: #380316
+
+ -- Michael Biebl <biebl@teco.edu>  Mon, 28 Aug 2006 01:14:29 +0200
+
+knetworkmanager (0.09+0.1r560817-1) unstable; urgency=medium
+
+  * Updated to svn revision 560817.
+  * Removed 04-gnome_keyring_daemon.patch, fixed upstream.
+  * Added 04-dbus_access.patch. Fixes D-Bus access rights.
+    Closes: #379309, #379364
+  * Enabled dial up support. Set pppconfig as configuration utility.
+    Closes: #376071
+  * Reload D-Bus after installation. Closes: #379307
+  * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379820
+
+ -- Michael Biebl <biebl@teco.edu>  Tue, 25 Jul 2006 23:33:31 +0200
+
+knetworkmanager (0.09+0.1r550737-1) unstable; urgency=low
+
+  * Updated to svn revision 550737.
+  * Added 01-no_network_status.patch which removes a build dependency on
+    networkstatus.
+  * Removed 03-configure_notifications.patch, merged upstream.
+  * This version does not ship an admin/ directory. Added a build dependency
+    on kapptemplate and modified debian/rules to copy it from kapptemplate.
+  * Bumped Standards-Version to 3.7.2, no further changes required.
+  * Updated homepage URL.
+  * Added 04-gnome_keyring_daemon.patch which sets the correct path to the
+    gnome-keyring-daemon binary. VPN plugins use gnome-keyring-daemon to store
+    their passwords.
+
+ -- Michael Biebl <biebl@teco.edu>  Wed, 14 Jun 2006 17:16:07 +0200
+
+knetworkmanager (0.09+0.1r527269-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed 01-xdg_app.patch, merged upstream.
+  * Added 03-configure_notifications.patch, this patch modifies the context
+    menu of the systray applet to provide quick access to the notification
+    settings.
+  * Added a "Provides: knetworkmanager" to make the package installable by its
+    upstream name.
+  * Initial upload. Closes: #351069
+
+ -- Michael Biebl <biebl@teco.edu>  Thu, 27 Apr 2006 08:01:39 +0200
+
+knetworkmanager (0.09+0.1r5964-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Michael Biebl <biebl@teco.edu>  Tue,  7 Feb 2006 21:43:56 +0100
+
diff --git a/debian/lenny/applications/knetworkmanage8/debian/compat b/debian/lenny/applications/knetworkmanage8/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/lenny/applications/knetworkmanage8/debian/control b/debian/lenny/applications/knetworkmanage8/debian/control
new file mode 100644
index 000000000..0b04bbf74
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/control
@@ -0,0 +1,35 @@
+Source: knetworkmanager8-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: cdbs,
+ debhelper (>= 7),
+ pkg-config,
+ kdelibs4-trinity-dev,
+ 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,
+ libnl-dev (>= 1.1),
+ quilt,
+ network-manager-vpnc,
+ network-manager-openvpn,
+ network-manager-strongswan,
+ network-manager-pptp,
+ automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+Homepage: http://opensuse.org/Projects/KNetworkManager
+
+Package: network-manager-kde-trinity
+Architecture: any
+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
+Description: KDE systray applet for controlling NetworkManager [Trinity]
+ Systray applet for controlling network connections managed by 
+ NetworkManager. It is mainly written for Trinity but also works for 
+ other desktop environments like GNOME or Xfce.
diff --git a/debian/lenny/applications/knetworkmanage8/debian/control.in b/debian/lenny/applications/knetworkmanage8/debian/control.in
new file mode 100644
index 000000000..43adf3e33
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/control.in
@@ -0,0 +1,36 @@
+Source: knetworkmanager-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: @@@MAINTAINER@@@
+Uploaders: @@@UPLOADERS@@@
+Build-Depends: cdbs,
+ debhelper (>= 7),
+ pkg-config,
+ kdelibs4-trinity-dev,
+ libnm-util-dev (>= 0.7.0),
+ libnm-glib-dev (>= 0.7.0),
+ network-manager-dev (>= 0.7.0),
+ libhal-dev,
+ libdbus-1-qt3-dev (>= 0.8.1),
+ libiw-dev,
+ libnl-dev (>= 1.1),
+ quilt,
+ network-manager-vpnc,
+ network-manager-openvpn,
+ network-manager-strongswan,
+ network-manager-pptp,
+ automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Standards-Version: 3.8.3
+Homepage: http://opensuse.org/Projects/KNetworkManager
+
+Package: network-manager-kde-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
+Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
+Provides: knetworkmanager-trinity
+Conflicts: network-manager-kde
+Description: KDE systray applet for controlling NetworkManager [Trinity]
+ Systray applet for controlling network connections managed by 
+ NetworkManager. It is mainly written for Trinity but also works for 
+ other desktop environments like GNOME or Xfce.
diff --git a/debian/lenny/applications/knetworkmanage8/debian/copyright b/debian/lenny/applications/knetworkmanage8/debian/copyright
new file mode 100644
index 000000000..2490de254
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/copyright
@@ -0,0 +1,34 @@
+This package was debianized by Michael Biebl <biebl@teco.edu> on
+Fri,  3 Feb 2006 05:53:06 +0100.
+
+It was downloaded from http://www.opensuse.org
+
+Upstream Authors: 
+  Timo Hoenig <thoenig@suse.de>
+  Will Stephenson <wstephenson@suse.de>
+  Stefan Bogner <sbogner@suse.de>
+  Helmut Schaa <hschaa@suse.de>
+  Valentine Sinitsyn <e_val@inbox.ru>
+
+Copyright: 
+  Copyright (C) 2005, 2006 Novell, Inc.
+
+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; either version 2 of the License, or
+  (at your option) any later version.
+
+  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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
diff --git a/debian/lenny/applications/knetworkmanage8/debian/knetworkmanager.1 b/debian/lenny/applications/knetworkmanage8/debian/knetworkmanager.1
new file mode 100644
index 000000000..3cd261c89
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/knetworkmanager.1
@@ -0,0 +1,145 @@
+.\" This file was generated by kdemangen.pl
+.TH KNETWORKMANAGER 1 "Feb 2006" "K Desktop Environment" "A NetworkManager front-end for KDE"
+.SH NAME
+knetworkmanager
+\- A NetworkManager front-end for KDE
+.SH SYNOPSIS
+knetworkmanager [Qt\-options] [KDE\-options] 
+.SH DESCRIPTION
+A NetworkManager front-end for KDE
+.SH OPTIONS
+.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 - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.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
+.BR networkmanager (1)
+.SH AUTHORS
+.nf
+Timo Hoenig <thoenig@suse.de>
+.br
+Stefan Bogner <sbogner@suse.de>
+.br
+Will Stephenson <wstephenson@suse.de>
+.br
+
diff --git a/debian/lenny/applications/knetworkmanage8/debian/manpages b/debian/lenny/applications/knetworkmanage8/debian/manpages
new file mode 100644
index 000000000..e2859341f
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/manpages
@@ -0,0 +1 @@
+debian/knetworkmanager.1
diff --git a/debian/lenny/applications/knetworkmanage8/debian/menu b/debian/lenny/applications/knetworkmanage8/debian/menu
new file mode 100644
index 000000000..9775e9c7c
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/menu
@@ -0,0 +1,6 @@
+?package(network-manager-kde): \
+	needs="X11" \
+	section="Applications/Network/Monitoring" \
+  	title="KNetworkManager" \
+	longtitle="A KDE frontend for NetworkManager" \
+	command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.lintian-overrides b/debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.lintian-overrides
new file mode 100644
index 000000000..9ae01a92b
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.lintian-overrides
@@ -0,0 +1,2 @@
+network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
+network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
diff --git a/debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.postinst b/debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.postinst
new file mode 100644
index 000000000..fdd4e51ca
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.postinst
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  configure)
+  	# Ask D-Bus to reload the config file
+  	if [ -x "/etc/init.d/dbus" ]; then
+		invoke-rc.d dbus force-reload || true
+	fi
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/lenny/applications/knetworkmanage8/debian/patches/series b/debian/lenny/applications/knetworkmanage8/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
diff --git a/debian/lenny/applications/knetworkmanage8/debian/rules b/debian/lenny/applications/knetworkmanage8/debian/rules
new file mode 100755
index 000000000..97955e38b
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/rules
@@ -0,0 +1,47 @@
+#!/usr/bin/make -f
+  
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO
+
+DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp
+
+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
+
+binary-install/network-manager-kde-trinity::
+	# Install autostart file
+	install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \
+		debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop
+
+clean::
+	find . -name Makefile.in | xargs rm -f
+	rm -f aclocal.m4
+	rm -f acinclude.m4
+	rm -f configure
+	rm -f configure.files
+	rm -f configure.in
+	rm -f config.h.in
+	rm -f stamp-h.in
+	rm -f subdirs	
+	rm -f admin/ltmain.sh
+	rm -f admin/libtool.m4.in
+	rm -f debian/stamp-bootstrap
diff --git a/debian/lenny/applications/knetworkmanage8/debian/watch b/debian/lenny/applications/knetworkmanage8/debian/watch
new file mode 100644
index 000000000..ad7a7be91
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanage8/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.kde.org/pub/kde/stable/apps/Trinity.x/network/knetworkmanager-(.*)\.tar\.gz
diff --git a/debian/lenny/applications/knetworkmanager/debian/README.source b/debian/lenny/applications/knetworkmanager/debian/README.source
deleted file mode 100644
index 96fb271ab..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-This package uses the quilt patch management system.
-
-Please refer to /usr/share/doc/quilt/README.source for further information.
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/buildvars.mk b/debian/lenny/applications/knetworkmanager/debian/cdbs/buildvars.mk
deleted file mode 100644
index 23d4709dc..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/cdbs/buildvars.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2002,2003 Colin Walters <walters@debian.org>
-# Description: Defines some useful variables, but no rules
-#
-# This program 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; either version 2, or (at
-# your option) any later version.
-#
-# This program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_rules_buildvars
-_cdbs_rules_buildvars = 1
-
-CDBS_VERSION = something
-
-# Common useful variables
-DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
-DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
-DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
-
-# Split into arch/indep packages
-ifneq ($(DEB_INDEP_PACKAGES),cdbs)
-DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
-DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
-endif
-# Split into normal and udeb packages
-ifeq ($(DEB_UDEB_PACKAGES),)
-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-else
-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-endif
-# Too much bother for now.  If someone complains we'll fix it.
-#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
-#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
-# A handy list of every package, udeb or not
-DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
-DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
-DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
-
-DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-
-# Some support for srcdir != builddir builds.
-# These are relative to the root of the package
-DEB_SRCDIR ?= .
-DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
-
-# Miscellaneous bits
-DEB_ARCH = $(shell dpkg --print-architecture)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
-DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-
-ifeq ($(words $(DEB_ALL_PACKAGES)),1)
-	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
-else
-	DEB_DESTDIR = $(CURDIR)/debian/tmp/
-endif
-
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
-
-endif
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
deleted file mode 100644
index 47e83ef4a..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-	touch debian/stamp-cvs-make
-
-include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
-
-DEB_PATCHDIRS := debian/patches/common debian/patches
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-	done
-
-clean::
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/kde.mk b/debian/lenny/applications/knetworkmanager/debian/cdbs/kde.mk
deleted file mode 100644
index 5b6508f8c..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/cdbs/kde.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Description: A class for KDE packages; sets KDE environment variables, etc
-#
-# This program 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; either version 2, or (at
-# your option) any later version.
-#
-# This program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_kde
-_cdbs_class_kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
-
-ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-common-build-arch common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
-common-install-arch common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
-
-clean::
-	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
-
-# This is a convenience target for calling manually.  It's not part of
-# the build process.
-buildprep: clean apply-patches
-	$(MAKE) -f admin/Makefile.common dist
-	debian/rules clean
-
-endif
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/team-members b/debian/lenny/applications/knetworkmanager/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/uploaders.mk b/debian/lenny/applications/knetworkmanager/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/versions.pl b/debian/lenny/applications/knetworkmanager/debian/cdbs/versions.pl
deleted file mode 100644
index 9ce11d8a3..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/-[^-]+$//;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "KDE-Version3=$version3\n";
-print "KDE-Version2=$version2\n";
-print "KDE-Next-Version3=$version3_next\n";
-print "KDE-Next-Version2=$version2_next\n";
diff --git a/debian/lenny/applications/knetworkmanager/debian/changelog b/debian/lenny/applications/knetworkmanager/debian/changelog
deleted file mode 100644
index ed0d32a81..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/changelog
+++ /dev/null
@@ -1,373 +0,0 @@
-knetworkmanager-trinity (1:0.8-0ubuntu12) karmic; urgency=low
-
-  * UI tweaks for discoverability
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 26 Oct 2009 17:44:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu10) karmic; urgency=low
-
-  * Fixed VPN reauthentication request dialog failure when used with the permanent storage option
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 06 Oct 2009 19:31:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu7) karmic; urgency=low
-
-  * Fixed various minor glitches
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 03 Oct 2009 12:29:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu6) karmic; urgency=low
-
-  * Repaired poor usability for new wireless connections
-  * Repaired poor usability for connection management
-  * VPN connections now remember login information when asked
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 29 Sep 2009 09:39:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu5) karmic; urgency=low
-
-  * Repaired VPN plugins
-  * VPNC now allows hashed group password
-  * PPTP repaired and enabled
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 28 Sep 2009 14:51:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu4) karmic; urgency=low
-
-  * Patched backend for new NM0.8 API
-  * Repaired poor usability in the "new connection" tasktray menu
-  * Repaired poor usability in the available devices tasktray menu
-  * Moved to /opt/trinity
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 22 Aug 2009 23:34:00 -0600
-
-knetworkmanager (1:0.7~~svn941706-1) unstable; urgency=low
-
-  * Updated SVN snapshot (r941706).
-  * debian/patches/04-dbus_access.patch
-    - Most of the relevant changes have been merged upstream. The patch now
-      only contains the Debian specific group "netdev" section.
-  * debian/control
-    - Bump Standards-Version to 3.8.1. No further changes.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 20 Mar 2009 22:59:51 +0100
-
-knetworkmanager (1:0.7~~svn931033-2) unstable; urgency=low
-
-  * debian/patches/05-no_blank_psk.patch
-    - Do not set zero-length PSK and LEAP passwords otherwise libnm-util fails
-      to validate them. Closes: #517213
-      Patch by Dan Williams, thanks!
-
- -- Michael Biebl <biebl@debian.org>  Tue, 03 Mar 2009 00:34:15 +0100
-
-knetworkmanager (1:0.7~~svn931033-1) unstable; urgency=low
-
-  * Merge experimental branch into unstable. Remaining changes:
-    - Remove 07-indicate_manual_config.patch, obsolete. 
-  * debian/control
-    - Wrap Build-Depends.
-    - Bump Build-Depends on debhelper to (>= 7).
-  * debian/compat
-    - Bump debhelper compat level to 7.
-  * debian/rules
-    - Include debhelper.mk before any other files as recommended by the cdbs
-      documentation.
-  * Update SVN snapshot to r931033.
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Feb 2009 10:54:39 +0100
-
-knetworkmanager (1:0.7~~svn908338-2) experimental; urgency=low
-
-  * debian/patches/04-dbus_access.patch
-    - Update D-Bus names and interfaces for NM 0.7. Closes: #511526
-    - Remove bare send_interface directives to avoid non-deterministic allow
-      messages with no interface. Closes: #510757
-    - Do not allow unpriviledged processes to ask for a users' connections.
-    - Allow introspection by default.
-
- -- Michael Biebl <biebl@debian.org>  Thu, 05 Feb 2009 01:52:22 +0100
-
-knetworkmanager (1:0.7~~svn908338-1) experimental; urgency=low
-
-  * Updated SVN snapshot (r908338).
-  * debian/rules
-    - Stop moving icons around, fixed upstream.
-  * debian/patches/01-configure_package_name.patch
-    - Make sure we set the correct PACKAGE name when generating the build
-      system so the translations are installed properly.
-  * debian/network-manager-kde.lintian-overrides
-    - Updated for the latest lintian changes.
-
- -- Michael Biebl <biebl@debian.org>  Sun, 11 Jan 2009 06:52:06 +0100
-
-knetworkmanager (1:0.7~~svn897092-1) experimental; urgency=low
-
-  * SVN snapshot of the upcoming 0.7 release (for NM 0.7).
-  * debian/control
-    - Add Build-Depends on pkg-config.
-    - Bump Build-Depends on nm-* packages to (>= 0.7.0).
-    - Add Build-Depends on libdbus-1-qt3-dev (>= 0.8.1).
-    - Bump Build-Depends on debhelper to (>= 6.0.7) for dh_lintian.
-    - Bump Depends on network-manager to (>= 0.7.0).
-    - Bump Standards-Version to 3.8.0. Add README.source as recommended by the
-      new policy.
-  * debian/rules
-    - Install autostart desktop file into /usr/share/autostart/.
-    - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them.
-      Closes: #487303
-    - Add support for both libtool 1.x and 2.x.
-  * Switch patch management system to quilt.
-  * debian/patches/04-dbus_access.patch
-    - Refresh and update.
-
- -- Michael Biebl <biebl@debian.org>  Tue, 16 Dec 2008 04:18:10 +0100
-
-knetworkmanager (1:0.2.2-2) unstable; urgency=low
-
-  * debian/patches/07-indicate_manual_config.patch
-    - manual-means-online: If there are interfaces that are not managed by
-      NetworkManager because they have custom configuration in
-      /etc/network/interfaces, we assume to be online and show a wired network
-      icon indicating manual network configuration.
-  * debian/control
-    - Add Build-Depends on pkg-config.
-
- -- Michael Biebl <biebl@debian.org>  Wed, 14 Jan 2009 08:22:11 +0100
-
-knetworkmanager (1:0.2.2-1) unstable; urgency=low
-
-  * New upstream release.
-    - Improved tray icon animation using mng files. Closes: #394815
-    - Improved LEAP security. Closes: #470709
-  * Removed patches
-    - debian/patches/01-fix_french_translation.patch (merged upstream)
-    - debian/patches/02-linux_types.patch (obsolete)
-    - debian/patches/03-awk_path.patch (fixed upstream)
-    - debian/patches/05-desktop_file_fixes.patch (merged upstream)
-  * debian/knetworkmanager.linda
-    - Remove the linda override file, linda is dead.
-  * debian/{knetworkmanager.lintian -> network-manager-kde.lintian-overrides}
-    - Rename the lintian override file so it is automatically installed by
-      dh_lintian.
-  * debian/rules
-    - Drop the no longer required install rules for the override files.
-    - Drop the install rule for the autostart file. It's provided by upstream
-      now.
-  * debian/copyright
-    - Update the authors list.
-  * debian/control
-    - Bump Build-Depends on libnl-dev (>= 1.1).
-    - Drop Build-Depends on kapptemplate. The upstream tarball ships a proper
-      admin/ directory again.
-  * debian/watch
-    - New download location at ftp.kde.org.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 04 Apr 2008 19:41:02 +0200
-
-knetworkmanager (1:0.2-3) unstable; urgency=low
-
-  * debian/control
-    - Use the new "Homepage:" field to specify the upstream URL.
-    - The Vcs-* fields are now officially supported, so remove the XS- prefix.
-    - Bump Standards-Version to 3.7.3. No further changes required.
-    - Fix a few capitalization errors in the package description.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 11 Jan 2008 02:08:24 +0100
-
-knetworkmanager (1:0.2-2) unstable; urgency=low
-
-  * Rebuild against network-manager 0.6.5 to enable phase2 and leap
-    authentication support.
-  * debian/rules
-    - Remove debian/stamp-bootstrap on clean. This fixes a FTBFS if package is
-      built twice in a row. Closes: #442621
-  * debian/control
-    - Add Build-Conflicts: autoconf2.13. Closes: #441046
-  * debian/menu
-    - Set section to Applications/Network/Monitoring which seems to be the
-      most appropriate amongst the available sections.
-  * debian/patches/05-desktop_file_fixes.patch
-    - Fix the *.desktop files to be compliant to the fd.o menu and desktop
-      entry spec.
-
- -- Michael Biebl <biebl@debian.org>  Sun, 16 Sep 2007 21:01:25 +0200
-
-knetworkmanager (1:0.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/patches/05-leap_support.patch
-    - Removed, merged upstream.
-  * debian/patches/06-version_check.patch
-    - Removed, merged upstream.
-  * The upstream tarball does not ship an admin/ directory. Build-Depend on
-    kapptemplate, so we can copy it from there.
-  * debian/menu
-    - Update to new menu hierarchy and add a longtitle.
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Jul 2007 17:10:36 +0200
-
-knetworkmanager (1:0.2~svn678822-3) unstable; urgency=low
-
-  * debian/patches/06-version_check.patch
-    - Added. Fixes the problem with knetworkmanager no longer connecting
-      automatically upon login. Closes: #431255
-      If you are upgrading from a previous 0.2 svn snapshot, you may have to
-      clear the list of trusted networks in the configuration dialog.
-
- -- Michael Biebl <biebl@debian.org>  Sun, 01 Jul 2007 11:47:00 +0200
-
-knetworkmanager (1:0.2~svn678822-2) unstable; urgency=low
-
-  * debian/patches/02-linux_types.patch
-    - Pass "-std=gnu++98" to CXXFLAGS. Otherwise the type __u64 is not defined
-      in linux-libc-dev for ANSI C/C89. Closes: #430795
-
- -- Michael Biebl <biebl@debian.org>  Thu, 28 Jun 2007 06:08:04 +0200
-
-knetworkmanager (1:0.2~svn678822-1) unstable; urgency=low
-
-  * SVN snapshot of the upcoming 0.2 release which has native VPN plugin
-    support. Closes: #415742
-  * debian/control
-    - Add XS-Vcs-* fields.
-    - Add Recommends: network-manager-vpnc, network-manager-openvpn.
-  * debian/rules
-    - Compile with openvpn and vpnc support.
-
-  * Removed patches that were merged upstream:
-    - debian/patches/05-no_deserialize.patch
-    - debian/patches/06-pretty_notification.patch
-    - debian/patches/07-overlay_icon_vpn.patch
-    - debian/patches/08-disable_sm.patch
-    - debian/patches/09-dbus_bool_t.patch
-
-  * debian/patches/02-linux_types.patch
-    - Added. Needed to workaround a problem in libnl.
-  * debian/patches/03-awk_path.patch
-    - Added. In Debian awk is installed in /usr/bin.
-  * debian/patches/04-dbus_access.patch
-    - Do not remove the dbus at_console access check but make it an
-      alternative to the Debian netdev group policy. Closes: #426467
-  * debian/patches/05-leap_support.patch
-    - Added. Do not fail to compile if LEAP support is not available.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 22 Jun 2007 21:08:32 +0100
-
-knetworkmanager (1:0.1-4) unstable; urgency=low
-
-  * Actually install the autostart file for knetworkmanager.
-    Thanks to Yannick Roehlly for spotting this glitch.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 12 Jan 2007 11:26:28 +0100
-
-knetworkmanager (1:0.1-3) unstable; urgency=low
-
-  * Pull some features and bug fixes from svn:
-    - debian/patches/05-no_deserialize.patch
-      + Don't call deserialize on encryption object to avoid warning of
-        libnm-util. Closes: #391486
-    - debian/patches/06-pretty_notification.patch
-      + Prettify notification messages.
-    - debian/patches/07-overlay_icon_vpn.patch
-      + Show overlay icon (lock) for active VPN connections.
-    - debian/patches/08-disable_sm.patch
-      + Disable session management to avoid a deadlock when accessing kwallet.
-        Install an autostart file into /usr/share/autostart/ instead.
-        Closes: #406162
-    - debian/patches/09-dbus_bool_t.patch
-      + Use dbus_bool_t instead of bool. Closes: #398974
-  * debian/patches/01-fix_french_translation.patch
-    - Added patch from Emmanuel Bouthenot which fixes some errors in the
-      French translation. Closes: #402285
-
- -- Michael Biebl <biebl@debian.org>  Tue,  9 Jan 2007 16:31:52 +0100
-
-knetworkmanager (1:0.1-2) unstable; urgency=low
-
-  * Update maintainer email address to biebl@debian.org. 
-
- -- Michael Biebl <biebl@debian.org>  Fri, 20 Oct 2006 00:02:03 +0200
-
-knetworkmanager (1:0.1-1) unstable; urgency=low
-
-  * Finally the 0.1 release. Woohoo!
-    - Use an epoch to fix the versioning scheme I managed to mess up.
-    - Fixes a crash when removing network objects for a nonexistent network
-      interface. Closes: #390052
-  * debian/patches/01-no_network_status.patch
-    - Removed, fixed upstream.
-  * debian/patches/03-configure.patch
-    - Removed, fixed upstream.
-  * Dropped the build-dep on kapptemplate. The upstream tarball now ships a
-    proper admin/ directory.
-  * debian/patches/02-dialup.patch
-    - Removed. Also dropped the Recommends: pppconfig. pppconfig can't
-      generate entries for /etc/network/interfaces yet. 
-
- -- Michael Biebl <biebl@teco.edu>  Fri, 29 Sep 2006 19:18:08 +0200
-
-knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low
-
-  * Updated to svn revision 586773.
-  * Do not refer to non existent khelpcenter help:/knetworkmanager/ in man
-    page. Closes: #385642
-
- -- Michael Biebl <biebl@teco.edu>  Wed, 20 Sep 2006 19:46:52 +0200
-
-knetworkmanager (0.09+0.1r577960-1) unstable; urgency=low
-
-  * Updated to svn revision 577960.
-    - Access KWallet on demand, not on startup. Closes: #379606
-  * Added a Recommends: pppconfig. Closes: #380316
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 28 Aug 2006 01:14:29 +0200
-
-knetworkmanager (0.09+0.1r560817-1) unstable; urgency=medium
-
-  * Updated to svn revision 560817.
-  * Removed 04-gnome_keyring_daemon.patch, fixed upstream.
-  * Added 04-dbus_access.patch. Fixes D-Bus access rights.
-    Closes: #379309, #379364
-  * Enabled dial up support. Set pppconfig as configuration utility.
-    Closes: #376071
-  * Reload D-Bus after installation. Closes: #379307
-  * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379820
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 25 Jul 2006 23:33:31 +0200
-
-knetworkmanager (0.09+0.1r550737-1) unstable; urgency=low
-
-  * Updated to svn revision 550737.
-  * Added 01-no_network_status.patch which removes a build dependency on
-    networkstatus.
-  * Removed 03-configure_notifications.patch, merged upstream.
-  * This version does not ship an admin/ directory. Added a build dependency
-    on kapptemplate and modified debian/rules to copy it from kapptemplate.
-  * Bumped Standards-Version to 3.7.2, no further changes required.
-  * Updated homepage URL.
-  * Added 04-gnome_keyring_daemon.patch which sets the correct path to the
-    gnome-keyring-daemon binary. VPN plugins use gnome-keyring-daemon to store
-    their passwords.
-
- -- Michael Biebl <biebl@teco.edu>  Wed, 14 Jun 2006 17:16:07 +0200
-
-knetworkmanager (0.09+0.1r527269-1) unstable; urgency=low
-
-  * New upstream release.
-  * Removed 01-xdg_app.patch, merged upstream.
-  * Added 03-configure_notifications.patch, this patch modifies the context
-    menu of the systray applet to provide quick access to the notification
-    settings.
-  * Added a "Provides: knetworkmanager" to make the package installable by its
-    upstream name.
-  * Initial upload. Closes: #351069
-
- -- Michael Biebl <biebl@teco.edu>  Thu, 27 Apr 2006 08:01:39 +0200
-
-knetworkmanager (0.09+0.1r5964-1) unstable; urgency=low
-
-  * Initial release.
-
- -- Michael Biebl <biebl@teco.edu>  Tue,  7 Feb 2006 21:43:56 +0100
-
diff --git a/debian/lenny/applications/knetworkmanager/debian/compat b/debian/lenny/applications/knetworkmanager/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/lenny/applications/knetworkmanager/debian/control b/debian/lenny/applications/knetworkmanager/debian/control
deleted file mode 100644
index 0b04bbf74..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/control
+++ /dev/null
@@ -1,35 +0,0 @@
-Source: knetworkmanager8-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs,
- debhelper (>= 7),
- pkg-config,
- kdelibs4-trinity-dev,
- 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,
- libnl-dev (>= 1.1),
- quilt,
- network-manager-vpnc,
- network-manager-openvpn,
- network-manager-strongswan,
- network-manager-pptp,
- automake, autoconf, libtool, libltdl-dev
-Standards-Version: 3.8.4
-Homepage: http://opensuse.org/Projects/KNetworkManager
-
-Package: network-manager-kde-trinity
-Architecture: any
-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
-Description: KDE systray applet for controlling NetworkManager [Trinity]
- Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for Trinity but also works for 
- other desktop environments like GNOME or Xfce.
diff --git a/debian/lenny/applications/knetworkmanager/debian/control.in b/debian/lenny/applications/knetworkmanager/debian/control.in
deleted file mode 100644
index 43adf3e33..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/control.in
+++ /dev/null
@@ -1,36 +0,0 @@
-Source: knetworkmanager-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs,
- debhelper (>= 7),
- pkg-config,
- kdelibs4-trinity-dev,
- libnm-util-dev (>= 0.7.0),
- libnm-glib-dev (>= 0.7.0),
- network-manager-dev (>= 0.7.0),
- libhal-dev,
- libdbus-1-qt3-dev (>= 0.8.1),
- libiw-dev,
- libnl-dev (>= 1.1),
- quilt,
- network-manager-vpnc,
- network-manager-openvpn,
- network-manager-strongswan,
- network-manager-pptp,
- automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
-Standards-Version: 3.8.3
-Homepage: http://opensuse.org/Projects/KNetworkManager
-
-Package: network-manager-kde-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
-Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
-Provides: knetworkmanager-trinity
-Conflicts: network-manager-kde
-Description: KDE systray applet for controlling NetworkManager [Trinity]
- Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for Trinity but also works for 
- other desktop environments like GNOME or Xfce.
diff --git a/debian/lenny/applications/knetworkmanager/debian/copyright b/debian/lenny/applications/knetworkmanager/debian/copyright
deleted file mode 100644
index 2490de254..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/copyright
+++ /dev/null
@@ -1,34 +0,0 @@
-This package was debianized by Michael Biebl <biebl@teco.edu> on
-Fri,  3 Feb 2006 05:53:06 +0100.
-
-It was downloaded from http://www.opensuse.org
-
-Upstream Authors: 
-  Timo Hoenig <thoenig@suse.de>
-  Will Stephenson <wstephenson@suse.de>
-  Stefan Bogner <sbogner@suse.de>
-  Helmut Schaa <hschaa@suse.de>
-  Valentine Sinitsyn <e_val@inbox.ru>
-
-Copyright: 
-  Copyright (C) 2005, 2006 Novell, Inc.
-
-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; either version 2 of the License, or
-  (at your option) any later version.
-
-  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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
diff --git a/debian/lenny/applications/knetworkmanager/debian/knetworkmanager.1 b/debian/lenny/applications/knetworkmanager/debian/knetworkmanager.1
deleted file mode 100644
index 3cd261c89..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/knetworkmanager.1
+++ /dev/null
@@ -1,145 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KNETWORKMANAGER 1 "Feb 2006" "K Desktop Environment" "A NetworkManager front-end for KDE"
-.SH NAME
-knetworkmanager
-\- A NetworkManager front-end for KDE
-.SH SYNOPSIS
-knetworkmanager [Qt\-options] [KDE\-options] 
-.SH DESCRIPTION
-A NetworkManager front-end for KDE
-.SH OPTIONS
-.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 - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.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
-.BR networkmanager (1)
-.SH AUTHORS
-.nf
-Timo Hoenig <thoenig@suse.de>
-.br
-Stefan Bogner <sbogner@suse.de>
-.br
-Will Stephenson <wstephenson@suse.de>
-.br
-
diff --git a/debian/lenny/applications/knetworkmanager/debian/manpages b/debian/lenny/applications/knetworkmanager/debian/manpages
deleted file mode 100644
index e2859341f..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/knetworkmanager.1
diff --git a/debian/lenny/applications/knetworkmanager/debian/menu b/debian/lenny/applications/knetworkmanager/debian/menu
deleted file mode 100644
index 9775e9c7c..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(network-manager-kde): \
-	needs="X11" \
-	section="Applications/Network/Monitoring" \
-  	title="KNetworkManager" \
-	longtitle="A KDE frontend for NetworkManager" \
-	command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides b/debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides
deleted file mode 100644
index 9ae01a92b..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
-network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
diff --git a/debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst b/debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst
deleted file mode 100644
index fdd4e51ca..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-  configure)
-  	# Ask D-Bus to reload the config file
-  	if [ -x "/etc/init.d/dbus" ]; then
-		invoke-rc.d dbus force-reload || true
-	fi
-	;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/lenny/applications/knetworkmanager/debian/patches/series b/debian/lenny/applications/knetworkmanager/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
diff --git a/debian/lenny/applications/knetworkmanager/debian/rules b/debian/lenny/applications/knetworkmanager/debian/rules
deleted file mode 100755
index 97955e38b..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/rules
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/make -f
-  
-include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO
-
-DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp
-
-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
-
-binary-install/network-manager-kde-trinity::
-	# Install autostart file
-	install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \
-		debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop
-
-clean::
-	find . -name Makefile.in | xargs rm -f
-	rm -f aclocal.m4
-	rm -f acinclude.m4
-	rm -f configure
-	rm -f configure.files
-	rm -f configure.in
-	rm -f config.h.in
-	rm -f stamp-h.in
-	rm -f subdirs	
-	rm -f admin/ltmain.sh
-	rm -f admin/libtool.m4.in
-	rm -f debian/stamp-bootstrap
diff --git a/debian/lenny/applications/knetworkmanager/debian/watch b/debian/lenny/applications/knetworkmanager/debian/watch
deleted file mode 100644
index ad7a7be91..000000000
--- a/debian/lenny/applications/knetworkmanager/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-ftp://ftp.kde.org/pub/kde/stable/apps/Trinity.x/network/knetworkmanager-(.*)\.tar\.gz
diff --git a/debian/squeeze/applications/knetworkmanager/debian/README.source b/debian/squeeze/applications/knetworkmanager/debian/README.source
deleted file mode 100644
index 96fb271ab..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-This package uses the quilt patch management system.
-
-Please refer to /usr/share/doc/quilt/README.source for further information.
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/buildvars.mk b/debian/squeeze/applications/knetworkmanager/debian/cdbs/buildvars.mk
deleted file mode 100644
index 23d4709dc..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/cdbs/buildvars.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2002,2003 Colin Walters <walters@debian.org>
-# Description: Defines some useful variables, but no rules
-#
-# This program 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; either version 2, or (at
-# your option) any later version.
-#
-# This program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_rules_buildvars
-_cdbs_rules_buildvars = 1
-
-CDBS_VERSION = something
-
-# Common useful variables
-DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
-DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
-DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
-
-# Split into arch/indep packages
-ifneq ($(DEB_INDEP_PACKAGES),cdbs)
-DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
-DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
-endif
-# Split into normal and udeb packages
-ifeq ($(DEB_UDEB_PACKAGES),)
-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-else
-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-endif
-# Too much bother for now.  If someone complains we'll fix it.
-#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
-#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
-# A handy list of every package, udeb or not
-DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
-DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
-DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
-
-DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-
-# Some support for srcdir != builddir builds.
-# These are relative to the root of the package
-DEB_SRCDIR ?= .
-DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
-
-# Miscellaneous bits
-DEB_ARCH = $(shell dpkg --print-architecture)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
-DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-
-ifeq ($(words $(DEB_ALL_PACKAGES)),1)
-	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
-else
-	DEB_DESTDIR = $(CURDIR)/debian/tmp/
-endif
-
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
-
-endif
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
deleted file mode 100644
index 47e83ef4a..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-	touch debian/stamp-cvs-make
-
-include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
-
-DEB_PATCHDIRS := debian/patches/common debian/patches
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-	done
-
-clean::
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/kde.mk b/debian/squeeze/applications/knetworkmanager/debian/cdbs/kde.mk
deleted file mode 100644
index 5b6508f8c..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/cdbs/kde.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Description: A class for KDE packages; sets KDE environment variables, etc
-#
-# This program 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; either version 2, or (at
-# your option) any later version.
-#
-# This program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_kde
-_cdbs_class_kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
-
-ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-common-build-arch common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
-common-install-arch common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
-
-clean::
-	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
-
-# This is a convenience target for calling manually.  It's not part of
-# the build process.
-buildprep: clean apply-patches
-	$(MAKE) -f admin/Makefile.common dist
-	debian/rules clean
-
-endif
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/team-members b/debian/squeeze/applications/knetworkmanager/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/uploaders.mk b/debian/squeeze/applications/knetworkmanager/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/versions.pl b/debian/squeeze/applications/knetworkmanager/debian/cdbs/versions.pl
deleted file mode 100644
index 9ce11d8a3..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/-[^-]+$//;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "KDE-Version3=$version3\n";
-print "KDE-Version2=$version2\n";
-print "KDE-Next-Version3=$version3_next\n";
-print "KDE-Next-Version2=$version2_next\n";
diff --git a/debian/squeeze/applications/knetworkmanager/debian/changelog b/debian/squeeze/applications/knetworkmanager/debian/changelog
deleted file mode 100644
index ed0d32a81..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/changelog
+++ /dev/null
@@ -1,373 +0,0 @@
-knetworkmanager-trinity (1:0.8-0ubuntu12) karmic; urgency=low
-
-  * UI tweaks for discoverability
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 26 Oct 2009 17:44:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu10) karmic; urgency=low
-
-  * Fixed VPN reauthentication request dialog failure when used with the permanent storage option
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 06 Oct 2009 19:31:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu7) karmic; urgency=low
-
-  * Fixed various minor glitches
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 03 Oct 2009 12:29:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu6) karmic; urgency=low
-
-  * Repaired poor usability for new wireless connections
-  * Repaired poor usability for connection management
-  * VPN connections now remember login information when asked
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 29 Sep 2009 09:39:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu5) karmic; urgency=low
-
-  * Repaired VPN plugins
-  * VPNC now allows hashed group password
-  * PPTP repaired and enabled
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 28 Sep 2009 14:51:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu4) karmic; urgency=low
-
-  * Patched backend for new NM0.8 API
-  * Repaired poor usability in the "new connection" tasktray menu
-  * Repaired poor usability in the available devices tasktray menu
-  * Moved to /opt/trinity
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 22 Aug 2009 23:34:00 -0600
-
-knetworkmanager (1:0.7~~svn941706-1) unstable; urgency=low
-
-  * Updated SVN snapshot (r941706).
-  * debian/patches/04-dbus_access.patch
-    - Most of the relevant changes have been merged upstream. The patch now
-      only contains the Debian specific group "netdev" section.
-  * debian/control
-    - Bump Standards-Version to 3.8.1. No further changes.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 20 Mar 2009 22:59:51 +0100
-
-knetworkmanager (1:0.7~~svn931033-2) unstable; urgency=low
-
-  * debian/patches/05-no_blank_psk.patch
-    - Do not set zero-length PSK and LEAP passwords otherwise libnm-util fails
-      to validate them. Closes: #517213
-      Patch by Dan Williams, thanks!
-
- -- Michael Biebl <biebl@debian.org>  Tue, 03 Mar 2009 00:34:15 +0100
-
-knetworkmanager (1:0.7~~svn931033-1) unstable; urgency=low
-
-  * Merge experimental branch into unstable. Remaining changes:
-    - Remove 07-indicate_manual_config.patch, obsolete. 
-  * debian/control
-    - Wrap Build-Depends.
-    - Bump Build-Depends on debhelper to (>= 7).
-  * debian/compat
-    - Bump debhelper compat level to 7.
-  * debian/rules
-    - Include debhelper.mk before any other files as recommended by the cdbs
-      documentation.
-  * Update SVN snapshot to r931033.
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Feb 2009 10:54:39 +0100
-
-knetworkmanager (1:0.7~~svn908338-2) experimental; urgency=low
-
-  * debian/patches/04-dbus_access.patch
-    - Update D-Bus names and interfaces for NM 0.7. Closes: #511526
-    - Remove bare send_interface directives to avoid non-deterministic allow
-      messages with no interface. Closes: #510757
-    - Do not allow unpriviledged processes to ask for a users' connections.
-    - Allow introspection by default.
-
- -- Michael Biebl <biebl@debian.org>  Thu, 05 Feb 2009 01:52:22 +0100
-
-knetworkmanager (1:0.7~~svn908338-1) experimental; urgency=low
-
-  * Updated SVN snapshot (r908338).
-  * debian/rules
-    - Stop moving icons around, fixed upstream.
-  * debian/patches/01-configure_package_name.patch
-    - Make sure we set the correct PACKAGE name when generating the build
-      system so the translations are installed properly.
-  * debian/network-manager-kde.lintian-overrides
-    - Updated for the latest lintian changes.
-
- -- Michael Biebl <biebl@debian.org>  Sun, 11 Jan 2009 06:52:06 +0100
-
-knetworkmanager (1:0.7~~svn897092-1) experimental; urgency=low
-
-  * SVN snapshot of the upcoming 0.7 release (for NM 0.7).
-  * debian/control
-    - Add Build-Depends on pkg-config.
-    - Bump Build-Depends on nm-* packages to (>= 0.7.0).
-    - Add Build-Depends on libdbus-1-qt3-dev (>= 0.8.1).
-    - Bump Build-Depends on debhelper to (>= 6.0.7) for dh_lintian.
-    - Bump Depends on network-manager to (>= 0.7.0).
-    - Bump Standards-Version to 3.8.0. Add README.source as recommended by the
-      new policy.
-  * debian/rules
-    - Install autostart desktop file into /usr/share/autostart/.
-    - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them.
-      Closes: #487303
-    - Add support for both libtool 1.x and 2.x.
-  * Switch patch management system to quilt.
-  * debian/patches/04-dbus_access.patch
-    - Refresh and update.
-
- -- Michael Biebl <biebl@debian.org>  Tue, 16 Dec 2008 04:18:10 +0100
-
-knetworkmanager (1:0.2.2-2) unstable; urgency=low
-
-  * debian/patches/07-indicate_manual_config.patch
-    - manual-means-online: If there are interfaces that are not managed by
-      NetworkManager because they have custom configuration in
-      /etc/network/interfaces, we assume to be online and show a wired network
-      icon indicating manual network configuration.
-  * debian/control
-    - Add Build-Depends on pkg-config.
-
- -- Michael Biebl <biebl@debian.org>  Wed, 14 Jan 2009 08:22:11 +0100
-
-knetworkmanager (1:0.2.2-1) unstable; urgency=low
-
-  * New upstream release.
-    - Improved tray icon animation using mng files. Closes: #394815
-    - Improved LEAP security. Closes: #470709
-  * Removed patches
-    - debian/patches/01-fix_french_translation.patch (merged upstream)
-    - debian/patches/02-linux_types.patch (obsolete)
-    - debian/patches/03-awk_path.patch (fixed upstream)
-    - debian/patches/05-desktop_file_fixes.patch (merged upstream)
-  * debian/knetworkmanager.linda
-    - Remove the linda override file, linda is dead.
-  * debian/{knetworkmanager.lintian -> network-manager-kde.lintian-overrides}
-    - Rename the lintian override file so it is automatically installed by
-      dh_lintian.
-  * debian/rules
-    - Drop the no longer required install rules for the override files.
-    - Drop the install rule for the autostart file. It's provided by upstream
-      now.
-  * debian/copyright
-    - Update the authors list.
-  * debian/control
-    - Bump Build-Depends on libnl-dev (>= 1.1).
-    - Drop Build-Depends on kapptemplate. The upstream tarball ships a proper
-      admin/ directory again.
-  * debian/watch
-    - New download location at ftp.kde.org.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 04 Apr 2008 19:41:02 +0200
-
-knetworkmanager (1:0.2-3) unstable; urgency=low
-
-  * debian/control
-    - Use the new "Homepage:" field to specify the upstream URL.
-    - The Vcs-* fields are now officially supported, so remove the XS- prefix.
-    - Bump Standards-Version to 3.7.3. No further changes required.
-    - Fix a few capitalization errors in the package description.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 11 Jan 2008 02:08:24 +0100
-
-knetworkmanager (1:0.2-2) unstable; urgency=low
-
-  * Rebuild against network-manager 0.6.5 to enable phase2 and leap
-    authentication support.
-  * debian/rules
-    - Remove debian/stamp-bootstrap on clean. This fixes a FTBFS if package is
-      built twice in a row. Closes: #442621
-  * debian/control
-    - Add Build-Conflicts: autoconf2.13. Closes: #441046
-  * debian/menu
-    - Set section to Applications/Network/Monitoring which seems to be the
-      most appropriate amongst the available sections.
-  * debian/patches/05-desktop_file_fixes.patch
-    - Fix the *.desktop files to be compliant to the fd.o menu and desktop
-      entry spec.
-
- -- Michael Biebl <biebl@debian.org>  Sun, 16 Sep 2007 21:01:25 +0200
-
-knetworkmanager (1:0.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/patches/05-leap_support.patch
-    - Removed, merged upstream.
-  * debian/patches/06-version_check.patch
-    - Removed, merged upstream.
-  * The upstream tarball does not ship an admin/ directory. Build-Depend on
-    kapptemplate, so we can copy it from there.
-  * debian/menu
-    - Update to new menu hierarchy and add a longtitle.
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Jul 2007 17:10:36 +0200
-
-knetworkmanager (1:0.2~svn678822-3) unstable; urgency=low
-
-  * debian/patches/06-version_check.patch
-    - Added. Fixes the problem with knetworkmanager no longer connecting
-      automatically upon login. Closes: #431255
-      If you are upgrading from a previous 0.2 svn snapshot, you may have to
-      clear the list of trusted networks in the configuration dialog.
-
- -- Michael Biebl <biebl@debian.org>  Sun, 01 Jul 2007 11:47:00 +0200
-
-knetworkmanager (1:0.2~svn678822-2) unstable; urgency=low
-
-  * debian/patches/02-linux_types.patch
-    - Pass "-std=gnu++98" to CXXFLAGS. Otherwise the type __u64 is not defined
-      in linux-libc-dev for ANSI C/C89. Closes: #430795
-
- -- Michael Biebl <biebl@debian.org>  Thu, 28 Jun 2007 06:08:04 +0200
-
-knetworkmanager (1:0.2~svn678822-1) unstable; urgency=low
-
-  * SVN snapshot of the upcoming 0.2 release which has native VPN plugin
-    support. Closes: #415742
-  * debian/control
-    - Add XS-Vcs-* fields.
-    - Add Recommends: network-manager-vpnc, network-manager-openvpn.
-  * debian/rules
-    - Compile with openvpn and vpnc support.
-
-  * Removed patches that were merged upstream:
-    - debian/patches/05-no_deserialize.patch
-    - debian/patches/06-pretty_notification.patch
-    - debian/patches/07-overlay_icon_vpn.patch
-    - debian/patches/08-disable_sm.patch
-    - debian/patches/09-dbus_bool_t.patch
-
-  * debian/patches/02-linux_types.patch
-    - Added. Needed to workaround a problem in libnl.
-  * debian/patches/03-awk_path.patch
-    - Added. In Debian awk is installed in /usr/bin.
-  * debian/patches/04-dbus_access.patch
-    - Do not remove the dbus at_console access check but make it an
-      alternative to the Debian netdev group policy. Closes: #426467
-  * debian/patches/05-leap_support.patch
-    - Added. Do not fail to compile if LEAP support is not available.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 22 Jun 2007 21:08:32 +0100
-
-knetworkmanager (1:0.1-4) unstable; urgency=low
-
-  * Actually install the autostart file for knetworkmanager.
-    Thanks to Yannick Roehlly for spotting this glitch.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 12 Jan 2007 11:26:28 +0100
-
-knetworkmanager (1:0.1-3) unstable; urgency=low
-
-  * Pull some features and bug fixes from svn:
-    - debian/patches/05-no_deserialize.patch
-      + Don't call deserialize on encryption object to avoid warning of
-        libnm-util. Closes: #391486
-    - debian/patches/06-pretty_notification.patch
-      + Prettify notification messages.
-    - debian/patches/07-overlay_icon_vpn.patch
-      + Show overlay icon (lock) for active VPN connections.
-    - debian/patches/08-disable_sm.patch
-      + Disable session management to avoid a deadlock when accessing kwallet.
-        Install an autostart file into /usr/share/autostart/ instead.
-        Closes: #406162
-    - debian/patches/09-dbus_bool_t.patch
-      + Use dbus_bool_t instead of bool. Closes: #398974
-  * debian/patches/01-fix_french_translation.patch
-    - Added patch from Emmanuel Bouthenot which fixes some errors in the
-      French translation. Closes: #402285
-
- -- Michael Biebl <biebl@debian.org>  Tue,  9 Jan 2007 16:31:52 +0100
-
-knetworkmanager (1:0.1-2) unstable; urgency=low
-
-  * Update maintainer email address to biebl@debian.org. 
-
- -- Michael Biebl <biebl@debian.org>  Fri, 20 Oct 2006 00:02:03 +0200
-
-knetworkmanager (1:0.1-1) unstable; urgency=low
-
-  * Finally the 0.1 release. Woohoo!
-    - Use an epoch to fix the versioning scheme I managed to mess up.
-    - Fixes a crash when removing network objects for a nonexistent network
-      interface. Closes: #390052
-  * debian/patches/01-no_network_status.patch
-    - Removed, fixed upstream.
-  * debian/patches/03-configure.patch
-    - Removed, fixed upstream.
-  * Dropped the build-dep on kapptemplate. The upstream tarball now ships a
-    proper admin/ directory.
-  * debian/patches/02-dialup.patch
-    - Removed. Also dropped the Recommends: pppconfig. pppconfig can't
-      generate entries for /etc/network/interfaces yet. 
-
- -- Michael Biebl <biebl@teco.edu>  Fri, 29 Sep 2006 19:18:08 +0200
-
-knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low
-
-  * Updated to svn revision 586773.
-  * Do not refer to non existent khelpcenter help:/knetworkmanager/ in man
-    page. Closes: #385642
-
- -- Michael Biebl <biebl@teco.edu>  Wed, 20 Sep 2006 19:46:52 +0200
-
-knetworkmanager (0.09+0.1r577960-1) unstable; urgency=low
-
-  * Updated to svn revision 577960.
-    - Access KWallet on demand, not on startup. Closes: #379606
-  * Added a Recommends: pppconfig. Closes: #380316
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 28 Aug 2006 01:14:29 +0200
-
-knetworkmanager (0.09+0.1r560817-1) unstable; urgency=medium
-
-  * Updated to svn revision 560817.
-  * Removed 04-gnome_keyring_daemon.patch, fixed upstream.
-  * Added 04-dbus_access.patch. Fixes D-Bus access rights.
-    Closes: #379309, #379364
-  * Enabled dial up support. Set pppconfig as configuration utility.
-    Closes: #376071
-  * Reload D-Bus after installation. Closes: #379307
-  * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379820
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 25 Jul 2006 23:33:31 +0200
-
-knetworkmanager (0.09+0.1r550737-1) unstable; urgency=low
-
-  * Updated to svn revision 550737.
-  * Added 01-no_network_status.patch which removes a build dependency on
-    networkstatus.
-  * Removed 03-configure_notifications.patch, merged upstream.
-  * This version does not ship an admin/ directory. Added a build dependency
-    on kapptemplate and modified debian/rules to copy it from kapptemplate.
-  * Bumped Standards-Version to 3.7.2, no further changes required.
-  * Updated homepage URL.
-  * Added 04-gnome_keyring_daemon.patch which sets the correct path to the
-    gnome-keyring-daemon binary. VPN plugins use gnome-keyring-daemon to store
-    their passwords.
-
- -- Michael Biebl <biebl@teco.edu>  Wed, 14 Jun 2006 17:16:07 +0200
-
-knetworkmanager (0.09+0.1r527269-1) unstable; urgency=low
-
-  * New upstream release.
-  * Removed 01-xdg_app.patch, merged upstream.
-  * Added 03-configure_notifications.patch, this patch modifies the context
-    menu of the systray applet to provide quick access to the notification
-    settings.
-  * Added a "Provides: knetworkmanager" to make the package installable by its
-    upstream name.
-  * Initial upload. Closes: #351069
-
- -- Michael Biebl <biebl@teco.edu>  Thu, 27 Apr 2006 08:01:39 +0200
-
-knetworkmanager (0.09+0.1r5964-1) unstable; urgency=low
-
-  * Initial release.
-
- -- Michael Biebl <biebl@teco.edu>  Tue,  7 Feb 2006 21:43:56 +0100
-
diff --git a/debian/squeeze/applications/knetworkmanager/debian/compat b/debian/squeeze/applications/knetworkmanager/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/squeeze/applications/knetworkmanager/debian/control b/debian/squeeze/applications/knetworkmanager/debian/control
deleted file mode 100644
index 0b04bbf74..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/control
+++ /dev/null
@@ -1,35 +0,0 @@
-Source: knetworkmanager8-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs,
- debhelper (>= 7),
- pkg-config,
- kdelibs4-trinity-dev,
- 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,
- libnl-dev (>= 1.1),
- quilt,
- network-manager-vpnc,
- network-manager-openvpn,
- network-manager-strongswan,
- network-manager-pptp,
- automake, autoconf, libtool, libltdl-dev
-Standards-Version: 3.8.4
-Homepage: http://opensuse.org/Projects/KNetworkManager
-
-Package: network-manager-kde-trinity
-Architecture: any
-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
-Description: KDE systray applet for controlling NetworkManager [Trinity]
- Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for Trinity but also works for 
- other desktop environments like GNOME or Xfce.
diff --git a/debian/squeeze/applications/knetworkmanager/debian/control.in b/debian/squeeze/applications/knetworkmanager/debian/control.in
deleted file mode 100644
index 43adf3e33..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/control.in
+++ /dev/null
@@ -1,36 +0,0 @@
-Source: knetworkmanager-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs,
- debhelper (>= 7),
- pkg-config,
- kdelibs4-trinity-dev,
- libnm-util-dev (>= 0.7.0),
- libnm-glib-dev (>= 0.7.0),
- network-manager-dev (>= 0.7.0),
- libhal-dev,
- libdbus-1-qt3-dev (>= 0.8.1),
- libiw-dev,
- libnl-dev (>= 1.1),
- quilt,
- network-manager-vpnc,
- network-manager-openvpn,
- network-manager-strongswan,
- network-manager-pptp,
- automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
-Standards-Version: 3.8.3
-Homepage: http://opensuse.org/Projects/KNetworkManager
-
-Package: network-manager-kde-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
-Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
-Provides: knetworkmanager-trinity
-Conflicts: network-manager-kde
-Description: KDE systray applet for controlling NetworkManager [Trinity]
- Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for Trinity but also works for 
- other desktop environments like GNOME or Xfce.
diff --git a/debian/squeeze/applications/knetworkmanager/debian/copyright b/debian/squeeze/applications/knetworkmanager/debian/copyright
deleted file mode 100644
index 2490de254..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/copyright
+++ /dev/null
@@ -1,34 +0,0 @@
-This package was debianized by Michael Biebl <biebl@teco.edu> on
-Fri,  3 Feb 2006 05:53:06 +0100.
-
-It was downloaded from http://www.opensuse.org
-
-Upstream Authors: 
-  Timo Hoenig <thoenig@suse.de>
-  Will Stephenson <wstephenson@suse.de>
-  Stefan Bogner <sbogner@suse.de>
-  Helmut Schaa <hschaa@suse.de>
-  Valentine Sinitsyn <e_val@inbox.ru>
-
-Copyright: 
-  Copyright (C) 2005, 2006 Novell, Inc.
-
-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; either version 2 of the License, or
-  (at your option) any later version.
-
-  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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
diff --git a/debian/squeeze/applications/knetworkmanager/debian/knetworkmanager.1 b/debian/squeeze/applications/knetworkmanager/debian/knetworkmanager.1
deleted file mode 100644
index 3cd261c89..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/knetworkmanager.1
+++ /dev/null
@@ -1,145 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KNETWORKMANAGER 1 "Feb 2006" "K Desktop Environment" "A NetworkManager front-end for KDE"
-.SH NAME
-knetworkmanager
-\- A NetworkManager front-end for KDE
-.SH SYNOPSIS
-knetworkmanager [Qt\-options] [KDE\-options] 
-.SH DESCRIPTION
-A NetworkManager front-end for KDE
-.SH OPTIONS
-.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 - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.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
-.BR networkmanager (1)
-.SH AUTHORS
-.nf
-Timo Hoenig <thoenig@suse.de>
-.br
-Stefan Bogner <sbogner@suse.de>
-.br
-Will Stephenson <wstephenson@suse.de>
-.br
-
diff --git a/debian/squeeze/applications/knetworkmanager/debian/manpages b/debian/squeeze/applications/knetworkmanager/debian/manpages
deleted file mode 100644
index e2859341f..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/knetworkmanager.1
diff --git a/debian/squeeze/applications/knetworkmanager/debian/menu b/debian/squeeze/applications/knetworkmanager/debian/menu
deleted file mode 100644
index 9775e9c7c..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(network-manager-kde): \
-	needs="X11" \
-	section="Applications/Network/Monitoring" \
-  	title="KNetworkManager" \
-	longtitle="A KDE frontend for NetworkManager" \
-	command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides b/debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides
deleted file mode 100644
index 9ae01a92b..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
-network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
diff --git a/debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst b/debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst
deleted file mode 100644
index fdd4e51ca..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-  configure)
-  	# Ask D-Bus to reload the config file
-  	if [ -x "/etc/init.d/dbus" ]; then
-		invoke-rc.d dbus force-reload || true
-	fi
-	;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/squeeze/applications/knetworkmanager/debian/patches/series b/debian/squeeze/applications/knetworkmanager/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
diff --git a/debian/squeeze/applications/knetworkmanager/debian/rules b/debian/squeeze/applications/knetworkmanager/debian/rules
deleted file mode 100755
index 97955e38b..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/rules
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/make -f
-  
-include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO
-
-DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp
-
-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
-
-binary-install/network-manager-kde-trinity::
-	# Install autostart file
-	install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \
-		debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop
-
-clean::
-	find . -name Makefile.in | xargs rm -f
-	rm -f aclocal.m4
-	rm -f acinclude.m4
-	rm -f configure
-	rm -f configure.files
-	rm -f configure.in
-	rm -f config.h.in
-	rm -f stamp-h.in
-	rm -f subdirs	
-	rm -f admin/ltmain.sh
-	rm -f admin/libtool.m4.in
-	rm -f debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/knetworkmanager/debian/watch b/debian/squeeze/applications/knetworkmanager/debian/watch
deleted file mode 100644
index ad7a7be91..000000000
--- a/debian/squeeze/applications/knetworkmanager/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-ftp://ftp.kde.org/pub/kde/stable/apps/Trinity.x/network/knetworkmanager-(.*)\.tar\.gz
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/README.source b/debian/squeeze/applications/knetworkmanager8/debian/README.source
new file mode 100644
index 000000000..96fb271ab
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/README.source
@@ -0,0 +1,3 @@
+This package uses the quilt patch management system.
+
+Please refer to /usr/share/doc/quilt/README.source for further information.
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/buildvars.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# This program 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; either version 2, or (at
+# your option) any later version.
+#
+# This program 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 program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..47e83ef4a
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
+endif
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	done
+
+clean::
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk
new file mode 100644
index 000000000..5b6508f8c
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program 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; either version 2, or (at
+# your option) any later version.
+#
+# This program 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 program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/kde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final =
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/team-members b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/team-members
new file mode 100644
index 000000000..05761af6e
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/team-members
@@ -0,0 +1,16 @@
+Sune Vuorela <debian@pusling.com>
+Ana Beatriz Guerrero Lopez <ana@debian.org>
+Fathi Boudra <fboudra@free.fr>
+Modestas Vainius <geromanas@mailas.com>
+Josh Metzler <joshdeb@metzlers.org>
+Isaac Clerencia <isaac@debian.org>
+Adeodato Simó <dato@net.com.org.es>
+Adeodato Simo <dato@net.com.org.es>
+Christopher Martin <chrsmrtn@debian.org>
+Daniel Schepler <schepler@debian.org>
+Sarah Hobbs <hobbsee@ubuntu.com>
+Nacho Barrientos Arias <nacho@debian.org>
+Ricardo Javier Cardenes Medina <rcardenes@debian.org>
+Ricardo Cardenes <rcardenes@debian.org>
+Armin Berres <trigger+debian@space-based.de>
+Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/uploaders.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/versions.pl b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/versions.pl
new file mode 100644
index 000000000..9ce11d8a3
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/-[^-]+$//;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/changelog b/debian/squeeze/applications/knetworkmanager8/debian/changelog
new file mode 100644
index 000000000..04405984c
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/changelog
@@ -0,0 +1,373 @@
+knetworkmanager8-trinity (1:0.8-0ubuntu12) karmic; urgency=low
+
+  * UI tweaks for discoverability
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 26 Oct 2009 17:44:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu10) karmic; urgency=low
+
+  * Fixed VPN reauthentication request dialog failure when used with the permanent storage option
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 06 Oct 2009 19:31:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu7) karmic; urgency=low
+
+  * Fixed various minor glitches
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 03 Oct 2009 12:29:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu6) karmic; urgency=low
+
+  * Repaired poor usability for new wireless connections
+  * Repaired poor usability for connection management
+  * VPN connections now remember login information when asked
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 29 Sep 2009 09:39:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu5) karmic; urgency=low
+
+  * Repaired VPN plugins
+  * VPNC now allows hashed group password
+  * PPTP repaired and enabled
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 28 Sep 2009 14:51:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu4) karmic; urgency=low
+
+  * Patched backend for new NM0.8 API
+  * Repaired poor usability in the "new connection" tasktray menu
+  * Repaired poor usability in the available devices tasktray menu
+  * Moved to /opt/trinity
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 22 Aug 2009 23:34:00 -0600
+
+knetworkmanager (1:0.7~~svn941706-1) unstable; urgency=low
+
+  * Updated SVN snapshot (r941706).
+  * debian/patches/04-dbus_access.patch
+    - Most of the relevant changes have been merged upstream. The patch now
+      only contains the Debian specific group "netdev" section.
+  * debian/control
+    - Bump Standards-Version to 3.8.1. No further changes.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 20 Mar 2009 22:59:51 +0100
+
+knetworkmanager (1:0.7~~svn931033-2) unstable; urgency=low
+
+  * debian/patches/05-no_blank_psk.patch
+    - Do not set zero-length PSK and LEAP passwords otherwise libnm-util fails
+      to validate them. Closes: #517213
+      Patch by Dan Williams, thanks!
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 03 Mar 2009 00:34:15 +0100
+
+knetworkmanager (1:0.7~~svn931033-1) unstable; urgency=low
+
+  * Merge experimental branch into unstable. Remaining changes:
+    - Remove 07-indicate_manual_config.patch, obsolete. 
+  * debian/control
+    - Wrap Build-Depends.
+    - Bump Build-Depends on debhelper to (>= 7).
+  * debian/compat
+    - Bump debhelper compat level to 7.
+  * debian/rules
+    - Include debhelper.mk before any other files as recommended by the cdbs
+      documentation.
+  * Update SVN snapshot to r931033.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 25 Feb 2009 10:54:39 +0100
+
+knetworkmanager (1:0.7~~svn908338-2) experimental; urgency=low
+
+  * debian/patches/04-dbus_access.patch
+    - Update D-Bus names and interfaces for NM 0.7. Closes: #511526
+    - Remove bare send_interface directives to avoid non-deterministic allow
+      messages with no interface. Closes: #510757
+    - Do not allow unpriviledged processes to ask for a users' connections.
+    - Allow introspection by default.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 05 Feb 2009 01:52:22 +0100
+
+knetworkmanager (1:0.7~~svn908338-1) experimental; urgency=low
+
+  * Updated SVN snapshot (r908338).
+  * debian/rules
+    - Stop moving icons around, fixed upstream.
+  * debian/patches/01-configure_package_name.patch
+    - Make sure we set the correct PACKAGE name when generating the build
+      system so the translations are installed properly.
+  * debian/network-manager-kde.lintian-overrides
+    - Updated for the latest lintian changes.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 11 Jan 2009 06:52:06 +0100
+
+knetworkmanager (1:0.7~~svn897092-1) experimental; urgency=low
+
+  * SVN snapshot of the upcoming 0.7 release (for NM 0.7).
+  * debian/control
+    - Add Build-Depends on pkg-config.
+    - Bump Build-Depends on nm-* packages to (>= 0.7.0).
+    - Add Build-Depends on libdbus-1-qt3-dev (>= 0.8.1).
+    - Bump Build-Depends on debhelper to (>= 6.0.7) for dh_lintian.
+    - Bump Depends on network-manager to (>= 0.7.0).
+    - Bump Standards-Version to 3.8.0. Add README.source as recommended by the
+      new policy.
+  * debian/rules
+    - Install autostart desktop file into /usr/share/autostart/.
+    - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them.
+      Closes: #487303
+    - Add support for both libtool 1.x and 2.x.
+  * Switch patch management system to quilt.
+  * debian/patches/04-dbus_access.patch
+    - Refresh and update.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 16 Dec 2008 04:18:10 +0100
+
+knetworkmanager (1:0.2.2-2) unstable; urgency=low
+
+  * debian/patches/07-indicate_manual_config.patch
+    - manual-means-online: If there are interfaces that are not managed by
+      NetworkManager because they have custom configuration in
+      /etc/network/interfaces, we assume to be online and show a wired network
+      icon indicating manual network configuration.
+  * debian/control
+    - Add Build-Depends on pkg-config.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 14 Jan 2009 08:22:11 +0100
+
+knetworkmanager (1:0.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+    - Improved tray icon animation using mng files. Closes: #394815
+    - Improved LEAP security. Closes: #470709
+  * Removed patches
+    - debian/patches/01-fix_french_translation.patch (merged upstream)
+    - debian/patches/02-linux_types.patch (obsolete)
+    - debian/patches/03-awk_path.patch (fixed upstream)
+    - debian/patches/05-desktop_file_fixes.patch (merged upstream)
+  * debian/knetworkmanager.linda
+    - Remove the linda override file, linda is dead.
+  * debian/{knetworkmanager.lintian -> network-manager-kde.lintian-overrides}
+    - Rename the lintian override file so it is automatically installed by
+      dh_lintian.
+  * debian/rules
+    - Drop the no longer required install rules for the override files.
+    - Drop the install rule for the autostart file. It's provided by upstream
+      now.
+  * debian/copyright
+    - Update the authors list.
+  * debian/control
+    - Bump Build-Depends on libnl-dev (>= 1.1).
+    - Drop Build-Depends on kapptemplate. The upstream tarball ships a proper
+      admin/ directory again.
+  * debian/watch
+    - New download location at ftp.kde.org.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 04 Apr 2008 19:41:02 +0200
+
+knetworkmanager (1:0.2-3) unstable; urgency=low
+
+  * debian/control
+    - Use the new "Homepage:" field to specify the upstream URL.
+    - The Vcs-* fields are now officially supported, so remove the XS- prefix.
+    - Bump Standards-Version to 3.7.3. No further changes required.
+    - Fix a few capitalization errors in the package description.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 11 Jan 2008 02:08:24 +0100
+
+knetworkmanager (1:0.2-2) unstable; urgency=low
+
+  * Rebuild against network-manager 0.6.5 to enable phase2 and leap
+    authentication support.
+  * debian/rules
+    - Remove debian/stamp-bootstrap on clean. This fixes a FTBFS if package is
+      built twice in a row. Closes: #442621
+  * debian/control
+    - Add Build-Conflicts: autoconf2.13. Closes: #441046
+  * debian/menu
+    - Set section to Applications/Network/Monitoring which seems to be the
+      most appropriate amongst the available sections.
+  * debian/patches/05-desktop_file_fixes.patch
+    - Fix the *.desktop files to be compliant to the fd.o menu and desktop
+      entry spec.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 16 Sep 2007 21:01:25 +0200
+
+knetworkmanager (1:0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/05-leap_support.patch
+    - Removed, merged upstream.
+  * debian/patches/06-version_check.patch
+    - Removed, merged upstream.
+  * The upstream tarball does not ship an admin/ directory. Build-Depend on
+    kapptemplate, so we can copy it from there.
+  * debian/menu
+    - Update to new menu hierarchy and add a longtitle.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 25 Jul 2007 17:10:36 +0200
+
+knetworkmanager (1:0.2~svn678822-3) unstable; urgency=low
+
+  * debian/patches/06-version_check.patch
+    - Added. Fixes the problem with knetworkmanager no longer connecting
+      automatically upon login. Closes: #431255
+      If you are upgrading from a previous 0.2 svn snapshot, you may have to
+      clear the list of trusted networks in the configuration dialog.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 01 Jul 2007 11:47:00 +0200
+
+knetworkmanager (1:0.2~svn678822-2) unstable; urgency=low
+
+  * debian/patches/02-linux_types.patch
+    - Pass "-std=gnu++98" to CXXFLAGS. Otherwise the type __u64 is not defined
+      in linux-libc-dev for ANSI C/C89. Closes: #430795
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 28 Jun 2007 06:08:04 +0200
+
+knetworkmanager (1:0.2~svn678822-1) unstable; urgency=low
+
+  * SVN snapshot of the upcoming 0.2 release which has native VPN plugin
+    support. Closes: #415742
+  * debian/control
+    - Add XS-Vcs-* fields.
+    - Add Recommends: network-manager-vpnc, network-manager-openvpn.
+  * debian/rules
+    - Compile with openvpn and vpnc support.
+
+  * Removed patches that were merged upstream:
+    - debian/patches/05-no_deserialize.patch
+    - debian/patches/06-pretty_notification.patch
+    - debian/patches/07-overlay_icon_vpn.patch
+    - debian/patches/08-disable_sm.patch
+    - debian/patches/09-dbus_bool_t.patch
+
+  * debian/patches/02-linux_types.patch
+    - Added. Needed to workaround a problem in libnl.
+  * debian/patches/03-awk_path.patch
+    - Added. In Debian awk is installed in /usr/bin.
+  * debian/patches/04-dbus_access.patch
+    - Do not remove the dbus at_console access check but make it an
+      alternative to the Debian netdev group policy. Closes: #426467
+  * debian/patches/05-leap_support.patch
+    - Added. Do not fail to compile if LEAP support is not available.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 22 Jun 2007 21:08:32 +0100
+
+knetworkmanager (1:0.1-4) unstable; urgency=low
+
+  * Actually install the autostart file for knetworkmanager.
+    Thanks to Yannick Roehlly for spotting this glitch.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 12 Jan 2007 11:26:28 +0100
+
+knetworkmanager (1:0.1-3) unstable; urgency=low
+
+  * Pull some features and bug fixes from svn:
+    - debian/patches/05-no_deserialize.patch
+      + Don't call deserialize on encryption object to avoid warning of
+        libnm-util. Closes: #391486
+    - debian/patches/06-pretty_notification.patch
+      + Prettify notification messages.
+    - debian/patches/07-overlay_icon_vpn.patch
+      + Show overlay icon (lock) for active VPN connections.
+    - debian/patches/08-disable_sm.patch
+      + Disable session management to avoid a deadlock when accessing kwallet.
+        Install an autostart file into /usr/share/autostart/ instead.
+        Closes: #406162
+    - debian/patches/09-dbus_bool_t.patch
+      + Use dbus_bool_t instead of bool. Closes: #398974
+  * debian/patches/01-fix_french_translation.patch
+    - Added patch from Emmanuel Bouthenot which fixes some errors in the
+      French translation. Closes: #402285
+
+ -- Michael Biebl <biebl@debian.org>  Tue,  9 Jan 2007 16:31:52 +0100
+
+knetworkmanager (1:0.1-2) unstable; urgency=low
+
+  * Update maintainer email address to biebl@debian.org. 
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 20 Oct 2006 00:02:03 +0200
+
+knetworkmanager (1:0.1-1) unstable; urgency=low
+
+  * Finally the 0.1 release. Woohoo!
+    - Use an epoch to fix the versioning scheme I managed to mess up.
+    - Fixes a crash when removing network objects for a nonexistent network
+      interface. Closes: #390052
+  * debian/patches/01-no_network_status.patch
+    - Removed, fixed upstream.
+  * debian/patches/03-configure.patch
+    - Removed, fixed upstream.
+  * Dropped the build-dep on kapptemplate. The upstream tarball now ships a
+    proper admin/ directory.
+  * debian/patches/02-dialup.patch
+    - Removed. Also dropped the Recommends: pppconfig. pppconfig can't
+      generate entries for /etc/network/interfaces yet. 
+
+ -- Michael Biebl <biebl@teco.edu>  Fri, 29 Sep 2006 19:18:08 +0200
+
+knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low
+
+  * Updated to svn revision 586773.
+  * Do not refer to non existent khelpcenter help:/knetworkmanager/ in man
+    page. Closes: #385642
+
+ -- Michael Biebl <biebl@teco.edu>  Wed, 20 Sep 2006 19:46:52 +0200
+
+knetworkmanager (0.09+0.1r577960-1) unstable; urgency=low
+
+  * Updated to svn revision 577960.
+    - Access KWallet on demand, not on startup. Closes: #379606
+  * Added a Recommends: pppconfig. Closes: #380316
+
+ -- Michael Biebl <biebl@teco.edu>  Mon, 28 Aug 2006 01:14:29 +0200
+
+knetworkmanager (0.09+0.1r560817-1) unstable; urgency=medium
+
+  * Updated to svn revision 560817.
+  * Removed 04-gnome_keyring_daemon.patch, fixed upstream.
+  * Added 04-dbus_access.patch. Fixes D-Bus access rights.
+    Closes: #379309, #379364
+  * Enabled dial up support. Set pppconfig as configuration utility.
+    Closes: #376071
+  * Reload D-Bus after installation. Closes: #379307
+  * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379820
+
+ -- Michael Biebl <biebl@teco.edu>  Tue, 25 Jul 2006 23:33:31 +0200
+
+knetworkmanager (0.09+0.1r550737-1) unstable; urgency=low
+
+  * Updated to svn revision 550737.
+  * Added 01-no_network_status.patch which removes a build dependency on
+    networkstatus.
+  * Removed 03-configure_notifications.patch, merged upstream.
+  * This version does not ship an admin/ directory. Added a build dependency
+    on kapptemplate and modified debian/rules to copy it from kapptemplate.
+  * Bumped Standards-Version to 3.7.2, no further changes required.
+  * Updated homepage URL.
+  * Added 04-gnome_keyring_daemon.patch which sets the correct path to the
+    gnome-keyring-daemon binary. VPN plugins use gnome-keyring-daemon to store
+    their passwords.
+
+ -- Michael Biebl <biebl@teco.edu>  Wed, 14 Jun 2006 17:16:07 +0200
+
+knetworkmanager (0.09+0.1r527269-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed 01-xdg_app.patch, merged upstream.
+  * Added 03-configure_notifications.patch, this patch modifies the context
+    menu of the systray applet to provide quick access to the notification
+    settings.
+  * Added a "Provides: knetworkmanager" to make the package installable by its
+    upstream name.
+  * Initial upload. Closes: #351069
+
+ -- Michael Biebl <biebl@teco.edu>  Thu, 27 Apr 2006 08:01:39 +0200
+
+knetworkmanager (0.09+0.1r5964-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Michael Biebl <biebl@teco.edu>  Tue,  7 Feb 2006 21:43:56 +0100
+
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/compat b/debian/squeeze/applications/knetworkmanager8/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/control b/debian/squeeze/applications/knetworkmanager8/debian/control
new file mode 100644
index 000000000..0b04bbf74
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/control
@@ -0,0 +1,35 @@
+Source: knetworkmanager8-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: cdbs,
+ debhelper (>= 7),
+ pkg-config,
+ kdelibs4-trinity-dev,
+ 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,
+ libnl-dev (>= 1.1),
+ quilt,
+ network-manager-vpnc,
+ network-manager-openvpn,
+ network-manager-strongswan,
+ network-manager-pptp,
+ automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+Homepage: http://opensuse.org/Projects/KNetworkManager
+
+Package: network-manager-kde-trinity
+Architecture: any
+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
+Description: KDE systray applet for controlling NetworkManager [Trinity]
+ Systray applet for controlling network connections managed by 
+ NetworkManager. It is mainly written for Trinity but also works for 
+ other desktop environments like GNOME or Xfce.
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/control.in b/debian/squeeze/applications/knetworkmanager8/debian/control.in
new file mode 100644
index 000000000..43adf3e33
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/control.in
@@ -0,0 +1,36 @@
+Source: knetworkmanager-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: @@@MAINTAINER@@@
+Uploaders: @@@UPLOADERS@@@
+Build-Depends: cdbs,
+ debhelper (>= 7),
+ pkg-config,
+ kdelibs4-trinity-dev,
+ libnm-util-dev (>= 0.7.0),
+ libnm-glib-dev (>= 0.7.0),
+ network-manager-dev (>= 0.7.0),
+ libhal-dev,
+ libdbus-1-qt3-dev (>= 0.8.1),
+ libiw-dev,
+ libnl-dev (>= 1.1),
+ quilt,
+ network-manager-vpnc,
+ network-manager-openvpn,
+ network-manager-strongswan,
+ network-manager-pptp,
+ automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Standards-Version: 3.8.3
+Homepage: http://opensuse.org/Projects/KNetworkManager
+
+Package: network-manager-kde-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
+Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
+Provides: knetworkmanager-trinity
+Conflicts: network-manager-kde
+Description: KDE systray applet for controlling NetworkManager [Trinity]
+ Systray applet for controlling network connections managed by 
+ NetworkManager. It is mainly written for Trinity but also works for 
+ other desktop environments like GNOME or Xfce.
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/copyright b/debian/squeeze/applications/knetworkmanager8/debian/copyright
new file mode 100644
index 000000000..2490de254
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/copyright
@@ -0,0 +1,34 @@
+This package was debianized by Michael Biebl <biebl@teco.edu> on
+Fri,  3 Feb 2006 05:53:06 +0100.
+
+It was downloaded from http://www.opensuse.org
+
+Upstream Authors: 
+  Timo Hoenig <thoenig@suse.de>
+  Will Stephenson <wstephenson@suse.de>
+  Stefan Bogner <sbogner@suse.de>
+  Helmut Schaa <hschaa@suse.de>
+  Valentine Sinitsyn <e_val@inbox.ru>
+
+Copyright: 
+  Copyright (C) 2005, 2006 Novell, Inc.
+
+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; either version 2 of the License, or
+  (at your option) any later version.
+
+  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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/knetworkmanager.1 b/debian/squeeze/applications/knetworkmanager8/debian/knetworkmanager.1
new file mode 100644
index 000000000..3cd261c89
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/knetworkmanager.1
@@ -0,0 +1,145 @@
+.\" This file was generated by kdemangen.pl
+.TH KNETWORKMANAGER 1 "Feb 2006" "K Desktop Environment" "A NetworkManager front-end for KDE"
+.SH NAME
+knetworkmanager
+\- A NetworkManager front-end for KDE
+.SH SYNOPSIS
+knetworkmanager [Qt\-options] [KDE\-options] 
+.SH DESCRIPTION
+A NetworkManager front-end for KDE
+.SH OPTIONS
+.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 - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.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
+.BR networkmanager (1)
+.SH AUTHORS
+.nf
+Timo Hoenig <thoenig@suse.de>
+.br
+Stefan Bogner <sbogner@suse.de>
+.br
+Will Stephenson <wstephenson@suse.de>
+.br
+
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/manpages b/debian/squeeze/applications/knetworkmanager8/debian/manpages
new file mode 100644
index 000000000..e2859341f
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/manpages
@@ -0,0 +1 @@
+debian/knetworkmanager.1
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/menu b/debian/squeeze/applications/knetworkmanager8/debian/menu
new file mode 100644
index 000000000..9775e9c7c
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/menu
@@ -0,0 +1,6 @@
+?package(network-manager-kde): \
+	needs="X11" \
+	section="Applications/Network/Monitoring" \
+  	title="KNetworkManager" \
+	longtitle="A KDE frontend for NetworkManager" \
+	command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
new file mode 100644
index 000000000..9ae01a92b
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
@@ -0,0 +1,2 @@
+network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
+network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst b/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
new file mode 100644
index 000000000..fdd4e51ca
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  configure)
+  	# Ask D-Bus to reload the config file
+  	if [ -x "/etc/init.d/dbus" ]; then
+		invoke-rc.d dbus force-reload || true
+	fi
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/patches/series b/debian/squeeze/applications/knetworkmanager8/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/rules b/debian/squeeze/applications/knetworkmanager8/debian/rules
new file mode 100755
index 000000000..97955e38b
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/rules
@@ -0,0 +1,47 @@
+#!/usr/bin/make -f
+  
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO
+
+DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp
+
+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
+
+binary-install/network-manager-kde-trinity::
+	# Install autostart file
+	install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \
+		debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop
+
+clean::
+	find . -name Makefile.in | xargs rm -f
+	rm -f aclocal.m4
+	rm -f acinclude.m4
+	rm -f configure
+	rm -f configure.files
+	rm -f configure.in
+	rm -f config.h.in
+	rm -f stamp-h.in
+	rm -f subdirs	
+	rm -f admin/ltmain.sh
+	rm -f admin/libtool.m4.in
+	rm -f debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/watch b/debian/squeeze/applications/knetworkmanager8/debian/watch
new file mode 100644
index 000000000..ad7a7be91
--- /dev/null
+++ b/debian/squeeze/applications/knetworkmanager8/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.kde.org/pub/kde/stable/apps/Trinity.x/network/knetworkmanager-(.*)\.tar\.gz
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/README.source b/ubuntu/maverick/applications/knetworkmanager/debian/README.source
deleted file mode 100644
index 96fb271ab..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-This package uses the quilt patch management system.
-
-Please refer to /usr/share/doc/quilt/README.source for further information.
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/buildvars.mk
deleted file mode 100644
index 23d4709dc..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/buildvars.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2002,2003 Colin Walters <walters@debian.org>
-# Description: Defines some useful variables, but no rules
-#
-# This program 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; either version 2, or (at
-# your option) any later version.
-#
-# This program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_rules_buildvars
-_cdbs_rules_buildvars = 1
-
-CDBS_VERSION = something
-
-# Common useful variables
-DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
-DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
-DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
-
-# Split into arch/indep packages
-ifneq ($(DEB_INDEP_PACKAGES),cdbs)
-DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
-DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
-endif
-# Split into normal and udeb packages
-ifeq ($(DEB_UDEB_PACKAGES),)
-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-else
-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-endif
-# Too much bother for now.  If someone complains we'll fix it.
-#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
-#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
-# A handy list of every package, udeb or not
-DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
-DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
-DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
-
-DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-
-# Some support for srcdir != builddir builds.
-# These are relative to the root of the package
-DEB_SRCDIR ?= .
-DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
-
-# Miscellaneous bits
-DEB_ARCH = $(shell dpkg --print-architecture)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
-DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-
-ifeq ($(words $(DEB_ALL_PACKAGES)),1)
-	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
-else
-	DEB_DESTDIR = $(CURDIR)/debian/tmp/
-endif
-
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
-
-endif
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
deleted file mode 100644
index 47e83ef4a..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-	touch debian/stamp-cvs-make
-
-include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
-
-DEB_PATCHDIRS := debian/patches/common debian/patches
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-	done
-
-clean::
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/kde.mk
deleted file mode 100644
index 5b6508f8c..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/kde.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Description: A class for KDE packages; sets KDE environment variables, etc
-#
-# This program 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; either version 2, or (at
-# your option) any later version.
-#
-# This program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_kde
-_cdbs_class_kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
-
-ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-common-build-arch common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
-common-install-arch common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
-
-clean::
-	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
-
-# This is a convenience target for calling manually.  It's not part of
-# the build process.
-buildprep: clean apply-patches
-	$(MAKE) -f admin/Makefile.common dist
-	debian/rules clean
-
-endif
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/team-members b/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/versions.pl b/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/versions.pl
deleted file mode 100644
index 9ce11d8a3..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/-[^-]+$//;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "KDE-Version3=$version3\n";
-print "KDE-Version2=$version2\n";
-print "KDE-Next-Version3=$version3_next\n";
-print "KDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/changelog b/ubuntu/maverick/applications/knetworkmanager/debian/changelog
deleted file mode 100644
index ed0d32a81..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/changelog
+++ /dev/null
@@ -1,373 +0,0 @@
-knetworkmanager-trinity (1:0.8-0ubuntu12) karmic; urgency=low
-
-  * UI tweaks for discoverability
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 26 Oct 2009 17:44:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu10) karmic; urgency=low
-
-  * Fixed VPN reauthentication request dialog failure when used with the permanent storage option
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 06 Oct 2009 19:31:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu7) karmic; urgency=low
-
-  * Fixed various minor glitches
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 03 Oct 2009 12:29:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu6) karmic; urgency=low
-
-  * Repaired poor usability for new wireless connections
-  * Repaired poor usability for connection management
-  * VPN connections now remember login information when asked
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 29 Sep 2009 09:39:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu5) karmic; urgency=low
-
-  * Repaired VPN plugins
-  * VPNC now allows hashed group password
-  * PPTP repaired and enabled
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 28 Sep 2009 14:51:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu4) karmic; urgency=low
-
-  * Patched backend for new NM0.8 API
-  * Repaired poor usability in the "new connection" tasktray menu
-  * Repaired poor usability in the available devices tasktray menu
-  * Moved to /opt/trinity
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 22 Aug 2009 23:34:00 -0600
-
-knetworkmanager (1:0.7~~svn941706-1) unstable; urgency=low
-
-  * Updated SVN snapshot (r941706).
-  * debian/patches/04-dbus_access.patch
-    - Most of the relevant changes have been merged upstream. The patch now
-      only contains the Debian specific group "netdev" section.
-  * debian/control
-    - Bump Standards-Version to 3.8.1. No further changes.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 20 Mar 2009 22:59:51 +0100
-
-knetworkmanager (1:0.7~~svn931033-2) unstable; urgency=low
-
-  * debian/patches/05-no_blank_psk.patch
-    - Do not set zero-length PSK and LEAP passwords otherwise libnm-util fails
-      to validate them. Closes: #517213
-      Patch by Dan Williams, thanks!
-
- -- Michael Biebl <biebl@debian.org>  Tue, 03 Mar 2009 00:34:15 +0100
-
-knetworkmanager (1:0.7~~svn931033-1) unstable; urgency=low
-
-  * Merge experimental branch into unstable. Remaining changes:
-    - Remove 07-indicate_manual_config.patch, obsolete. 
-  * debian/control
-    - Wrap Build-Depends.
-    - Bump Build-Depends on debhelper to (>= 7).
-  * debian/compat
-    - Bump debhelper compat level to 7.
-  * debian/rules
-    - Include debhelper.mk before any other files as recommended by the cdbs
-      documentation.
-  * Update SVN snapshot to r931033.
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Feb 2009 10:54:39 +0100
-
-knetworkmanager (1:0.7~~svn908338-2) experimental; urgency=low
-
-  * debian/patches/04-dbus_access.patch
-    - Update D-Bus names and interfaces for NM 0.7. Closes: #511526
-    - Remove bare send_interface directives to avoid non-deterministic allow
-      messages with no interface. Closes: #510757
-    - Do not allow unpriviledged processes to ask for a users' connections.
-    - Allow introspection by default.
-
- -- Michael Biebl <biebl@debian.org>  Thu, 05 Feb 2009 01:52:22 +0100
-
-knetworkmanager (1:0.7~~svn908338-1) experimental; urgency=low
-
-  * Updated SVN snapshot (r908338).
-  * debian/rules
-    - Stop moving icons around, fixed upstream.
-  * debian/patches/01-configure_package_name.patch
-    - Make sure we set the correct PACKAGE name when generating the build
-      system so the translations are installed properly.
-  * debian/network-manager-kde.lintian-overrides
-    - Updated for the latest lintian changes.
-
- -- Michael Biebl <biebl@debian.org>  Sun, 11 Jan 2009 06:52:06 +0100
-
-knetworkmanager (1:0.7~~svn897092-1) experimental; urgency=low
-
-  * SVN snapshot of the upcoming 0.7 release (for NM 0.7).
-  * debian/control
-    - Add Build-Depends on pkg-config.
-    - Bump Build-Depends on nm-* packages to (>= 0.7.0).
-    - Add Build-Depends on libdbus-1-qt3-dev (>= 0.8.1).
-    - Bump Build-Depends on debhelper to (>= 6.0.7) for dh_lintian.
-    - Bump Depends on network-manager to (>= 0.7.0).
-    - Bump Standards-Version to 3.8.0. Add README.source as recommended by the
-      new policy.
-  * debian/rules
-    - Install autostart desktop file into /usr/share/autostart/.
-    - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them.
-      Closes: #487303
-    - Add support for both libtool 1.x and 2.x.
-  * Switch patch management system to quilt.
-  * debian/patches/04-dbus_access.patch
-    - Refresh and update.
-
- -- Michael Biebl <biebl@debian.org>  Tue, 16 Dec 2008 04:18:10 +0100
-
-knetworkmanager (1:0.2.2-2) unstable; urgency=low
-
-  * debian/patches/07-indicate_manual_config.patch
-    - manual-means-online: If there are interfaces that are not managed by
-      NetworkManager because they have custom configuration in
-      /etc/network/interfaces, we assume to be online and show a wired network
-      icon indicating manual network configuration.
-  * debian/control
-    - Add Build-Depends on pkg-config.
-
- -- Michael Biebl <biebl@debian.org>  Wed, 14 Jan 2009 08:22:11 +0100
-
-knetworkmanager (1:0.2.2-1) unstable; urgency=low
-
-  * New upstream release.
-    - Improved tray icon animation using mng files. Closes: #394815
-    - Improved LEAP security. Closes: #470709
-  * Removed patches
-    - debian/patches/01-fix_french_translation.patch (merged upstream)
-    - debian/patches/02-linux_types.patch (obsolete)
-    - debian/patches/03-awk_path.patch (fixed upstream)
-    - debian/patches/05-desktop_file_fixes.patch (merged upstream)
-  * debian/knetworkmanager.linda
-    - Remove the linda override file, linda is dead.
-  * debian/{knetworkmanager.lintian -> network-manager-kde.lintian-overrides}
-    - Rename the lintian override file so it is automatically installed by
-      dh_lintian.
-  * debian/rules
-    - Drop the no longer required install rules for the override files.
-    - Drop the install rule for the autostart file. It's provided by upstream
-      now.
-  * debian/copyright
-    - Update the authors list.
-  * debian/control
-    - Bump Build-Depends on libnl-dev (>= 1.1).
-    - Drop Build-Depends on kapptemplate. The upstream tarball ships a proper
-      admin/ directory again.
-  * debian/watch
-    - New download location at ftp.kde.org.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 04 Apr 2008 19:41:02 +0200
-
-knetworkmanager (1:0.2-3) unstable; urgency=low
-
-  * debian/control
-    - Use the new "Homepage:" field to specify the upstream URL.
-    - The Vcs-* fields are now officially supported, so remove the XS- prefix.
-    - Bump Standards-Version to 3.7.3. No further changes required.
-    - Fix a few capitalization errors in the package description.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 11 Jan 2008 02:08:24 +0100
-
-knetworkmanager (1:0.2-2) unstable; urgency=low
-
-  * Rebuild against network-manager 0.6.5 to enable phase2 and leap
-    authentication support.
-  * debian/rules
-    - Remove debian/stamp-bootstrap on clean. This fixes a FTBFS if package is
-      built twice in a row. Closes: #442621
-  * debian/control
-    - Add Build-Conflicts: autoconf2.13. Closes: #441046
-  * debian/menu
-    - Set section to Applications/Network/Monitoring which seems to be the
-      most appropriate amongst the available sections.
-  * debian/patches/05-desktop_file_fixes.patch
-    - Fix the *.desktop files to be compliant to the fd.o menu and desktop
-      entry spec.
-
- -- Michael Biebl <biebl@debian.org>  Sun, 16 Sep 2007 21:01:25 +0200
-
-knetworkmanager (1:0.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/patches/05-leap_support.patch
-    - Removed, merged upstream.
-  * debian/patches/06-version_check.patch
-    - Removed, merged upstream.
-  * The upstream tarball does not ship an admin/ directory. Build-Depend on
-    kapptemplate, so we can copy it from there.
-  * debian/menu
-    - Update to new menu hierarchy and add a longtitle.
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Jul 2007 17:10:36 +0200
-
-knetworkmanager (1:0.2~svn678822-3) unstable; urgency=low
-
-  * debian/patches/06-version_check.patch
-    - Added. Fixes the problem with knetworkmanager no longer connecting
-      automatically upon login. Closes: #431255
-      If you are upgrading from a previous 0.2 svn snapshot, you may have to
-      clear the list of trusted networks in the configuration dialog.
-
- -- Michael Biebl <biebl@debian.org>  Sun, 01 Jul 2007 11:47:00 +0200
-
-knetworkmanager (1:0.2~svn678822-2) unstable; urgency=low
-
-  * debian/patches/02-linux_types.patch
-    - Pass "-std=gnu++98" to CXXFLAGS. Otherwise the type __u64 is not defined
-      in linux-libc-dev for ANSI C/C89. Closes: #430795
-
- -- Michael Biebl <biebl@debian.org>  Thu, 28 Jun 2007 06:08:04 +0200
-
-knetworkmanager (1:0.2~svn678822-1) unstable; urgency=low
-
-  * SVN snapshot of the upcoming 0.2 release which has native VPN plugin
-    support. Closes: #415742
-  * debian/control
-    - Add XS-Vcs-* fields.
-    - Add Recommends: network-manager-vpnc, network-manager-openvpn.
-  * debian/rules
-    - Compile with openvpn and vpnc support.
-
-  * Removed patches that were merged upstream:
-    - debian/patches/05-no_deserialize.patch
-    - debian/patches/06-pretty_notification.patch
-    - debian/patches/07-overlay_icon_vpn.patch
-    - debian/patches/08-disable_sm.patch
-    - debian/patches/09-dbus_bool_t.patch
-
-  * debian/patches/02-linux_types.patch
-    - Added. Needed to workaround a problem in libnl.
-  * debian/patches/03-awk_path.patch
-    - Added. In Debian awk is installed in /usr/bin.
-  * debian/patches/04-dbus_access.patch
-    - Do not remove the dbus at_console access check but make it an
-      alternative to the Debian netdev group policy. Closes: #426467
-  * debian/patches/05-leap_support.patch
-    - Added. Do not fail to compile if LEAP support is not available.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 22 Jun 2007 21:08:32 +0100
-
-knetworkmanager (1:0.1-4) unstable; urgency=low
-
-  * Actually install the autostart file for knetworkmanager.
-    Thanks to Yannick Roehlly for spotting this glitch.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 12 Jan 2007 11:26:28 +0100
-
-knetworkmanager (1:0.1-3) unstable; urgency=low
-
-  * Pull some features and bug fixes from svn:
-    - debian/patches/05-no_deserialize.patch
-      + Don't call deserialize on encryption object to avoid warning of
-        libnm-util. Closes: #391486
-    - debian/patches/06-pretty_notification.patch
-      + Prettify notification messages.
-    - debian/patches/07-overlay_icon_vpn.patch
-      + Show overlay icon (lock) for active VPN connections.
-    - debian/patches/08-disable_sm.patch
-      + Disable session management to avoid a deadlock when accessing kwallet.
-        Install an autostart file into /usr/share/autostart/ instead.
-        Closes: #406162
-    - debian/patches/09-dbus_bool_t.patch
-      + Use dbus_bool_t instead of bool. Closes: #398974
-  * debian/patches/01-fix_french_translation.patch
-    - Added patch from Emmanuel Bouthenot which fixes some errors in the
-      French translation. Closes: #402285
-
- -- Michael Biebl <biebl@debian.org>  Tue,  9 Jan 2007 16:31:52 +0100
-
-knetworkmanager (1:0.1-2) unstable; urgency=low
-
-  * Update maintainer email address to biebl@debian.org. 
-
- -- Michael Biebl <biebl@debian.org>  Fri, 20 Oct 2006 00:02:03 +0200
-
-knetworkmanager (1:0.1-1) unstable; urgency=low
-
-  * Finally the 0.1 release. Woohoo!
-    - Use an epoch to fix the versioning scheme I managed to mess up.
-    - Fixes a crash when removing network objects for a nonexistent network
-      interface. Closes: #390052
-  * debian/patches/01-no_network_status.patch
-    - Removed, fixed upstream.
-  * debian/patches/03-configure.patch
-    - Removed, fixed upstream.
-  * Dropped the build-dep on kapptemplate. The upstream tarball now ships a
-    proper admin/ directory.
-  * debian/patches/02-dialup.patch
-    - Removed. Also dropped the Recommends: pppconfig. pppconfig can't
-      generate entries for /etc/network/interfaces yet. 
-
- -- Michael Biebl <biebl@teco.edu>  Fri, 29 Sep 2006 19:18:08 +0200
-
-knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low
-
-  * Updated to svn revision 586773.
-  * Do not refer to non existent khelpcenter help:/knetworkmanager/ in man
-    page. Closes: #385642
-
- -- Michael Biebl <biebl@teco.edu>  Wed, 20 Sep 2006 19:46:52 +0200
-
-knetworkmanager (0.09+0.1r577960-1) unstable; urgency=low
-
-  * Updated to svn revision 577960.
-    - Access KWallet on demand, not on startup. Closes: #379606
-  * Added a Recommends: pppconfig. Closes: #380316
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 28 Aug 2006 01:14:29 +0200
-
-knetworkmanager (0.09+0.1r560817-1) unstable; urgency=medium
-
-  * Updated to svn revision 560817.
-  * Removed 04-gnome_keyring_daemon.patch, fixed upstream.
-  * Added 04-dbus_access.patch. Fixes D-Bus access rights.
-    Closes: #379309, #379364
-  * Enabled dial up support. Set pppconfig as configuration utility.
-    Closes: #376071
-  * Reload D-Bus after installation. Closes: #379307
-  * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379820
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 25 Jul 2006 23:33:31 +0200
-
-knetworkmanager (0.09+0.1r550737-1) unstable; urgency=low
-
-  * Updated to svn revision 550737.
-  * Added 01-no_network_status.patch which removes a build dependency on
-    networkstatus.
-  * Removed 03-configure_notifications.patch, merged upstream.
-  * This version does not ship an admin/ directory. Added a build dependency
-    on kapptemplate and modified debian/rules to copy it from kapptemplate.
-  * Bumped Standards-Version to 3.7.2, no further changes required.
-  * Updated homepage URL.
-  * Added 04-gnome_keyring_daemon.patch which sets the correct path to the
-    gnome-keyring-daemon binary. VPN plugins use gnome-keyring-daemon to store
-    their passwords.
-
- -- Michael Biebl <biebl@teco.edu>  Wed, 14 Jun 2006 17:16:07 +0200
-
-knetworkmanager (0.09+0.1r527269-1) unstable; urgency=low
-
-  * New upstream release.
-  * Removed 01-xdg_app.patch, merged upstream.
-  * Added 03-configure_notifications.patch, this patch modifies the context
-    menu of the systray applet to provide quick access to the notification
-    settings.
-  * Added a "Provides: knetworkmanager" to make the package installable by its
-    upstream name.
-  * Initial upload. Closes: #351069
-
- -- Michael Biebl <biebl@teco.edu>  Thu, 27 Apr 2006 08:01:39 +0200
-
-knetworkmanager (0.09+0.1r5964-1) unstable; urgency=low
-
-  * Initial release.
-
- -- Michael Biebl <biebl@teco.edu>  Tue,  7 Feb 2006 21:43:56 +0100
-
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/compat b/ubuntu/maverick/applications/knetworkmanager/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/control b/ubuntu/maverick/applications/knetworkmanager/debian/control
deleted file mode 100644
index 41a91963b..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/control
+++ /dev/null
@@ -1,37 +0,0 @@
-Source: knetworkmanager8-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs,
- debhelper (>= 7),
- pkg-config,
- kdelibs4-trinity-dev,
- 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,
- libnl-dev (>= 1.1),
- quilt,
- network-manager-vpnc,
- network-manager-openvpn,
- network-manager-strongswan,
- network-manager-pptp,
- automake, autoconf, libtool, libltdl-dev
-Standards-Version: 3.8.4
-Homepage: http://opensuse.org/Projects/KNetworkManager
-
-Package: network-manager-kde-trinity
-Architecture: any
-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
-Provides: knetworkmanager-trinity
-Conflicts: network-manager-kde
-Description: KDE systray applet for controlling NetworkManager [Trinity]
- Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for Trinity but also works for 
- other desktop environments like GNOME or Xfce.
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/control.in b/ubuntu/maverick/applications/knetworkmanager/debian/control.in
deleted file mode 100644
index 43adf3e33..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/control.in
+++ /dev/null
@@ -1,36 +0,0 @@
-Source: knetworkmanager-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs,
- debhelper (>= 7),
- pkg-config,
- kdelibs4-trinity-dev,
- libnm-util-dev (>= 0.7.0),
- libnm-glib-dev (>= 0.7.0),
- network-manager-dev (>= 0.7.0),
- libhal-dev,
- libdbus-1-qt3-dev (>= 0.8.1),
- libiw-dev,
- libnl-dev (>= 1.1),
- quilt,
- network-manager-vpnc,
- network-manager-openvpn,
- network-manager-strongswan,
- network-manager-pptp,
- automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
-Standards-Version: 3.8.3
-Homepage: http://opensuse.org/Projects/KNetworkManager
-
-Package: network-manager-kde-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
-Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
-Provides: knetworkmanager-trinity
-Conflicts: network-manager-kde
-Description: KDE systray applet for controlling NetworkManager [Trinity]
- Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for Trinity but also works for 
- other desktop environments like GNOME or Xfce.
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/copyright b/ubuntu/maverick/applications/knetworkmanager/debian/copyright
deleted file mode 100644
index 2490de254..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/copyright
+++ /dev/null
@@ -1,34 +0,0 @@
-This package was debianized by Michael Biebl <biebl@teco.edu> on
-Fri,  3 Feb 2006 05:53:06 +0100.
-
-It was downloaded from http://www.opensuse.org
-
-Upstream Authors: 
-  Timo Hoenig <thoenig@suse.de>
-  Will Stephenson <wstephenson@suse.de>
-  Stefan Bogner <sbogner@suse.de>
-  Helmut Schaa <hschaa@suse.de>
-  Valentine Sinitsyn <e_val@inbox.ru>
-
-Copyright: 
-  Copyright (C) 2005, 2006 Novell, Inc.
-
-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; either version 2 of the License, or
-  (at your option) any later version.
-
-  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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/knetworkmanager.1 b/ubuntu/maverick/applications/knetworkmanager/debian/knetworkmanager.1
deleted file mode 100644
index 3cd261c89..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/knetworkmanager.1
+++ /dev/null
@@ -1,145 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KNETWORKMANAGER 1 "Feb 2006" "K Desktop Environment" "A NetworkManager front-end for KDE"
-.SH NAME
-knetworkmanager
-\- A NetworkManager front-end for KDE
-.SH SYNOPSIS
-knetworkmanager [Qt\-options] [KDE\-options] 
-.SH DESCRIPTION
-A NetworkManager front-end for KDE
-.SH OPTIONS
-.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 - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.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
-.BR networkmanager (1)
-.SH AUTHORS
-.nf
-Timo Hoenig <thoenig@suse.de>
-.br
-Stefan Bogner <sbogner@suse.de>
-.br
-Will Stephenson <wstephenson@suse.de>
-.br
-
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/manpages b/ubuntu/maverick/applications/knetworkmanager/debian/manpages
deleted file mode 100644
index e2859341f..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/knetworkmanager.1
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/menu b/ubuntu/maverick/applications/knetworkmanager/debian/menu
deleted file mode 100644
index 9775e9c7c..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(network-manager-kde): \
-	needs="X11" \
-	section="Applications/Network/Monitoring" \
-  	title="KNetworkManager" \
-	longtitle="A KDE frontend for NetworkManager" \
-	command="/opt/trinity/bin/knetworkmanager"
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides
deleted file mode 100644
index 9ae01a92b..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
-network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst b/ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst
deleted file mode 100644
index fdd4e51ca..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/network-manager-kde-trinity.postinst
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-  configure)
-  	# Ask D-Bus to reload the config file
-  	if [ -x "/etc/init.d/dbus" ]; then
-		invoke-rc.d dbus force-reload || true
-	fi
-	;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/patches/series b/ubuntu/maverick/applications/knetworkmanager/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/rules b/ubuntu/maverick/applications/knetworkmanager/debian/rules
deleted file mode 100755
index 97955e38b..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/rules
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/make -f
-  
-include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO
-
-DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp
-
-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
-
-binary-install/network-manager-kde-trinity::
-	# Install autostart file
-	install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \
-		debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop
-
-clean::
-	find . -name Makefile.in | xargs rm -f
-	rm -f aclocal.m4
-	rm -f acinclude.m4
-	rm -f configure
-	rm -f configure.files
-	rm -f configure.in
-	rm -f config.h.in
-	rm -f stamp-h.in
-	rm -f subdirs	
-	rm -f admin/ltmain.sh
-	rm -f admin/libtool.m4.in
-	rm -f debian/stamp-bootstrap
diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/watch b/ubuntu/maverick/applications/knetworkmanager/debian/watch
deleted file mode 100644
index ad7a7be91..000000000
--- a/ubuntu/maverick/applications/knetworkmanager/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-ftp://ftp.kde.org/pub/kde/stable/apps/Trinity.x/network/knetworkmanager-(.*)\.tar\.gz
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/README.source b/ubuntu/maverick/applications/knetworkmanager8/debian/README.source
new file mode 100644
index 000000000..96fb271ab
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/README.source
@@ -0,0 +1,3 @@
+This package uses the quilt patch management system.
+
+Please refer to /usr/share/doc/quilt/README.source for further information.
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# This program 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; either version 2, or (at
+# your option) any later version.
+#
+# This program 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 program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..47e83ef4a
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
+endif
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	done
+
+clean::
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
new file mode 100644
index 000000000..5b6508f8c
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program 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; either version 2, or (at
+# your option) any later version.
+#
+# This program 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 program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/kde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final =
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/team-members b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/team-members
new file mode 100644
index 000000000..05761af6e
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/team-members
@@ -0,0 +1,16 @@
+Sune Vuorela <debian@pusling.com>
+Ana Beatriz Guerrero Lopez <ana@debian.org>
+Fathi Boudra <fboudra@free.fr>
+Modestas Vainius <geromanas@mailas.com>
+Josh Metzler <joshdeb@metzlers.org>
+Isaac Clerencia <isaac@debian.org>
+Adeodato Simó <dato@net.com.org.es>
+Adeodato Simo <dato@net.com.org.es>
+Christopher Martin <chrsmrtn@debian.org>
+Daniel Schepler <schepler@debian.org>
+Sarah Hobbs <hobbsee@ubuntu.com>
+Nacho Barrientos Arias <nacho@debian.org>
+Ricardo Javier Cardenes Medina <rcardenes@debian.org>
+Ricardo Cardenes <rcardenes@debian.org>
+Armin Berres <trigger+debian@space-based.de>
+Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl
new file mode 100644
index 000000000..9ce11d8a3
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/-[^-]+$//;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/changelog b/ubuntu/maverick/applications/knetworkmanager8/debian/changelog
new file mode 100644
index 000000000..04405984c
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/changelog
@@ -0,0 +1,373 @@
+knetworkmanager8-trinity (1:0.8-0ubuntu12) karmic; urgency=low
+
+  * UI tweaks for discoverability
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 26 Oct 2009 17:44:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu10) karmic; urgency=low
+
+  * Fixed VPN reauthentication request dialog failure when used with the permanent storage option
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 06 Oct 2009 19:31:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu7) karmic; urgency=low
+
+  * Fixed various minor glitches
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 03 Oct 2009 12:29:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu6) karmic; urgency=low
+
+  * Repaired poor usability for new wireless connections
+  * Repaired poor usability for connection management
+  * VPN connections now remember login information when asked
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 29 Sep 2009 09:39:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu5) karmic; urgency=low
+
+  * Repaired VPN plugins
+  * VPNC now allows hashed group password
+  * PPTP repaired and enabled
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 28 Sep 2009 14:51:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu4) karmic; urgency=low
+
+  * Patched backend for new NM0.8 API
+  * Repaired poor usability in the "new connection" tasktray menu
+  * Repaired poor usability in the available devices tasktray menu
+  * Moved to /opt/trinity
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 22 Aug 2009 23:34:00 -0600
+
+knetworkmanager (1:0.7~~svn941706-1) unstable; urgency=low
+
+  * Updated SVN snapshot (r941706).
+  * debian/patches/04-dbus_access.patch
+    - Most of the relevant changes have been merged upstream. The patch now
+      only contains the Debian specific group "netdev" section.
+  * debian/control
+    - Bump Standards-Version to 3.8.1. No further changes.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 20 Mar 2009 22:59:51 +0100
+
+knetworkmanager (1:0.7~~svn931033-2) unstable; urgency=low
+
+  * debian/patches/05-no_blank_psk.patch
+    - Do not set zero-length PSK and LEAP passwords otherwise libnm-util fails
+      to validate them. Closes: #517213
+      Patch by Dan Williams, thanks!
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 03 Mar 2009 00:34:15 +0100
+
+knetworkmanager (1:0.7~~svn931033-1) unstable; urgency=low
+
+  * Merge experimental branch into unstable. Remaining changes:
+    - Remove 07-indicate_manual_config.patch, obsolete. 
+  * debian/control
+    - Wrap Build-Depends.
+    - Bump Build-Depends on debhelper to (>= 7).
+  * debian/compat
+    - Bump debhelper compat level to 7.
+  * debian/rules
+    - Include debhelper.mk before any other files as recommended by the cdbs
+      documentation.
+  * Update SVN snapshot to r931033.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 25 Feb 2009 10:54:39 +0100
+
+knetworkmanager (1:0.7~~svn908338-2) experimental; urgency=low
+
+  * debian/patches/04-dbus_access.patch
+    - Update D-Bus names and interfaces for NM 0.7. Closes: #511526
+    - Remove bare send_interface directives to avoid non-deterministic allow
+      messages with no interface. Closes: #510757
+    - Do not allow unpriviledged processes to ask for a users' connections.
+    - Allow introspection by default.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 05 Feb 2009 01:52:22 +0100
+
+knetworkmanager (1:0.7~~svn908338-1) experimental; urgency=low
+
+  * Updated SVN snapshot (r908338).
+  * debian/rules
+    - Stop moving icons around, fixed upstream.
+  * debian/patches/01-configure_package_name.patch
+    - Make sure we set the correct PACKAGE name when generating the build
+      system so the translations are installed properly.
+  * debian/network-manager-kde.lintian-overrides
+    - Updated for the latest lintian changes.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 11 Jan 2009 06:52:06 +0100
+
+knetworkmanager (1:0.7~~svn897092-1) experimental; urgency=low
+
+  * SVN snapshot of the upcoming 0.7 release (for NM 0.7).
+  * debian/control
+    - Add Build-Depends on pkg-config.
+    - Bump Build-Depends on nm-* packages to (>= 0.7.0).
+    - Add Build-Depends on libdbus-1-qt3-dev (>= 0.8.1).
+    - Bump Build-Depends on debhelper to (>= 6.0.7) for dh_lintian.
+    - Bump Depends on network-manager to (>= 0.7.0).
+    - Bump Standards-Version to 3.8.0. Add README.source as recommended by the
+      new policy.
+  * debian/rules
+    - Install autostart desktop file into /usr/share/autostart/.
+    - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them.
+      Closes: #487303
+    - Add support for both libtool 1.x and 2.x.
+  * Switch patch management system to quilt.
+  * debian/patches/04-dbus_access.patch
+    - Refresh and update.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 16 Dec 2008 04:18:10 +0100
+
+knetworkmanager (1:0.2.2-2) unstable; urgency=low
+
+  * debian/patches/07-indicate_manual_config.patch
+    - manual-means-online: If there are interfaces that are not managed by
+      NetworkManager because they have custom configuration in
+      /etc/network/interfaces, we assume to be online and show a wired network
+      icon indicating manual network configuration.
+  * debian/control
+    - Add Build-Depends on pkg-config.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 14 Jan 2009 08:22:11 +0100
+
+knetworkmanager (1:0.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+    - Improved tray icon animation using mng files. Closes: #394815
+    - Improved LEAP security. Closes: #470709
+  * Removed patches
+    - debian/patches/01-fix_french_translation.patch (merged upstream)
+    - debian/patches/02-linux_types.patch (obsolete)
+    - debian/patches/03-awk_path.patch (fixed upstream)
+    - debian/patches/05-desktop_file_fixes.patch (merged upstream)
+  * debian/knetworkmanager.linda
+    - Remove the linda override file, linda is dead.
+  * debian/{knetworkmanager.lintian -> network-manager-kde.lintian-overrides}
+    - Rename the lintian override file so it is automatically installed by
+      dh_lintian.
+  * debian/rules
+    - Drop the no longer required install rules for the override files.
+    - Drop the install rule for the autostart file. It's provided by upstream
+      now.
+  * debian/copyright
+    - Update the authors list.
+  * debian/control
+    - Bump Build-Depends on libnl-dev (>= 1.1).
+    - Drop Build-Depends on kapptemplate. The upstream tarball ships a proper
+      admin/ directory again.
+  * debian/watch
+    - New download location at ftp.kde.org.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 04 Apr 2008 19:41:02 +0200
+
+knetworkmanager (1:0.2-3) unstable; urgency=low
+
+  * debian/control
+    - Use the new "Homepage:" field to specify the upstream URL.
+    - The Vcs-* fields are now officially supported, so remove the XS- prefix.
+    - Bump Standards-Version to 3.7.3. No further changes required.
+    - Fix a few capitalization errors in the package description.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 11 Jan 2008 02:08:24 +0100
+
+knetworkmanager (1:0.2-2) unstable; urgency=low
+
+  * Rebuild against network-manager 0.6.5 to enable phase2 and leap
+    authentication support.
+  * debian/rules
+    - Remove debian/stamp-bootstrap on clean. This fixes a FTBFS if package is
+      built twice in a row. Closes: #442621
+  * debian/control
+    - Add Build-Conflicts: autoconf2.13. Closes: #441046
+  * debian/menu
+    - Set section to Applications/Network/Monitoring which seems to be the
+      most appropriate amongst the available sections.
+  * debian/patches/05-desktop_file_fixes.patch
+    - Fix the *.desktop files to be compliant to the fd.o menu and desktop
+      entry spec.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 16 Sep 2007 21:01:25 +0200
+
+knetworkmanager (1:0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/05-leap_support.patch
+    - Removed, merged upstream.
+  * debian/patches/06-version_check.patch
+    - Removed, merged upstream.
+  * The upstream tarball does not ship an admin/ directory. Build-Depend on
+    kapptemplate, so we can copy it from there.
+  * debian/menu
+    - Update to new menu hierarchy and add a longtitle.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 25 Jul 2007 17:10:36 +0200
+
+knetworkmanager (1:0.2~svn678822-3) unstable; urgency=low
+
+  * debian/patches/06-version_check.patch
+    - Added. Fixes the problem with knetworkmanager no longer connecting
+      automatically upon login. Closes: #431255
+      If you are upgrading from a previous 0.2 svn snapshot, you may have to
+      clear the list of trusted networks in the configuration dialog.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 01 Jul 2007 11:47:00 +0200
+
+knetworkmanager (1:0.2~svn678822-2) unstable; urgency=low
+
+  * debian/patches/02-linux_types.patch
+    - Pass "-std=gnu++98" to CXXFLAGS. Otherwise the type __u64 is not defined
+      in linux-libc-dev for ANSI C/C89. Closes: #430795
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 28 Jun 2007 06:08:04 +0200
+
+knetworkmanager (1:0.2~svn678822-1) unstable; urgency=low
+
+  * SVN snapshot of the upcoming 0.2 release which has native VPN plugin
+    support. Closes: #415742
+  * debian/control
+    - Add XS-Vcs-* fields.
+    - Add Recommends: network-manager-vpnc, network-manager-openvpn.
+  * debian/rules
+    - Compile with openvpn and vpnc support.
+
+  * Removed patches that were merged upstream:
+    - debian/patches/05-no_deserialize.patch
+    - debian/patches/06-pretty_notification.patch
+    - debian/patches/07-overlay_icon_vpn.patch
+    - debian/patches/08-disable_sm.patch
+    - debian/patches/09-dbus_bool_t.patch
+
+  * debian/patches/02-linux_types.patch
+    - Added. Needed to workaround a problem in libnl.
+  * debian/patches/03-awk_path.patch
+    - Added. In Debian awk is installed in /usr/bin.
+  * debian/patches/04-dbus_access.patch
+    - Do not remove the dbus at_console access check but make it an
+      alternative to the Debian netdev group policy. Closes: #426467
+  * debian/patches/05-leap_support.patch
+    - Added. Do not fail to compile if LEAP support is not available.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 22 Jun 2007 21:08:32 +0100
+
+knetworkmanager (1:0.1-4) unstable; urgency=low
+
+  * Actually install the autostart file for knetworkmanager.
+    Thanks to Yannick Roehlly for spotting this glitch.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 12 Jan 2007 11:26:28 +0100
+
+knetworkmanager (1:0.1-3) unstable; urgency=low
+
+  * Pull some features and bug fixes from svn:
+    - debian/patches/05-no_deserialize.patch
+      + Don't call deserialize on encryption object to avoid warning of
+        libnm-util. Closes: #391486
+    - debian/patches/06-pretty_notification.patch
+      + Prettify notification messages.
+    - debian/patches/07-overlay_icon_vpn.patch
+      + Show overlay icon (lock) for active VPN connections.
+    - debian/patches/08-disable_sm.patch
+      + Disable session management to avoid a deadlock when accessing kwallet.
+        Install an autostart file into /usr/share/autostart/ instead.
+        Closes: #406162
+    - debian/patches/09-dbus_bool_t.patch
+      + Use dbus_bool_t instead of bool. Closes: #398974
+  * debian/patches/01-fix_french_translation.patch
+    - Added patch from Emmanuel Bouthenot which fixes some errors in the
+      French translation. Closes: #402285
+
+ -- Michael Biebl <biebl@debian.org>  Tue,  9 Jan 2007 16:31:52 +0100
+
+knetworkmanager (1:0.1-2) unstable; urgency=low
+
+  * Update maintainer email address to biebl@debian.org. 
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 20 Oct 2006 00:02:03 +0200
+
+knetworkmanager (1:0.1-1) unstable; urgency=low
+
+  * Finally the 0.1 release. Woohoo!
+    - Use an epoch to fix the versioning scheme I managed to mess up.
+    - Fixes a crash when removing network objects for a nonexistent network
+      interface. Closes: #390052
+  * debian/patches/01-no_network_status.patch
+    - Removed, fixed upstream.
+  * debian/patches/03-configure.patch
+    - Removed, fixed upstream.
+  * Dropped the build-dep on kapptemplate. The upstream tarball now ships a
+    proper admin/ directory.
+  * debian/patches/02-dialup.patch
+    - Removed. Also dropped the Recommends: pppconfig. pppconfig can't
+      generate entries for /etc/network/interfaces yet. 
+
+ -- Michael Biebl <biebl@teco.edu>  Fri, 29 Sep 2006 19:18:08 +0200
+
+knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low
+
+  * Updated to svn revision 586773.
+  * Do not refer to non existent khelpcenter help:/knetworkmanager/ in man
+    page. Closes: #385642
+
+ -- Michael Biebl <biebl@teco.edu>  Wed, 20 Sep 2006 19:46:52 +0200
+
+knetworkmanager (0.09+0.1r577960-1) unstable; urgency=low
+
+  * Updated to svn revision 577960.
+    - Access KWallet on demand, not on startup. Closes: #379606
+  * Added a Recommends: pppconfig. Closes: #380316
+
+ -- Michael Biebl <biebl@teco.edu>  Mon, 28 Aug 2006 01:14:29 +0200
+
+knetworkmanager (0.09+0.1r560817-1) unstable; urgency=medium
+
+  * Updated to svn revision 560817.
+  * Removed 04-gnome_keyring_daemon.patch, fixed upstream.
+  * Added 04-dbus_access.patch. Fixes D-Bus access rights.
+    Closes: #379309, #379364
+  * Enabled dial up support. Set pppconfig as configuration utility.
+    Closes: #376071
+  * Reload D-Bus after installation. Closes: #379307
+  * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379820
+
+ -- Michael Biebl <biebl@teco.edu>  Tue, 25 Jul 2006 23:33:31 +0200
+
+knetworkmanager (0.09+0.1r550737-1) unstable; urgency=low
+
+  * Updated to svn revision 550737.
+  * Added 01-no_network_status.patch which removes a build dependency on
+    networkstatus.
+  * Removed 03-configure_notifications.patch, merged upstream.
+  * This version does not ship an admin/ directory. Added a build dependency
+    on kapptemplate and modified debian/rules to copy it from kapptemplate.
+  * Bumped Standards-Version to 3.7.2, no further changes required.
+  * Updated homepage URL.
+  * Added 04-gnome_keyring_daemon.patch which sets the correct path to the
+    gnome-keyring-daemon binary. VPN plugins use gnome-keyring-daemon to store
+    their passwords.
+
+ -- Michael Biebl <biebl@teco.edu>  Wed, 14 Jun 2006 17:16:07 +0200
+
+knetworkmanager (0.09+0.1r527269-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed 01-xdg_app.patch, merged upstream.
+  * Added 03-configure_notifications.patch, this patch modifies the context
+    menu of the systray applet to provide quick access to the notification
+    settings.
+  * Added a "Provides: knetworkmanager" to make the package installable by its
+    upstream name.
+  * Initial upload. Closes: #351069
+
+ -- Michael Biebl <biebl@teco.edu>  Thu, 27 Apr 2006 08:01:39 +0200
+
+knetworkmanager (0.09+0.1r5964-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Michael Biebl <biebl@teco.edu>  Tue,  7 Feb 2006 21:43:56 +0100
+
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/compat b/ubuntu/maverick/applications/knetworkmanager8/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/control b/ubuntu/maverick/applications/knetworkmanager8/debian/control
new file mode 100644
index 000000000..41a91963b
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control
@@ -0,0 +1,37 @@
+Source: knetworkmanager8-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: cdbs,
+ debhelper (>= 7),
+ pkg-config,
+ kdelibs4-trinity-dev,
+ 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,
+ libnl-dev (>= 1.1),
+ quilt,
+ network-manager-vpnc,
+ network-manager-openvpn,
+ network-manager-strongswan,
+ network-manager-pptp,
+ automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+Homepage: http://opensuse.org/Projects/KNetworkManager
+
+Package: network-manager-kde-trinity
+Architecture: any
+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
+Provides: knetworkmanager-trinity
+Conflicts: network-manager-kde
+Description: KDE systray applet for controlling NetworkManager [Trinity]
+ Systray applet for controlling network connections managed by 
+ NetworkManager. It is mainly written for Trinity but also works for 
+ other desktop environments like GNOME or Xfce.
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/control.in b/ubuntu/maverick/applications/knetworkmanager8/debian/control.in
new file mode 100644
index 000000000..43adf3e33
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/control.in
@@ -0,0 +1,36 @@
+Source: knetworkmanager-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: @@@MAINTAINER@@@
+Uploaders: @@@UPLOADERS@@@
+Build-Depends: cdbs,
+ debhelper (>= 7),
+ pkg-config,
+ kdelibs4-trinity-dev,
+ libnm-util-dev (>= 0.7.0),
+ libnm-glib-dev (>= 0.7.0),
+ network-manager-dev (>= 0.7.0),
+ libhal-dev,
+ libdbus-1-qt3-dev (>= 0.8.1),
+ libiw-dev,
+ libnl-dev (>= 1.1),
+ quilt,
+ network-manager-vpnc,
+ network-manager-openvpn,
+ network-manager-strongswan,
+ network-manager-pptp,
+ automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Standards-Version: 3.8.3
+Homepage: http://opensuse.org/Projects/KNetworkManager
+
+Package: network-manager-kde-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
+Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
+Provides: knetworkmanager-trinity
+Conflicts: network-manager-kde
+Description: KDE systray applet for controlling NetworkManager [Trinity]
+ Systray applet for controlling network connections managed by 
+ NetworkManager. It is mainly written for Trinity but also works for 
+ other desktop environments like GNOME or Xfce.
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/copyright b/ubuntu/maverick/applications/knetworkmanager8/debian/copyright
new file mode 100644
index 000000000..2490de254
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/copyright
@@ -0,0 +1,34 @@
+This package was debianized by Michael Biebl <biebl@teco.edu> on
+Fri,  3 Feb 2006 05:53:06 +0100.
+
+It was downloaded from http://www.opensuse.org
+
+Upstream Authors: 
+  Timo Hoenig <thoenig@suse.de>
+  Will Stephenson <wstephenson@suse.de>
+  Stefan Bogner <sbogner@suse.de>
+  Helmut Schaa <hschaa@suse.de>
+  Valentine Sinitsyn <e_val@inbox.ru>
+
+Copyright: 
+  Copyright (C) 2005, 2006 Novell, Inc.
+
+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; either version 2 of the License, or
+  (at your option) any later version.
+
+  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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/knetworkmanager.1 b/ubuntu/maverick/applications/knetworkmanager8/debian/knetworkmanager.1
new file mode 100644
index 000000000..3cd261c89
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/knetworkmanager.1
@@ -0,0 +1,145 @@
+.\" This file was generated by kdemangen.pl
+.TH KNETWORKMANAGER 1 "Feb 2006" "K Desktop Environment" "A NetworkManager front-end for KDE"
+.SH NAME
+knetworkmanager
+\- A NetworkManager front-end for KDE
+.SH SYNOPSIS
+knetworkmanager [Qt\-options] [KDE\-options] 
+.SH DESCRIPTION
+A NetworkManager front-end for KDE
+.SH OPTIONS
+.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 - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.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
+.BR networkmanager (1)
+.SH AUTHORS
+.nf
+Timo Hoenig <thoenig@suse.de>
+.br
+Stefan Bogner <sbogner@suse.de>
+.br
+Will Stephenson <wstephenson@suse.de>
+.br
+
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/manpages b/ubuntu/maverick/applications/knetworkmanager8/debian/manpages
new file mode 100644
index 000000000..e2859341f
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/manpages
@@ -0,0 +1 @@
+debian/knetworkmanager.1
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/menu b/ubuntu/maverick/applications/knetworkmanager8/debian/menu
new file mode 100644
index 000000000..9775e9c7c
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/menu
@@ -0,0 +1,6 @@
+?package(network-manager-kde): \
+	needs="X11" \
+	section="Applications/Network/Monitoring" \
+  	title="KNetworkManager" \
+	longtitle="A KDE frontend for NetworkManager" \
+	command="/opt/trinity/bin/knetworkmanager"
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
new file mode 100644
index 000000000..9ae01a92b
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
@@ -0,0 +1,2 @@
+network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
+network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst b/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
new file mode 100644
index 000000000..fdd4e51ca
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  configure)
+  	# Ask D-Bus to reload the config file
+  	if [ -x "/etc/init.d/dbus" ]; then
+		invoke-rc.d dbus force-reload || true
+	fi
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/patches/series b/ubuntu/maverick/applications/knetworkmanager8/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/rules b/ubuntu/maverick/applications/knetworkmanager8/debian/rules
new file mode 100755
index 000000000..97955e38b
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/rules
@@ -0,0 +1,47 @@
+#!/usr/bin/make -f
+  
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO
+
+DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp
+
+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
+
+binary-install/network-manager-kde-trinity::
+	# Install autostart file
+	install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \
+		debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop
+
+clean::
+	find . -name Makefile.in | xargs rm -f
+	rm -f aclocal.m4
+	rm -f acinclude.m4
+	rm -f configure
+	rm -f configure.files
+	rm -f configure.in
+	rm -f config.h.in
+	rm -f stamp-h.in
+	rm -f subdirs	
+	rm -f admin/ltmain.sh
+	rm -f admin/libtool.m4.in
+	rm -f debian/stamp-bootstrap
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/watch b/ubuntu/maverick/applications/knetworkmanager8/debian/watch
new file mode 100644
index 000000000..ad7a7be91
--- /dev/null
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.kde.org/pub/kde/stable/apps/Trinity.x/network/knetworkmanager-(.*)\.tar\.gz
-- 
cgit v1.2.3


From 32401070ab2e346154babf7a612ff1c826381919 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 17 Oct 2011 12:47:42 -0500
Subject: Fix knetworkmanager8 on lenny

---
 .../knetworkmanage8/debian/README.source           |   3 -
 .../knetworkmanage8/debian/cdbs/buildvars.mk       |  86 -----
 .../knetworkmanage8/debian/cdbs/debian-qt-kde.mk   | 109 ------
 .../knetworkmanage8/debian/cdbs/kde.mk             |  97 ------
 .../knetworkmanage8/debian/cdbs/team-members       |  16 -
 .../knetworkmanage8/debian/cdbs/uploaders.mk       |  29 --
 .../knetworkmanage8/debian/cdbs/versions.pl        |  19 --
 .../applications/knetworkmanage8/debian/changelog  | 373 ---------------------
 .../applications/knetworkmanage8/debian/compat     |   1 -
 .../applications/knetworkmanage8/debian/control    |  35 --
 .../applications/knetworkmanage8/debian/control.in |  36 --
 .../applications/knetworkmanage8/debian/copyright  |  34 --
 .../knetworkmanage8/debian/knetworkmanager.1       | 145 --------
 .../applications/knetworkmanage8/debian/manpages   |   1 -
 .../lenny/applications/knetworkmanage8/debian/menu |   6 -
 .../network-manager-kde-trinity.lintian-overrides  |   2 -
 .../debian/network-manager-kde-trinity.postinst    |  16 -
 .../knetworkmanage8/debian/patches/series          |   0
 .../applications/knetworkmanage8/debian/rules      |  47 ---
 .../applications/knetworkmanage8/debian/watch      |   2 -
 .../knetworkmanager8/debian/README.source          |   3 +
 .../knetworkmanager8/debian/cdbs/buildvars.mk      |  86 +++++
 .../knetworkmanager8/debian/cdbs/debian-qt-kde.mk  | 109 ++++++
 .../knetworkmanager8/debian/cdbs/kde.mk            |  97 ++++++
 .../knetworkmanager8/debian/cdbs/team-members      |  16 +
 .../knetworkmanager8/debian/cdbs/uploaders.mk      |  29 ++
 .../knetworkmanager8/debian/cdbs/versions.pl       |  19 ++
 .../applications/knetworkmanager8/debian/changelog | 373 +++++++++++++++++++++
 .../applications/knetworkmanager8/debian/compat    |   1 +
 .../applications/knetworkmanager8/debian/control   |  35 ++
 .../knetworkmanager8/debian/control.in             |  36 ++
 .../applications/knetworkmanager8/debian/copyright |  34 ++
 .../knetworkmanager8/debian/knetworkmanager.1      | 145 ++++++++
 .../applications/knetworkmanager8/debian/manpages  |   1 +
 .../applications/knetworkmanager8/debian/menu      |   6 +
 .../network-manager-kde-trinity.lintian-overrides  |   2 +
 .../debian/network-manager-kde-trinity.postinst    |  16 +
 .../knetworkmanager8/debian/patches/series         |   0
 .../applications/knetworkmanager8/debian/rules     |  47 +++
 .../applications/knetworkmanager8/debian/watch     |   2 +
 40 files changed, 1057 insertions(+), 1057 deletions(-)
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/README.source
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/cdbs/buildvars.mk
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/cdbs/debian-qt-kde.mk
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/cdbs/kde.mk
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/cdbs/team-members
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/cdbs/uploaders.mk
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/cdbs/versions.pl
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/changelog
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/compat
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/control
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/control.in
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/copyright
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/knetworkmanager.1
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/manpages
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/menu
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.lintian-overrides
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.postinst
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/patches/series
 delete mode 100755 debian/lenny/applications/knetworkmanage8/debian/rules
 delete mode 100644 debian/lenny/applications/knetworkmanage8/debian/watch
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/README.source
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/cdbs/buildvars.mk
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/cdbs/team-members
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/cdbs/uploaders.mk
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/cdbs/versions.pl
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/changelog
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/compat
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/control
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/control.in
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/copyright
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/knetworkmanager.1
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/manpages
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/menu
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/patches/series
 create mode 100755 debian/lenny/applications/knetworkmanager8/debian/rules
 create mode 100644 debian/lenny/applications/knetworkmanager8/debian/watch

diff --git a/debian/lenny/applications/knetworkmanage8/debian/README.source b/debian/lenny/applications/knetworkmanage8/debian/README.source
deleted file mode 100644
index 96fb271ab..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-This package uses the quilt patch management system.
-
-Please refer to /usr/share/doc/quilt/README.source for further information.
diff --git a/debian/lenny/applications/knetworkmanage8/debian/cdbs/buildvars.mk b/debian/lenny/applications/knetworkmanage8/debian/cdbs/buildvars.mk
deleted file mode 100644
index 23d4709dc..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/cdbs/buildvars.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2002,2003 Colin Walters <walters@debian.org>
-# Description: Defines some useful variables, but no rules
-#
-# This program 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; either version 2, or (at
-# your option) any later version.
-#
-# This program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_rules_buildvars
-_cdbs_rules_buildvars = 1
-
-CDBS_VERSION = something
-
-# Common useful variables
-DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
-DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
-DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
-
-# Split into arch/indep packages
-ifneq ($(DEB_INDEP_PACKAGES),cdbs)
-DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
-DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
-endif
-# Split into normal and udeb packages
-ifeq ($(DEB_UDEB_PACKAGES),)
-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-else
-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-endif
-# Too much bother for now.  If someone complains we'll fix it.
-#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
-#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
-# A handy list of every package, udeb or not
-DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
-DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
-DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
-
-DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-
-# Some support for srcdir != builddir builds.
-# These are relative to the root of the package
-DEB_SRCDIR ?= .
-DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
-
-# Miscellaneous bits
-DEB_ARCH = $(shell dpkg --print-architecture)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
-DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-
-ifeq ($(words $(DEB_ALL_PACKAGES)),1)
-	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
-else
-	DEB_DESTDIR = $(CURDIR)/debian/tmp/
-endif
-
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
-
-endif
diff --git a/debian/lenny/applications/knetworkmanage8/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetworkmanage8/debian/cdbs/debian-qt-kde.mk
deleted file mode 100644
index 47e83ef4a..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/cdbs/debian-qt-kde.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-	touch debian/stamp-cvs-make
-
-include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
-
-DEB_PATCHDIRS := debian/patches/common debian/patches
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-	done
-
-clean::
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/debian/lenny/applications/knetworkmanage8/debian/cdbs/kde.mk b/debian/lenny/applications/knetworkmanage8/debian/cdbs/kde.mk
deleted file mode 100644
index 5b6508f8c..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/cdbs/kde.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Description: A class for KDE packages; sets KDE environment variables, etc
-#
-# This program 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; either version 2, or (at
-# your option) any later version.
-#
-# This program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_kde
-_cdbs_class_kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
-
-ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-common-build-arch common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
-common-install-arch common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
-
-clean::
-	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
-
-# This is a convenience target for calling manually.  It's not part of
-# the build process.
-buildprep: clean apply-patches
-	$(MAKE) -f admin/Makefile.common dist
-	debian/rules clean
-
-endif
diff --git a/debian/lenny/applications/knetworkmanage8/debian/cdbs/team-members b/debian/lenny/applications/knetworkmanage8/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/lenny/applications/knetworkmanage8/debian/cdbs/uploaders.mk b/debian/lenny/applications/knetworkmanage8/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/lenny/applications/knetworkmanage8/debian/cdbs/versions.pl b/debian/lenny/applications/knetworkmanage8/debian/cdbs/versions.pl
deleted file mode 100644
index 9ce11d8a3..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/-[^-]+$//;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "KDE-Version3=$version3\n";
-print "KDE-Version2=$version2\n";
-print "KDE-Next-Version3=$version3_next\n";
-print "KDE-Next-Version2=$version2_next\n";
diff --git a/debian/lenny/applications/knetworkmanage8/debian/changelog b/debian/lenny/applications/knetworkmanage8/debian/changelog
deleted file mode 100644
index 04405984c..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/changelog
+++ /dev/null
@@ -1,373 +0,0 @@
-knetworkmanager8-trinity (1:0.8-0ubuntu12) karmic; urgency=low
-
-  * UI tweaks for discoverability
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 26 Oct 2009 17:44:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu10) karmic; urgency=low
-
-  * Fixed VPN reauthentication request dialog failure when used with the permanent storage option
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 06 Oct 2009 19:31:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu7) karmic; urgency=low
-
-  * Fixed various minor glitches
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 03 Oct 2009 12:29:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu6) karmic; urgency=low
-
-  * Repaired poor usability for new wireless connections
-  * Repaired poor usability for connection management
-  * VPN connections now remember login information when asked
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 29 Sep 2009 09:39:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu5) karmic; urgency=low
-
-  * Repaired VPN plugins
-  * VPNC now allows hashed group password
-  * PPTP repaired and enabled
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 28 Sep 2009 14:51:00 -0600
-
-knetworkmanager-trinity (1:0.8-0ubuntu4) karmic; urgency=low
-
-  * Patched backend for new NM0.8 API
-  * Repaired poor usability in the "new connection" tasktray menu
-  * Repaired poor usability in the available devices tasktray menu
-  * Moved to /opt/trinity
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 22 Aug 2009 23:34:00 -0600
-
-knetworkmanager (1:0.7~~svn941706-1) unstable; urgency=low
-
-  * Updated SVN snapshot (r941706).
-  * debian/patches/04-dbus_access.patch
-    - Most of the relevant changes have been merged upstream. The patch now
-      only contains the Debian specific group "netdev" section.
-  * debian/control
-    - Bump Standards-Version to 3.8.1. No further changes.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 20 Mar 2009 22:59:51 +0100
-
-knetworkmanager (1:0.7~~svn931033-2) unstable; urgency=low
-
-  * debian/patches/05-no_blank_psk.patch
-    - Do not set zero-length PSK and LEAP passwords otherwise libnm-util fails
-      to validate them. Closes: #517213
-      Patch by Dan Williams, thanks!
-
- -- Michael Biebl <biebl@debian.org>  Tue, 03 Mar 2009 00:34:15 +0100
-
-knetworkmanager (1:0.7~~svn931033-1) unstable; urgency=low
-
-  * Merge experimental branch into unstable. Remaining changes:
-    - Remove 07-indicate_manual_config.patch, obsolete. 
-  * debian/control
-    - Wrap Build-Depends.
-    - Bump Build-Depends on debhelper to (>= 7).
-  * debian/compat
-    - Bump debhelper compat level to 7.
-  * debian/rules
-    - Include debhelper.mk before any other files as recommended by the cdbs
-      documentation.
-  * Update SVN snapshot to r931033.
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Feb 2009 10:54:39 +0100
-
-knetworkmanager (1:0.7~~svn908338-2) experimental; urgency=low
-
-  * debian/patches/04-dbus_access.patch
-    - Update D-Bus names and interfaces for NM 0.7. Closes: #511526
-    - Remove bare send_interface directives to avoid non-deterministic allow
-      messages with no interface. Closes: #510757
-    - Do not allow unpriviledged processes to ask for a users' connections.
-    - Allow introspection by default.
-
- -- Michael Biebl <biebl@debian.org>  Thu, 05 Feb 2009 01:52:22 +0100
-
-knetworkmanager (1:0.7~~svn908338-1) experimental; urgency=low
-
-  * Updated SVN snapshot (r908338).
-  * debian/rules
-    - Stop moving icons around, fixed upstream.
-  * debian/patches/01-configure_package_name.patch
-    - Make sure we set the correct PACKAGE name when generating the build
-      system so the translations are installed properly.
-  * debian/network-manager-kde.lintian-overrides
-    - Updated for the latest lintian changes.
-
- -- Michael Biebl <biebl@debian.org>  Sun, 11 Jan 2009 06:52:06 +0100
-
-knetworkmanager (1:0.7~~svn897092-1) experimental; urgency=low
-
-  * SVN snapshot of the upcoming 0.7 release (for NM 0.7).
-  * debian/control
-    - Add Build-Depends on pkg-config.
-    - Bump Build-Depends on nm-* packages to (>= 0.7.0).
-    - Add Build-Depends on libdbus-1-qt3-dev (>= 0.8.1).
-    - Bump Build-Depends on debhelper to (>= 6.0.7) for dh_lintian.
-    - Bump Depends on network-manager to (>= 0.7.0).
-    - Bump Standards-Version to 3.8.0. Add README.source as recommended by the
-      new policy.
-  * debian/rules
-    - Install autostart desktop file into /usr/share/autostart/.
-    - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them.
-      Closes: #487303
-    - Add support for both libtool 1.x and 2.x.
-  * Switch patch management system to quilt.
-  * debian/patches/04-dbus_access.patch
-    - Refresh and update.
-
- -- Michael Biebl <biebl@debian.org>  Tue, 16 Dec 2008 04:18:10 +0100
-
-knetworkmanager (1:0.2.2-2) unstable; urgency=low
-
-  * debian/patches/07-indicate_manual_config.patch
-    - manual-means-online: If there are interfaces that are not managed by
-      NetworkManager because they have custom configuration in
-      /etc/network/interfaces, we assume to be online and show a wired network
-      icon indicating manual network configuration.
-  * debian/control
-    - Add Build-Depends on pkg-config.
-
- -- Michael Biebl <biebl@debian.org>  Wed, 14 Jan 2009 08:22:11 +0100
-
-knetworkmanager (1:0.2.2-1) unstable; urgency=low
-
-  * New upstream release.
-    - Improved tray icon animation using mng files. Closes: #394815
-    - Improved LEAP security. Closes: #470709
-  * Removed patches
-    - debian/patches/01-fix_french_translation.patch (merged upstream)
-    - debian/patches/02-linux_types.patch (obsolete)
-    - debian/patches/03-awk_path.patch (fixed upstream)
-    - debian/patches/05-desktop_file_fixes.patch (merged upstream)
-  * debian/knetworkmanager.linda
-    - Remove the linda override file, linda is dead.
-  * debian/{knetworkmanager.lintian -> network-manager-kde.lintian-overrides}
-    - Rename the lintian override file so it is automatically installed by
-      dh_lintian.
-  * debian/rules
-    - Drop the no longer required install rules for the override files.
-    - Drop the install rule for the autostart file. It's provided by upstream
-      now.
-  * debian/copyright
-    - Update the authors list.
-  * debian/control
-    - Bump Build-Depends on libnl-dev (>= 1.1).
-    - Drop Build-Depends on kapptemplate. The upstream tarball ships a proper
-      admin/ directory again.
-  * debian/watch
-    - New download location at ftp.kde.org.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 04 Apr 2008 19:41:02 +0200
-
-knetworkmanager (1:0.2-3) unstable; urgency=low
-
-  * debian/control
-    - Use the new "Homepage:" field to specify the upstream URL.
-    - The Vcs-* fields are now officially supported, so remove the XS- prefix.
-    - Bump Standards-Version to 3.7.3. No further changes required.
-    - Fix a few capitalization errors in the package description.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 11 Jan 2008 02:08:24 +0100
-
-knetworkmanager (1:0.2-2) unstable; urgency=low
-
-  * Rebuild against network-manager 0.6.5 to enable phase2 and leap
-    authentication support.
-  * debian/rules
-    - Remove debian/stamp-bootstrap on clean. This fixes a FTBFS if package is
-      built twice in a row. Closes: #442621
-  * debian/control
-    - Add Build-Conflicts: autoconf2.13. Closes: #441046
-  * debian/menu
-    - Set section to Applications/Network/Monitoring which seems to be the
-      most appropriate amongst the available sections.
-  * debian/patches/05-desktop_file_fixes.patch
-    - Fix the *.desktop files to be compliant to the fd.o menu and desktop
-      entry spec.
-
- -- Michael Biebl <biebl@debian.org>  Sun, 16 Sep 2007 21:01:25 +0200
-
-knetworkmanager (1:0.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/patches/05-leap_support.patch
-    - Removed, merged upstream.
-  * debian/patches/06-version_check.patch
-    - Removed, merged upstream.
-  * The upstream tarball does not ship an admin/ directory. Build-Depend on
-    kapptemplate, so we can copy it from there.
-  * debian/menu
-    - Update to new menu hierarchy and add a longtitle.
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Jul 2007 17:10:36 +0200
-
-knetworkmanager (1:0.2~svn678822-3) unstable; urgency=low
-
-  * debian/patches/06-version_check.patch
-    - Added. Fixes the problem with knetworkmanager no longer connecting
-      automatically upon login. Closes: #431255
-      If you are upgrading from a previous 0.2 svn snapshot, you may have to
-      clear the list of trusted networks in the configuration dialog.
-
- -- Michael Biebl <biebl@debian.org>  Sun, 01 Jul 2007 11:47:00 +0200
-
-knetworkmanager (1:0.2~svn678822-2) unstable; urgency=low
-
-  * debian/patches/02-linux_types.patch
-    - Pass "-std=gnu++98" to CXXFLAGS. Otherwise the type __u64 is not defined
-      in linux-libc-dev for ANSI C/C89. Closes: #430795
-
- -- Michael Biebl <biebl@debian.org>  Thu, 28 Jun 2007 06:08:04 +0200
-
-knetworkmanager (1:0.2~svn678822-1) unstable; urgency=low
-
-  * SVN snapshot of the upcoming 0.2 release which has native VPN plugin
-    support. Closes: #415742
-  * debian/control
-    - Add XS-Vcs-* fields.
-    - Add Recommends: network-manager-vpnc, network-manager-openvpn.
-  * debian/rules
-    - Compile with openvpn and vpnc support.
-
-  * Removed patches that were merged upstream:
-    - debian/patches/05-no_deserialize.patch
-    - debian/patches/06-pretty_notification.patch
-    - debian/patches/07-overlay_icon_vpn.patch
-    - debian/patches/08-disable_sm.patch
-    - debian/patches/09-dbus_bool_t.patch
-
-  * debian/patches/02-linux_types.patch
-    - Added. Needed to workaround a problem in libnl.
-  * debian/patches/03-awk_path.patch
-    - Added. In Debian awk is installed in /usr/bin.
-  * debian/patches/04-dbus_access.patch
-    - Do not remove the dbus at_console access check but make it an
-      alternative to the Debian netdev group policy. Closes: #426467
-  * debian/patches/05-leap_support.patch
-    - Added. Do not fail to compile if LEAP support is not available.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 22 Jun 2007 21:08:32 +0100
-
-knetworkmanager (1:0.1-4) unstable; urgency=low
-
-  * Actually install the autostart file for knetworkmanager.
-    Thanks to Yannick Roehlly for spotting this glitch.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 12 Jan 2007 11:26:28 +0100
-
-knetworkmanager (1:0.1-3) unstable; urgency=low
-
-  * Pull some features and bug fixes from svn:
-    - debian/patches/05-no_deserialize.patch
-      + Don't call deserialize on encryption object to avoid warning of
-        libnm-util. Closes: #391486
-    - debian/patches/06-pretty_notification.patch
-      + Prettify notification messages.
-    - debian/patches/07-overlay_icon_vpn.patch
-      + Show overlay icon (lock) for active VPN connections.
-    - debian/patches/08-disable_sm.patch
-      + Disable session management to avoid a deadlock when accessing kwallet.
-        Install an autostart file into /usr/share/autostart/ instead.
-        Closes: #406162
-    - debian/patches/09-dbus_bool_t.patch
-      + Use dbus_bool_t instead of bool. Closes: #398974
-  * debian/patches/01-fix_french_translation.patch
-    - Added patch from Emmanuel Bouthenot which fixes some errors in the
-      French translation. Closes: #402285
-
- -- Michael Biebl <biebl@debian.org>  Tue,  9 Jan 2007 16:31:52 +0100
-
-knetworkmanager (1:0.1-2) unstable; urgency=low
-
-  * Update maintainer email address to biebl@debian.org. 
-
- -- Michael Biebl <biebl@debian.org>  Fri, 20 Oct 2006 00:02:03 +0200
-
-knetworkmanager (1:0.1-1) unstable; urgency=low
-
-  * Finally the 0.1 release. Woohoo!
-    - Use an epoch to fix the versioning scheme I managed to mess up.
-    - Fixes a crash when removing network objects for a nonexistent network
-      interface. Closes: #390052
-  * debian/patches/01-no_network_status.patch
-    - Removed, fixed upstream.
-  * debian/patches/03-configure.patch
-    - Removed, fixed upstream.
-  * Dropped the build-dep on kapptemplate. The upstream tarball now ships a
-    proper admin/ directory.
-  * debian/patches/02-dialup.patch
-    - Removed. Also dropped the Recommends: pppconfig. pppconfig can't
-      generate entries for /etc/network/interfaces yet. 
-
- -- Michael Biebl <biebl@teco.edu>  Fri, 29 Sep 2006 19:18:08 +0200
-
-knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low
-
-  * Updated to svn revision 586773.
-  * Do not refer to non existent khelpcenter help:/knetworkmanager/ in man
-    page. Closes: #385642
-
- -- Michael Biebl <biebl@teco.edu>  Wed, 20 Sep 2006 19:46:52 +0200
-
-knetworkmanager (0.09+0.1r577960-1) unstable; urgency=low
-
-  * Updated to svn revision 577960.
-    - Access KWallet on demand, not on startup. Closes: #379606
-  * Added a Recommends: pppconfig. Closes: #380316
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 28 Aug 2006 01:14:29 +0200
-
-knetworkmanager (0.09+0.1r560817-1) unstable; urgency=medium
-
-  * Updated to svn revision 560817.
-  * Removed 04-gnome_keyring_daemon.patch, fixed upstream.
-  * Added 04-dbus_access.patch. Fixes D-Bus access rights.
-    Closes: #379309, #379364
-  * Enabled dial up support. Set pppconfig as configuration utility.
-    Closes: #376071
-  * Reload D-Bus after installation. Closes: #379307
-  * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379820
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 25 Jul 2006 23:33:31 +0200
-
-knetworkmanager (0.09+0.1r550737-1) unstable; urgency=low
-
-  * Updated to svn revision 550737.
-  * Added 01-no_network_status.patch which removes a build dependency on
-    networkstatus.
-  * Removed 03-configure_notifications.patch, merged upstream.
-  * This version does not ship an admin/ directory. Added a build dependency
-    on kapptemplate and modified debian/rules to copy it from kapptemplate.
-  * Bumped Standards-Version to 3.7.2, no further changes required.
-  * Updated homepage URL.
-  * Added 04-gnome_keyring_daemon.patch which sets the correct path to the
-    gnome-keyring-daemon binary. VPN plugins use gnome-keyring-daemon to store
-    their passwords.
-
- -- Michael Biebl <biebl@teco.edu>  Wed, 14 Jun 2006 17:16:07 +0200
-
-knetworkmanager (0.09+0.1r527269-1) unstable; urgency=low
-
-  * New upstream release.
-  * Removed 01-xdg_app.patch, merged upstream.
-  * Added 03-configure_notifications.patch, this patch modifies the context
-    menu of the systray applet to provide quick access to the notification
-    settings.
-  * Added a "Provides: knetworkmanager" to make the package installable by its
-    upstream name.
-  * Initial upload. Closes: #351069
-
- -- Michael Biebl <biebl@teco.edu>  Thu, 27 Apr 2006 08:01:39 +0200
-
-knetworkmanager (0.09+0.1r5964-1) unstable; urgency=low
-
-  * Initial release.
-
- -- Michael Biebl <biebl@teco.edu>  Tue,  7 Feb 2006 21:43:56 +0100
-
diff --git a/debian/lenny/applications/knetworkmanage8/debian/compat b/debian/lenny/applications/knetworkmanage8/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/lenny/applications/knetworkmanage8/debian/control b/debian/lenny/applications/knetworkmanage8/debian/control
deleted file mode 100644
index 0b04bbf74..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/control
+++ /dev/null
@@ -1,35 +0,0 @@
-Source: knetworkmanager8-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs,
- debhelper (>= 7),
- pkg-config,
- kdelibs4-trinity-dev,
- 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,
- libnl-dev (>= 1.1),
- quilt,
- network-manager-vpnc,
- network-manager-openvpn,
- network-manager-strongswan,
- network-manager-pptp,
- automake, autoconf, libtool, libltdl-dev
-Standards-Version: 3.8.4
-Homepage: http://opensuse.org/Projects/KNetworkManager
-
-Package: network-manager-kde-trinity
-Architecture: any
-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
-Description: KDE systray applet for controlling NetworkManager [Trinity]
- Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for Trinity but also works for 
- other desktop environments like GNOME or Xfce.
diff --git a/debian/lenny/applications/knetworkmanage8/debian/control.in b/debian/lenny/applications/knetworkmanage8/debian/control.in
deleted file mode 100644
index 43adf3e33..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/control.in
+++ /dev/null
@@ -1,36 +0,0 @@
-Source: knetworkmanager-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs,
- debhelper (>= 7),
- pkg-config,
- kdelibs4-trinity-dev,
- libnm-util-dev (>= 0.7.0),
- libnm-glib-dev (>= 0.7.0),
- network-manager-dev (>= 0.7.0),
- libhal-dev,
- libdbus-1-qt3-dev (>= 0.8.1),
- libiw-dev,
- libnl-dev (>= 1.1),
- quilt,
- network-manager-vpnc,
- network-manager-openvpn,
- network-manager-strongswan,
- network-manager-pptp,
- automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
-Standards-Version: 3.8.3
-Homepage: http://opensuse.org/Projects/KNetworkManager
-
-Package: network-manager-kde-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
-Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
-Provides: knetworkmanager-trinity
-Conflicts: network-manager-kde
-Description: KDE systray applet for controlling NetworkManager [Trinity]
- Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for Trinity but also works for 
- other desktop environments like GNOME or Xfce.
diff --git a/debian/lenny/applications/knetworkmanage8/debian/copyright b/debian/lenny/applications/knetworkmanage8/debian/copyright
deleted file mode 100644
index 2490de254..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/copyright
+++ /dev/null
@@ -1,34 +0,0 @@
-This package was debianized by Michael Biebl <biebl@teco.edu> on
-Fri,  3 Feb 2006 05:53:06 +0100.
-
-It was downloaded from http://www.opensuse.org
-
-Upstream Authors: 
-  Timo Hoenig <thoenig@suse.de>
-  Will Stephenson <wstephenson@suse.de>
-  Stefan Bogner <sbogner@suse.de>
-  Helmut Schaa <hschaa@suse.de>
-  Valentine Sinitsyn <e_val@inbox.ru>
-
-Copyright: 
-  Copyright (C) 2005, 2006 Novell, Inc.
-
-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; either version 2 of the License, or
-  (at your option) any later version.
-
-  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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
diff --git a/debian/lenny/applications/knetworkmanage8/debian/knetworkmanager.1 b/debian/lenny/applications/knetworkmanage8/debian/knetworkmanager.1
deleted file mode 100644
index 3cd261c89..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/knetworkmanager.1
+++ /dev/null
@@ -1,145 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KNETWORKMANAGER 1 "Feb 2006" "K Desktop Environment" "A NetworkManager front-end for KDE"
-.SH NAME
-knetworkmanager
-\- A NetworkManager front-end for KDE
-.SH SYNOPSIS
-knetworkmanager [Qt\-options] [KDE\-options] 
-.SH DESCRIPTION
-A NetworkManager front-end for KDE
-.SH OPTIONS
-.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 - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.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
-.BR networkmanager (1)
-.SH AUTHORS
-.nf
-Timo Hoenig <thoenig@suse.de>
-.br
-Stefan Bogner <sbogner@suse.de>
-.br
-Will Stephenson <wstephenson@suse.de>
-.br
-
diff --git a/debian/lenny/applications/knetworkmanage8/debian/manpages b/debian/lenny/applications/knetworkmanage8/debian/manpages
deleted file mode 100644
index e2859341f..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/knetworkmanager.1
diff --git a/debian/lenny/applications/knetworkmanage8/debian/menu b/debian/lenny/applications/knetworkmanage8/debian/menu
deleted file mode 100644
index 9775e9c7c..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(network-manager-kde): \
-	needs="X11" \
-	section="Applications/Network/Monitoring" \
-  	title="KNetworkManager" \
-	longtitle="A KDE frontend for NetworkManager" \
-	command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.lintian-overrides b/debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.lintian-overrides
deleted file mode 100644
index 9ae01a92b..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
-network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
diff --git a/debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.postinst b/debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.postinst
deleted file mode 100644
index fdd4e51ca..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/network-manager-kde-trinity.postinst
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-  configure)
-  	# Ask D-Bus to reload the config file
-  	if [ -x "/etc/init.d/dbus" ]; then
-		invoke-rc.d dbus force-reload || true
-	fi
-	;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/lenny/applications/knetworkmanage8/debian/patches/series b/debian/lenny/applications/knetworkmanage8/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
diff --git a/debian/lenny/applications/knetworkmanage8/debian/rules b/debian/lenny/applications/knetworkmanage8/debian/rules
deleted file mode 100755
index 97955e38b..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/rules
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/make -f
-  
-include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO
-
-DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp
-
-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
-
-binary-install/network-manager-kde-trinity::
-	# Install autostart file
-	install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \
-		debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop
-
-clean::
-	find . -name Makefile.in | xargs rm -f
-	rm -f aclocal.m4
-	rm -f acinclude.m4
-	rm -f configure
-	rm -f configure.files
-	rm -f configure.in
-	rm -f config.h.in
-	rm -f stamp-h.in
-	rm -f subdirs	
-	rm -f admin/ltmain.sh
-	rm -f admin/libtool.m4.in
-	rm -f debian/stamp-bootstrap
diff --git a/debian/lenny/applications/knetworkmanage8/debian/watch b/debian/lenny/applications/knetworkmanage8/debian/watch
deleted file mode 100644
index ad7a7be91..000000000
--- a/debian/lenny/applications/knetworkmanage8/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-ftp://ftp.kde.org/pub/kde/stable/apps/Trinity.x/network/knetworkmanager-(.*)\.tar\.gz
diff --git a/debian/lenny/applications/knetworkmanager8/debian/README.source b/debian/lenny/applications/knetworkmanager8/debian/README.source
new file mode 100644
index 000000000..96fb271ab
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/README.source
@@ -0,0 +1,3 @@
+This package uses the quilt patch management system.
+
+Please refer to /usr/share/doc/quilt/README.source for further information.
diff --git a/debian/lenny/applications/knetworkmanager8/debian/cdbs/buildvars.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# This program 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; either version 2, or (at
+# your option) any later version.
+#
+# This program 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 program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
diff --git a/debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..47e83ef4a
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
+endif
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	done
+
+clean::
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk
new file mode 100644
index 000000000..5b6508f8c
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program 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; either version 2, or (at
+# your option) any later version.
+#
+# This program 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 program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/kde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final =
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/debian/lenny/applications/knetworkmanager8/debian/cdbs/team-members b/debian/lenny/applications/knetworkmanager8/debian/cdbs/team-members
new file mode 100644
index 000000000..05761af6e
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/cdbs/team-members
@@ -0,0 +1,16 @@
+Sune Vuorela <debian@pusling.com>
+Ana Beatriz Guerrero Lopez <ana@debian.org>
+Fathi Boudra <fboudra@free.fr>
+Modestas Vainius <geromanas@mailas.com>
+Josh Metzler <joshdeb@metzlers.org>
+Isaac Clerencia <isaac@debian.org>
+Adeodato Simó <dato@net.com.org.es>
+Adeodato Simo <dato@net.com.org.es>
+Christopher Martin <chrsmrtn@debian.org>
+Daniel Schepler <schepler@debian.org>
+Sarah Hobbs <hobbsee@ubuntu.com>
+Nacho Barrientos Arias <nacho@debian.org>
+Ricardo Javier Cardenes Medina <rcardenes@debian.org>
+Ricardo Cardenes <rcardenes@debian.org>
+Armin Berres <trigger+debian@space-based.de>
+Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/lenny/applications/knetworkmanager8/debian/cdbs/uploaders.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
diff --git a/debian/lenny/applications/knetworkmanager8/debian/cdbs/versions.pl b/debian/lenny/applications/knetworkmanager8/debian/cdbs/versions.pl
new file mode 100644
index 000000000..9ce11d8a3
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/-[^-]+$//;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/debian/lenny/applications/knetworkmanager8/debian/changelog b/debian/lenny/applications/knetworkmanager8/debian/changelog
new file mode 100644
index 000000000..04405984c
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/changelog
@@ -0,0 +1,373 @@
+knetworkmanager8-trinity (1:0.8-0ubuntu12) karmic; urgency=low
+
+  * UI tweaks for discoverability
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 26 Oct 2009 17:44:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu10) karmic; urgency=low
+
+  * Fixed VPN reauthentication request dialog failure when used with the permanent storage option
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 06 Oct 2009 19:31:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu7) karmic; urgency=low
+
+  * Fixed various minor glitches
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 03 Oct 2009 12:29:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu6) karmic; urgency=low
+
+  * Repaired poor usability for new wireless connections
+  * Repaired poor usability for connection management
+  * VPN connections now remember login information when asked
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 29 Sep 2009 09:39:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu5) karmic; urgency=low
+
+  * Repaired VPN plugins
+  * VPNC now allows hashed group password
+  * PPTP repaired and enabled
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 28 Sep 2009 14:51:00 -0600
+
+knetworkmanager-trinity (1:0.8-0ubuntu4) karmic; urgency=low
+
+  * Patched backend for new NM0.8 API
+  * Repaired poor usability in the "new connection" tasktray menu
+  * Repaired poor usability in the available devices tasktray menu
+  * Moved to /opt/trinity
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 22 Aug 2009 23:34:00 -0600
+
+knetworkmanager (1:0.7~~svn941706-1) unstable; urgency=low
+
+  * Updated SVN snapshot (r941706).
+  * debian/patches/04-dbus_access.patch
+    - Most of the relevant changes have been merged upstream. The patch now
+      only contains the Debian specific group "netdev" section.
+  * debian/control
+    - Bump Standards-Version to 3.8.1. No further changes.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 20 Mar 2009 22:59:51 +0100
+
+knetworkmanager (1:0.7~~svn931033-2) unstable; urgency=low
+
+  * debian/patches/05-no_blank_psk.patch
+    - Do not set zero-length PSK and LEAP passwords otherwise libnm-util fails
+      to validate them. Closes: #517213
+      Patch by Dan Williams, thanks!
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 03 Mar 2009 00:34:15 +0100
+
+knetworkmanager (1:0.7~~svn931033-1) unstable; urgency=low
+
+  * Merge experimental branch into unstable. Remaining changes:
+    - Remove 07-indicate_manual_config.patch, obsolete. 
+  * debian/control
+    - Wrap Build-Depends.
+    - Bump Build-Depends on debhelper to (>= 7).
+  * debian/compat
+    - Bump debhelper compat level to 7.
+  * debian/rules
+    - Include debhelper.mk before any other files as recommended by the cdbs
+      documentation.
+  * Update SVN snapshot to r931033.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 25 Feb 2009 10:54:39 +0100
+
+knetworkmanager (1:0.7~~svn908338-2) experimental; urgency=low
+
+  * debian/patches/04-dbus_access.patch
+    - Update D-Bus names and interfaces for NM 0.7. Closes: #511526
+    - Remove bare send_interface directives to avoid non-deterministic allow
+      messages with no interface. Closes: #510757
+    - Do not allow unpriviledged processes to ask for a users' connections.
+    - Allow introspection by default.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 05 Feb 2009 01:52:22 +0100
+
+knetworkmanager (1:0.7~~svn908338-1) experimental; urgency=low
+
+  * Updated SVN snapshot (r908338).
+  * debian/rules
+    - Stop moving icons around, fixed upstream.
+  * debian/patches/01-configure_package_name.patch
+    - Make sure we set the correct PACKAGE name when generating the build
+      system so the translations are installed properly.
+  * debian/network-manager-kde.lintian-overrides
+    - Updated for the latest lintian changes.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 11 Jan 2009 06:52:06 +0100
+
+knetworkmanager (1:0.7~~svn897092-1) experimental; urgency=low
+
+  * SVN snapshot of the upcoming 0.7 release (for NM 0.7).
+  * debian/control
+    - Add Build-Depends on pkg-config.
+    - Bump Build-Depends on nm-* packages to (>= 0.7.0).
+    - Add Build-Depends on libdbus-1-qt3-dev (>= 0.8.1).
+    - Bump Build-Depends on debhelper to (>= 6.0.7) for dh_lintian.
+    - Bump Depends on network-manager to (>= 0.7.0).
+    - Bump Standards-Version to 3.8.0. Add README.source as recommended by the
+      new policy.
+  * debian/rules
+    - Install autostart desktop file into /usr/share/autostart/.
+    - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them.
+      Closes: #487303
+    - Add support for both libtool 1.x and 2.x.
+  * Switch patch management system to quilt.
+  * debian/patches/04-dbus_access.patch
+    - Refresh and update.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 16 Dec 2008 04:18:10 +0100
+
+knetworkmanager (1:0.2.2-2) unstable; urgency=low
+
+  * debian/patches/07-indicate_manual_config.patch
+    - manual-means-online: If there are interfaces that are not managed by
+      NetworkManager because they have custom configuration in
+      /etc/network/interfaces, we assume to be online and show a wired network
+      icon indicating manual network configuration.
+  * debian/control
+    - Add Build-Depends on pkg-config.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 14 Jan 2009 08:22:11 +0100
+
+knetworkmanager (1:0.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+    - Improved tray icon animation using mng files. Closes: #394815
+    - Improved LEAP security. Closes: #470709
+  * Removed patches
+    - debian/patches/01-fix_french_translation.patch (merged upstream)
+    - debian/patches/02-linux_types.patch (obsolete)
+    - debian/patches/03-awk_path.patch (fixed upstream)
+    - debian/patches/05-desktop_file_fixes.patch (merged upstream)
+  * debian/knetworkmanager.linda
+    - Remove the linda override file, linda is dead.
+  * debian/{knetworkmanager.lintian -> network-manager-kde.lintian-overrides}
+    - Rename the lintian override file so it is automatically installed by
+      dh_lintian.
+  * debian/rules
+    - Drop the no longer required install rules for the override files.
+    - Drop the install rule for the autostart file. It's provided by upstream
+      now.
+  * debian/copyright
+    - Update the authors list.
+  * debian/control
+    - Bump Build-Depends on libnl-dev (>= 1.1).
+    - Drop Build-Depends on kapptemplate. The upstream tarball ships a proper
+      admin/ directory again.
+  * debian/watch
+    - New download location at ftp.kde.org.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 04 Apr 2008 19:41:02 +0200
+
+knetworkmanager (1:0.2-3) unstable; urgency=low
+
+  * debian/control
+    - Use the new "Homepage:" field to specify the upstream URL.
+    - The Vcs-* fields are now officially supported, so remove the XS- prefix.
+    - Bump Standards-Version to 3.7.3. No further changes required.
+    - Fix a few capitalization errors in the package description.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 11 Jan 2008 02:08:24 +0100
+
+knetworkmanager (1:0.2-2) unstable; urgency=low
+
+  * Rebuild against network-manager 0.6.5 to enable phase2 and leap
+    authentication support.
+  * debian/rules
+    - Remove debian/stamp-bootstrap on clean. This fixes a FTBFS if package is
+      built twice in a row. Closes: #442621
+  * debian/control
+    - Add Build-Conflicts: autoconf2.13. Closes: #441046
+  * debian/menu
+    - Set section to Applications/Network/Monitoring which seems to be the
+      most appropriate amongst the available sections.
+  * debian/patches/05-desktop_file_fixes.patch
+    - Fix the *.desktop files to be compliant to the fd.o menu and desktop
+      entry spec.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 16 Sep 2007 21:01:25 +0200
+
+knetworkmanager (1:0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/05-leap_support.patch
+    - Removed, merged upstream.
+  * debian/patches/06-version_check.patch
+    - Removed, merged upstream.
+  * The upstream tarball does not ship an admin/ directory. Build-Depend on
+    kapptemplate, so we can copy it from there.
+  * debian/menu
+    - Update to new menu hierarchy and add a longtitle.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 25 Jul 2007 17:10:36 +0200
+
+knetworkmanager (1:0.2~svn678822-3) unstable; urgency=low
+
+  * debian/patches/06-version_check.patch
+    - Added. Fixes the problem with knetworkmanager no longer connecting
+      automatically upon login. Closes: #431255
+      If you are upgrading from a previous 0.2 svn snapshot, you may have to
+      clear the list of trusted networks in the configuration dialog.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 01 Jul 2007 11:47:00 +0200
+
+knetworkmanager (1:0.2~svn678822-2) unstable; urgency=low
+
+  * debian/patches/02-linux_types.patch
+    - Pass "-std=gnu++98" to CXXFLAGS. Otherwise the type __u64 is not defined
+      in linux-libc-dev for ANSI C/C89. Closes: #430795
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 28 Jun 2007 06:08:04 +0200
+
+knetworkmanager (1:0.2~svn678822-1) unstable; urgency=low
+
+  * SVN snapshot of the upcoming 0.2 release which has native VPN plugin
+    support. Closes: #415742
+  * debian/control
+    - Add XS-Vcs-* fields.
+    - Add Recommends: network-manager-vpnc, network-manager-openvpn.
+  * debian/rules
+    - Compile with openvpn and vpnc support.
+
+  * Removed patches that were merged upstream:
+    - debian/patches/05-no_deserialize.patch
+    - debian/patches/06-pretty_notification.patch
+    - debian/patches/07-overlay_icon_vpn.patch
+    - debian/patches/08-disable_sm.patch
+    - debian/patches/09-dbus_bool_t.patch
+
+  * debian/patches/02-linux_types.patch
+    - Added. Needed to workaround a problem in libnl.
+  * debian/patches/03-awk_path.patch
+    - Added. In Debian awk is installed in /usr/bin.
+  * debian/patches/04-dbus_access.patch
+    - Do not remove the dbus at_console access check but make it an
+      alternative to the Debian netdev group policy. Closes: #426467
+  * debian/patches/05-leap_support.patch
+    - Added. Do not fail to compile if LEAP support is not available.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 22 Jun 2007 21:08:32 +0100
+
+knetworkmanager (1:0.1-4) unstable; urgency=low
+
+  * Actually install the autostart file for knetworkmanager.
+    Thanks to Yannick Roehlly for spotting this glitch.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 12 Jan 2007 11:26:28 +0100
+
+knetworkmanager (1:0.1-3) unstable; urgency=low
+
+  * Pull some features and bug fixes from svn:
+    - debian/patches/05-no_deserialize.patch
+      + Don't call deserialize on encryption object to avoid warning of
+        libnm-util. Closes: #391486
+    - debian/patches/06-pretty_notification.patch
+      + Prettify notification messages.
+    - debian/patches/07-overlay_icon_vpn.patch
+      + Show overlay icon (lock) for active VPN connections.
+    - debian/patches/08-disable_sm.patch
+      + Disable session management to avoid a deadlock when accessing kwallet.
+        Install an autostart file into /usr/share/autostart/ instead.
+        Closes: #406162
+    - debian/patches/09-dbus_bool_t.patch
+      + Use dbus_bool_t instead of bool. Closes: #398974
+  * debian/patches/01-fix_french_translation.patch
+    - Added patch from Emmanuel Bouthenot which fixes some errors in the
+      French translation. Closes: #402285
+
+ -- Michael Biebl <biebl@debian.org>  Tue,  9 Jan 2007 16:31:52 +0100
+
+knetworkmanager (1:0.1-2) unstable; urgency=low
+
+  * Update maintainer email address to biebl@debian.org. 
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 20 Oct 2006 00:02:03 +0200
+
+knetworkmanager (1:0.1-1) unstable; urgency=low
+
+  * Finally the 0.1 release. Woohoo!
+    - Use an epoch to fix the versioning scheme I managed to mess up.
+    - Fixes a crash when removing network objects for a nonexistent network
+      interface. Closes: #390052
+  * debian/patches/01-no_network_status.patch
+    - Removed, fixed upstream.
+  * debian/patches/03-configure.patch
+    - Removed, fixed upstream.
+  * Dropped the build-dep on kapptemplate. The upstream tarball now ships a
+    proper admin/ directory.
+  * debian/patches/02-dialup.patch
+    - Removed. Also dropped the Recommends: pppconfig. pppconfig can't
+      generate entries for /etc/network/interfaces yet. 
+
+ -- Michael Biebl <biebl@teco.edu>  Fri, 29 Sep 2006 19:18:08 +0200
+
+knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low
+
+  * Updated to svn revision 586773.
+  * Do not refer to non existent khelpcenter help:/knetworkmanager/ in man
+    page. Closes: #385642
+
+ -- Michael Biebl <biebl@teco.edu>  Wed, 20 Sep 2006 19:46:52 +0200
+
+knetworkmanager (0.09+0.1r577960-1) unstable; urgency=low
+
+  * Updated to svn revision 577960.
+    - Access KWallet on demand, not on startup. Closes: #379606
+  * Added a Recommends: pppconfig. Closes: #380316
+
+ -- Michael Biebl <biebl@teco.edu>  Mon, 28 Aug 2006 01:14:29 +0200
+
+knetworkmanager (0.09+0.1r560817-1) unstable; urgency=medium
+
+  * Updated to svn revision 560817.
+  * Removed 04-gnome_keyring_daemon.patch, fixed upstream.
+  * Added 04-dbus_access.patch. Fixes D-Bus access rights.
+    Closes: #379309, #379364
+  * Enabled dial up support. Set pppconfig as configuration utility.
+    Closes: #376071
+  * Reload D-Bus after installation. Closes: #379307
+  * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379820
+
+ -- Michael Biebl <biebl@teco.edu>  Tue, 25 Jul 2006 23:33:31 +0200
+
+knetworkmanager (0.09+0.1r550737-1) unstable; urgency=low
+
+  * Updated to svn revision 550737.
+  * Added 01-no_network_status.patch which removes a build dependency on
+    networkstatus.
+  * Removed 03-configure_notifications.patch, merged upstream.
+  * This version does not ship an admin/ directory. Added a build dependency
+    on kapptemplate and modified debian/rules to copy it from kapptemplate.
+  * Bumped Standards-Version to 3.7.2, no further changes required.
+  * Updated homepage URL.
+  * Added 04-gnome_keyring_daemon.patch which sets the correct path to the
+    gnome-keyring-daemon binary. VPN plugins use gnome-keyring-daemon to store
+    their passwords.
+
+ -- Michael Biebl <biebl@teco.edu>  Wed, 14 Jun 2006 17:16:07 +0200
+
+knetworkmanager (0.09+0.1r527269-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed 01-xdg_app.patch, merged upstream.
+  * Added 03-configure_notifications.patch, this patch modifies the context
+    menu of the systray applet to provide quick access to the notification
+    settings.
+  * Added a "Provides: knetworkmanager" to make the package installable by its
+    upstream name.
+  * Initial upload. Closes: #351069
+
+ -- Michael Biebl <biebl@teco.edu>  Thu, 27 Apr 2006 08:01:39 +0200
+
+knetworkmanager (0.09+0.1r5964-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Michael Biebl <biebl@teco.edu>  Tue,  7 Feb 2006 21:43:56 +0100
+
diff --git a/debian/lenny/applications/knetworkmanager8/debian/compat b/debian/lenny/applications/knetworkmanager8/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/lenny/applications/knetworkmanager8/debian/control b/debian/lenny/applications/knetworkmanager8/debian/control
new file mode 100644
index 000000000..0b04bbf74
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/control
@@ -0,0 +1,35 @@
+Source: knetworkmanager8-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: cdbs,
+ debhelper (>= 7),
+ pkg-config,
+ kdelibs4-trinity-dev,
+ 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,
+ libnl-dev (>= 1.1),
+ quilt,
+ network-manager-vpnc,
+ network-manager-openvpn,
+ network-manager-strongswan,
+ network-manager-pptp,
+ automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+Homepage: http://opensuse.org/Projects/KNetworkManager
+
+Package: network-manager-kde-trinity
+Architecture: any
+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
+Description: KDE systray applet for controlling NetworkManager [Trinity]
+ Systray applet for controlling network connections managed by 
+ NetworkManager. It is mainly written for Trinity but also works for 
+ other desktop environments like GNOME or Xfce.
diff --git a/debian/lenny/applications/knetworkmanager8/debian/control.in b/debian/lenny/applications/knetworkmanager8/debian/control.in
new file mode 100644
index 000000000..43adf3e33
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/control.in
@@ -0,0 +1,36 @@
+Source: knetworkmanager-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: @@@MAINTAINER@@@
+Uploaders: @@@UPLOADERS@@@
+Build-Depends: cdbs,
+ debhelper (>= 7),
+ pkg-config,
+ kdelibs4-trinity-dev,
+ libnm-util-dev (>= 0.7.0),
+ libnm-glib-dev (>= 0.7.0),
+ network-manager-dev (>= 0.7.0),
+ libhal-dev,
+ libdbus-1-qt3-dev (>= 0.8.1),
+ libiw-dev,
+ libnl-dev (>= 1.1),
+ quilt,
+ network-manager-vpnc,
+ network-manager-openvpn,
+ network-manager-strongswan,
+ network-manager-pptp,
+ automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Standards-Version: 3.8.3
+Homepage: http://opensuse.org/Projects/KNetworkManager
+
+Package: network-manager-kde-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
+Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
+Provides: knetworkmanager-trinity
+Conflicts: network-manager-kde
+Description: KDE systray applet for controlling NetworkManager [Trinity]
+ Systray applet for controlling network connections managed by 
+ NetworkManager. It is mainly written for Trinity but also works for 
+ other desktop environments like GNOME or Xfce.
diff --git a/debian/lenny/applications/knetworkmanager8/debian/copyright b/debian/lenny/applications/knetworkmanager8/debian/copyright
new file mode 100644
index 000000000..2490de254
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/copyright
@@ -0,0 +1,34 @@
+This package was debianized by Michael Biebl <biebl@teco.edu> on
+Fri,  3 Feb 2006 05:53:06 +0100.
+
+It was downloaded from http://www.opensuse.org
+
+Upstream Authors: 
+  Timo Hoenig <thoenig@suse.de>
+  Will Stephenson <wstephenson@suse.de>
+  Stefan Bogner <sbogner@suse.de>
+  Helmut Schaa <hschaa@suse.de>
+  Valentine Sinitsyn <e_val@inbox.ru>
+
+Copyright: 
+  Copyright (C) 2005, 2006 Novell, Inc.
+
+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; either version 2 of the License, or
+  (at your option) any later version.
+
+  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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
diff --git a/debian/lenny/applications/knetworkmanager8/debian/knetworkmanager.1 b/debian/lenny/applications/knetworkmanager8/debian/knetworkmanager.1
new file mode 100644
index 000000000..3cd261c89
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/knetworkmanager.1
@@ -0,0 +1,145 @@
+.\" This file was generated by kdemangen.pl
+.TH KNETWORKMANAGER 1 "Feb 2006" "K Desktop Environment" "A NetworkManager front-end for KDE"
+.SH NAME
+knetworkmanager
+\- A NetworkManager front-end for KDE
+.SH SYNOPSIS
+knetworkmanager [Qt\-options] [KDE\-options] 
+.SH DESCRIPTION
+A NetworkManager front-end for KDE
+.SH OPTIONS
+.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 - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.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
+.BR networkmanager (1)
+.SH AUTHORS
+.nf
+Timo Hoenig <thoenig@suse.de>
+.br
+Stefan Bogner <sbogner@suse.de>
+.br
+Will Stephenson <wstephenson@suse.de>
+.br
+
diff --git a/debian/lenny/applications/knetworkmanager8/debian/manpages b/debian/lenny/applications/knetworkmanager8/debian/manpages
new file mode 100644
index 000000000..e2859341f
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/manpages
@@ -0,0 +1 @@
+debian/knetworkmanager.1
diff --git a/debian/lenny/applications/knetworkmanager8/debian/menu b/debian/lenny/applications/knetworkmanager8/debian/menu
new file mode 100644
index 000000000..9775e9c7c
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/menu
@@ -0,0 +1,6 @@
+?package(network-manager-kde): \
+	needs="X11" \
+	section="Applications/Network/Monitoring" \
+  	title="KNetworkManager" \
+	longtitle="A KDE frontend for NetworkManager" \
+	command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
new file mode 100644
index 000000000..9ae01a92b
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
@@ -0,0 +1,2 @@
+network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager
+network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so
diff --git a/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst b/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
new file mode 100644
index 000000000..fdd4e51ca
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  configure)
+  	# Ask D-Bus to reload the config file
+  	if [ -x "/etc/init.d/dbus" ]; then
+		invoke-rc.d dbus force-reload || true
+	fi
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/lenny/applications/knetworkmanager8/debian/patches/series b/debian/lenny/applications/knetworkmanager8/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
diff --git a/debian/lenny/applications/knetworkmanager8/debian/rules b/debian/lenny/applications/knetworkmanager8/debian/rules
new file mode 100755
index 000000000..97955e38b
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/rules
@@ -0,0 +1,47 @@
+#!/usr/bin/make -f
+  
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO
+
+DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp
+
+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
+
+binary-install/network-manager-kde-trinity::
+	# Install autostart file
+	install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \
+		debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop
+
+clean::
+	find . -name Makefile.in | xargs rm -f
+	rm -f aclocal.m4
+	rm -f acinclude.m4
+	rm -f configure
+	rm -f configure.files
+	rm -f configure.in
+	rm -f config.h.in
+	rm -f stamp-h.in
+	rm -f subdirs	
+	rm -f admin/ltmain.sh
+	rm -f admin/libtool.m4.in
+	rm -f debian/stamp-bootstrap
diff --git a/debian/lenny/applications/knetworkmanager8/debian/watch b/debian/lenny/applications/knetworkmanager8/debian/watch
new file mode 100644
index 000000000..ad7a7be91
--- /dev/null
+++ b/debian/lenny/applications/knetworkmanager8/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.kde.org/pub/kde/stable/apps/Trinity.x/network/knetworkmanager-(.*)\.tar\.gz
-- 
cgit v1.2.3