DEB: Rearranged applications folder into sub categories.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

2984 files changed, 0 insertions, 11874 deletions

diff --git a/debian/_base/applications/amarok.cmake/debian/changelog b/debian/_base/applications/amarok.cmake/debian/changelog
deleted file mode 100644
index dfc13c56b..000000000
--- a/debian/_base/applications/amarok.cmake/debian/changelog
+++ /dev/null
@@ -1,1586 +0,0 @@
-amarok-trinity (2:1.4.10-1ubuntu0) karmic; urgency=low
-
-  * Karmic rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
-
-amarok-trinity (2:1.4.10-0ubuntu5) jaunty; urgency=low
-
-  * Jaunty rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 28 April 2009 13:23:00 -0600
-
-amarok-trinity (2:1.4.10-0ubuntu4) intrepid; urgency=low
-
-  * Moved Trinity to /opt/trinity
-  * Integrated properly with KDE4.2+
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 20:08:00 -0600
-
-amarok-trinity (2:1.4.10-0ubuntu2) intrepid; urgency=low
-
-  * Fixed Debian MP3 autoinstaller
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 08 Dec 2008 15:59:00 -0600
-
-amarok-trinity (2:1.4.10-0ubuntu1) intrepid; urgency=low
-
-  * Added -trinity prefix
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 02 Dec 2008 22:55:00 -0600
-
-amarok (2:1.4.10-0ubuntu3) intrepid; urgency=low
-
-  * Add kubuntu_12_eject_command.diff, change eject command to
-    umount, we no longer have kdeeject
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 13 Oct 2008 22:16:22 +0100
-
-amarok (2:1.4.10-0ubuntu2) intrepid; urgency=low
-
-  * Update install-mp3 to use install-package
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 08 Sep 2008 14:30:40 +0100
-
-amarok (2:1.4.10-0ubuntu1) intrepid; urgency=low
-
-  * New upstream release
-  * Add kubuntu_11_fix_libmtp-0.3.0-API.diff
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Thu, 14 Aug 2008 18:04:13 +0200
-
-amarok (2:1.4.9.1-2ubuntu3) intrepid; urgency=low
-
-  * Add moodbar to the feature list
-  * Remove the amarok-engine virtual package, see debian version 1.4.8-2 for
-    reasoning
-  * amarok-common conflicts with amarok packages older than -2ubuntu1, but
-    doesn't replace them (LP: #244628)
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Mon, 30 Jun 2008 19:19:04 +0200
-
-amarok (2:1.4.9.1-2ubuntu2) intrepid; urgency=low
-
-  * Add manpages - unbreak build
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Fri, 27 Jun 2008 15:34:42 +0200
-
-amarok (2:1.4.9.1-2ubuntu1) intrepid; urgency=low
-
-  * Merge with Debian, remaining changes in debian/KUBUNTU-DEBIAN-DIFFERENCES 
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Wed, 25 Jun 2008 21:16:38 +0200
-
-amarok (1.4.9.1-2) unstable; urgency=medium
-
-  * Add 15_temptables_more_indices.diff patch which creates more indices for
-    some temporary tables that are used extensively while building collection
-    database. Apparently, SQLite 3.5.x is slower than 3.4.x when doing
-    matches on unindexed temporary table fields. This should solve (or improve
-    situation significantly) major performance problems with SQLite 3.5.x
-    (Closes: #479068). Urgency medium because this problem affects many 
-    lenny and sid Amarok users having rather large (15k+ songs) collections.
-
- -- Modestas Vainius <modestas@vainius.eu>  Sun, 11 May 2008 04:07:01 +0300
-
-amarok (1.4.9.1-1) unstable; urgency=low
-
-  * New upstream bugfix release:
-    - The last.fm dialog did not always properly disable options when the
-      username was not entered.
-    - Fix Amazon Cover fetching by using their new web service api.
-      (Closes: #474186)
-    - Don't insert items into Dynamic Mode that don't exist.
-    - If unavailable tracks are in the Playlist and random mode is on, don't
-    - stop those tracks if selected; continue with available tracks.
-  * Repackage original tarball as orig.tar.gz instead of doing tarball-in-orig
-    tarball thing. The previous way made patch testing and debugging more
-    painful unnecessarily.
-  * Resynchronize patches:
-    - 11_bug403340_cancel_rename_when_deleting_items.diff - fix offsets.
-    - 97_automake_cleanup.diff - adopt to upstream changes, fix offsets.
-  * Improve debian/rules stamp-automake and clean targets a bit not to rm
-    automake generated files uselessly (if they were not regenerated)
-
- -- Modestas Vainius <modestas@vainius.eu>  Fri, 11 Apr 2008 10:12:31 +0300
-
-amarok (1.4.8-2) unstable; urgency=low
-
-  * Remove Adeodato Simó from Uploaders by his request. Thank you Adeodato for
-    all your hard work!
-  * Remove amarok-gstreamer.install because there is no gstreamer engine
-    anymore.
-  * Remove overrides/amarok-arts. arts engine is no longer available.
-  * Drop internal cdbs/kde.mk in favour of the one shipped with cdbs. Merge
-    missing functionality (cvs-make/automake) into debian/rules.
-  * Auto-guess automake /usr/share directory.
-  * Rework interdependences among amarok and its engines' packages:
-    - Drop amarok-engine virtual package. Amarok and its engines ABI are not
-      even compatible between Amarok point releases so virtual package, which,
-      unfortunately, is versionless by definition, is not practical here.
-    - Rename engine packages to amarok-engine-$engine. Make them conflict
-      and replace previous amarok-$engine packages. Also make amarok conflict
-      with amarok-engine virtual package. All these changes will ensure that
-      partial upgrades from etch are not allowed (Closes: #432219).
-    - Make amarok depend on any of its engines of the same binary version
-      via alternate dependences. Default engine is amarok-engine-xine. Edit
-      amarok-engine-xine description accordingly.
-    - Make all amarok engines recommend amarok strictly of the same binary
-      version. Recommends instead of Depends here breaks circular dependency
-      (Closes: #368485).
-    - Downgrade amarok-engines to amarok Suggests.
-    - Convert amarok-engines package to arch:all because it's a metapackage.
-      Edit amarok-engines description because it's no longer going to be
-      installed by default.
-    - Add amarok-yauap to amarok-engines Suggests.
-  * New binary packages:
-    - amarok-common - arch:all package for architecture independent files
-      split from amarok. It recommends amarok (>= ${source:Version}) to
-      avoid circular dependency as in case of stricter "Depends" relationship.
-    - amarok-konqsidebar - split konqsidebar into its own binary package. The
-      reason for this is that it's incompatible with konqueror (>= 4:4.0.0)
-      and needs to _conflict_ with it (due to *.desktop files). Add
-      amarok-konqsidebar to amarok Recommends and amarok to amarok-konqsidebar
-      Depends.
-    - amarok-dbg - package with debugging symbols (Closes: #368840).
-    - amarok-engine-yauap - Yauap Commandline Audio Player engine
-      (Closes: #445371):
-      * Add libdbus-qt-1-dev to Build-Depends
-      * Pass --with-yauap to configure
-      * Add amarok-yauap.install
-      * Depend on yauap.
-  * Add "Homepage" field to debian/control source section, remove homepage
-    reference from amarok binary package description.
-  * Disable /usr/share/doc/amarok-* symlinks in debian/rules. They just
-    complicate packaging unnecessarily and make lintian unhappy.
-  * Ship only README from upstream source in /usr/share/doc/amarok.
-  * debian/README.Debian: remove a note about installing ruby, because it's
-    a dependency and gets installed anyway.
-  * New patches:
-    - 01_libtool_update.diff - use ltmain.sh and libtool.m4.in from Debian
-      libtool. This patch is used instead of previous `cp` in debian/rules,
-      because the patch 02_ below depends on it.
-    - 02_admin_cleanup.diff - admin/* cleanup patch.
-    - 97_automake_cleanup.diff - automake cleanup patch to get rid of excess
-      dependencies and shut dpkg-shlibdeps up. Superseeds previous
-      03_no_libadd_in_convenience_libs.diff patch.
-    - 11_bug403340_cancel_rename_when_deleting_items.diff - cancel a pending
-      'rename' request for the playlist item that is about to be deleted.
-       The patch solves a popular crash. (Closes: #403340).
-    - 12_devicemanager_dcopcall_no_timeout.diff - do not use timeout for dcop
-      calls. It's very unsafe because it might break further dcop calls such
-      as the one in the debian bug #432752 (Closes: #432752).
-    - 13_lastfm_crash_434835.diff - resolve lastfm crash which could be
-      triggered by switching away from lastfm track while it was still
-      handshaking or buffering (Closes: #434835). Thanks to Raphael for the
-      excelent instructions how to reproduce the crash.
-    - 14_ruby_libs_not_scripts.diff - remove #! stanzas from ruby library
-      files.
-  * Prepend sequence number to the filenames of existing debian/patches/*.
-    Edit debian/patches/series accordingly.
-  * Move Depends/Recommends on ruby, python & friends from amarok to
-    amarok-common since they scripts have been moved here.
-  * Add moodbar to amarok Suggests (Closes: #421420). Tweak amarok package
-    description accordingly.
-  * Add DM-Upload-Allowed: yes to debian/control source section.
-  * s/XS-Vcs/Vcs/ in debian/control.
-  * Drop DEB_DH_SHLIBDEPS_ARGS_amarok from debian/rules. No longer needed with
-    recent dpkg-shlibdeps.
-  * Build-Depend on debhelper (>= 5.0.0)
-  * Add executable permissions for some amarok scripts to make lintian happy.
-  * s/.NF/.nf/ in debian/amarok.1
-  * Drop DEB_INSTALL_DIRS_amarok from debian/rules. No longer needed.
-  * Use more accurate method to exclude (-X) amarok engines from being handled
-    by dh_makeshlibs instead of just DEB_DH_MAKESHLIBS_ARGS_ALL = -n.
-  * Do not amarok.install /usr/lib/libamarok.so and /usr/lib/libamarok.la.
-    They are devel-only and, hence, useless in the private library like
-    libamarok case.
-  * Install *.lintian files with overrides.
-  * Add manual pages: amarokapp.1 amarokcollectionscanner.1 amarok_libvisual.1
-  * Do not install COPYING files which are present in some script directories.
-    Also remove useless (according to lintian) MacOS X resource fork file
-    rubygems/._gem_commands.rb
-  * Exclude amarok from amarok-engine-* packages dependency lists.
-
- -- Modestas Vainius <modestas@vainius.eu>  Tue, 04 Mar 2008 15:28:46 +0200
-
-amarok (1.4.8-1) unstable; urgency=low
-
-  [ Adeodato Simó ]
-  * Build against libgpod-nogtk-dev.
-
-  * Update Build-Standards to 3.7.3:
-    + move menu entry to Applications/Sound.
-
-  * Build-depend on automake instead of automake1.9.
-
-  [ Modestas Vainius ]
-  * Add myself as maintainer with the permission from Adeodato Simó.
-  * Add Adeodato Simó as uploader.
-  * debian/control: drop Vcs-Bazaar field. amarok debian packaging is
-    now hosted at kde-extras svn repo therefore I'm adding appropriate
-    XS-Vcs-Svn and XS-Vcs-Browser fields.
-
-  * New upstream release (1.4.8) (Closes: #457352).
-  * Resync patches:
-    - proxy_lyrics.diff - removed, merged upstream.
-    - fix_gcc4.3_ftbfs.diff - removed, resolved upstream.
-  * Drop kdemultimedia-dev from Build-Depends. It's no longer needed.
-  * debian/rules: use /usr/share/automake-1.10 instead of *-1.9
-    because 'automake' package provides version 1.10.
-
- -- Modestas Vainius <modestas@vainius.eu>  Mon, 24 Dec 2007 23:10:02 +0200
-
-amarok (2:1.4.9.1-0ubuntu3) hardy; urgency=low
-
-  * Added kdebase-kio-plugins as a recommened package 
-
- -- Jonathan Aquilina <eagles051387@gmail.com>  Tue, 15 Apr 2008 14:24:23 +0200
-
-amarok (2:1.4.9.1-0ubuntu2) hardy; urgency=low
-
-  [ Daniel Hahler]
-  * debian/patches/kubuntu_08_add_lastfm_recommended_radio.diff:
-    Add lastfm recommended radio station (LP: #103227)
-  * debian/patches/kubuntu_09_audio_mimetypes.diff:
-    - Add mimetypes audio/flac and audio/ogg (LP: #201291)
-
-  [ Harald Sitter ]
-  * Unbreak manual media device configuration by enhancing
-    kubuntu_08_luks_device_detection.diff (LP: #207704)
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Sat, 12 Apr 2008 13:47:12 +0200
-
-amarok (2:1.4.9.1-0ubuntu1) hardy; urgency=low
-
-  * Upstream patch release
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 10 Apr 2008 23:07:12 +0100
-
-amarok (2:1.4.9-0ubuntu1) hardy; urgency=low
-
-  * New upstream release
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Wed, 09 Apr 2008 13:09:03 +0200
-
-amarok (2:1.4.8-0ubuntu5) hardy; urgency=low
-
-  * Added kubuntu_08_luks_device_detection.diff to ajust Amarok's
-    media device detection to properly work with kdebase's
-    LUKS patch kubuntu_9913_kiomedialuks.diff) (LP: #186384)
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Tue, 18 Mar 2008 01:10:01 +0100
-
-amarok (2:1.4.8-0ubuntu4) hardy; urgency=low
-
-  * Update install-mp3 to correctly error when something goes wrong
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Mar 2008 13:11:08 +0000
-
-amarok (2:1.4.8-0ubuntu3) hardy; urgency=low
-
-  [ Sven Boden ]
-  * Fix for bug "187406: Amarok install-mp3 fails silently" (LP #187406)
-
-  [ Sarah Hobbs ]
-  * Sponsored upload.  (Closes LP: #187406)
-  * Reworked patch to avoid setting absolute paths (eg /usr/bin/kdesu) 
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 12 Mar 2008 00:50:22 +1100
-
-amarok (2:1.4.8-0ubuntu2) hardy; urgency=low
-
-  * Fix install-mp3 installation path (LP: #179624)
-
- -- Guillaume Martres <smarter3@gmail.com>  Mon, 31 Dec 2007 11:50:29 +0100
-
-amarok (2:1.4.8-0ubuntu1) hardy; urgency=low
-
-  * New upstream release.
-  * Removed kubuntu_05_utf8_to_mtp_devices_fix.diff (applied upstream).
-  * Removed kubuntu_06_fix_amarok_freeze_installing_mp3.diff (applied upstream).
-  * Removed proxy_lyrics.diff (applied upstream).
-  * Removed overrides/ and it's content since there is no amarok-arts anymore.
-  * Removed amarok-gstreamer.install since there is no amarok-gstreamer anymore.
-  * Changed Standards-Version to 3.7.3.
-  * Moved "Homepage" from Description stanza to the source section.
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Mon, 17 Dec 2007 16:19:44 +0100
-
-amarok (2:1.4.7-2ubuntu5) hardy; urgency=low
-
-  * build without the libkerma-dev build dpendancy also ( realy fixed this
-    upload )
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Mon, 10 Dec 2007 01:56:48 -0600
-
-amarok (2:1.4.7-2ubuntu4) hardy; urgency=low
-
-  * build with --without-libkarma, as it seems to be default if left blank.
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Sat, 08 Dec 2007 09:49:20 -0600
-
-amarok (2:1.4.7-2ubuntu3) hardy; urgency=low
-
-  * removed --with-libkarma, libkarma{0,-dev} is not in Main yet. 
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Wed, 05 Dec 2007 23:47:20 -0600
-
-amarok (2:1.4.7-2ubuntu2) hardy; urgency=low
-
-  * Rebuild for libmtp6 -> libmtp7 transition
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 04 Dec 2007 14:01:22 +0000
-
-amarok (2:1.4.7-2ubuntu1) hardy; urgency=low
-
-  * Merge with Debian, remaining changes in debian/KUBUNTU-DEBIAN-DIFFERENCES
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 03 Dec 2007 20:01:18 +0000
-
-amarok (1.4.7-2) UNRELEASED; urgency=low
-
-  * Build against libgpod-nogtk-dev.
-
- -- Adeodato Simó <dato@net.com.org.es>  Sun, 26 Aug 2007 16:16:54 +0200
-
-amarok (1.4.7-1) unstable; urgency=low
-
-  * The "Are you breaking up with me?" release.
-
- -- Adeodato Simó <dato@net.com.org.es>  Mon, 20 Aug 2007 11:00:49 +0200
-
-amarok (1.4.6-1) unstable; urgency=low
-
-  * New upstream version packaged.
-
-  * Drop magnatune_CVE-2006-6980.diff; a (better) fix was applied upstream.
-
- -- Adeodato Simó <dato@net.com.org.es>  Fri, 22 Jun 2007 22:12:29 +0100
-
-amarok (1.4.5-5) unstable; urgency=low
-
-  * Rebuild against libtunepimp 0.5; change Build-Depends from libtunepimp3-dev
-    to libtunepimp-dev. (Closes: #425884)
-
- -- Adeodato Simó <dato@net.com.org.es>  Fri, 25 May 2007 11:02:17 +0200
-
-amarok (1.4.5-4) unstable; urgency=low
-
-  * Upload to unstable.  (Closes: #421920)
-
-  * Remove build-dependency on dpkg-dev (the version in stable groks
-    ${binary:Version}), and drop version requirement on debhelper and
-    libtag1-dev as well.
-
-  * Drop the changes made to remove circular dependencies.  (Reopens: #368485,
-    closes: #415484, #412464)
-
-  * Add patch to fix FTBFS with gcc-4.3.  (Closes: #417684)
-
-  * Use ${binary:Version} instead of ${source:Version}.
-
-  * Add XS-VCS-Bzr field.
-
-  * Add watch file, and adjust download URL on debian/copyright.
-
- -- Adeodato Simó <dato@net.com.org.es>  Fri, 11 May 2007 11:57:31 +0200
-
-amarok (1.4.5-3) experimental; urgency=low
-
-  * Add support for devices using MTP, build-dep on libmtp-dev added. 
-    (Closes: #405399)
-  * Add support for karma devices, build-dep on libkarma-dev added.
-    (Closes: #400801)
-  * Added patch fixing CVE-2006-6980: amarok magnatune unsafe shell.
-    (Closes: #410850)
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Mon, 12 Mar 2007 02:38:05 +0100
-
-amarok (1.4.5-2) experimental; urgency=low
-
-  * iPod support is back. Added versioned build-dep on libgpod-dev (>=0.4.2).
-    (Closes: #409985)
-  * Add patch to add the "Queue Track" functionality to the Amarok DCOP API:
-    queuemedia.patch. Patch by Isaac Clerencia <isaac@debian.org>
-  * Add patch to allow amarok get lyrics via http proxy with authentication.
-    Thanks to Filipe Lautert <filipe@icewall.org>. (Closes: #409568)
-  * Added versioned dep on amarok-engines | amarok-engine, thanks to Andreas
-    Pakulat for pointing this. (Closes: #409996). 
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 10 Feb 2007 00:40:10 +0100
-
-amarok (1.4.5-1) experimental; urgency=low
-
-  * New upstream release:
-    - Remove patches merged by upstream: invoke_browser, sparc-asm, magnatune,
-      kde134333_negative_length_fix, revert-fix-for-bug-116127.
-  * The XMMS visualization interface has been removed by upstream:
-    - Remove xmms-dev build-dep.
-    - amarok's description updated.
-    - update amarok.install/rules.
-  * iPod support temporarily dropped. (It needs libgpod >= 0.4.2, which is not
-    yet in Debian).
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Fri,  2 Feb 2007 05:15:29 +0100
-
-amarok (1.4.4-4) unstable; urgency=high
-
-  * Include final version of the magnatune.patch and really apply it.
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 18 Feb 2007 01:17:49 +0100
-
-amarok (1.4.4-3) unstable; urgency=high
-
-  * Edited patch magnatune.patch fixing CVE-2006-6980: amarok magnatune 
-    unsafe shell. (Closes: #410850). 
-  	The reference to the ruby scripts pointed in the bug report, is a problem
-    that was already solved in amarok 1.4.4.
-  * Add dep on unzip (needed to uncompress albums).
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 15 Feb 2007 22:28:13 +0100
-
-amarok (1.4.4-2) unstable; urgency=high
-
-  * Patched magnatune code to avoid multiple credit-card charges.
-    (Closes: #402309)
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 12 Dec 2006 16:51:13 +0100
-
-amarok (1.4.4-1) unstable; urgency=medium
-  
-  * Adding myself as uploader. ACK my last three NMUs...
-  * Removed circular dependencies. Now amarok-engines and amarok-$engine 
-    Recommends: amarok, instead of depends on amarok (Closes: #368485).
-  * Fix kde#134333: properly compute total playlist length if there are
-    tracks dynamic lengths (e.g. last.fm streams) in the playlist. Patch by
-    Modestas Vainius <geromanas@mailas.com>.
-  * Replaced ${Source-Version} with ${source:Version} and added versioned
-    build-dependency on dpkg-dev accordingly.
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 26 Nov 2006 03:42:59 +0100
-
-amarok (2:1.4.7-0ubuntu3) gutsy; urgency=low
-
-  * Added kubuntu_05_utf8_to_mtp_devices_fix.diff from upstream.  (KDE
-    Bug #139722)
-  * Added kubuntu_06_fix_amarok_freeze_installing_mp3.diff from
-    upstream.  (KDE Bug #147126, LP: #58617)  Thanks markey for fixing
-    this!
-  * Added amarok Suggests: libxine1-ffmpeg.  (LP: #134741)
-  * Added kubuntu_07_gnome_multimedia_keys.diff, a script that lets the
-    multimedia keys in GNOME work in amarok.  (LP: #87299)
-  * Use adept_batch update in install-mp3 not apt-get update
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 01 Sep 2007 00:11:20 +1000
-
-amarok (2:1.4.7-0ubuntu2) gutsy; urgency=low
-
-  * Rebuild for libmtp5 -> libmtp6 library transition.
-
- -- Steve Kowalik <stevenk@ubuntu.com>  Sat, 18 Aug 2007 00:55:59 +1000
-
-amarok (2:1.4.7-0ubuntu1) gutsy; urgency=low
-
-  * New Upstream version
-  * debian/control: replaced automake1.8 with automake1.9
-
- -- Stephan Hermann <sh@sourcecode.de>  Wed, 15 Aug 2007 09:47:17 +0200
-
-amarok (2:1.4.6-0ubuntu2) gutsy; urgency=low
-
-  * Rebuild for the libgpod1 -> libgpod2 library transition.
-  * Bump required version of the libgpod development headers.
-
- -- Steve Kowalik <stevenk@ubuntu.com>  Tue, 17 Jul 2007 00:36:04 +1000
-
-amarok (2:1.4.6-0ubuntu1) gutsy; urgency=low
-
-  * New Upstream Release.  (LP: #46526)
-  * Fixed kubuntu-media-amarok syntax (LP: #112252)
-  * Removed kubuntu_05_magnatune_security_fix.diff - fixed upstream
-  * Removed kubuntu_06_right_click_sound_control_fix.diff - fixed upstream
-  * Removed kubuntu_07_monge_exports_correct_symbols.diff - fixed
-    upstream
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 19 Jun 2007 01:09:37 +1000
-
-amarok (2:1.4.5-0ubuntu7) feisty; urgency=low
-
-  * Spelling correction: amaroK -> Amarok
-  * Description update (no kio support with libxine - yet)
-
- -- Harald Sitter <sitter.harald@gmail.com>  Tue,  3 Apr 2007 17:45:46 +0200
-
-amarok (2:1.4.5-0ubuntu6) feisty; urgency=low
-
-  * Fixed the install-mp3 script 
-
- -- Ryan Kavanagh <ryan@kubuntu.org>  Tue,  6 Mar 2007 19:11:17 -0500
-
-amarok (2:1.4.5-0ubuntu5) feisty; urgency=low
-
-  * Added patches:
-    - kubuntu_05_magnatune_security_fix.diff.  Fixes CVE #-2006-6979, 
-      KDE Bug #138499
-    - kubuntu_06_right_click_sound_control_fix.diff.  KDE Bug #141672
-    - kubuntu_07_monge_exports_correct_symbols.diff
-  * All patches from amarok SVN.
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Thu, 15 Feb 2007 15:32:32 +1100
-
-amarok (2:1.4.5-0ubuntu4) feisty; urgency=low
-
-  * Correct thinko in .install for installing the missing files.
-
- -- Steve Kowalik <stevenk@ubuntu.com>  Wed, 14 Feb 2007 00:17:29 +1100
-
-amarok (2:1.4.5-0ubuntu3) feisty; urgency=low
-
-  * Update libmtp build-dep to 0.1.3-0ubuntu1
-  * Install missing files (cd player .desktop file, libhttp11, amarok_addaspodcast.desktop)
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  7 Feb 2007 11:45:28 +0000
-
-amarok (2:1.4.5-0ubuntu2) feisty; urgency=low
-
-  * Added Build-dep libgpod-dev
-  * Fixed amarok.install
-    - Install collection bin files in the correct path
-      (Closes Malone #83454)
-    - Added back ipod lib (Closes Malone #83515)
-
- -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 06 Feb 2007 19:36:32 +0100
-
-amarok (2:1.4.5-0ubuntu1) feisty; urgency=low
-
-  [ Brandon Holtsclaw ]
-  * New Upstream Release
-  * Removed the following patches , adopted upstream
-    - invoke_browser.patch
-    - kubuntu_05_lastfm_xine.diff
-    - some-binaries-in-usr-lib.patch
-    - sparc-asm.patch
-
-  [ Sarah Hobbs ]
-  * Added dependancy kdebase-kio-plugins.  Closes malone #66764
-  * Compiling without stack smashing protection.  Closes malone #81768
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Sun,  4 Feb 2007 00:46:12 -0600
-
-amarok (2:1.4.4-0.3ubuntu4) feisty; urgency=low
-
-  * No-change upload for the libpq4->libpq5 transition.
-
- -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 15 Jan 2007 15:39:10 +0000
-
-amarok (2:1.4.4-0.3ubuntu3) feisty; urgency=low
-
-  * Rebuild against libtunepimp5
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  8 Dec 2006 10:47:51 +0000
-
-amarok (2:1.4.4-0.3ubuntu2) feisty; urgency=low
-
-  * Add patch kubuntu_05_lastfm_xine.diff from upstream to make
-    last.fm streams work with Xine 1.1.3
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Dec 2006 13:03:34 +0000
-
-amarok (2:1.4.4-0.3ubuntu1) feisty; urgency=low
-
-  * Fake Sync from debian unstable
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Thu, 23 Nov 2006 03:46:05 -0600
-
-amarok (2:1.4.4-0ubuntu3) feisty; urgency=low
-
-  * Compile with MTP Device Support
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Tue, 14 Nov 2006 22:13:11 -0600
-
-amarok (2:1.4.4-0ubuntu2) feisty; urgency=low
-
-  * Add debian/kubuntu-media-amarok and
-    debian amarok_play_audiocd.desktop for good KDE integration
-
- -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 03 Nov 2006 23:57:33 +0200
-
-amarok (2:1.4.4-0ubuntu1) feisty; urgency=low
-
-  * New Upstream Version
-  * Removed kubuntu_06_dapp_assert.diff and kubuntu_05_playlist_encoding.diff
-    adopted upstream
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Thu, 26 Oct 2006 16:19:30 -0500
-
-amarok (1.4.4-0.3) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Applied patch invoke_browser.patch to allow amarok open external URLs.
-    (Closes: #397266).
-  * Removed dependency on xmms and updated README.Debian. Thanks to Bryan
-    Donlan and Michael Biebl. (Closes: #393141)
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 19 Nov 2006 02:50:39 +0100
-
-amarok (1.4.4-0.2) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Applied patch to fix build on sparc. Thanks to Jurij Smakov for the patch.
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat,  4 Nov 2006 10:19:37 +0100
-
-amarok (1.4.4-0.1) unstable; urgency=low
-
-  * Non-maintainer upload with permission from the maintainer.
-  * New upstream release.
-  * Dropped patch 143_provided_upstream_playlist_encoding.diff,
-    merged by upstream.
-  * Moved architecture-dependent files from /usr/share to
-    /usr/lib. Thanks to Ted Percival. (Closes: #392392)
-  * Updated debian/compat to 5.
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 31 Oct 2006 21:59:59 +0100
-
-amarok (2:1.4.3-0ubuntu10) edgy; urgency=low
-
-  * Make sure amarok_njb support is installed to the correct location
-  * Closes Malone: #61492 
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Sat, 14 Oct 2006 13:46:21 -0500
-
-amarok (2:1.4.3-0ubuntu9) edgy; urgency=low
-
-  * Set .pot name in debian/rules
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  1 Oct 2006 12:44:07 +0100
-
-amarok (2:1.4.3-0ubuntu8) edgy; urgency=low
-
-  * The DAAP client would crash Amarok under certain conditions when
-    kdelibs was compiled with asserts on. Thanks to  Ian Monroe 
-  * Closes KDE: #132851
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Wed, 20 Sep 2006 21:10:11 -0500
-
-amarok (2:1.4.3-0ubuntu7) edgy; urgency=low
-
-  * Various fixes to install-mp3
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 20 Sep 2006 14:54:21 +0100
-
-amarok (2:1.4.3-0ubuntu6) edgy; urgency=low
-
-  * Added support for edgy ( and future TBA releases ) to install-mp3
-  * Closes Malone #60637
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Sat, 16 Sep 2006 03:56:07 -0500
-
-amarok (2:1.4.3-0ubuntu5) edgy; urgency=low
-
-  * Fixed a typo that prevented Amarok configuring Nomad Jukebox
-    in debian/rules
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Sat, 16 Sep 2006 01:48:11 -0500
-
-amarok (2:1.4.3-0ubuntu4) edgy; urgency=low
-
-  * Built --with-libnjb support ( Creative Nomad Devices )
-  * Added kubuntu_05_playlist_encoding.diff. This bug could result 
-    in failure to restore the current playlist. (BR 133613)
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Fri, 15 Sep 2006 10:53:56 -0500
-
-amarok (2:1.4.3-0ubuntu3) edgy; urgency=low
-
-  * Fixed little error in install-mp3, in the case multiverse is
-    already activated. Code could be really optimized, but it works
-    as it is. I will probably make something clean after edgy release.
-
- -- Anthony Mercatante <tonio@ubuntu.com>  Tue,  13 Sep 2006 22:26:14 +0200
-
-amarok (2:1.4.3-0ubuntu2) edgy; urgency=low
-
-  * Improved install-mp3 to manage ubuntu/gnome and other desktops correctly.
-    (closes #59007)
-
- -- Anthony Mercatante <tonio@ubuntu.com>  Mon,  11 Sep 2006 17:02:14 +0200
-
-amarok (2:1.4.3-0ubuntu1) edgy; urgency=low
-
-  [ Brandon Holtsclaw ]
-  * New Upstream Release
-  * Removed kubuntu_0{5,6,7,8}_*.diff patches as they have been applyed upstream
-  * Added build-dep ruby1.8-dev and automake-1.9 as now required to build amarok
-
-  [ Jonathan Riddell ]
-  * Remove automake1.7 build-dep
-  * Install all files
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Mon,  4 Sep 2006 22:08:14 -0500
-
-amarok (2:1.4.2-0ubuntu3) edgy; urgency=low
-
-  [ Jonathan Riddell ]
-  * Remove kubuntu_03_podir.diff, not built with tar in .orig
-	
-  [ Sarah Hobbs ]
-  * Added a more verbose error message when install-mp3 script fails
-
-  [ Brandon Holtsclaw ]
-  * Collection scanner would only restart a maximum of 2 times instead of
-    20. (fixed in SVN revision 578922) - kubuntu_08_scanner.diff
-  * MTP mediadevice support would not compile against libmtp versions gt
-    0.0.12. (fixed in SVN revision 576121) - kubuntu_06_mtp.diff
-  * AudioCD playback would stutter and sometimes freeze Amarok. (BR 133015)
-    - kubuntu_05_audiocd.diff
-  * Fixed bug which prevented Amarok from creating the collection database
-    in rare circumstances using SQLite. (BR 133072) - kubuntu_07_collection.diff
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Thu, 31 Aug 2006 12:01:16 -0500
-
-amarok (2:1.4.2-0ubuntu2) edgy; urgency=low
-
-  * amarok_libvisual helper added to amarok.install (malone #57636)
-  * Fixed typo in Sugests for libvisual-0.4-plugins Closes Last Half malone #55779 
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Sun, 27 Aug 2006 05:52:34 -0500
-
-amarok (2:1.4.2-0ubuntu1) edgy; urgency=low
- 
-  [ Brandon Holtsclaw ]
-  * Removed libgstreamer0.10-dev as its not needed anylonger 
-    gst support has been droped upstream and in kubuntu
-  * Added libhal-dev as a build dep (malone #55779)
- 
-  [ Daniel Molkentin ]
-  * Install DAAP media device
-
-  [ Sarah Hobbs ]
-  * New upstream version. Closes #24063, #49098, #47179, #52958 and other bugs
-  * Moved python-qt3 from recommends to depends.  Closes bugs #55075, #48724
-  * Removed python from suggests (already a dep of python-qt3)
-  * Changed suggests libvisual-0.2 to libvisual0.4.0-plugins.  Closes bug #55734
-  * Compiled with libvisual support.  Added build-dep libvisual-0.4-dev.  Closes other half of bug #55734
-  * Removed debian/amarok-gstreamer.install as we no longer distribute
-    amarok-gstreamer
-  * Change build-dep automake1.9 --> automake1.7
-  * Changed build-dep debhelper --> debhelper (>=5)
-  * Bumped Compat to 5
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Wed, 23 Aug 2006 07:11:02 -0500
-
-amarok (2:1.4.1-0ubuntu3) edgy; urgency=low
-
-  * Make debian/install-mp3 executable.  Closes bug #52994
-  * Install amarokapp in /usr/bin. Closes bugs #16474, #52360
-  * Stopped compiling with exscalibar support - upstream 
-    removed the moodbar
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 18 Jul 2006 13:55:53 +1000
-
-amarok (2:1.4.1-0ubuntu2) edgy; urgency=low
-
-  * Depend on amarok-xine not amarok-engines
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 12 Jul 2006 00:01:33 +0000
-
-amarok (2:1.4.1-0ubuntu1) edgy; urgency=low
-
-  * New upstream release
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 22:46:21 +0000
-
-amarok (1.4.0a-1) unstable; urgency=low
-
-  * Revised tarball for 1.4.0 (closes: #367897), fixing the following issues:
-
-    + does not botch migration from 1.3 SQLite collections, which in addition
-      caused further collection rebuilds to appear empty. (Closes: #368396)
-    + correctly closes database connections, thus not failing with "too many
-      open files" and deleting the collection after some hours in pause mode.
-      (Closes: #368086)
-    + audio CDs can be reproduced again. (Upstream #127388)
-
-  * Switch to included SQLite; for some reason, dynamic linking against 3.3.5
-    makes scores unfunctional. (Closes: #367468)
-
- -- Adeodato Simó <dato@net.com.org.es>  Sat, 27 May 2006 15:23:14 +0200
-
-amarok (1.4.0-1) unstable; urgency=low
-
-  * New upstream release. The upstream tarball no longer ships the GStreamer
-    engine, and aRts support was dropped a while ago, and this upload only
-    includes the XINE engine.
-
-    Bugs reported in the Debian BTS fixed in this version:
-
-    + collection is updated at start up. (Closes: #330017)
-    + metadata for icecast streams is displayed. (Closes: #349796)
-    + the correct charset is used for lyrics URLs. (Closes: #352882)
-    + iPods are recognized even after emptying them. (Closes: #350305)
-    + non-ascii characters are displayed correctly under non UTF-8
-      locales in the konqueror sidebar. (Closes: #353058)
-    + last.fm submission queue is flushed after network unavailability
-      even if no more tracks are played. (Closes: #344429)
-
-    Regressions fixed since the latest beta:
-
-    + iPod model detection works again, without needing libgpod-cvs.
-      (Closes: #364789)
-    + filling tags using MusicBrainz works again. (Closes: #364798)
-
-  * Enable Moodbar support, now that Exscalibar has entered unstable.
-    (Closes: #364588)
-
-  * Update Standards-Version to 3.7.2 (no changes required).
-
- -- Adeodato Simó <dato@net.com.org.es>  Sun, 14 May 2006 16:42:14 -0500
-
-amarok (1.4-beta3c-1) experimental; urgency=low
-
-  * Third beta for the upcoming 1.4 version packaged.
-
-  * Build against libtunepimp3-dev.
-
- -- Adeodato Simó <dato@net.com.org.es>  Sat, 15 Apr 2006 19:47:54 +0200
-
-amarok (1.4-beta2-3) experimental; urgency=low
-
-  * Rebuild against libmysqlclient15off. (Closes: #358490)
-
- -- Adeodato Simó <dato@net.com.org.es>  Thu, 23 Mar 2006 02:18:56 +0100
-
-amarok (1.4-beta2-2) experimental; urgency=low
-
-  * Fix yesterday's brainfart: aKode can't output to aRts, so remove this
-    statement from the description.
-    
-  * In addition, and after a bit of chit-chat with upstream, follow their
-    wishes and not package aKode at all (bye amarok-arts), and don't include
-    GStreamer 0.10 support for now.
-
- -- Adeodato Simó <dato@net.com.org.es>  Mon,  6 Mar 2006 23:37:43 +0100
-
-amarok (1.4-beta2-1) experimental; urgency=low
-
-  * Second beta for the upcoming 1.4 version packaged.
-
-    This release drops the aRts engine; in order to keep support for
-    outputting to aRts, ship the aKode engine in the amarok-arts package.
-
-    Also, GStreamer 0.8 support is dropped in favour of GStreamer 0.10. Update
-    build-dependencies and amarok-gstreamer's dependencies accordingly.
-
-  * Use strncpy instead of qstrdup in the patch for main.cpp, so that argv[0]
-    is overwritten correctly. This closes: #352171 (amaroK not remembering the
-    desktop it was on upon login), and incidentally makes Erich Schubert happy.
-
-  * Drop build-dependency on libgtk2.0-dev now that #353590 is fixed.
-
- -- Adeodato Simó <dato@net.com.org.es>  Mon,  6 Mar 2006 05:44:33 +0100
-
-amarok (1.4-beta1-r511476b) experimental; urgency=low
-
-  * First beta (plus SVN) for the upcoming 1.4 version packaged.
-    (Closes: #352590)
-
-  * Update build-depends to support iRiver iFP (B-D: libifp-dev, libusb-dev),
-    and iPod via libgpod (B-D: libgpod-dev; plus libgtk2.0-dev due to #353590).
-
-  * Since lyrics downloading is now implemented in a separate Ruby script,
-    promote ruby from Suggests to Recommends, so that functionality is ideally
-    not lost. Add a note with this information to README.Debian.
-
-  * Link against sqlite dynamically again, since amaroK 1.4 can cope with the
-    restriction explained in the changelog entry for 1.3.1-1 and Bug#326648.
-
- -- Adeodato Simó <dato@net.com.org.es>  Mon, 20 Feb 2006 05:42:15 +0100
-
-amarok (1.3.9-1) unstable; urgency=medium
-
-  * New upstream bugfix release.
-
-  * Build against libtunepimp3-dev. (Closes: #359086)
-
- -- Adeodato Simó <dato@net.com.org.es>  Thu, 27 Apr 2006 00:33:29 +0200
-
-amarok (1.3.8-1) unstable; urgency=low
-
-  * New upstream bugfix release:
-
-    + fetching lyrics works again. (Closes: #344509)
-
-  * Do not use g++-3.4 in arm, m68k and hppa anymore, sid's g++-4.0 is
-    expected to work. (Closes: #342953)
-
-  * Update MySQL build-dependency to libmysqlclient15-dev. (Closes: #343759)
-
-  * Switch patch management to quilt, and make use of patchsys-quilt.mk.
-
-  * Drop build-depends version constraints that are satisfied with stable.
-    Drop the ones for kdebase-dev and kdemultimedia-dev as well, which were
-    transient and all arches have the minimum required versions in sid now.
-
- -- Adeodato Simó <dato@net.com.org.es>  Wed, 18 Jan 2006 01:43:40 +0100
-
-amarok (1.3.7-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-
-  * Built against kdelibs4c2a, so installable in sid again. (Closes: #341959)
-    Temporarily bump build-deps on kdebase-dev and kdemultimedia-dev.
-
-  * Remove debian/patches/taglib-1.3.1-suffices.diff, since taglib 1.4 is in
-    testing and unstable, and I'll be using a backport for sarge packages.
-    Bump version constraint in debian/control.
-
-  * Again, update my e-mail address in debian/control, yada yada.
-
- -- Adeodato Simó <dato@net.com.org.es>  Wed, 07 Dec 2005 06:44:59 +0100
-
-amarok (2:1.3.9-0ubuntu4) dapper; urgency=low
-
-  * debian/cdbs/kde.mk:
-    - added dh_iconcache.
-
- -- Daniel Holbach <daniel.holbach@ubuntu.com>  Sun, 21 May 2006 16:16:47 +0200
-
-amarok (2:1.3.9-0ubuntu3) dapper; urgency=low
-
-  * Don't install hr translations, it's really Hindi
-    Closes Malone #44517
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 16 May 2006 00:14:56 +0300
-
-amarok (2:1.3.9-0ubuntu2) dapper; urgency=low
-
-  * Rebuild against the new libmysqlclient15off with correct symbols.
-
- -- Adam Conrad <adconrad@ubuntu.com>  Thu,  6 Apr 2006 12:46:44 +1000
-
-amarok (2:1.3.9-0ubuntu1) dapper; urgency=low
-
-  * New upstream release
-  * Use automake1.7, that's what the upstream file seems to use
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 25 Mar 2006 17:32:01 +0000
-
-amarok (2:1.3.8-0ubuntu7) dapper; urgency=low
-
-  * Re-uploaded for new language-pack scripts, no changes
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Mar 2006 18:49:41 +0000
-
-amarok (2:1.3.8-0ubuntu6) dapper; urgency=low
-
-  * Re-uploaded for new language-pack scripts, no changes
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 23 Feb 2006 12:28:47 +0000
-
-amarok (2:1.3.8-0ubuntu5) dapper; urgency=low
-
-  * Add kubuntu_03_podir.diff, change podir so .pot file gets
-    generated in a place that keeps the language pack scripts happy
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Feb 2006 19:09:30 +0000
-
-amarok (2:1.3.8-0ubuntu4) dapper; urgency=low
-
-  * Remove amarok-gstreamer from enginePackages substvars
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Feb 2006 11:44:19 +0000
-
-amarok (2:1.3.8-0ubuntu3) dapper; urgency=low
-
-  * Remove use of GCC 3.4
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Feb 2006 10:52:51 +0000
-
-amarok (2:1.3.8-0ubuntu2) dapper; urgency=low
-
-  * Remove GStreamer 0.8 support, default to xine
-  * Change from libmysqlclient14-dev to libmysqlclient15-dev build-dep
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  1 Feb 2006 11:56:01 +0000
-
-amarok (2:1.3.8-0ubuntu1) dapper; urgency=low
-
-  * New upstream release
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 15 Jan 2006 19:10:14 +0000
-
-amarok (2:1.3.7-0ubuntu4) dapper; urgency=low
-
-  * weaken build dependencies
-
- -- Reinhard Tartler <siretart@ubuntu.com>  Fri, 30 Dec 2005 14:55:13 +0100
-
-amarok (2:1.3.7-0ubuntu3) dapper; urgency=low
-
-  * Add kubuntu_02_read_kubuntu_config.diff to make it read Debian's
-    amarokrc file, which hides the splash screen
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Dec 2005 20:13:28 +0000
-
-amarok (2:1.3.7-0ubuntu2) dapper; urgency=low
-
-  * debian/control: Removed the text about libvisual. There is no libvisual 
-    support right now in ubuntu
-
- -- Stephan Hermann <sh@sourcecode.de>  Wed,  7 Dec 2005 23:52:58 +0100
-
-amarok (2:1.3.7-0ubuntu1) dapper; urgency=low
-
-  * New upstream release
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 20:59:31 +0000
-
-amarok (2:1.3.6-1ubuntu3) dapper; urgency=low
-
-  * Make amarok-gstreamer default engine
-  * Add kubuntu_01_kdepot.diff for pot generation
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 29 Nov 2005 19:18:38 +0000
-
-amarok (2:1.3.6-1ubuntu2) dapper; urgency=low
-
-  * debian/substvars: moved gstreamer0.8-mad to Suggests section
-  * Update kde.mk for .pot generation
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 26 Nov 2005 02:52:27 +0000
-
-amarok (2:1.3.6-1ubuntu1) dapper; urgency=low
-
-  * Sync with debian, and readded the Ubuntu specific Epoch
-  * Merged the debian/changelog
-  * debian/control:
-    - Removed libvisual-dev, libsdl1.2-dev from build-deps
-    - Removed libvisual-plugins from Suggests
-  * debian/amarok.install: prevent installing amarok_libvisual  
-
- -- Stephan Hermann <sh@sourcecode.de>  Sun, 20 Nov 2005 18:32:06 +0100
-
-amarok (1.3.6-1) unstable; urgency=low
-
-  * New upstream bugfix release:
-
-    + last.fm submissions are properly saved on disk while offline again; they
-      had been broken by Qt 3.3.5. (Closes: #334469, #337109)
-    + includes missing semicolon in amarok.desktop. (Closes: #336026)
-
-  * Update my e-mail address in debian/control.
-
- -- Adeodato Simó <dato@the-barrel.org>  Tue, 08 Nov 2005 10:40:42 +0100
-
-amarok (1.3.5-1) unstable; urgency=low
-
-  * New upstream bugfix release, quickly released to fix a potential crash at
-    startup (upstream #114983).
-
- -- Adeodato Simó <asp16@alu.ua.es>  Tue, 25 Oct 2005 14:55:29 +0200
-
-amarok (1.3.4-1) unstable; urgency=low
-
-  * New upstream bugfix release, which makes this maintainer of yours
-    immensely happy because a fix for upstream #114195 is included.
-    ("Collection scanner ignored files with non-ascii characters").
-
-  * Add libvisual support (closes: #335053). Thanks to Jean-Rémy Falleri for
-    the heads-up. Changes needed:
-
-    + add libvisual0.2-dev and libsdl1.2-dev to Build-Depends.
-    + add libvisual0.2-plugins to Suggests, and mention it in the paragraph
-      regarding visualization plugins in amarok's description.
-    + add the appropriate snippet to some-binaries-in-usr-lib.patch in order
-      to cope with amarok_libvisual installed in /usr/lib/amarok instead of
-      /usr/bin, as mandated by Policy. 
-
- -- Adeodato Simó <asp16@alu.ua.es>  Mon, 24 Oct 2005 09:30:22 +0200
-
-amarok (1.3.3-1) unstable; urgency=low
-
-  * New upstream bugfix release:
-
-    + does not loose playlist / podcasts on restart. (Closes: #329878)
-    + PostgreSQL configuration dialog no longer shows MySQL's. (Closes: #327630)
-
-  * Updated the Debian menu icons to the new logo.
-
-  * Updated copyright notice, list of authors, and FSF postal address in
-    debian/copyright.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Thu, 13 Oct 2005 00:04:34 +0200
-
-amarok (1.3.2-1) unstable; urgency=low
-
-  * New upstream bugfix release, featuring the return of alsasink support.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Wed, 21 Sep 2005 04:14:52 +0200
-
-amarok (1.3.1-2) unstable; urgency=low
-
-  * Use g++ 3.4 in arm, m68k and hppa.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Tue, 06 Sep 2005 00:21:03 +0200
-
-amarok (1.3.1-1) unstable; urgency=low
-
-  * New upstream bugfix release. Beware, though, that the GStreamer engine has
-    been rewritten (!), and ALSASINK SUPPORT REMOVED due to temporary breakage.
-
-  * Use the internal copy of sqlite for now. This fixes the collection being
-    non functional with SQLite 3.2.5 due to this version preventing a database
-    handle opened in one thread to be used in another. See Bug#326648 for
-    reference. (Closes: #326562, #312386)
-
-  * Enable PostgreSQL support (closes: #326612, #326713):
-
-    + debian/rules: pass --enable-postgresql to ./configure.
-    + debian/control: add libpq-dev to Build-Depends.
-
-    (Before somebody comes around with the word "bloat" ready, libpq4 is 6
-     times smaller than libmysqlclient14.)
-
-  * Regain preciousss "my `grep -c NEEDED` is smaller than yours" karma by not
-    using LIBADD in the statusbar convenience lib. The Depends line had gained
-    some weight in 1.2.3-1.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Mon, 05 Sep 2005 20:57:41 +0200
-
-amarok (2:1.3.1-0ubuntu4) breezy; urgency=low
-
-  * Add kubuntu_02_column_sort_crash.diff fix a
-    crash on column sort http://bugs.kde.org/113042
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Oct 2005 16:14:12 +0100
-
-amarok (2:1.3.1-0ubuntu3) breezy; urgency=low
-
-  * Add kubuntu_01_alsasink.diff to fix and reenable alsasink
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  3 Oct 2005 22:40:05 +0100
-
-amarok (2:1.3.1-0ubuntu2) breezy; urgency=low
-
-  * debian/control: added khelpcenter as suggestion
-
- -- Stephan Hermann <sh@sourcecode.de>  Sat, 17 Sep 2005 02:23:08 +0200
-
-amarok (2:1.3.1-0ubuntu1) breezy; urgency=low
-
-  * New Upstream Release
-  * Merged the Debian package from Adeodato Simó
-  * debian/substvars: moved gstreamer0.8-mad to Suggests section
-
- -- Stephan Hermann <sh@sourcecode.de>  Fri, 16 Sep 2005 19:59:06 +0200
-
-amarok (1.3.0-1) unstable; urgency=low
-
-  * New upstream release packaged (closes: #323249). Bugs reported in the
-    Debian BTS fixed in this version:
-
-    + does not display advertisements in lyrics. (Closes: #321499)
-    + pre-amp in the equalizer works with XINE engine too. (Closes: #283750)
-    + includes PartyMode. (Closes: #293293)
-    + includes equalizer presets. (Closes: #283761)
-    + builds fine with GCC 4.0. (Closes: #314779)
-
-  * Updated Build-Dependencies:
-
-    + automake1.6 to automake1.9.
-    + libmysqlclient12-dev to libmysqlclient14-dev.
-    + temporarily bump version constraint in kdemultimedia-dev and kdebase-dev
-      in order to allow an early upload in the middle of the KDE transition.
-
-  * Adjustments to the build-system:
-
-    + do not require TagLib 1.4.0 since it's not in Debian yet (#323280).
-    + don't use KDE_FINAL in amarok/src since both MySQL and KDE have had the
-      brilliant idea to define a struct/class named "NET".
-
-  * This version links against libtunepimp2c2, so libtunepimp2 0.3.0-4
-    breakage does not affect us anymore. (Closes: #318000)
-
-  * Update Standards-Version to 3.6.2 (no changes required).
-
- -- Adeodato Simó <asp16@alu.ua.es>  Sat, 03 Sep 2005 01:42:56 +0200
-
-amarok (1.2.4-1) unstable; urgency=low
-
-  * The "following Debian Policy is cool, except when it's not" release.
-
-  * New upstream bugfix release:
-
-    + amaroK now correctly displays the name of the first available engine,
-      instead of an empty line. (Closes: #307949)
-
-  * The KDE Session Manager can now restore amaroK on login (closes: #302852,
-    #308099). Patch amarokapp to set its own argv[0] to 'amarok', since for the
-    session manager to restore an application the binary must be in the $PATH.
-
-  * Made the crash handler aware that amarokapp is in /usr/lib/amarok, and not
-    in /usr/bin.
-
-  * Include small patch to fix upstream bug 103510 ("systray icon continues
-    'playing' after songs end, if 'clear list' was hit while playing").
-
- -- Adeodato Simó <asp16@alu.ua.es>  Mon, 06 Jun 2005 00:08:28 +0200
-
-amarok (2:1.2.4-0ubuntu4) breezy; urgency=low
-
-  * Rebuild for the xorg -> mesa GL/GLU transition.
-
- -- Adam Conrad <adconrad@ubuntu.com>  Sun, 21 Aug 2005 19:34:41 +1000
-
-amarok (2:1.2.4-0ubuntu3) breezy; urgency=low
-
-  * Add kubuntu_02_gstreamer_output.patch to default GStreamer to alsasink
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 13 Jul 2005 18:19:28 +0000
-
-amarok (2:1.2.4-0ubuntu2) breezy; urgency=low
-
-  * Default to GStreamer plugin
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  6 Jul 2005 15:30:52 +0000
-
-amarok (2:1.2.4-0ubuntu1) breezy; urgency=low
-
-  * New upstream release
-  * Add kubuntu_01_gcc4_fixes.patch to fix compiler errors
-
- -- Jonathan Riddell <jr@jriddell.org>  Fri,  3 Jun 2005 17:22:10 +0000
-
-amarok (1.2.3-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-
-  * This version fixes an important memory leak in the GStreamer engine that
-    happened when a radio stream stalled. (Closes: #299931)
-
- -- Adeodato Simó <asp16@alu.ua.es>  Tue, 29 Mar 2005 01:43:28 +0200
-
-amarok (2:1.2.3-1ubuntu4) hoary; urgency=low
-
-  * Revert back to amarok-arts on request of mdz
-
- -- Chris Halls <chris.halls@credativ.co.uk>  Wed,  6 Apr 2005 09:33:35 +0100
-
-amarok (2:1.2.3-1ubuntu3) hoary; urgency=low
-
-  * Switch default engine to amarok-xine, which is better supported
-    upstream and is less buggy (Hoary: #8429, #8255)
-
- -- Chris Halls <chris.halls@credativ.co.uk>  Mon,  4 Apr 2005 20:01:48 +0100
-
-amarok (2:1.2.3-1ubuntu2) hoary; urgency=low
-
-  * Add build-depend on libtool.
-  * Remove automake1.6 patch
-
- -- Jonathan Riddell <jr@jriddell.org>  Wed, 30 Mar 2005 14:35:20 +0100
-
-amarok (2:1.2.3-1ubuntu1) hoary; urgency=low
-
-  * Sync with Debian
-
- -- Jonathan Riddell <jr@jriddell.org>  Wed, 30 Mar 2005 04:25:27 +0000
-
-amarok (1.2.2-1) kalyxo-unstable; urgency=low
-
-  * New upstream bugfix release.
-
-  * Added a menu file, plus XPM icons.
-
-  * Switched to tarball-in-tarball for the .orig.tar.gz (which is sensibly
-    smaller now, since upstream uses bz2). Added bzip2 to Build-Depends.
-
-  * Build-depend on automake1.6 and libtool, and regenerate configure and
-    Makefiles.in at build-time.
-
-  * Use the kde.mk class maintained by the Debian KDE Maintainers, instead
-    of the one shipped with cdbs.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Thu, 17 Mar 2005 19:38:34 +0100
-
-amarok (1.2.1-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-
-  * Include patch from CVS to make amaroK bind listening TCP connections to
-    the local interface only. Related to Bug#297693, but not the same.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Fri, 04 Mar 2005 14:54:34 +0100
-
-amarok (1.2.0-1) unstable; urgency=low
-
-  * New upstream release packaged (closes: #296139). Lots of improvements and
-    new functionality, see the changelog or http://amarok.kde.org for details.
-    Bugs reported in the Debian BTS fixed with in this version:
-
-    + the search text input element is now cleared when the user writes
-      something there. (Closes: #278359)
-
-    + analyzers work with the XINE engine. (Closes: #287091)
-
-  * amaroK's collection can be now stored in a MySQL database:
-
-    + Build-Depend on libmysqlclient12-dev
-
-    + Pass --enable-mysql to configure.
-
-  * amaroK now includes a sidebar plugin for Konqueror:
-
-    + debian/amarok.install:
-      - add files for the konqueror sidebar.
-
-    + debian/control:
-      - added kdebase-dev as Build-Dependency.
-
-    + debian/rules:
-      - exclude konqsidebar_universalamarok.so from dh_shlibdeps, so that
-        amarok doesn't end up depending on konqueror. (The plugin will be
-        ignored in systems without konqueror installed.)
-
-  * Other changes:
-
-    + amaroK now ships several scripts to enhance it. These are written in
-      Python and Ruby, so add those as suggested packages. Added note to
-      README.Debian about this, too.
-
-    + removed sqlite3_in_configure.in.patch, no longer necessary in 1.2.
-
-    + added www-browser as an alternative for the konqueror suggests, since
-      upstream fixed the code so that the configured browser is used.
-
-    + renamed debian/README to debian/README.Debian, so that it gets
-      installed. D'oh!
-
-    + debian/control:
-      - remove Build-Dependency on libkjsembed-dev, no longer needed.
-
-    + debian/amarok.install: 
-      - install amarok.profile.xml into /usr/share/apps/profiles.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Wed, 23 Feb 2005 03:03:37 +0100
-
-amarok (1.1.1-2) unstable; urgency=high
-
-  * Upload to get rid of the dependency on libflac4, which is not longer in
-    the archive (closes: #289344). Urgency set to high as other packages with
-    RC bug fixes can't enter testing because of the libflac6 transition not
-    being ready.
-
-    + Relibtoolized the package, so that binaries won't link against not
-      needed libraries. Introduced disable_no_undefined.patch, many thanks to
-      Daniel Schepler for his insight with this (and for providing the patch).
-      [This has reduced the number of NEEDED libraries from 45 to 18, libflac
-      being among them.]
-
-    + debian/control:
-      - version Build-Dependency on libtunepimp2-dev to (>= 0.3.0-2.1).
-
-  * Some new versions of libraries have become available in Debian since the
-    last upload:
-
-    + Taglib 1.3 is now in the archive:
-      - removed debian/patches/taglib-1.2-suffices.patch.
-      - update Build-Depends to libtag1-dev (>> 1.3.1).
-
-    + SQLite 3 is now in the archive:
-      - changed Build-Depends on libsqlite0-dev to libsqlite3-dev.
-      - pass --without-included-sqlite to ./configure.
-      - patch configure.in to check for sqlite3 (>= 3.0). Upstream forgot to
-        update this check in the 1.1 series. [sqlite3_in_configure.in.patch]
-  
-  * New package relationships:
-
-    + amarok now recommends kdemultimedia-kio-plugins, which is needed to play
-      audio CDs.
-
-    + amarok now suggests konqueror, since it's called in the MusicBrainz
-      dialog and some other places. (Closes: #282523)
-
-  * Created a README.Debian files with the following:
-
-    + Explain why the amarokapp and amarok_xmmswrapper2 binaries are shipped
-      in /usr/lib/amarok instead of /usr/bin, differing from upstream.
-
-    + Describe a fix for the 'Socket-path is not a link or a directory' error.
-
-    + Explicitly mention what is needed to play audio CDs in amarok.
-
-  * Other changes:
-
-    + Patched admin/configure.in.min to include AM_MAINTAINER_MODE. To make
-      the .diff.gz stuff smaller, force automake-1.6 (which upstream uses) in
-      admin/detect-autoconf.sh. [am_maintainer_mode.patch, automake-1.6.patch]
-
-    + Prevent admin/cvs.sh from creating .gmo files at "make dist" time, since
-      those can't be shipped in the .diff.gz. [gmo_files_at_build_time.patch]
-
-    + debian/amarok.1:
-      - correct "hyphen vs. minus sign" usage.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Fri, 14 Jan 2005 01:54:47 +0100
-
-amarok (1.1.1-1) unstable; urgency=low
-
-  * New upstream release packaged. Most notably, fixes several GStreamer
-    engine related bugs.
-
-  * debian/control: add to amarok-gstreamer's description that is not possible
-    to use artssink for output.
-
-  * debian/rules:
-    - call dh_install with --list-missing (DEB_DH_INSTALL_ARGS).
-
-  * debian/patches/:
-    - removed proper-otherlang-handbook-path.patch, issue fixed upstream.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Sat, 09 Oct 2004 22:51:06 +0200
-
-amarok (1.1.0-2) unstable; urgency=low
-
-  * Fix the location of translated amaroK handbook: tde/HTML/$LANG/amarok, not
-    tde/HTML/$LANG directly. [debian/patches/proper-otherlang-handbook-path.patch]
-
- -- Adeodato Simó <asp16@alu.ua.es>  Mon, 27 Sep 2004 14:02:30 +0200
-
-amarok (1.1.0-1) unstable; urgency=low
-
-  * New upstream version:
-    - several last minute fixes.
-    - includes handbook in several languages (da, et, fr, it, pt, sv).
-
-  * First upload to Debian (closes: #236696).
-
- -- Adeodato Simó <asp16@alu.ua.es>  Mon, 27 Sep 2004 01:53:56 +0200
-
-amarok (1.1-cvs-0+kalyxo1) experimental; urgency=low
-
-  * New maintainer. Thanks to Peter Rockai for his initial work.
-
-  * Updated to amaroK 1.1 CVS (2004-09-24):
-    - temporarily link statically against libsqlite, since sqlite >= 3.0.7 is
-      required and is not available in Debian (requested in #272271).
-    - added debian/patches/taglib-1.2-suffices.patch to lower the requirement
-      from taglib 1.3 (requested in #273029) to 1.2, which is enough.
-    - new package amarok-xine (yet another engine for amaroK, hurray!)
-    - added the following Build-Dependencies:
-      + libkjsembed-dev (amaroK is now JavaScript scriptable).
-      + libtunepimp2-dev (MusicBrainz support).
-      + libxine-dev (for the xine engine).
-      + libtag1-dev (missing).
-
-  * New package amarok-engines:
-    - depends on all the available engine packages and will be installed by
-      default unless the user specifies an specific engine.
-    - all the amarok-* packages Provide: amarok-engine, and amarok now
-      Depends: amarok-engines | amarok-engine.
-
-  * Removed the amarok-xmms package:
-    - its single binary amarok_xmmswrapper2 is now included in the main amarok
-      package.
-    - include some hackery to prevent amarok from depending on xmms (!).
-      amaroK just does a no-op and issues a warning on stderr if xmms is not
-      installed and user opens the visualizations menu, so this seems safe.
-      A xmms-lib package (in which amarok could easily depend) is requested in
-      #272913.
-
-  * Install amarokapp and amarok_xmmswrapper2 in /usr/lib/amarok instead of
-    /usr/bin:
-    - needed for FHS/Debian Policy compliance.
-    - added debian/patches/some-binaries-in-usr-lib.patch to fix locations in
-      source (amarok/src/loader/loader.cpp, amarok/src/socketserver.cpp).
-
-  * Added lintian overrides for an aRts module which must go in /usr/lib
-    despite not being a shared library. noatun and some other arts-related
-    packages have the same problem, if someone has a solution please share.
-
-  * Made /usr/share/doc/amarok-* symlinks to /usr/share/doc/amarok.
-
-  * Do not make amarok-arts depend on the meta-package "arts"; the
-    dependencies given by ${shlib:Depends} do suffice.
-
-  * debian/control: updated to Standars-Version 3.6.1.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Fri, 24 Sep 2004 02:49:46 +0200
-
-amarok (1.0.2-1) unstable; urgency=low
-
-  * New upstream version.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Thu,  5 Aug 2004 14:23:23 +0200
-
-amarok (1.0.1-1) unstable; urgency=low
-
-  * New upstream version
-  * Make depends among amarok packages versioned
-  * Prepare to upload into Debian, closes: #236696
-  * Add manpage for amarok by Alejandro Exojo
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Wed, 30 Jun 2004 23:24:16 +0200
-
-amarok (1.0.0-3) unstable; urgency=low
-
-  * Dynamically link against libsqlite0
-  * Fix gstreamer dependencies
-  * Various small fixes (sections, descriptions, doc dirs)
-  * Thanks go to Adeodato Simó for help with various issues
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Sat, 26 Jun 2004 23:06:00 +0200
-
-amarok (1.0.0-2) unstable; urgency=low
-
-  * Make the depends on amarok-gstreamer a bit more tight. Only depend on
-    audiosink, recommend the decoder plugins.
-  * Make the amarok engines depend on amarok itself.
-  * Compile with xmms visualisation support.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Wed, 23 Jun 2004 13:58:12 +0200
-
-amarok (1.0.0-1) unstable; urgency=low
-
-  * Build official 1.0.0 release.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Wed, 16 Jun 2004 23:48:52 +0200
-
-amarok (1.0-pre1-2) unstable; urgency=low
-
-  * Fix amarok-arts package, was missing mcop files. Duh.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Wed, 16 Jun 2004 23:25:29 +0200
-
-amarok (1.0-pre1-1) unstable; urgency=low
-
-  * First 1.0.0 prerelease.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Wed, 16 Jun 2004 10:18:31 +0200
-
-amarok (1.0-beta4-2) unstable; urgency=low
-
-  * Patch to final beta4 version.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Tue,  1 Jun 2004 17:47:53 +0200
-
-amarok (1.0-beta4-1) unstable; urgency=low
-
-  * New upstream RC (beta4-rc1).
-  * Build with GST support.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Tue,  1 Jun 2004 10:24:09 +0200
-
-amarok (1.0-beta3-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Sat, 29 May 2004 17:08:55 +0200
-
-amarok (1.0-beta1-0) workstation-unstable; urgency=low
-
-  * Initial packaging
-
- -- Peter Rockai (mornfall) <mornfall@mornfall.homeip.net>  Sun, 11 Apr 2004  17:05:00 +0200
diff --git a/debian/_base/applications/amarok.cmake/debian/compat b/debian/_base/applications/amarok.cmake/debian/compat
deleted file mode 100644
index 7ed6ff82d..000000000
--- a/debian/_base/applications/amarok.cmake/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/_base/applications/amarok.cmake/debian/control b/debian/_base/applications/amarok.cmake/debian/control
deleted file mode 100644
index f521e33ea..000000000
--- a/debian/_base/applications/amarok.cmake/debian/control
+++ /dev/null
@@ -1,97 +0,0 @@
-Source: amarok-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu>
-Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, cmake-trinity, ninja-build, bzip2,
- kdelibs4-trinity-dev,
- libxine-dev, libdbus-tqt-1-dev,
- libtag1-dev, libsqlite3-dev, libtunepimp-dev,
- libmysqlclient15-dev | libmysqlclient16-dev, libpq-dev,
- libvisual-0.4-dev, libsdl1.2-dev,
- libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev,
- ruby, ruby1.8-dev, kdebase-trinity-dev
-Standards-Version: 3.8.4
-Homepage: http://amarok.kde.org
-
-Package: amarok-trinity
-Architecture: any
-Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
-Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
- python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins
-Description: versatile and easy to use audio player for Trinity
- Amarok tries to be a little different, providing a simple drag and drop
- interface that really makes playlist handling easy.
- .
- Features include:
-   - rapid playlist creation, with drag and drop from a directory view
-   - nice playlist browser for your existing playlists (PLS or M3U formats)
-   - collection-indexing support, for smart browsing and playlist creation
-   - possibility of accessing media via kioslaves, allowing you to play
-     via smb:// or fish:// (normal streams are of course supported)
-   - inline ID3 tag editing, capable of retrieving tags via MusicBrainz
-   - album cover support: automatically displays album covers from the
-     filesystem, or downloaded on the fly
-   - miscellaneous audio effects, including crossfading
-   - easy bindable global shortcuts, rich DCOP interface
-   - On-Screen Display (OSD), on track change or at keypress
-   - iPod and iRiver support
-   - Last.fm stream playing support (if ruby is installed)
-   - Track "mood" display (requires moodbar package installed)
- .
- Support for libvisual visualization plugins is also compiled in (you need 
- to have libvisual-0.4-plugins installed to be able to use it).
-
-Package: amarok-common-trinity
-Architecture: all
-Depends: ruby
-Recommends: amarok-trinity (>= ${source:Version})
-Suggests: libqt0-ruby1.8-trinity, python, python-qt3
-Description: architecture independent files for Amarok [Trinity]
- This package contains architecture independent files needed for Amarok to run
- properly. It also provides Amarok documentation. Therefore, unless you have
- 'amarok' package installed, you will hardly find this package useful.
- .
- You need to install Python if you intend to use Zeroconf support, WebControl
- and/or playlist2html scripts. You will also need python-qt3 for the
- WebControl script.
-
-Package: amarok-engines-trinity
-Architecture: all
-Depends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
-Description: output engines for the Amarok music player [Trinity]
- This package serves merely as a reference point if you want to install
- all available Amarok engines. It depends on those Amarok engines that
- generally can be used by most users. You can safely remove this metapackage
- as you can remove the amarok-engine-$engine packages that you don't use.
-
-Package: amarok-engine-xine-trinity
-Architecture: any
-Depends: ${shlibs:Depends}
-Recommends: amarok-trinity (= ${binary:Version})
-Description: xine engine for the Amarok audio player [Trinity]
- This package provides the xine engine for Amarok, which you may prefer
- for some reason over the other engines (e.g., it is the lightest engine
- Dependency-wise).
-
-Package: amarok-engine-yauap-trinity
-Architecture: any
-Depends: yauap, ${shlibs:Depends}
-Recommends: amarok-trinity (= ${binary:Version})
-Description: Yauap engine for the Amarok audio player [Trinity]
- This package includes Amarok yauap engine, which provides a frontend
- to Yauap Commandline Audio Player. DBus is used as a means of communication
- between the engine and Yauap. Please note that some extra Amarok features 
- (like visualizations) might not be available while using this engine.
-
-Package: amarok-trinity-dbg
-Priority: extra
-Architecture: any
-Depends: amarok-trinity (= ${binary:Version})
-Recommends: kdelibs-trinity-dbg
-Description: debugging symbols for Amarok [Trinity]
- This package provides debugging symbols for all binary packages built from
- amarok source package. It's highly recommended to have this package installed
- before reporting any Amarok crashes to either Amarok developers or Debian
- package maintainers.
diff --git a/debian/_base/applications/amarok.cmake/debian/rules b/debian/_base/applications/amarok.cmake/debian/rules
deleted file mode 100755
index 3934caf74..000000000
--- a/debian/_base/applications/amarok.cmake/debian/rules
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/make -f
-
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include debian/cdbs/debian-tde.mk
-
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
--DWITH_IFP="ON" -DWITH_NJB="ON" -DWITH_MTP="ON" -DWITH_DAAP="ON" -DWITH_YAUAP="ON" \
--DWITH_LIBVISUAL="ON" -DWITH_KONQSIDEBAR="ON" -DWITH_XINE="ON" -DWITH_IPOD="ON"
-
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
-
-### VARIABLES
-# Exempt amarok engines from being handled as proper public libraries
-# by dh_makeshlibs
-DEB_DH_MAKESHLIBS_ARGS_ALL = -Xlibamarok_\\w*-engine-trinity
-
-export KUBUNTU_DESKTOP_POT=extragear-multimedia_amarok-trinity
-
-#DEB_CONFIGURE_EXTRA_FLAGS  :=	--without-included-sqlite \
-#				--disable-final \
-#				--without-akode \
-#				--without-gstreamer10 \
-#				--without-libkarma \
-#				--with-ifp      \
-#				--with-libgpod  \
-#				--with-libnjb   \
-#				--with-libmtp   \
-#				--enable-mysql  \
-#				--enable-postgresql \
-#				--with-yauap \
-#				--prefix=/opt/trinity \
-#				--with-extra-libs=/usr/lib/mesa
-
-# Ship upstream README in amarok docs
-DEB_INSTALL_DOCS_ALL =
-DEB_INSTALL_DOCS_amarok-trinity = $(DEB_SRCDIR)/README
-
-# Amarok engines should not auto-depend on amarok. 
-# Appropriate relationships are set manually in the control file.
-DEB_DH_SHLIBDEPS_ARGS_amarok-engine-xine-trinity = -- -xamarok-trinity
-DEB_DH_SHLIBDEPS_ARGS_amarok-engine-yauap-trinity = -- -xamarok-trinity
-
-binary-fixup/amarok-common-trinity::
-	# Fix permissions of some amarok scripts
-	chmod a+x  \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/playlist2html/Playlist.py \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/ruby_debug/debug.rb \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/templates/python_qt_template.py \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/templates/ruby_qt_template.rb \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/webcontrol/Playlist.py \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/webcontrol/RequestHandler.py
-
-binary-post-install/amarok-common-trinity::
-	# Remove excess COPYING files from script directories
-	rm -f \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/lyrics_astraweb/COPYING \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/lyrics_lyrc/COPYING \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/score_default/COPYING \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/score_impulsive/COPYING
-	# Remove Mac OSX resource fork file
-	rm -f debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/ruby_lib/rubygems/._gem_commands.rb
-
-### POST-INSTALL HACKING
-common-binary-post-install-arch::
-	# Check for not installed files
-	dh_install --no-act --list-missing
-
-	chmod a+x debian/amarok-trinity/opt/trinity/lib/amarok/install-mp3
-	chmod +x debian/amarok-trinity/opt/trinity/bin/kubuntu-media-amarok
-	ln -s /opt/trinity/bin/amarokapp debian/amarok-trinity/opt/trinity/lib/amarok/amarokapp
diff --git a/debian/_base/applications/abakus/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/abakus/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/abakus/debian/cdbs/versions.pl b/debian/_base/applications/development/kdbg/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/abakus/debian/cdbs/versions.pl
+++ b/debian/_base/applications/development/kdbg/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kdbg/debian/changelog b/debian/_base/applications/development/kdbg/debian/changelog
index 85cee798e..85cee798e 100644
--- a/debian/_base/applications/kdbg/debian/changelog
+++ b/debian/_base/applications/development/kdbg/debian/changelog
diff --git a/debian/_base/applications/abakus/debian/compat b/debian/_base/applications/development/kdbg/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/abakus/debian/compat
+++ b/debian/_base/applications/development/kdbg/debian/compat
diff --git a/debian/_base/applications/kdbg/debian/control b/debian/_base/applications/development/kdbg/debian/control
index 656937dc2..656937dc2 100644
--- a/debian/_base/applications/kdbg/debian/control
+++ b/debian/_base/applications/development/kdbg/debian/control
diff --git a/debian/_base/applications/kdbg/debian/copyright b/debian/_base/applications/development/kdbg/debian/copyright
index ebf1e447c..ebf1e447c 100644
--- a/debian/_base/applications/kdbg/debian/copyright
+++ b/debian/_base/applications/development/kdbg/debian/copyright
diff --git a/debian/_base/applications/kdbg/debian/doc-base b/debian/_base/applications/development/kdbg/debian/doc-base
index 330debeb4..330debeb4 100644
--- a/debian/_base/applications/kdbg/debian/doc-base
+++ b/debian/_base/applications/development/kdbg/debian/doc-base
diff --git a/debian/_base/applications/kdbg/debian/docs b/debian/_base/applications/development/kdbg/debian/docs
index 2e58c4d34..2e58c4d34 100644
--- a/debian/_base/applications/kdbg/debian/docs
+++ b/debian/_base/applications/development/kdbg/debian/docs
diff --git a/debian/_base/applications/kdbg/debian/kdbg.1 b/debian/_base/applications/development/kdbg/debian/kdbg.1
index 588ef94db..588ef94db 100644
--- a/debian/_base/applications/kdbg/debian/kdbg.1
+++ b/debian/_base/applications/development/kdbg/debian/kdbg.1
diff --git a/debian/_base/applications/kdbg/debian/kdbg.xpm b/debian/_base/applications/development/kdbg/debian/kdbg.xpm
index 8df7ac5f7..8df7ac5f7 100644
--- a/debian/_base/applications/kdbg/debian/kdbg.xpm
+++ b/debian/_base/applications/development/kdbg/debian/kdbg.xpm
diff --git a/debian/_base/applications/kdbg/debian/menu b/debian/_base/applications/development/kdbg/debian/menu
index d3a882bd0..d3a882bd0 100644
--- a/debian/_base/applications/kdbg/debian/menu
+++ b/debian/_base/applications/development/kdbg/debian/menu
diff --git a/debian/_base/applications/kdbg/debian/rules b/debian/_base/applications/development/kdbg/debian/rules
index e51602acc..e51602acc 100755
--- a/debian/_base/applications/kdbg/debian/rules
+++ b/debian/_base/applications/development/kdbg/debian/rules
diff --git a/debian/_base/applications/abakus/debian/source/format b/debian/_base/applications/development/kdbg/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/abakus/debian/source/format
+++ b/debian/_base/applications/development/kdbg/debian/source/format
diff --git a/debian/_base/applications/abakus/debian/source/options b/debian/_base/applications/development/kdbg/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/abakus/debian/source/options
+++ b/debian/_base/applications/development/kdbg/debian/source/options
diff --git a/debian/_base/applications/adept/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/kdesvn/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/adept/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/development/kdesvn/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kdesvn/debian/cdbs/versions.pl b/debian/_base/applications/development/kdesvn/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/debian/_base/applications/kdesvn/debian/cdbs/versions.pl
+++ b/debian/_base/applications/development/kdesvn/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kdesvn/debian/changelog b/debian/_base/applications/development/kdesvn/debian/changelog
index c3e74b6d9..c3e74b6d9 100644
--- a/debian/_base/applications/kdesvn/debian/changelog
+++ b/debian/_base/applications/development/kdesvn/debian/changelog
diff --git a/debian/_base/applications/adept/debian/compat b/debian/_base/applications/development/kdesvn/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/adept/debian/compat
+++ b/debian/_base/applications/development/kdesvn/debian/compat
diff --git a/debian/_base/applications/kdesvn/debian/control b/debian/_base/applications/development/kdesvn/debian/control
index d1a99f247..d1a99f247 100644
--- a/debian/_base/applications/kdesvn/debian/control
+++ b/debian/_base/applications/development/kdesvn/debian/control
diff --git a/debian/_base/applications/kdesvn/debian/copyright b/debian/_base/applications/development/kdesvn/debian/copyright
index a3d664a33..a3d664a33 100644
--- a/debian/_base/applications/kdesvn/debian/copyright
+++ b/debian/_base/applications/development/kdesvn/debian/copyright
diff --git a/debian/_base/applications/kdesvn/debian/docs b/debian/_base/applications/development/kdesvn/debian/docs
index ca0272abf..ca0272abf 100644
--- a/debian/_base/applications/kdesvn/debian/docs
+++ b/debian/_base/applications/development/kdesvn/debian/docs
diff --git a/debian/_base/applications/kdesvn/debian/icons/kdesvn.xpm b/debian/_base/applications/development/kdesvn/debian/icons/kdesvn.xpm
index d5e2abf6a..d5e2abf6a 100644
--- a/debian/_base/applications/kdesvn/debian/icons/kdesvn.xpm
+++ b/debian/_base/applications/development/kdesvn/debian/icons/kdesvn.xpm
diff --git a/debian/_base/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install b/debian/_base/applications/development/kdesvn/debian/kdesvn-kio-plugins-trinity.install
index 44c022ef7..44c022ef7 100644
--- a/debian/_base/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install
+++ b/debian/_base/applications/development/kdesvn/debian/kdesvn-kio-plugins-trinity.install
diff --git a/debian/_base/applications/kdesvn/debian/kdesvn-trinity.install b/debian/_base/applications/development/kdesvn/debian/kdesvn-trinity.install
index 546d35034..546d35034 100644
--- a/debian/_base/applications/kdesvn/debian/kdesvn-trinity.install
+++ b/debian/_base/applications/development/kdesvn/debian/kdesvn-trinity.install
diff --git a/debian/_base/applications/kdesvn/debian/kdesvn-trinity.manpages b/debian/_base/applications/development/kdesvn/debian/kdesvn-trinity.manpages
index c834c876c..c834c876c 100644
--- a/debian/_base/applications/kdesvn/debian/kdesvn-trinity.manpages
+++ b/debian/_base/applications/development/kdesvn/debian/kdesvn-trinity.manpages
diff --git a/debian/_base/applications/kdesvn/debian/kdesvn-trinity.menu b/debian/_base/applications/development/kdesvn/debian/kdesvn-trinity.menu
index c85d2665d..c85d2665d 100644
--- a/debian/_base/applications/kdesvn/debian/kdesvn-trinity.menu
+++ b/debian/_base/applications/development/kdesvn/debian/kdesvn-trinity.menu
diff --git a/debian/_base/applications/kdesvn/debian/libsvnqt-trinity-dev.install b/debian/_base/applications/development/kdesvn/debian/libsvnqt-trinity-dev.install
index fb3c81018..fb3c81018 100644
--- a/debian/_base/applications/kdesvn/debian/libsvnqt-trinity-dev.install
+++ b/debian/_base/applications/development/kdesvn/debian/libsvnqt-trinity-dev.install
diff --git a/debian/_base/applications/kdesvn/debian/libsvnqt4-trinity.install b/debian/_base/applications/development/kdesvn/debian/libsvnqt4-trinity.install
index fcfe51754..fcfe51754 100644
--- a/debian/_base/applications/kdesvn/debian/libsvnqt4-trinity.install
+++ b/debian/_base/applications/development/kdesvn/debian/libsvnqt4-trinity.install
diff --git a/debian/_base/applications/kdesvn/debian/man/kdesvn.1 b/debian/_base/applications/development/kdesvn/debian/man/kdesvn.1
index 0e4816669..0e4816669 100644
--- a/debian/_base/applications/kdesvn/debian/man/kdesvn.1
+++ b/debian/_base/applications/development/kdesvn/debian/man/kdesvn.1
diff --git a/debian/_base/applications/kdesvn/debian/man/kdesvnaskpass.1 b/debian/_base/applications/development/kdesvn/debian/man/kdesvnaskpass.1
index 4cc8f03ad..4cc8f03ad 100644
--- a/debian/_base/applications/kdesvn/debian/man/kdesvnaskpass.1
+++ b/debian/_base/applications/development/kdesvn/debian/man/kdesvnaskpass.1
diff --git a/debian/_base/applications/abakus/debian/patches/series b/debian/_base/applications/development/kdesvn/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/abakus/debian/patches/series
+++ b/debian/_base/applications/development/kdesvn/debian/patches/series
diff --git a/debian/_base/applications/kdesvn/debian/rules b/debian/_base/applications/development/kdesvn/debian/rules
index 6cc910e98..6cc910e98 100755
--- a/debian/_base/applications/kdesvn/debian/rules
+++ b/debian/_base/applications/development/kdesvn/debian/rules
diff --git a/debian/_base/applications/adept/debian/source/format b/debian/_base/applications/development/kdesvn/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/adept/debian/source/format
+++ b/debian/_base/applications/development/kdesvn/debian/source/format
diff --git a/debian/_base/applications/adept/debian/source/options b/debian/_base/applications/development/kdesvn/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/adept/debian/source/options
+++ b/debian/_base/applications/development/kdesvn/debian/source/options
diff --git a/debian/_base/applications/kdesvn/debian/watch b/debian/_base/applications/development/kdesvn/debian/watch
index 190c9f8f7..190c9f8f7 100644
--- a/debian/_base/applications/kdesvn/debian/watch
+++ b/debian/_base/applications/development/kdesvn/debian/watch
diff --git a/debian/_base/applications/amarok.cmake/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/amarok.cmake/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/adept/debian/cdbs/versions.pl b/debian/_base/applications/development/kdiff3/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/adept/debian/cdbs/versions.pl
+++ b/debian/_base/applications/development/kdiff3/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kdiff3/debian/changelog b/debian/_base/applications/development/kdiff3/debian/changelog
index f0215eada..f0215eada 100644
--- a/debian/_base/applications/kdiff3/debian/changelog
+++ b/debian/_base/applications/development/kdiff3/debian/changelog
diff --git a/debian/_base/applications/amarok/debian/compat b/debian/_base/applications/development/kdiff3/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/amarok/debian/compat
+++ b/debian/_base/applications/development/kdiff3/debian/compat
diff --git a/debian/_base/applications/kdiff3/debian/control b/debian/_base/applications/development/kdiff3/debian/control
index 4071b3065..4071b3065 100644
--- a/debian/_base/applications/kdiff3/debian/control
+++ b/debian/_base/applications/development/kdiff3/debian/control
diff --git a/debian/_base/applications/kdiff3/debian/copyright b/debian/_base/applications/development/kdiff3/debian/copyright
index 05b7204fd..05b7204fd 100644
--- a/debian/_base/applications/kdiff3/debian/copyright
+++ b/debian/_base/applications/development/kdiff3/debian/copyright
diff --git a/debian/_base/applications/abakus/debian/docs b/debian/_base/applications/development/kdiff3/debian/docs
index e845566c0..e845566c0 100644
--- a/debian/_base/applications/abakus/debian/docs
+++ b/debian/_base/applications/development/kdiff3/debian/docs
diff --git a/debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.doc-base
index 014004a26..014004a26 100644
--- a/debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
+++ b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.doc-base
diff --git a/debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.install b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.install
index 6d9c9dd9a..6d9c9dd9a 100644
--- a/debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.install
+++ b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.install
diff --git a/debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.links b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.links
index e3fbe7781..e3fbe7781 100644
--- a/debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.links
+++ b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.links
diff --git a/debian/_base/applications/kdiff3/debian/kdiff3-trinity.install b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity.install
index 00e22f353..00e22f353 100644
--- a/debian/_base/applications/kdiff3/debian/kdiff3-trinity.install
+++ b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity.install
diff --git a/debian/_base/applications/kdiff3/debian/kdiff3-trinity.sgml b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity.sgml
index 6eaa4064f..6eaa4064f 100644
--- a/debian/_base/applications/kdiff3/debian/kdiff3-trinity.sgml
+++ b/debian/_base/applications/development/kdiff3/debian/kdiff3-trinity.sgml
diff --git a/debian/_base/applications/kbarcode/debian/patches/.gitignore b/debian/_base/applications/development/kdiff3/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kbarcode/debian/patches/.gitignore
+++ b/debian/_base/applications/development/kdiff3/debian/patches/.gitignore
diff --git a/debian/_base/applications/kdiff3/debian/rules b/debian/_base/applications/development/kdiff3/debian/rules
index 9181b1148..9181b1148 100755
--- a/debian/_base/applications/kdiff3/debian/rules
+++ b/debian/_base/applications/development/kdiff3/debian/rules
diff --git a/debian/_base/applications/amarok.cmake/debian/source/format b/debian/_base/applications/development/kdiff3/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/amarok.cmake/debian/source/format
+++ b/debian/_base/applications/development/kdiff3/debian/source/format
diff --git a/debian/_base/applications/amarok.cmake/debian/source/options b/debian/_base/applications/development/kdiff3/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/amarok.cmake/debian/source/options
+++ b/debian/_base/applications/development/kdiff3/debian/source/options
diff --git a/debian/_base/applications/kdiff3/debian/watch b/debian/_base/applications/development/kdiff3/debian/watch
index 1f8b23456..1f8b23456 100644
--- a/debian/_base/applications/kdiff3/debian/watch
+++ b/debian/_base/applications/development/kdiff3/debian/watch
diff --git a/debian/_base/applications/kpicosim/debian/Makefile.am b/debian/_base/applications/development/kpicosim/debian/Makefile.am
index 5de86e2c3..5de86e2c3 100644
--- a/debian/_base/applications/kpicosim/debian/Makefile.am
+++ b/debian/_base/applications/development/kpicosim/debian/Makefile.am
diff --git a/debian/_base/applications/kpicosim/debian/changelog b/debian/_base/applications/development/kpicosim/debian/changelog
index 5d239becc..5d239becc 100644
--- a/debian/_base/applications/kpicosim/debian/changelog
+++ b/debian/_base/applications/development/kpicosim/debian/changelog
diff --git a/debian/_base/applications/basket/debian/compat b/debian/_base/applications/development/kpicosim/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/basket/debian/compat
+++ b/debian/_base/applications/development/kpicosim/debian/compat
diff --git a/debian/_base/applications/kpicosim/debian/control b/debian/_base/applications/development/kpicosim/debian/control
index bd70b1347..bd70b1347 100644
--- a/debian/_base/applications/kpicosim/debian/control
+++ b/debian/_base/applications/development/kpicosim/debian/control
diff --git a/debian/_base/applications/kpicosim/debian/copyright b/debian/_base/applications/development/kpicosim/debian/copyright
index 1e968a7a0..1e968a7a0 100644
--- a/debian/_base/applications/kpicosim/debian/copyright
+++ b/debian/_base/applications/development/kpicosim/debian/copyright
diff --git a/debian/_base/applications/kpicosim/debian/dirs b/debian/_base/applications/development/kpicosim/debian/dirs
index ca882bbb7..ca882bbb7 100644
--- a/debian/_base/applications/kpicosim/debian/dirs
+++ b/debian/_base/applications/development/kpicosim/debian/dirs
diff --git a/debian/_base/applications/kbiff/debian/docs b/debian/_base/applications/development/kpicosim/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/debian/_base/applications/kbiff/debian/docs
+++ b/debian/_base/applications/development/kpicosim/debian/docs
diff --git a/debian/_base/applications/kpicosim/debian/kpicosim-trinity.links b/debian/_base/applications/development/kpicosim/debian/kpicosim-trinity.links
index 78a8ee9df..78a8ee9df 100644
--- a/debian/_base/applications/kpicosim/debian/kpicosim-trinity.links
+++ b/debian/_base/applications/development/kpicosim/debian/kpicosim-trinity.links
diff --git a/debian/_base/applications/kpicosim/debian/kpicosim-trinity.manpages b/debian/_base/applications/development/kpicosim/debian/kpicosim-trinity.manpages
index 046bd32dd..046bd32dd 100644
--- a/debian/_base/applications/kpicosim/debian/kpicosim-trinity.manpages
+++ b/debian/_base/applications/development/kpicosim/debian/kpicosim-trinity.manpages
diff --git a/debian/_base/applications/kpicosim/debian/kpicosim.1 b/debian/_base/applications/development/kpicosim/debian/kpicosim.1
index 5557b20a8..5557b20a8 100644
--- a/debian/_base/applications/kpicosim/debian/kpicosim.1
+++ b/debian/_base/applications/development/kpicosim/debian/kpicosim.1
diff --git a/debian/_base/applications/kpicosim/debian/menu b/debian/_base/applications/development/kpicosim/debian/menu
index 12de54d49..12de54d49 100644
--- a/debian/_base/applications/kpicosim/debian/menu
+++ b/debian/_base/applications/development/kpicosim/debian/menu
diff --git a/debian/_base/applications/kpicosim/debian/rules b/debian/_base/applications/development/kpicosim/debian/rules
index 98b6ba69e..98b6ba69e 100755
--- a/debian/_base/applications/kpicosim/debian/rules
+++ b/debian/_base/applications/development/kpicosim/debian/rules
diff --git a/debian/_base/applications/amarok/debian/source/format b/debian/_base/applications/development/kpicosim/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/amarok/debian/source/format
+++ b/debian/_base/applications/development/kpicosim/debian/source/format
diff --git a/debian/_base/applications/amarok/debian/source/options b/debian/_base/applications/development/kpicosim/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/amarok/debian/source/options
+++ b/debian/_base/applications/development/kpicosim/debian/source/options
diff --git a/debian/_base/applications/kpicosim/debian/watch b/debian/_base/applications/development/kpicosim/debian/watch
index fc0a7c717..fc0a7c717 100644
--- a/debian/_base/applications/kpicosim/debian/watch
+++ b/debian/_base/applications/development/kpicosim/debian/watch
diff --git a/debian/_base/applications/ktechlab/debian/changelog b/debian/_base/applications/development/ktechlab/debian/changelog
index 283fadf39..283fadf39 100644
--- a/debian/_base/applications/ktechlab/debian/changelog
+++ b/debian/_base/applications/development/ktechlab/debian/changelog
diff --git a/debian/_base/applications/bibletime/debian/compat b/debian/_base/applications/development/ktechlab/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/bibletime/debian/compat
+++ b/debian/_base/applications/development/ktechlab/debian/compat
diff --git a/debian/_base/applications/ktechlab/debian/control b/debian/_base/applications/development/ktechlab/debian/control
index a65c796eb..a65c796eb 100644
--- a/debian/_base/applications/ktechlab/debian/control
+++ b/debian/_base/applications/development/ktechlab/debian/control
diff --git a/debian/_base/applications/ktechlab/debian/copyright b/debian/_base/applications/development/ktechlab/debian/copyright
index 5b1af8a2e..5b1af8a2e 100644
--- a/debian/_base/applications/ktechlab/debian/copyright
+++ b/debian/_base/applications/development/ktechlab/debian/copyright
diff --git a/debian/_base/applications/ktechlab/debian/debiandirs b/debian/_base/applications/development/ktechlab/debian/debiandirs
index 2b39b1c4e..2b39b1c4e 100644
--- a/debian/_base/applications/ktechlab/debian/debiandirs
+++ b/debian/_base/applications/development/ktechlab/debian/debiandirs
diff --git a/debian/_base/applications/basket/debian/docs b/debian/_base/applications/development/ktechlab/debian/docs
index 724e08449..724e08449 100644
--- a/debian/_base/applications/basket/debian/docs
+++ b/debian/_base/applications/development/ktechlab/debian/docs
diff --git a/debian/_base/applications/ktechlab/debian/ktechlab.1 b/debian/_base/applications/development/ktechlab/debian/ktechlab.1
index 226deb2e6..226deb2e6 100644
--- a/debian/_base/applications/ktechlab/debian/ktechlab.1
+++ b/debian/_base/applications/development/ktechlab/debian/ktechlab.1
diff --git a/debian/_base/applications/ktechlab/debian/manpages b/debian/_base/applications/development/ktechlab/debian/manpages
index ae17eaa94..ae17eaa94 100644
--- a/debian/_base/applications/ktechlab/debian/manpages
+++ b/debian/_base/applications/development/ktechlab/debian/manpages
diff --git a/debian/_base/applications/ktechlab/debian/menu b/debian/_base/applications/development/ktechlab/debian/menu
index 8d468de83..8d468de83 100644
--- a/debian/_base/applications/ktechlab/debian/menu
+++ b/debian/_base/applications/development/ktechlab/debian/menu
diff --git a/debian/_base/applications/ktechlab/debian/microbe.1 b/debian/_base/applications/development/ktechlab/debian/microbe.1
index ad4ae5ec0..ad4ae5ec0 100644
--- a/debian/_base/applications/ktechlab/debian/microbe.1
+++ b/debian/_base/applications/development/ktechlab/debian/microbe.1
diff --git a/debian/_base/applications/kchmviewer/debian/patches/.gitignore b/debian/_base/applications/development/ktechlab/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kchmviewer/debian/patches/.gitignore
+++ b/debian/_base/applications/development/ktechlab/debian/patches/.gitignore
diff --git a/debian/_base/applications/ktechlab/debian/rules b/debian/_base/applications/development/ktechlab/debian/rules
index 6ee5ee935..6ee5ee935 100755
--- a/debian/_base/applications/ktechlab/debian/rules
+++ b/debian/_base/applications/development/ktechlab/debian/rules
diff --git a/debian/_base/applications/basket/debian/source/format b/debian/_base/applications/development/ktechlab/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/basket/debian/source/format
+++ b/debian/_base/applications/development/ktechlab/debian/source/format
diff --git a/debian/_base/applications/basket/debian/source/options b/debian/_base/applications/development/ktechlab/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/basket/debian/source/options
+++ b/debian/_base/applications/development/ktechlab/debian/source/options
diff --git a/debian/_base/applications/piklab/debian/changelog b/debian/_base/applications/development/piklab/debian/changelog
index b0f58e45c..b0f58e45c 100644
--- a/debian/_base/applications/piklab/debian/changelog
+++ b/debian/_base/applications/development/piklab/debian/changelog
diff --git a/debian/_base/applications/compizconfig-backend-kconfig/debian/compat b/debian/_base/applications/development/piklab/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/compizconfig-backend-kconfig/debian/compat
+++ b/debian/_base/applications/development/piklab/debian/compat
diff --git a/debian/_base/applications/piklab/debian/control b/debian/_base/applications/development/piklab/debian/control
index 95848bd18..95848bd18 100644
--- a/debian/_base/applications/piklab/debian/control
+++ b/debian/_base/applications/development/piklab/debian/control
diff --git a/debian/_base/applications/piklab/debian/copyright b/debian/_base/applications/development/piklab/debian/copyright
index 5144c002c..5144c002c 100644
--- a/debian/_base/applications/piklab/debian/copyright
+++ b/debian/_base/applications/development/piklab/debian/copyright
diff --git a/debian/_base/applications/kbarcode/debian/docs b/debian/_base/applications/development/piklab/debian/docs
index 724e08449..724e08449 100644
--- a/debian/_base/applications/kbarcode/debian/docs
+++ b/debian/_base/applications/development/piklab/debian/docs
diff --git a/debian/_base/applications/piklab/debian/install b/debian/_base/applications/development/piklab/debian/install
index 4b76727ec..4b76727ec 100644
--- a/debian/_base/applications/piklab/debian/install
+++ b/debian/_base/applications/development/piklab/debian/install
diff --git a/debian/_base/applications/piklab/debian/menu b/debian/_base/applications/development/piklab/debian/menu
index bf328cb78..bf328cb78 100644
--- a/debian/_base/applications/piklab/debian/menu
+++ b/debian/_base/applications/development/piklab/debian/menu
diff --git a/debian/_base/applications/amarok.cmake/debian/patches/series b/debian/_base/applications/development/piklab/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/amarok.cmake/debian/patches/series
+++ b/debian/_base/applications/development/piklab/debian/patches/series
diff --git a/debian/_base/applications/piklab/debian/piklab.desktop b/debian/_base/applications/development/piklab/debian/piklab.desktop
index 41e546d50..41e546d50 100644
--- a/debian/_base/applications/piklab/debian/piklab.desktop
+++ b/debian/_base/applications/development/piklab/debian/piklab.desktop
diff --git a/debian/_base/applications/piklab/debian/piklab.sng b/debian/_base/applications/development/piklab/debian/piklab.sng
index 4d2aa5902..4d2aa5902 100644
--- a/debian/_base/applications/piklab/debian/piklab.sng
+++ b/debian/_base/applications/development/piklab/debian/piklab.sng
diff --git a/debian/_base/applications/piklab/debian/piklab.xpm b/debian/_base/applications/development/piklab/debian/piklab.xpm
index 9f7cfe61f..9f7cfe61f 100644
--- a/debian/_base/applications/piklab/debian/piklab.xpm
+++ b/debian/_base/applications/development/piklab/debian/piklab.xpm
diff --git a/debian/_base/applications/piklab/debian/piklab48.xpm b/debian/_base/applications/development/piklab/debian/piklab48.xpm
index c7819f422..c7819f422 100644
--- a/debian/_base/applications/piklab/debian/piklab48.xpm
+++ b/debian/_base/applications/development/piklab/debian/piklab48.xpm
diff --git a/debian/_base/applications/piklab/debian/rules b/debian/_base/applications/development/piklab/debian/rules
index 4fd3da4c2..4fd3da4c2 100755
--- a/debian/_base/applications/piklab/debian/rules
+++ b/debian/_base/applications/development/piklab/debian/rules
diff --git a/debian/_base/applications/bibletime/debian/source/format b/debian/_base/applications/development/piklab/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/bibletime/debian/source/format
+++ b/debian/_base/applications/development/piklab/debian/source/format
diff --git a/debian/_base/applications/bibletime/debian/source/options b/debian/_base/applications/development/piklab/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/bibletime/debian/source/options
+++ b/debian/_base/applications/development/piklab/debian/source/options
diff --git a/debian/_base/applications/filelight-l10n/debian/changelog b/debian/_base/applications/filelight-l10n/debian/changelog
deleted file mode 100644
index 1c4c5eee8..000000000
--- a/debian/_base/applications/filelight-l10n/debian/changelog
+++ /dev/null
@@ -1,37 +0,0 @@
-filelight-l10n-trinity (1.0-4) karmic; urgency=low
-
-  * Karmic rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
-
-filelight-l10n-trinity (1.0-3) intrepid; urgency=low
-
-  * Moved Trinity to /opt/trinity
-  * Integrated properly with KDE4.2+
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
-
-filelight-l10n-trinity (1.0-2) intrepid; urgency=low
-
-  * Added -trinity suffix
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 09 Feb 2009 10:33:00 -0600
-
-filelight-l10n (1.0-2) unstable; urgency=low
-
-  * Depends on filelight. 
-  * Updated policy to 3.7.3.0. No changes needed.
-  * Added homepage as control field.
-  * Fix copyright file to sort out lintian warnings. 
-
- -- Raúl Sánchez Siles <rasasi78@gmail.com>  Sat, 19 Apr 2008 23:39:34 +0200
-
-filelight-l10n (1.0-1) unstable; urgency=low
-
-  * Initial release. (Closes: #447414).
-  * filelight: [INTL:de] German PO file corrections (Closes: #313714)
-  * filelight: No help: "Could not find service 'khelpcenter'"(Closes:
-  #263393).
-  * filelight: [INTL:sv] Swedish PO translation (Closes: #353796)
-
- -- Raúl Sánchez Siles <rasasi78@gmail.com>  Mon, 22 Oct 2007 00:53:30 +0200
diff --git a/debian/_base/applications/filelight-l10n/debian/control b/debian/_base/applications/filelight-l10n/debian/control
deleted file mode 100644
index 3f71dd7a3..000000000
--- a/debian/_base/applications/filelight-l10n/debian/control
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: filelight-l10n-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Uploaders: Raúl Sánchez Siles <rasasi78@gmail.com>
-Build-Depends: kdelibs4-trinity-dev (>= 4:3.4.3), cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, automake, autoconf, libtool, libltdl-dev
-Standards-Version: 3.8.4
-Homepage: http://www.methylblue.com/filelight/
-
-Package: filelight-l10n-trinity
-Architecture: any
-Depends: ${shlibs:Depends} , filelight-trinity (>= ${source:Version})
-Description: Localization (l10n) for Filelight, disk space usage tool [Trinity]
- This package provides localization(l10n) files (translations and docs) for
- Filelight, Filelight allows you to understand your disk usage by graphically
- representing your filesystem as a set of concentric, segmented rings.
- .
- See the 'filelight' package description for more information.
-
diff --git a/debian/_base/applications/filelight-l10n/debian/copyright b/debian/_base/applications/filelight-l10n/debian/copyright
deleted file mode 100644
index f840087a2..000000000
--- a/debian/_base/applications/filelight-l10n/debian/copyright
+++ /dev/null
@@ -1,38 +0,0 @@
-This package was debianized by Raúl Sánchez Siles<rasasi78@gmail.com>
-on Mon Oct 1 08:59:34 CEST 2007 based on the work by Christopher Martin
-<chrsmrtn@debian.org> with the help of Ana Guerrero<ana@ekaia.org> and
-others.
-
-The Debian packaging is Copyright 2007, Raul Sánchez Siles <rasasi78@gmail.com>
-and Christopher Martin <chrsmrtn@debian.org> is licensed under the GPLv2,
-which can be found at '/usr/share/common-licenses/GPL-2'.
-
-It was downloaded from: http://www.methylblue.com/filelight/
-
-Primary Developers:
-   Max Howell <mxcl@users.sf.net>
-
-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., 51 Franklin St, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-Copyright
-
-Filelight:
-
-    Copyright 2005-2006 Max Howell <max.howell@methylblue.com>
diff --git a/debian/_base/applications/filelight-l10n/debian/rules b/debian/_base/applications/filelight-l10n/debian/rules
deleted file mode 100755
index f23b6381f..000000000
--- a/debian/_base/applications/filelight-l10n/debian/rules
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/debian-tde.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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/kde
diff --git a/debian/_base/applications/knights/debian/changelog b/debian/_base/applications/games/knights/debian/changelog
index 5dfb85e8c..5dfb85e8c 100644
--- a/debian/_base/applications/knights/debian/changelog
+++ b/debian/_base/applications/games/knights/debian/changelog
diff --git a/debian/_base/applications/desktop-effects-kde/debian/compat b/debian/_base/applications/games/knights/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/desktop-effects-kde/debian/compat
+++ b/debian/_base/applications/games/knights/debian/compat
diff --git a/debian/_base/applications/knights/debian/control b/debian/_base/applications/games/knights/debian/control
index 6bdfad971..6bdfad971 100644
--- a/debian/_base/applications/knights/debian/control
+++ b/debian/_base/applications/games/knights/debian/control
diff --git a/debian/_base/applications/knights/debian/copyright b/debian/_base/applications/games/knights/debian/copyright
index c8554f7b5..c8554f7b5 100644
--- a/debian/_base/applications/knights/debian/copyright
+++ b/debian/_base/applications/games/knights/debian/copyright
diff --git a/debian/_base/applications/gwenview-i18n/debian/debiandirs b/debian/_base/applications/games/knights/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/debian/_base/applications/gwenview-i18n/debian/debiandirs
+++ b/debian/_base/applications/games/knights/debian/debiandirs
diff --git a/debian/_base/applications/kde-guidance/debian/docs b/debian/_base/applications/games/knights/debian/docs
index 724e08449..724e08449 100644
--- a/debian/_base/applications/kde-guidance/debian/docs
+++ b/debian/_base/applications/games/knights/debian/docs
diff --git a/debian/_base/applications/knights/debian/knights.1 b/debian/_base/applications/games/knights/debian/knights.1
index d66f50342..d66f50342 100644
--- a/debian/_base/applications/knights/debian/knights.1
+++ b/debian/_base/applications/games/knights/debian/knights.1
diff --git a/debian/_base/applications/knights/debian/knights.xpm b/debian/_base/applications/games/knights/debian/knights.xpm
index afbf1959a..afbf1959a 100644
--- a/debian/_base/applications/knights/debian/knights.xpm
+++ b/debian/_base/applications/games/knights/debian/knights.xpm
diff --git a/debian/_base/applications/knights/debian/menu b/debian/_base/applications/games/knights/debian/menu
index f2f72ca74..f2f72ca74 100644
--- a/debian/_base/applications/knights/debian/menu
+++ b/debian/_base/applications/games/knights/debian/menu
diff --git a/debian/_base/applications/kde-style-lipstik/debian/patches/.gitignore b/debian/_base/applications/games/knights/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kde-style-lipstik/debian/patches/.gitignore
+++ b/debian/_base/applications/games/knights/debian/patches/.gitignore
diff --git a/debian/_base/applications/knights/debian/rules b/debian/_base/applications/games/knights/debian/rules
index bde510e8b..bde510e8b 100755
--- a/debian/_base/applications/knights/debian/rules
+++ b/debian/_base/applications/games/knights/debian/rules
diff --git a/debian/_base/applications/compizconfig-backend-kconfig/debian/source/format b/debian/_base/applications/games/knights/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/compizconfig-backend-kconfig/debian/source/format
+++ b/debian/_base/applications/games/knights/debian/source/format
diff --git a/debian/_base/applications/compizconfig-backend-kconfig/debian/source/options b/debian/_base/applications/games/knights/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/compizconfig-backend-kconfig/debian/source/options
+++ b/debian/_base/applications/games/knights/debian/source/options
diff --git a/debian/_base/applications/knights/debian/watch b/debian/_base/applications/games/knights/debian/watch
index e3fef441b..e3fef441b 100644
--- a/debian/_base/applications/knights/debian/watch
+++ b/debian/_base/applications/games/knights/debian/watch
diff --git a/debian/_base/applications/digikam/debian/NEWS b/debian/_base/applications/graphics/digikam/debian/NEWS
index a90a3b444..a90a3b444 100644
--- a/debian/_base/applications/digikam/debian/NEWS
+++ b/debian/_base/applications/graphics/digikam/debian/NEWS
diff --git a/debian/_base/applications/digikam/debian/README.Debian b/debian/_base/applications/graphics/digikam/debian/README.Debian
index 351a34b1f..351a34b1f 100644
--- a/debian/_base/applications/digikam/debian/README.Debian
+++ b/debian/_base/applications/graphics/digikam/debian/README.Debian
diff --git a/debian/_base/applications/amarok/debian/cdbs/debian-tde.mk b/debian/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/amarok/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/amarok.cmake/debian/cdbs/versions.pl b/debian/_base/applications/graphics/digikam/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/amarok.cmake/debian/cdbs/versions.pl
+++ b/debian/_base/applications/graphics/digikam/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/digikam/debian/changelog b/debian/_base/applications/graphics/digikam/debian/changelog
index 42c8bae54..42c8bae54 100644
--- a/debian/_base/applications/digikam/debian/changelog
+++ b/debian/_base/applications/graphics/digikam/debian/changelog
diff --git a/debian/_base/applications/digikam/debian/clean b/debian/_base/applications/graphics/digikam/debian/clean
index d0ada902a..d0ada902a 100644
--- a/debian/_base/applications/digikam/debian/clean
+++ b/debian/_base/applications/graphics/digikam/debian/clean
diff --git a/debian/_base/applications/digikam/debian/compat b/debian/_base/applications/graphics/digikam/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/digikam/debian/compat
+++ b/debian/_base/applications/graphics/digikam/debian/compat
diff --git a/debian/_base/applications/digikam/debian/control b/debian/_base/applications/graphics/digikam/debian/control
index 5c190400f..5c190400f 100644
--- a/debian/_base/applications/digikam/debian/control
+++ b/debian/_base/applications/graphics/digikam/debian/control
diff --git a/debian/_base/applications/digikam/debian/copyright b/debian/_base/applications/graphics/digikam/debian/copyright
index c4c44e441..c4c44e441 100644
--- a/debian/_base/applications/digikam/debian/copyright
+++ b/debian/_base/applications/graphics/digikam/debian/copyright
diff --git a/debian/_base/applications/digikam/debian/digikam-trinity.install b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.install
index 87c7fe33f..87c7fe33f 100644
--- a/debian/_base/applications/digikam/debian/digikam-trinity.install
+++ b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.install
diff --git a/debian/_base/applications/digikam/debian/digikam-trinity.lintian-overrides b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.lintian-overrides
index 59b14fa47..59b14fa47 100644
--- a/debian/_base/applications/digikam/debian/digikam-trinity.lintian-overrides
+++ b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.lintian-overrides
diff --git a/debian/_base/applications/digikam/debian/digikam-trinity.manpages b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.manpages
index 4e21f2805..4e21f2805 100644
--- a/debian/_base/applications/digikam/debian/digikam-trinity.manpages
+++ b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.manpages
diff --git a/debian/_base/applications/digikam/debian/digikam-trinity.menu b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.menu
index 949e0fba8..949e0fba8 100644
--- a/debian/_base/applications/digikam/debian/digikam-trinity.menu
+++ b/debian/_base/applications/graphics/digikam/debian/digikam-trinity.menu
diff --git a/debian/_base/applications/digikam/debian/digikam.manpage b/debian/_base/applications/graphics/digikam/debian/digikam.manpage
index ed8c640c1..ed8c640c1 100644
--- a/debian/_base/applications/digikam/debian/digikam.manpage
+++ b/debian/_base/applications/graphics/digikam/debian/digikam.manpage
diff --git a/debian/_base/applications/amarok/debian/patches/series b/debian/_base/applications/graphics/digikam/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/amarok/debian/patches/series
+++ b/debian/_base/applications/graphics/digikam/debian/patches/series
diff --git a/debian/_base/applications/digikam/debian/rules b/debian/_base/applications/graphics/digikam/debian/rules
index f46ce7a86..f46ce7a86 100755
--- a/debian/_base/applications/digikam/debian/rules
+++ b/debian/_base/applications/graphics/digikam/debian/rules
diff --git a/debian/_base/applications/digikam/debian/showfoto-trinity.install b/debian/_base/applications/graphics/digikam/debian/showfoto-trinity.install
index d9ff5c47a..d9ff5c47a 100644
--- a/debian/_base/applications/digikam/debian/showfoto-trinity.install
+++ b/debian/_base/applications/graphics/digikam/debian/showfoto-trinity.install
diff --git a/debian/_base/applications/digikam/debian/showfoto-trinity.manpage b/debian/_base/applications/graphics/digikam/debian/showfoto-trinity.manpage
index 2c5a6ad20..2c5a6ad20 100644
--- a/debian/_base/applications/digikam/debian/showfoto-trinity.manpage
+++ b/debian/_base/applications/graphics/digikam/debian/showfoto-trinity.manpage
diff --git a/debian/_base/applications/digikam/debian/showfoto-trinity.manpages b/debian/_base/applications/graphics/digikam/debian/showfoto-trinity.manpages
index e146c959f..e146c959f 100644
--- a/debian/_base/applications/digikam/debian/showfoto-trinity.manpages
+++ b/debian/_base/applications/graphics/digikam/debian/showfoto-trinity.manpages
diff --git a/debian/_base/applications/digikam/debian/showfoto-trinity.menu b/debian/_base/applications/graphics/digikam/debian/showfoto-trinity.menu
index 32ce26612..32ce26612 100644
--- a/debian/_base/applications/digikam/debian/showfoto-trinity.menu
+++ b/debian/_base/applications/graphics/digikam/debian/showfoto-trinity.menu
diff --git a/debian/_base/applications/desktop-effects-kde/debian/source/format b/debian/_base/applications/graphics/digikam/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/desktop-effects-kde/debian/source/format
+++ b/debian/_base/applications/graphics/digikam/debian/source/format
diff --git a/debian/_base/applications/desktop-effects-kde/debian/source/options b/debian/_base/applications/graphics/digikam/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/desktop-effects-kde/debian/source/options
+++ b/debian/_base/applications/graphics/digikam/debian/source/options
diff --git a/debian/_base/applications/digikam/debian/watch b/debian/_base/applications/graphics/digikam/debian/watch
index 16e6d05c4..16e6d05c4 100644
--- a/debian/_base/applications/digikam/debian/watch
+++ b/debian/_base/applications/graphics/digikam/debian/watch
diff --git a/debian/_base/applications/digikam/debian/xpm.d/digikam-16.xpm b/debian/_base/applications/graphics/digikam/debian/xpm.d/digikam-16.xpm
index 5820677d7..5820677d7 100644
--- a/debian/_base/applications/digikam/debian/xpm.d/digikam-16.xpm
+++ b/debian/_base/applications/graphics/digikam/debian/xpm.d/digikam-16.xpm
diff --git a/debian/_base/applications/digikam/debian/xpm.d/digikam.xpm b/debian/_base/applications/graphics/digikam/debian/xpm.d/digikam.xpm
index 88a2f7df2..88a2f7df2 100644
--- a/debian/_base/applications/digikam/debian/xpm.d/digikam.xpm
+++ b/debian/_base/applications/graphics/digikam/debian/xpm.d/digikam.xpm
diff --git a/debian/_base/applications/digikam/debian/xpm.d/showfoto-16.xpm b/debian/_base/applications/graphics/digikam/debian/xpm.d/showfoto-16.xpm
index 7425c5ba7..7425c5ba7 100644
--- a/debian/_base/applications/digikam/debian/xpm.d/showfoto-16.xpm
+++ b/debian/_base/applications/graphics/digikam/debian/xpm.d/showfoto-16.xpm
diff --git a/debian/_base/applications/digikam/debian/xpm.d/showfoto.xpm b/debian/_base/applications/graphics/digikam/debian/xpm.d/showfoto.xpm
index ef7ea08fa..ef7ea08fa 100644
--- a/debian/_base/applications/digikam/debian/xpm.d/showfoto.xpm
+++ b/debian/_base/applications/graphics/digikam/debian/xpm.d/showfoto.xpm
diff --git a/debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk b/debian/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/amarok/debian/cdbs/versions.pl b/debian/_base/applications/graphics/gwenview-i18n/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/amarok/debian/cdbs/versions.pl
+++ b/debian/_base/applications/graphics/gwenview-i18n/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/gwenview-i18n/debian/changelog b/debian/_base/applications/graphics/gwenview-i18n/debian/changelog
index 035a06d71..035a06d71 100644
--- a/debian/_base/applications/gwenview-i18n/debian/changelog
+++ b/debian/_base/applications/graphics/gwenview-i18n/debian/changelog
diff --git a/debian/_base/applications/dolphin/debian/compat b/debian/_base/applications/graphics/gwenview-i18n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/dolphin/debian/compat
+++ b/debian/_base/applications/graphics/gwenview-i18n/debian/compat
diff --git a/debian/_base/applications/gwenview-i18n/debian/control b/debian/_base/applications/graphics/gwenview-i18n/debian/control
index c7bc196b8..c7bc196b8 100644
--- a/debian/_base/applications/gwenview-i18n/debian/control
+++ b/debian/_base/applications/graphics/gwenview-i18n/debian/control
diff --git a/debian/_base/applications/gwenview-i18n/debian/copyright b/debian/_base/applications/graphics/gwenview-i18n/debian/copyright
index b0709da94..b0709da94 100644
--- a/debian/_base/applications/gwenview-i18n/debian/copyright
+++ b/debian/_base/applications/graphics/gwenview-i18n/debian/copyright
diff --git a/debian/_base/applications/kmyfirewall/debian/debiandirs b/debian/_base/applications/graphics/gwenview-i18n/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/debian/_base/applications/kmyfirewall/debian/debiandirs
+++ b/debian/_base/applications/graphics/gwenview-i18n/debian/debiandirs
diff --git a/debian/_base/applications/basket/debian/patches/series b/debian/_base/applications/graphics/gwenview-i18n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/basket/debian/patches/series
+++ b/debian/_base/applications/graphics/gwenview-i18n/debian/patches/series
diff --git a/debian/_base/applications/gwenview-i18n/debian/rules b/debian/_base/applications/graphics/gwenview-i18n/debian/rules
index b84d1292d..b84d1292d 100755
--- a/debian/_base/applications/gwenview-i18n/debian/rules
+++ b/debian/_base/applications/graphics/gwenview-i18n/debian/rules
diff --git a/debian/_base/applications/digikam/debian/source/format b/debian/_base/applications/graphics/gwenview-i18n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/digikam/debian/source/format
+++ b/debian/_base/applications/graphics/gwenview-i18n/debian/source/format
diff --git a/debian/_base/applications/digikam/debian/source/options b/debian/_base/applications/graphics/gwenview-i18n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/digikam/debian/source/options
+++ b/debian/_base/applications/graphics/gwenview-i18n/debian/source/options
diff --git a/debian/_base/applications/compizconfig-backend-kconfig/debian/cdbs/debian-tde.mk b/debian/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/compizconfig-backend-kconfig/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/bibletime/debian/cdbs/versions.pl b/debian/_base/applications/graphics/gwenview/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/bibletime/debian/cdbs/versions.pl
+++ b/debian/_base/applications/graphics/gwenview/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/gwenview/debian/changelog b/debian/_base/applications/graphics/gwenview/debian/changelog
index 2c29a5ee5..2c29a5ee5 100644
--- a/debian/_base/applications/gwenview/debian/changelog
+++ b/debian/_base/applications/graphics/gwenview/debian/changelog
diff --git a/debian/_base/applications/filelight-l10n/debian/compat b/debian/_base/applications/graphics/gwenview/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/filelight-l10n/debian/compat
+++ b/debian/_base/applications/graphics/gwenview/debian/compat
diff --git a/debian/_base/applications/gwenview/debian/control b/debian/_base/applications/graphics/gwenview/debian/control
index bd7b237fb..bd7b237fb 100644
--- a/debian/_base/applications/gwenview/debian/control
+++ b/debian/_base/applications/graphics/gwenview/debian/control
diff --git a/debian/_base/applications/gwenview/debian/copyright b/debian/_base/applications/graphics/gwenview/debian/copyright
index d87dc89ff..d87dc89ff 100644
--- a/debian/_base/applications/gwenview/debian/copyright
+++ b/debian/_base/applications/graphics/gwenview/debian/copyright
diff --git a/debian/_base/applications/gwenview/debian/gwenview.doc-base b/debian/_base/applications/graphics/gwenview/debian/gwenview.doc-base
index 9efaff358..9efaff358 100644
--- a/debian/_base/applications/gwenview/debian/gwenview.doc-base
+++ b/debian/_base/applications/graphics/gwenview/debian/gwenview.doc-base
diff --git a/debian/_base/applications/gwenview/debian/gwenview.lintian b/debian/_base/applications/graphics/gwenview/debian/gwenview.lintian
index e8c71a351..e8c71a351 100644
--- a/debian/_base/applications/gwenview/debian/gwenview.lintian
+++ b/debian/_base/applications/graphics/gwenview/debian/gwenview.lintian
diff --git a/debian/_base/applications/gwenview/debian/gwenview.xpm b/debian/_base/applications/graphics/gwenview/debian/gwenview.xpm
index 076efa834..076efa834 100644
--- a/debian/_base/applications/gwenview/debian/gwenview.xpm
+++ b/debian/_base/applications/graphics/gwenview/debian/gwenview.xpm
diff --git a/debian/_base/applications/gwenview/debian/menu b/debian/_base/applications/graphics/gwenview/debian/menu
index c20d8c34c..c20d8c34c 100644
--- a/debian/_base/applications/gwenview/debian/menu
+++ b/debian/_base/applications/graphics/gwenview/debian/menu
diff --git a/debian/_base/applications/bibletime/debian/patches/series b/debian/_base/applications/graphics/gwenview/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/bibletime/debian/patches/series
+++ b/debian/_base/applications/graphics/gwenview/debian/patches/series
diff --git a/debian/_base/applications/gwenview/debian/rules b/debian/_base/applications/graphics/gwenview/debian/rules
index 7c5315da0..7c5315da0 100755
--- a/debian/_base/applications/gwenview/debian/rules
+++ b/debian/_base/applications/graphics/gwenview/debian/rules
diff --git a/debian/_base/applications/dolphin/debian/source/format b/debian/_base/applications/graphics/gwenview/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/dolphin/debian/source/format
+++ b/debian/_base/applications/graphics/gwenview/debian/source/format
diff --git a/debian/_base/applications/dolphin/debian/source/options b/debian/_base/applications/graphics/gwenview/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/dolphin/debian/source/options
+++ b/debian/_base/applications/graphics/gwenview/debian/source/options
diff --git a/debian/_base/applications/ksquirrel/debian/README.debian b/debian/_base/applications/graphics/ksquirrel/debian/README.debian
index 7c478322f..7c478322f 100644
--- a/debian/_base/applications/ksquirrel/debian/README.debian
+++ b/debian/_base/applications/graphics/ksquirrel/debian/README.debian
diff --git a/debian/_base/applications/ksquirrel/debian/changelog b/debian/_base/applications/graphics/ksquirrel/debian/changelog
index 8f786a231..8f786a231 100644
--- a/debian/_base/applications/ksquirrel/debian/changelog
+++ b/debian/_base/applications/graphics/ksquirrel/debian/changelog
diff --git a/debian/_base/applications/filelight/debian/compat b/debian/_base/applications/graphics/ksquirrel/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/filelight/debian/compat
+++ b/debian/_base/applications/graphics/ksquirrel/debian/compat
diff --git a/debian/_base/applications/ksquirrel/debian/control b/debian/_base/applications/graphics/ksquirrel/debian/control
index 59466b140..59466b140 100644
--- a/debian/_base/applications/ksquirrel/debian/control
+++ b/debian/_base/applications/graphics/ksquirrel/debian/control
diff --git a/debian/_base/applications/ksquirrel/debian/copyright b/debian/_base/applications/graphics/ksquirrel/debian/copyright
index d09bb9228..d09bb9228 100644
--- a/debian/_base/applications/ksquirrel/debian/copyright
+++ b/debian/_base/applications/graphics/ksquirrel/debian/copyright
diff --git a/debian/_base/applications/kde-style-qtcurve/debian/docs b/debian/_base/applications/graphics/ksquirrel/debian/docs
index 724e08449..724e08449 100644
--- a/debian/_base/applications/kde-style-qtcurve/debian/docs
+++ b/debian/_base/applications/graphics/ksquirrel/debian/docs
diff --git a/debian/_base/applications/ksquirrel/debian/ksquirrel-libs-configurator.1 b/debian/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1
index a6da62b4c..a6da62b4c 100644
--- a/debian/_base/applications/ksquirrel/debian/ksquirrel-libs-configurator.1
+++ b/debian/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1
diff --git a/debian/_base/applications/kdiff3/debian/patches/.gitignore b/debian/_base/applications/graphics/ksquirrel/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kdiff3/debian/patches/.gitignore
+++ b/debian/_base/applications/graphics/ksquirrel/debian/patches/.gitignore
diff --git a/debian/_base/applications/ksquirrel/debian/rules b/debian/_base/applications/graphics/ksquirrel/debian/rules
index a291256f6..a291256f6 100755
--- a/debian/_base/applications/ksquirrel/debian/rules
+++ b/debian/_base/applications/graphics/ksquirrel/debian/rules
diff --git a/debian/_base/applications/filelight-l10n/debian/source/format b/debian/_base/applications/graphics/ksquirrel/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/filelight-l10n/debian/source/format
+++ b/debian/_base/applications/graphics/ksquirrel/debian/source/format
diff --git a/debian/_base/applications/filelight-l10n/debian/source/options b/debian/_base/applications/graphics/ksquirrel/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/filelight-l10n/debian/source/options
+++ b/debian/_base/applications/graphics/ksquirrel/debian/source/options
diff --git a/debian/_base/applications/ksquirrel/debian/watch b/debian/_base/applications/graphics/ksquirrel/debian/watch
index a276799ff..a276799ff 100644
--- a/debian/_base/applications/ksquirrel/debian/watch
+++ b/debian/_base/applications/graphics/ksquirrel/debian/watch
diff --git a/debian/_base/applications/digikam/debian/cdbs/debian-tde.mk b/debian/_base/applications/graphics/kuickshow/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/digikam/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/graphics/kuickshow/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl b/debian/_base/applications/graphics/kuickshow/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl
+++ b/debian/_base/applications/graphics/kuickshow/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kuickshow/debian/changelog b/debian/_base/applications/graphics/kuickshow/debian/changelog
index c156cee8b..c156cee8b 100644
--- a/debian/_base/applications/kuickshow/debian/changelog
+++ b/debian/_base/applications/graphics/kuickshow/debian/changelog
diff --git a/debian/_base/applications/fusion-icon/debian/compat b/debian/_base/applications/graphics/kuickshow/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/fusion-icon/debian/compat
+++ b/debian/_base/applications/graphics/kuickshow/debian/compat
diff --git a/debian/_base/applications/kuickshow/debian/control b/debian/_base/applications/graphics/kuickshow/debian/control
index 4bf58eaf7..4bf58eaf7 100644
--- a/debian/_base/applications/kuickshow/debian/control
+++ b/debian/_base/applications/graphics/kuickshow/debian/control
diff --git a/debian/_base/applications/kuickshow/debian/copyright b/debian/_base/applications/graphics/kuickshow/debian/copyright
index 2373ec1a7..2373ec1a7 100644
--- a/debian/_base/applications/kuickshow/debian/copyright
+++ b/debian/_base/applications/graphics/kuickshow/debian/copyright
diff --git a/debian/_base/applications/kuickshow/debian/icons/kuickshow-16.xpm b/debian/_base/applications/graphics/kuickshow/debian/icons/kuickshow-16.xpm
index cf91f34d9..cf91f34d9 100644
--- a/debian/_base/applications/kuickshow/debian/icons/kuickshow-16.xpm
+++ b/debian/_base/applications/graphics/kuickshow/debian/icons/kuickshow-16.xpm
diff --git a/debian/_base/applications/kuickshow/debian/icons/kuickshow.xpm b/debian/_base/applications/graphics/kuickshow/debian/icons/kuickshow.xpm
index 5d2d6ca97..5d2d6ca97 100644
--- a/debian/_base/applications/kuickshow/debian/icons/kuickshow.xpm
+++ b/debian/_base/applications/graphics/kuickshow/debian/icons/kuickshow.xpm
diff --git a/debian/_base/applications/kuickshow/debian/kuickshow-trinity.install b/debian/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.install
index dee09fb33..dee09fb33 100644
--- a/debian/_base/applications/kuickshow/debian/kuickshow-trinity.install
+++ b/debian/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.install
diff --git a/debian/_base/applications/kuickshow/debian/kuickshow-trinity.lintian b/debian/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.lintian
index dd274dba5..dd274dba5 100644
--- a/debian/_base/applications/kuickshow/debian/kuickshow-trinity.lintian
+++ b/debian/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.lintian
diff --git a/debian/_base/applications/kuickshow/debian/kuickshow-trinity.manpages b/debian/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.manpages
index 3eadda903..3eadda903 100644
--- a/debian/_base/applications/kuickshow/debian/kuickshow-trinity.manpages
+++ b/debian/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.manpages
diff --git a/debian/_base/applications/kuickshow/debian/kuickshow-trinity.menu b/debian/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.menu
index 4d17d621c..4d17d621c 100644
--- a/debian/_base/applications/kuickshow/debian/kuickshow-trinity.menu
+++ b/debian/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.menu
diff --git a/debian/_base/applications/kuickshow/debian/man/kuickshow.1 b/debian/_base/applications/graphics/kuickshow/debian/man/kuickshow.1
index 2675eae4e..2675eae4e 100644
--- a/debian/_base/applications/kuickshow/debian/man/kuickshow.1
+++ b/debian/_base/applications/graphics/kuickshow/debian/man/kuickshow.1
diff --git a/debian/_base/applications/compizconfig-backend-kconfig/debian/patches/series b/debian/_base/applications/graphics/kuickshow/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/compizconfig-backend-kconfig/debian/patches/series
+++ b/debian/_base/applications/graphics/kuickshow/debian/patches/series
diff --git a/debian/_base/applications/kuickshow/debian/rules b/debian/_base/applications/graphics/kuickshow/debian/rules
index e2fae601d..e2fae601d 100755
--- a/debian/_base/applications/kuickshow/debian/rules
+++ b/debian/_base/applications/graphics/kuickshow/debian/rules
diff --git a/debian/_base/applications/filelight/debian/source/format b/debian/_base/applications/graphics/kuickshow/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/filelight/debian/source/format
+++ b/debian/_base/applications/graphics/kuickshow/debian/source/format
diff --git a/debian/_base/applications/filelight/debian/source/options b/debian/_base/applications/graphics/kuickshow/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/filelight/debian/source/options
+++ b/debian/_base/applications/graphics/kuickshow/debian/source/options
diff --git a/debian/_base/applications/potracegui/debian/changelog b/debian/_base/applications/graphics/potracegui/debian/changelog
index 87afc2863..87afc2863 100644
--- a/debian/_base/applications/potracegui/debian/changelog
+++ b/debian/_base/applications/graphics/potracegui/debian/changelog
diff --git a/debian/_base/applications/gtk-qt-engine/debian/compat b/debian/_base/applications/graphics/potracegui/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/gtk-qt-engine/debian/compat
+++ b/debian/_base/applications/graphics/potracegui/debian/compat
diff --git a/debian/_base/applications/potracegui/debian/control b/debian/_base/applications/graphics/potracegui/debian/control
index 946b1132c..946b1132c 100644
--- a/debian/_base/applications/potracegui/debian/control
+++ b/debian/_base/applications/graphics/potracegui/debian/control
diff --git a/debian/_base/applications/potracegui/debian/copyright b/debian/_base/applications/graphics/potracegui/debian/copyright
index f3437d1cc..f3437d1cc 100644
--- a/debian/_base/applications/potracegui/debian/copyright
+++ b/debian/_base/applications/graphics/potracegui/debian/copyright
diff --git a/debian/_base/applications/potracegui/debian/dirs b/debian/_base/applications/graphics/potracegui/debian/dirs
index 34e17c1b8..34e17c1b8 100644
--- a/debian/_base/applications/potracegui/debian/dirs
+++ b/debian/_base/applications/graphics/potracegui/debian/dirs
diff --git a/debian/_base/applications/potracegui/debian/docs b/debian/_base/applications/graphics/potracegui/debian/docs
index ba8894c15..ba8894c15 100644
--- a/debian/_base/applications/potracegui/debian/docs
+++ b/debian/_base/applications/graphics/potracegui/debian/docs
diff --git a/debian/_base/applications/potracegui/debian/potracegui-trinity.1 b/debian/_base/applications/graphics/potracegui/debian/potracegui-trinity.1
index ef8dc8b59..ef8dc8b59 100644
--- a/debian/_base/applications/potracegui/debian/potracegui-trinity.1
+++ b/debian/_base/applications/graphics/potracegui/debian/potracegui-trinity.1
diff --git a/debian/_base/applications/potracegui/debian/potracegui-trinity.menu b/debian/_base/applications/graphics/potracegui/debian/potracegui-trinity.menu
index ec42ba351..ec42ba351 100644
--- a/debian/_base/applications/potracegui/debian/potracegui-trinity.menu
+++ b/debian/_base/applications/graphics/potracegui/debian/potracegui-trinity.menu
diff --git a/debian/_base/applications/potracegui/debian/rules b/debian/_base/applications/graphics/potracegui/debian/rules
index fdda3113f..fdda3113f 100755
--- a/debian/_base/applications/potracegui/debian/rules
+++ b/debian/_base/applications/graphics/potracegui/debian/rules
diff --git a/debian/_base/applications/fusion-icon/debian/source/format b/debian/_base/applications/graphics/potracegui/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/fusion-icon/debian/source/format
+++ b/debian/_base/applications/graphics/potracegui/debian/source/format
diff --git a/debian/_base/applications/fusion-icon/debian/source/options b/debian/_base/applications/graphics/potracegui/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/fusion-icon/debian/source/options
+++ b/debian/_base/applications/graphics/potracegui/debian/source/options
diff --git a/debian/_base/applications/potracegui/debian/watch b/debian/_base/applications/graphics/potracegui/debian/watch
index ecb7330aa..ecb7330aa 100644
--- a/debian/_base/applications/potracegui/debian/watch
+++ b/debian/_base/applications/graphics/potracegui/debian/watch
diff --git a/debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/digikam/debian/cdbs/versions.pl b/debian/_base/applications/internet/kbiff/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/digikam/debian/cdbs/versions.pl
+++ b/debian/_base/applications/internet/kbiff/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kbiff/debian/changelog b/debian/_base/applications/internet/kbiff/debian/changelog
index bf7871f3b..bf7871f3b 100644
--- a/debian/_base/applications/kbiff/debian/changelog
+++ b/debian/_base/applications/internet/kbiff/debian/changelog
diff --git a/debian/_base/applications/gwenview-i18n/debian/compat b/debian/_base/applications/internet/kbiff/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/gwenview-i18n/debian/compat
+++ b/debian/_base/applications/internet/kbiff/debian/compat
diff --git a/debian/_base/applications/kbiff/debian/control b/debian/_base/applications/internet/kbiff/debian/control
index 3ce16eb96..3ce16eb96 100644
--- a/debian/_base/applications/kbiff/debian/control
+++ b/debian/_base/applications/internet/kbiff/debian/control
diff --git a/debian/_base/applications/kbiff/debian/copyright b/debian/_base/applications/internet/kbiff/debian/copyright
index f2ff3daec..f2ff3daec 100644
--- a/debian/_base/applications/kbiff/debian/copyright
+++ b/debian/_base/applications/internet/kbiff/debian/copyright
diff --git a/debian/_base/applications/basket/debian/dirs b/debian/_base/applications/internet/kbiff/debian/dirs
index f583045fe..f583045fe 100644
--- a/debian/_base/applications/basket/debian/dirs
+++ b/debian/_base/applications/internet/kbiff/debian/dirs
diff --git a/debian/_base/applications/kpicosim/debian/docs b/debian/_base/applications/internet/kbiff/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/debian/_base/applications/kpicosim/debian/docs
+++ b/debian/_base/applications/internet/kbiff/debian/docs
diff --git a/debian/_base/applications/kbiff/debian/menu b/debian/_base/applications/internet/kbiff/debian/menu
index ab7f8c6e7..ab7f8c6e7 100644
--- a/debian/_base/applications/kbiff/debian/menu
+++ b/debian/_base/applications/internet/kbiff/debian/menu
diff --git a/debian/_base/applications/kbiff/debian/rules b/debian/_base/applications/internet/kbiff/debian/rules
index b50919ccf..b50919ccf 100755
--- a/debian/_base/applications/kbiff/debian/rules
+++ b/debian/_base/applications/internet/kbiff/debian/rules
diff --git a/debian/_base/applications/gtk-qt-engine/debian/source/format b/debian/_base/applications/internet/kbiff/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/gtk-qt-engine/debian/source/format
+++ b/debian/_base/applications/internet/kbiff/debian/source/format
diff --git a/debian/_base/applications/gtk-qt-engine/debian/source/options b/debian/_base/applications/internet/kbiff/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/gtk-qt-engine/debian/source/options
+++ b/debian/_base/applications/internet/kbiff/debian/source/options
diff --git a/debian/_base/applications/kbiff/debian/watch b/debian/_base/applications/internet/kbiff/debian/watch
index eb0794476..eb0794476 100644
--- a/debian/_base/applications/kbiff/debian/watch
+++ b/debian/_base/applications/internet/kbiff/debian/watch
diff --git a/debian/_base/applications/filelight-l10n/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/filelight-l10n/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/dolphin/debian/cdbs/versions.pl b/debian/_base/applications/internet/konversation/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/dolphin/debian/cdbs/versions.pl
+++ b/debian/_base/applications/internet/konversation/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/konversation/debian/changelog b/debian/_base/applications/internet/konversation/debian/changelog
index bdb599f0f..bdb599f0f 100644
--- a/debian/_base/applications/konversation/debian/changelog
+++ b/debian/_base/applications/internet/konversation/debian/changelog
diff --git a/debian/_base/applications/gwenview/debian/compat b/debian/_base/applications/internet/konversation/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/gwenview/debian/compat
+++ b/debian/_base/applications/internet/konversation/debian/compat
diff --git a/debian/_base/applications/konversation/debian/control b/debian/_base/applications/internet/konversation/debian/control
index be952d05b..be952d05b 100644
--- a/debian/_base/applications/konversation/debian/control
+++ b/debian/_base/applications/internet/konversation/debian/control
diff --git a/debian/_base/applications/konversation/debian/copyright b/debian/_base/applications/internet/konversation/debian/copyright
index cb5c85c8e..cb5c85c8e 100644
--- a/debian/_base/applications/konversation/debian/copyright
+++ b/debian/_base/applications/internet/konversation/debian/copyright
diff --git a/debian/_base/applications/konversation/debian/konversation-trinity.docs b/debian/_base/applications/internet/konversation/debian/konversation-trinity.docs
index e7f450c0c..e7f450c0c 100644
--- a/debian/_base/applications/konversation/debian/konversation-trinity.docs
+++ b/debian/_base/applications/internet/konversation/debian/konversation-trinity.docs
diff --git a/debian/_base/applications/konversation/debian/konversation-trinity.install b/debian/_base/applications/internet/konversation/debian/konversation-trinity.install
index ca10af6cf..ca10af6cf 100644
--- a/debian/_base/applications/konversation/debian/konversation-trinity.install
+++ b/debian/_base/applications/internet/konversation/debian/konversation-trinity.install
diff --git a/debian/_base/applications/konversation/debian/konversation-trinity.manpages b/debian/_base/applications/internet/konversation/debian/konversation-trinity.manpages
index 13cdaf4b2..13cdaf4b2 100644
--- a/debian/_base/applications/konversation/debian/konversation-trinity.manpages
+++ b/debian/_base/applications/internet/konversation/debian/konversation-trinity.manpages
diff --git a/debian/_base/applications/konversation/debian/konversation-trinity.menu b/debian/_base/applications/internet/konversation/debian/konversation-trinity.menu
index 0fbd13937..0fbd13937 100644
--- a/debian/_base/applications/konversation/debian/konversation-trinity.menu
+++ b/debian/_base/applications/internet/konversation/debian/konversation-trinity.menu
diff --git a/debian/_base/applications/konversation/debian/konversation16x16.xpm b/debian/_base/applications/internet/konversation/debian/konversation16x16.xpm
index 4b4a9376c..4b4a9376c 100644
--- a/debian/_base/applications/konversation/debian/konversation16x16.xpm
+++ b/debian/_base/applications/internet/konversation/debian/konversation16x16.xpm
diff --git a/debian/_base/applications/konversation/debian/konversation32x32.xpm b/debian/_base/applications/internet/konversation/debian/konversation32x32.xpm
index 60c8f3b0c..60c8f3b0c 100644
--- a/debian/_base/applications/konversation/debian/konversation32x32.xpm
+++ b/debian/_base/applications/internet/konversation/debian/konversation32x32.xpm
diff --git a/debian/_base/applications/konversation/debian/man/konversation.1.docbook b/debian/_base/applications/internet/konversation/debian/man/konversation.1.docbook
index f48e27b95..f48e27b95 100644
--- a/debian/_base/applications/konversation/debian/man/konversation.1.docbook
+++ b/debian/_base/applications/internet/konversation/debian/man/konversation.1.docbook
diff --git a/debian/_base/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook b/debian/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook
index 1752d7b2c..1752d7b2c 100644
--- a/debian/_base/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
+++ b/debian/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook
diff --git a/debian/_base/applications/kdmtheme/debian/patches/.gitignore b/debian/_base/applications/internet/konversation/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kdmtheme/debian/patches/.gitignore
+++ b/debian/_base/applications/internet/konversation/debian/patches/.gitignore
diff --git a/debian/_base/applications/konversation/debian/rules b/debian/_base/applications/internet/konversation/debian/rules
index b0ed413fd..b0ed413fd 100755
--- a/debian/_base/applications/konversation/debian/rules
+++ b/debian/_base/applications/internet/konversation/debian/rules
diff --git a/debian/_base/applications/gwenview-i18n/debian/source/format b/debian/_base/applications/internet/konversation/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/gwenview-i18n/debian/source/format
+++ b/debian/_base/applications/internet/konversation/debian/source/format
diff --git a/debian/_base/applications/gwenview-i18n/debian/source/options b/debian/_base/applications/internet/konversation/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/gwenview-i18n/debian/source/options
+++ b/debian/_base/applications/internet/konversation/debian/source/options
diff --git a/debian/_base/applications/filelight/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/filelight/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/filelight-l10n/debian/cdbs/versions.pl b/debian/_base/applications/internet/kopete-otr/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/filelight-l10n/debian/cdbs/versions.pl
+++ b/debian/_base/applications/internet/kopete-otr/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kopete-otr/debian/changelog b/debian/_base/applications/internet/kopete-otr/debian/changelog
index f424502b9..f424502b9 100644
--- a/debian/_base/applications/kopete-otr/debian/changelog
+++ b/debian/_base/applications/internet/kopete-otr/debian/changelog
diff --git a/debian/_base/applications/k3b-i18n/debian/compat b/debian/_base/applications/internet/kopete-otr/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/k3b-i18n/debian/compat
+++ b/debian/_base/applications/internet/kopete-otr/debian/compat
diff --git a/debian/_base/applications/kopete-otr/debian/control b/debian/_base/applications/internet/kopete-otr/debian/control
index 8a6cf46bc..8a6cf46bc 100644
--- a/debian/_base/applications/kopete-otr/debian/control
+++ b/debian/_base/applications/internet/kopete-otr/debian/control
diff --git a/debian/_base/applications/kopete-otr/debian/copyright b/debian/_base/applications/internet/kopete-otr/debian/copyright
index 86dcae02e..86dcae02e 100644
--- a/debian/_base/applications/kopete-otr/debian/copyright
+++ b/debian/_base/applications/internet/kopete-otr/debian/copyright
diff --git a/debian/_base/applications/kopete-otr/debian/rules b/debian/_base/applications/internet/kopete-otr/debian/rules
index 7a6c3e8e4..7a6c3e8e4 100755
--- a/debian/_base/applications/kopete-otr/debian/rules
+++ b/debian/_base/applications/internet/kopete-otr/debian/rules
diff --git a/debian/_base/applications/gwenview/debian/source/format b/debian/_base/applications/internet/kopete-otr/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/gwenview/debian/source/format
+++ b/debian/_base/applications/internet/kopete-otr/debian/source/format
diff --git a/debian/_base/applications/gwenview/debian/source/options b/debian/_base/applications/internet/kopete-otr/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/gwenview/debian/source/options
+++ b/debian/_base/applications/internet/kopete-otr/debian/source/options
diff --git a/debian/_base/applications/kopete-otr/debian/watch b/debian/_base/applications/internet/kopete-otr/debian/watch
index 50ddb75fa..50ddb75fa 100644
--- a/debian/_base/applications/kopete-otr/debian/watch
+++ b/debian/_base/applications/internet/kopete-otr/debian/watch
diff --git a/debian/_base/applications/kstreamripper/debian/README.Debian-source b/debian/_base/applications/internet/kstreamripper/debian/README.Debian-source
index 57547ac25..57547ac25 100644
--- a/debian/_base/applications/kstreamripper/debian/README.Debian-source
+++ b/debian/_base/applications/internet/kstreamripper/debian/README.Debian-source
diff --git a/debian/_base/applications/kstreamripper/debian/changelog b/debian/_base/applications/internet/kstreamripper/debian/changelog
index 7e7fdb95b..7e7fdb95b 100644
--- a/debian/_base/applications/kstreamripper/debian/changelog
+++ b/debian/_base/applications/internet/kstreamripper/debian/changelog
diff --git a/debian/_base/applications/k3b/debian/compat b/debian/_base/applications/internet/kstreamripper/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/k3b/debian/compat
+++ b/debian/_base/applications/internet/kstreamripper/debian/compat
diff --git a/debian/_base/applications/kstreamripper/debian/control b/debian/_base/applications/internet/kstreamripper/debian/control
index 8ac3fab61..8ac3fab61 100644
--- a/debian/_base/applications/kstreamripper/debian/control
+++ b/debian/_base/applications/internet/kstreamripper/debian/control
diff --git a/debian/_base/applications/kstreamripper/debian/copyright b/debian/_base/applications/internet/kstreamripper/debian/copyright
index 61d405298..61d405298 100644
--- a/debian/_base/applications/kstreamripper/debian/copyright
+++ b/debian/_base/applications/internet/kstreamripper/debian/copyright
diff --git a/debian/_base/applications/kstreamripper/debian/dirs b/debian/_base/applications/internet/kstreamripper/debian/dirs
index a59ccc8af..a59ccc8af 100644
--- a/debian/_base/applications/kstreamripper/debian/dirs
+++ b/debian/_base/applications/internet/kstreamripper/debian/dirs
diff --git a/debian/_base/applications/keep/debian/docs b/debian/_base/applications/internet/kstreamripper/debian/docs
index 724e08449..724e08449 100644
--- a/debian/_base/applications/keep/debian/docs
+++ b/debian/_base/applications/internet/kstreamripper/debian/docs
diff --git a/debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.install b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.install
index dc292dbda..dc292dbda 100644
--- a/debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.install
+++ b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.install
diff --git a/debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.postinst b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst
index f5542ab64..f5542ab64 100644
--- a/debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.postinst
+++ b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst
diff --git a/debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.postrm b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm
index 5209bcb38..5209bcb38 100644
--- a/debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.postrm
+++ b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm
diff --git a/debian/_base/applications/kstreamripper/debian/kstreamripper.1 b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper.1
index b409a6be0..b409a6be0 100644
--- a/debian/_base/applications/kstreamripper/debian/kstreamripper.1
+++ b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper.1
diff --git a/debian/_base/applications/kstreamripper/debian/kstreamripper.desktop b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper.desktop
index a0c155fac..a0c155fac 100644
--- a/debian/_base/applications/kstreamripper/debian/kstreamripper.desktop
+++ b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper.desktop
diff --git a/debian/_base/applications/kstreamripper/debian/kstreamripper.menu b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper.menu
index 9ae6cbe73..9ae6cbe73 100644
--- a/debian/_base/applications/kstreamripper/debian/kstreamripper.menu
+++ b/debian/_base/applications/internet/kstreamripper/debian/kstreamripper.menu
diff --git a/debian/_base/applications/kstreamripper/debian/rules b/debian/_base/applications/internet/kstreamripper/debian/rules
index cb9dc49ae..cb9dc49ae 100755
--- a/debian/_base/applications/kstreamripper/debian/rules
+++ b/debian/_base/applications/internet/kstreamripper/debian/rules
diff --git a/debian/_base/applications/k3b-i18n/debian/source/format b/debian/_base/applications/internet/kstreamripper/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/k3b-i18n/debian/source/format
+++ b/debian/_base/applications/internet/kstreamripper/debian/source/format
diff --git a/debian/_base/applications/k3b-i18n/debian/source/options b/debian/_base/applications/internet/kstreamripper/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/k3b-i18n/debian/source/options
+++ b/debian/_base/applications/internet/kstreamripper/debian/source/options
diff --git a/debian/_base/applications/ktorrent/debian/README.Debian b/debian/_base/applications/internet/ktorrent/debian/README.Debian
index 0d4e3f758..0d4e3f758 100644
--- a/debian/_base/applications/ktorrent/debian/README.Debian
+++ b/debian/_base/applications/internet/ktorrent/debian/README.Debian
diff --git a/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/filelight/debian/cdbs/versions.pl b/debian/_base/applications/internet/ktorrent/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/filelight/debian/cdbs/versions.pl
+++ b/debian/_base/applications/internet/ktorrent/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/ktorrent/debian/changelog b/debian/_base/applications/internet/ktorrent/debian/changelog
index a82f9b70b..a82f9b70b 100644
--- a/debian/_base/applications/ktorrent/debian/changelog
+++ b/debian/_base/applications/internet/ktorrent/debian/changelog
diff --git a/debian/_base/applications/k9copy/debian/compat b/debian/_base/applications/internet/ktorrent/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/k9copy/debian/compat
+++ b/debian/_base/applications/internet/ktorrent/debian/compat
diff --git a/debian/_base/applications/ktorrent/debian/control b/debian/_base/applications/internet/ktorrent/debian/control
index c19d8c957..c19d8c957 100644
--- a/debian/_base/applications/ktorrent/debian/control
+++ b/debian/_base/applications/internet/ktorrent/debian/control
diff --git a/debian/_base/applications/ktorrent/debian/copyright b/debian/_base/applications/internet/ktorrent/debian/copyright
index 9b8756613..9b8756613 100644
--- a/debian/_base/applications/ktorrent/debian/copyright
+++ b/debian/_base/applications/internet/ktorrent/debian/copyright
diff --git a/debian/_base/applications/ktorrent/debian/ktorrent.1.docbook b/debian/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook
index f9b49424b..f9b49424b 100644
--- a/debian/_base/applications/ktorrent/debian/ktorrent.1.docbook
+++ b/debian/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook
diff --git a/debian/_base/applications/digikam/debian/patches/series b/debian/_base/applications/internet/ktorrent/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/digikam/debian/patches/series
+++ b/debian/_base/applications/internet/ktorrent/debian/patches/series
diff --git a/debian/_base/applications/ktorrent/debian/rules b/debian/_base/applications/internet/ktorrent/debian/rules
index be25e3755..be25e3755 100755
--- a/debian/_base/applications/ktorrent/debian/rules
+++ b/debian/_base/applications/internet/ktorrent/debian/rules
diff --git a/debian/_base/applications/k3b/debian/source/format b/debian/_base/applications/internet/ktorrent/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/k3b/debian/source/format
+++ b/debian/_base/applications/internet/ktorrent/debian/source/format
diff --git a/debian/_base/applications/k3b/debian/source/options b/debian/_base/applications/internet/ktorrent/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/k3b/debian/source/options
+++ b/debian/_base/applications/internet/ktorrent/debian/source/options
diff --git a/debian/_base/applications/ktorrent/debian/watch b/debian/_base/applications/internet/ktorrent/debian/watch
index 0262eb3c5..0262eb3c5 100644
--- a/debian/_base/applications/ktorrent/debian/watch
+++ b/debian/_base/applications/internet/ktorrent/debian/watch
diff --git a/debian/_base/applications/kvirc/debian/changelog b/debian/_base/applications/internet/kvirc/debian/changelog
index 889d5878f..889d5878f 100644
--- a/debian/_base/applications/kvirc/debian/changelog
+++ b/debian/_base/applications/internet/kvirc/debian/changelog
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/compat b/debian/_base/applications/internet/kvirc/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kaffeine-mozilla/debian/compat
+++ b/debian/_base/applications/internet/kvirc/debian/compat
diff --git a/debian/_base/applications/kvirc/debian/control b/debian/_base/applications/internet/kvirc/debian/control
index 8eecf6292..8eecf6292 100644
--- a/debian/_base/applications/kvirc/debian/control
+++ b/debian/_base/applications/internet/kvirc/debian/control
diff --git a/debian/_base/applications/kvirc/debian/copyright b/debian/_base/applications/internet/kvirc/debian/copyright
index 3f6f5b6e5..3f6f5b6e5 100644
--- a/debian/_base/applications/kvirc/debian/copyright
+++ b/debian/_base/applications/internet/kvirc/debian/copyright
diff --git a/debian/_base/applications/kvirc/debian/kvirc-data-trinity.install b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
index fd6afdc77..fd6afdc77 100644
--- a/debian/_base/applications/kvirc/debian/kvirc-data-trinity.install
+++ b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
diff --git a/debian/_base/applications/kvirc/debian/kvirc-data-trinity.links b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.links
index 831b763bf..831b763bf 100644
--- a/debian/_base/applications/kvirc/debian/kvirc-data-trinity.links
+++ b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.links
diff --git a/debian/_base/applications/kvirc/debian/kvirc-data-trinity.postinst b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.postinst
index ae66752f1..ae66752f1 100644
--- a/debian/_base/applications/kvirc/debian/kvirc-data-trinity.postinst
+++ b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.postinst
diff --git a/debian/_base/applications/kvirc/debian/kvirc-data-trinity.prerm b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.prerm
index 4efb6507f..4efb6507f 100644
--- a/debian/_base/applications/kvirc/debian/kvirc-data-trinity.prerm
+++ b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.prerm
diff --git a/debian/_base/applications/kvirc/debian/kvirc-trinity-dev.install b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.install
index b786fb7ec..b786fb7ec 100644
--- a/debian/_base/applications/kvirc/debian/kvirc-trinity-dev.install
+++ b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.install
diff --git a/debian/_base/applications/kvirc/debian/kvirc-trinity-dev.links b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.links
index 23a8e59b0..23a8e59b0 100644
--- a/debian/_base/applications/kvirc/debian/kvirc-trinity-dev.links
+++ b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.links
diff --git a/debian/_base/applications/kvirc/debian/kvirc-trinity.install b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity.install
index 994dd3e0e..994dd3e0e 100644
--- a/debian/_base/applications/kvirc/debian/kvirc-trinity.install
+++ b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity.install
diff --git a/debian/_base/applications/kvirc/debian/kvirc-trinity.menu b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity.menu
index b35945214..b35945214 100644
--- a/debian/_base/applications/kvirc/debian/kvirc-trinity.menu
+++ b/debian/_base/applications/internet/kvirc/debian/kvirc-trinity.menu
diff --git a/debian/_base/applications/kvirc/debian/overrides/kvirc b/debian/_base/applications/internet/kvirc/debian/overrides/kvirc
index dc125fd2e..dc125fd2e 100644
--- a/debian/_base/applications/kvirc/debian/overrides/kvirc
+++ b/debian/_base/applications/internet/kvirc/debian/overrides/kvirc
diff --git a/debian/_base/applications/dolphin/debian/patches/series b/debian/_base/applications/internet/kvirc/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/dolphin/debian/patches/series
+++ b/debian/_base/applications/internet/kvirc/debian/patches/series
diff --git a/debian/_base/applications/kvirc/debian/rules b/debian/_base/applications/internet/kvirc/debian/rules
index 3a8490e65..3a8490e65 100755
--- a/debian/_base/applications/kvirc/debian/rules
+++ b/debian/_base/applications/internet/kvirc/debian/rules
diff --git a/debian/_base/applications/k9copy/debian/source/format b/debian/_base/applications/internet/kvirc/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/k9copy/debian/source/format
+++ b/debian/_base/applications/internet/kvirc/debian/source/format
diff --git a/debian/_base/applications/k9copy/debian/source/options b/debian/_base/applications/internet/kvirc/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/k9copy/debian/source/options
+++ b/debian/_base/applications/internet/kvirc/debian/source/options
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/source/format b/debian/_base/applications/internet/kvpnc/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kaffeine-mozilla/debian/source/format
+++ b/debian/_base/applications/internet/kvpnc/debian/source/format
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/source/options b/debian/_base/applications/internet/kvpnc/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kaffeine-mozilla/debian/source/options
+++ b/debian/_base/applications/internet/kvpnc/debian/source/options
diff --git a/debian/_base/applications/smb4k/debian/README.Debian b/debian/_base/applications/internet/smb4k/debian/README.Debian
index 995d110e5..995d110e5 100644
--- a/debian/_base/applications/smb4k/debian/README.Debian
+++ b/debian/_base/applications/internet/smb4k/debian/README.Debian
diff --git a/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk b/debian/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/gtk-qt-engine/debian/cdbs/versions.pl b/debian/_base/applications/internet/smb4k/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/gtk-qt-engine/debian/cdbs/versions.pl
+++ b/debian/_base/applications/internet/smb4k/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/smb4k/debian/changelog b/debian/_base/applications/internet/smb4k/debian/changelog
index aa842f771..aa842f771 100644
--- a/debian/_base/applications/smb4k/debian/changelog
+++ b/debian/_base/applications/internet/smb4k/debian/changelog
diff --git a/debian/_base/applications/kaffeine/debian/compat b/debian/_base/applications/internet/smb4k/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kaffeine/debian/compat
+++ b/debian/_base/applications/internet/smb4k/debian/compat
diff --git a/debian/_base/applications/smb4k/debian/control b/debian/_base/applications/internet/smb4k/debian/control
index 628025dc7..628025dc7 100644
--- a/debian/_base/applications/smb4k/debian/control
+++ b/debian/_base/applications/internet/smb4k/debian/control
diff --git a/debian/_base/applications/smb4k/debian/copyright b/debian/_base/applications/internet/smb4k/debian/copyright
index d32c049ef..d32c049ef 100644
--- a/debian/_base/applications/smb4k/debian/copyright
+++ b/debian/_base/applications/internet/smb4k/debian/copyright
diff --git a/debian/_base/applications/smb4k/debian/docs b/debian/_base/applications/internet/smb4k/debian/docs
index e4acf0127..e4acf0127 100644
--- a/debian/_base/applications/smb4k/debian/docs
+++ b/debian/_base/applications/internet/smb4k/debian/docs
diff --git a/debian/_base/applications/smb4k/debian/menu b/debian/_base/applications/internet/smb4k/debian/menu
index 7f7c9cb2a..7f7c9cb2a 100644
--- a/debian/_base/applications/smb4k/debian/menu
+++ b/debian/_base/applications/internet/smb4k/debian/menu
diff --git a/debian/_base/applications/smb4k/debian/rules b/debian/_base/applications/internet/smb4k/debian/rules
index c8022b5a5..c8022b5a5 100755
--- a/debian/_base/applications/smb4k/debian/rules
+++ b/debian/_base/applications/internet/smb4k/debian/rules
diff --git a/debian/_base/applications/kaffeine/debian/source/format b/debian/_base/applications/internet/smb4k/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kaffeine/debian/source/format
+++ b/debian/_base/applications/internet/smb4k/debian/source/format
diff --git a/debian/_base/applications/kaffeine/debian/source/options b/debian/_base/applications/internet/smb4k/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kaffeine/debian/source/options
+++ b/debian/_base/applications/internet/smb4k/debian/source/options
diff --git a/debian/_base/applications/smb4k/debian/watch b/debian/_base/applications/internet/smb4k/debian/watch
index 70154d877..70154d877 100644
--- a/debian/_base/applications/smb4k/debian/watch
+++ b/debian/_base/applications/internet/smb4k/debian/watch
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/changelog b/debian/_base/applications/knetworkmanager.cmake/debian/changelog
deleted file mode 100644
index ed0d32a81..000000000
--- a/debian/_base/applications/knetworkmanager.cmake/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/_base/applications/knetworkmanager.cmake/debian/control b/debian/_base/applications/knetworkmanager.cmake/debian/control
deleted file mode 100644
index 4192ddc51..000000000
--- a/debian/_base/applications/knetworkmanager.cmake/debian/control
+++ /dev/null
@@ -1,31 +0,0 @@
-Source: knetworkmanager-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs, debhelper (>= 7), quilt, cmake-trinity, ninja-build,
- 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-tqt-dev (>= 0.8.1),
- libiw-dev,
- libnl-dev (>= 1.1),
- network-manager-vpnc,
- network-manager-openvpn,
- network-manager-strongswan,
- network-manager-pptp
-Standards-Version: 3.8.3
-Homepage: http://opensuse.org/Projects/KNetworkManager
-
-Package: network-manager-tde
-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/_base/applications/knetworkmanager.cmake/debian/rules b/debian/_base/applications/knetworkmanager.cmake/debian/rules
deleted file mode 100755
index 7554d7394..000000000
--- a/debian/_base/applications/knetworkmanager.cmake/debian/rules
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/make -f
-
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include debian/cdbs/debian-tde.mk
-
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
--DWITH_OPENVPN="ON" -DWITH_VPNC="ON" -DWITH_PPTP="ON"
-
-DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO
-
-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
diff --git a/debian/_base/applications/kpowersave.cmake/debian/changelog b/debian/_base/applications/kpowersave.cmake/debian/changelog
deleted file mode 100644
index c23417124..000000000
--- a/debian/_base/applications/kpowersave.cmake/debian/changelog
+++ /dev/null
@@ -1,372 +0,0 @@
-kpowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
-
-  * Karmic rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
-
-kpowersave-trinity (0.7.3-0ubuntu2) intrepid; urgency=low
-
-  * Moved Trinity to /opt/trinity
-  * Integrated properly with KDE4.2+
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
-
-kpowersave-trinity (0.7.3-0ubuntu1) intrepid; urgency=low
-
-  * Added -trinity suffix
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 14 Dec 2008 15:12:00 -0600
-
-kpowersave (0.7.3-2ubuntu1) intrepid; urgency=low
-
-  * Merge from debian unstable, remaining changes:
-    - debian/patches/kubuntu_02_messages_target.diff
-    - Modified maintainer field per specification
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Fri, 25 Jan 2008 09:54:46 +0000
-
-kpowersave (0.7.3-2) unstable; urgency=low
-
-  * debian/control
-    - Bump Standards-Version to 3.7.3. No further changes required.
-    - Drop Recommends: pm-utils | powersaved | hibernate | acpi-support.
-      Let the hal package depend on the correct suspend framework.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 25 Jan 2008 06:02:09 +0100
-
-kpowersave (0.7.3-1ubuntu1) hardy; urgency=low
-
-  * Merge from debian unstable.
-  * Dropped debian/patches/kubuntu_01_kdepot.patch - in KDE CDBS class.
-  * Remaining Ubuntu changes:
-    - debian/patches/kubuntu_02_messages_target.diff
-
- -- Jonathan Patrick Davies <jpatrick@kubuntu.org>  Wed, 24 Oct 2007 20:41:44 +0200
-
-kpowersave (0.7.3-1) unstable; urgency=low
-
-  * New upstream release.
-    - Fixes a crash in HardwareInfo::checkCurrentCPUFreqPolicy ().
-      Closes: #422057
-  * debian/control
-    - Use the new "Homepage:" field to specify the upstream URL.
-    - Add a Build-Conflicts against autoconf2.13.
-  * debian/menu
-    - Update to the new menu spec.
-  * debian/patches/10-kpowersave-crash-on-getenv.patch
-    - Removed, fixed upstream.
-  * debian/patches/06-handle_failed_suspend.patch
-    - Removed, merged upstream.
-  * debian/patches/05-restore_window.patch
-    - Removed, merged upstream.
-  * debian/patches/04-default_config.patch
-    - Updated, wodim is now already in the application blacklist that is
-      provided by upstream.
-
- -- Michael Biebl <biebl@debian.org>  Thu, 04 Oct 2007 12:48:39 +0200
-
-kpowersave (0.7.2-3ubuntu1) gutsy; urgency=low
-
-  * Merge from debian unstable. 
-  * Remaining Ubuntu changes:
-    * debian/control: change Maintainer field
-    * debian/patches/kubuntu_01_kdepot.patch
-    * debian/patches/kubuntu_02_messages_target.diff
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 19 May 2007 13:22:26 +1000
-
-kpowersave (0.7.2-3) unstable; urgency=low
-
-  * debian/patches/10-kpowersave-crash-on-getenv.patch
-    - Fixes a crash when the environment variable DESKTOP_SESSION is not set.
-      Patch by Pierre Habouzit, thanks!  Closes: #422420
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Apr 2007 21:07:05 +0200
-
-kpowersave (0.7.2-2) unstable; urgency=low
-
-  * Upload to unstable.
-  * debian/patches/05-restore_window.patch
-    - Pull from svn. Properly restore minimized configuration dialog.
-      Closes: #413638
-  * debian/patches/06-handle_failed_suspend.patch
-    - Pull from svn. Check the return code of the Suspend() method and display
-      a message box if it failed. Closes: #413811
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Apr 2007 20:40:41 +0200
-
-kpowersave (0.7.2-1ubuntu1) feisty; urgency=low
-
-  * Merge from debian experimental
-  * Dropped Ubuntu changes:
-    * debian/control: drop Conflics/Replaces/Provides klaptopdaemon - does not
-      conflict anymore
-    * debian/rules: remove dh_iconcache - done by cdbs
-  * Remaining Ubuntu changes:
-    * debian/control: change Maintainer field
-    * debian/patches/kubuntu_01_kdepot.patch
-    * debian/patches/kubuntu_02_messages_target.diff
-
- -- Luka Renko <lure@ubuntu.com>  Mon, 19 Mar 2007 22:30:13 +0100
-
-kpowersave (0.7.2-1) experimental; urgency=low
-
-  * New upstream release. Closes: #412647
-  * debian/patches/01-autoconf_2.6.patch,
-    debian/patches/02-close_dialog_on_destroy.patch
-    - Removed, merged upstream.
-  * debian/patches/04-default_config.patch
-    - Add wodim to application blacklist.
-    - Do not unmount external media on suspend.
-      kded/mediamanager in Debian is missing a patch which would allow that. 
-  * Beginning with this version, the dependency on powersaved as backend has
-    been dropped. All the heavy lifting is done via HAL now.
-    Update debian/control accordingly:
-    - Remove build dependency on libpowersave-dev.
-    - Remove dependency on powersaved, add a versioned dependency on 
-      hal (>= 0.5.8.1) instead (needed for cpu frequency scaling support).
-    - For proper suspend/resume support, hal should use one of the existing 
-      suspend frameworks. Add Recommends on these packages. 
-    - Update the package description.
-
- -- Michael Biebl <biebl@debian.org>  Mon,  5 Mar 2007 07:24:09 +0100
-
-kpowersave (0.7.2-0ubuntu1) feisty; urgency=low
-
-  * New upstream release: uses HAL directly (no powersave dependency)
-  * Changes:
-    * drop 01-autoconf_2.6.patch: included upstream
-    * drop 02-close_dialog_on_destroy.patch: included upstream
-    * drop 03-reset_blankonly_to_default.patch: fixed upstream
-    * update kubuntu_01_kdepot.patch to apply
-    * drop Build-Depends on libpowersave-dev: now uses HAL 
-    * drop Depends on powersaved: now uses HAL
-    * update Maintainer field
-  * UVF exception approved by MOTU https://launchpad.net/bugs/88793
-
- -- Luka Renko <lure@ubuntu.com>  Wed, 28 Feb 2007 22:35:46 +0100
-
-kpowersave (0.6.2-5ubuntu1) feisty; urgency=low
-
-  * Merge from debian unstable, remaining changes:
-    - Added dh_iconcache
-    - Add kubuntu_02_messages_target.diff fix messages 
-      target for .pot generation
-    - Added kubuntu_01_kdepot.diff for pot file extraction to rosetta
-    - Added a Conflicts/Replaces/Provides: klaptopdaemon to enforce 
-      its removal. 
-
- -- ville palo <vi64pa@gmail.com>  Sun, 21 Jan 2007 09:21:00 +0000
-
-kpowersave (0.6.2-5) unstable; urgency=low
-
-  * Prepend a sequence number to all patches.
-  * debian/patches/03-reset_blankonly_to_default.patch
-    - Added. Reset kscreensaver settings to correct default values on scheme 
-      changes and on application shutdown.
-      Patch by Modestas Vainius, thanks! Closes: #399473
-
- -- Michael Biebl <biebl@debian.org>  Sat, 20 Jan 2007 19:49:40 +0100
-
-kpowersave (0.6.2-4) unstable; urgency=low
-
-  * debian/patches/close_dialog_on_destroy.patch
-    - Added. Correctly close the information dialog when activated over dcop.
-      Closes: #398201
-
- -- Michael Biebl <biebl@debian.org>  Mon, 13 Nov 2006 06:05:56 +0100
-
-kpowersave (0.6.2-3) unstable; urgency=low
-
-  * Update maintainer email address to biebl@debian.org.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 20 Oct 2006 00:04:12 +0200
-
-kpowersave (0.6.2-2ubuntu2) edgy; urgency=low
-
-  * Rebuild against dbus 0.90
-
- -- Sebastian Dröge <slomo@ubuntu.com>  Wed, 30 Aug 2006 22:04:58 +0200
-
-kpowersave (0.6.2-2ubuntu1) edgy; urgency=low
-
-  * Merge from debian unstable.
-
- -- Luka Renko <lure@ubuntu.com>  Sat, 12 Aug 2006 17:17:17 +0200
-
-kpowersave (0.6.2-2) unstable; urgency=medium
-
-  * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379824
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 25 Jul 2006 23:10:10 +0200
-
-kpowersave (0.6.2-1) unstable; urgency=low
-
-  * New upstream release.
-    - Display correct warning message if user lacks permissions to connect to
-      powersaved over dbus. Closes: #356609
-  * Requires powersave 0.12.8 or newer.
-
- -- Michael Biebl <biebl@teco.edu>  Sat, 24 Jun 2006 19:16:02 +0200
-
-kpowersave (0.6.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * Corrected typo in package description. Closes: #364191
-  * Removed kpowersave-fix-utf8_in_eventrc.diff, fixed upstream.
-  * Bumped Standards-Version to 3.7.2, no further changes required.
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 15 May 2006 02:28:48 +0200
-
-kpowersave (0.6.0-1ubuntu4) dapper; urgency=low
-
-  * Added dh_iconcache
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 13 May 2006 20:16:04 +1000
-
-kpowersave (0.6.0-1ubuntu3) dapper; urgency=low
-
-  * Add kubuntu_02_messages_target.diff fix messages 
-    target for .pot generation
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Apr 2006 15:03:01 +0000
-
-kpowersave (0.6.0-1ubuntu2) dapper; urgency=low
-
-  * Added kubuntu_01_kdepot.diff for pot file extraction to rosetta
-
- -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 13 Apr 2006 00:40:57 +0200
-
-kpowersave (0.6.0-1ubuntu1) dapper; urgency=low
-
-  * Added kpowersave-fix-utf8_in_eventrc.diff
-
- -- Luka Renko <lure.net@gmail.com>  Wed, 12 Apr 2006 19:39:57 +0200
-
-kpowersave (0.6.0-1) unstable; urgency=low
-
-  * New upstream release.
-  * Requires powersave 0.12.7 or newer.
-  * Added build dependency on libxtst-dev.
-  * Added kpowersave-fix-utf8_in_eventrc.diff. 
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 17 Apr 2006 18:21:14 +0200
-
-kpowersave (0.5.11-1ubuntu1) dapper; urgency=low
-
-  * New upstream release.
-
- -- Luka Renko <lure.net@gmail.com>  Sun, 26 Mar 2006 18:59:38 +0200
-
-kpowersave (0.5.11-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Michael Biebl <biebl@teco.edu>  Thu, 23 Mar 2006 09:45:35 +0100
-
-kpowersave (0.5.10-1ubuntu1) dapper; urgency=low
-
-  * Added a Conflicts/Replaces/Provides: klaptopdaemon to enforce its removal. 
-
- -- Michael Biebl <biebl@teco.edu>  Thu,  9 Mar 2006 23:05:33 +0100
-
-kpowersave (0.5.10-1) unstable; urgency=low
-
-  * New upstream release.
-  * Requires powersave 0.12.2 or newer.
-
- -- Michael Biebl <biebl@teco.edu>  Tue,  7 Mar 2006 23:45:01 +0100
-
-kpowersave (0.5.9-1) unstable; urgency=low
-
-  * New upstream release.
-  * Requires powersave 0.12.1 or newer.
-
- -- Michael Biebl <biebl@teco.edu>  Thu,  2 Mar 2006 18:43:24 +0100
-
-kpowersave (0.5.8-1) unstable; urgency=low
-
-  * New upstream release.
-  * Bumped debhelper compatibility to 5.
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 21 Feb 2006 10:51:35 +0100
-
-kpowersave (0.5.7-1) unstable; urgency=low
-
-  * New upstream release.
-    - kpowersave now shows correct instructions how to start the powersaved
-      daemon. Closes: #352218
-    - Layout problem in the information dialog has been fixed. Closes: #352684 
-  * Corrected formatting of the homepage url in the long description.
-  
- -- Michael Biebl <biebl@teco.edu>  Tue, 14 Feb 2006 23:27:37 +0100
-
-kpowersave (0.5.6-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Michael Biebl <biebl@teco.edu>  Tue,  7 Feb 2006 02:51:39 +0100
-
-kpowersave (0.5.5-1) unstable; urgency=low
-
-  * New upstream release.
-  * Removed build dependency on libcpufreq-dev as it is now correctly handled
-    by libpowersave-dev.
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 31 Jan 2006 01:32:36 +0100
-
-kpowersave (0.5.4-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 23 Jan 2006 23:14:39 +0100
-
-kpowersave (0.5.3-1) unstable; urgency=low
-
-  * New upstream release.
-  * Requires powersave 0.11.5 or newer.
-
- -- Michael Biebl <biebl@teco.edu>  Wed, 18 Jan 2006 05:10:26 +0100
-
-kpowersave (0.5.2-1ubuntu1) dapper; urgency=low
-
-  * Add kubuntu_01_desktop_autostart.patch to prevent kpowersave from starting
-    automatically in GNOME (Closes: Malone #32340).
-
- -- Raphaël Pinson <raphink@ubuntu.com>  Sat,  4 Mar 2006 17:22:09 +0100
-
-kpowersave (0.5.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * Removed patches absolute_build_path_fix.diff and sound_files_path.diff,
-    fixed upstream.
-  * Tightened dependencies on powersave, version 0.11.2 or newer is required.
-  * Use Debian libtool and regenerate the autotools files.
-    + Added build dependencies to automake1.9, autoconf and libtool.
-  * hal and dbus are now mandatory. Added the corresponding build
-    dependencies.
-  * Removed the build dependency on libqt3-compat-headers. Package has been
-    fixed upstream to compile cleanly without it. 
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 16 Jan 2006 02:02:45 +0100
-
-kpowersave (0.5.0-1) unstable; urgency=low
-
-  * New upstream release.
-  * This release was not uploaded to unstable.
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 10 Jan 2006 02:25:11 +0100
-
-kpowersave (0.4.5-2) unstable; urgency=low
-
-  * Depend on powersaved (<< 0.10). kpowersave-0.4.x does not work properly with
-    powersaved (>= 0.10). 
-
- -- Michael Biebl <biebl@teco.edu>  Sun,  8 Jan 2006 18:00:08 +0100
-
-kpowersave (0.4.5-1) unstable; urgency=low
-
-  * Initial release. Closes: #329922
-
- -- Michael Biebl <biebl@teco.edu>  Wed,  9 Nov 2005 00:53:24 +0100
-
diff --git a/debian/_base/applications/kpowersave.cmake/debian/compat b/debian/_base/applications/kpowersave.cmake/debian/compat
deleted file mode 100644
index 7ed6ff82d..000000000
--- a/debian/_base/applications/kpowersave.cmake/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/_base/applications/kpowersave.cmake/debian/control b/debian/_base/applications/kpowersave.cmake/debian/control
deleted file mode 100644
index c7d180969..000000000
--- a/debian/_base/applications/kpowersave.cmake/debian/control
+++ /dev/null
@@ -1,40 +0,0 @@
-Source: kpowersave-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, cmake-trinity, ninja-build, kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev
-Standards-Version: 3.8.4
-Homepage: http://sourceforge.net/projects/powersave/
-
-Package: kpowersave-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1)
-Description: HAL based power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power 
- management settings and policies of your computer.
- It relies on HAL to do the heavy lifting.
- .
- Current feature list:
-  * support for ACPI, APM and PMU
-  * trigger suspend to disk/ram and standby
-  * switch cpu frequency policy (between: performance, dynamic and powersave)
-  * applet icon with information about AC state, battery fill and battery
-    (warning) states
-  * applet tooltip with information about battery fill and remaining battery 
-    time/percentage
-  * autosuspend (to suspend the machine if the user has been inactive for a 
-    defined time)
-  * a global configurable blacklist with programs which prevent autosuspend
-    (e.g. videoplayer and cd burning tools)
-  * trigger lock screen and select the lock method
-  * KNotify support
-  * online help
-  * localisations for many languages
- KPowersave supports schemes with following configurable specific 
- settings for:
-  * screensaver
-  * DPMS
-  * autosuspend
-  * scheme specific blacklist for autosuspend
-  * notification settings
diff --git a/debian/_base/applications/kpowersave.cmake/debian/install b/debian/_base/applications/kpowersave.cmake/debian/install
deleted file mode 100644
index 4a1194bd1..000000000
--- a/debian/_base/applications/kpowersave.cmake/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/kpowersave.xpm usr/share/pixmaps
diff --git a/debian/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.linda b/debian/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
deleted file mode 100644
index 4d9818595..000000000
--- a/debian/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
+++ /dev/null
@@ -1,4 +0,0 @@
-Tag: lib-not-in-shlibs
-
-Tag: no-shlib-file
-Data: /usr/trinity/lib/libkdeinit_*.so
diff --git a/debian/_base/applications/kpowersave.cmake/debian/menu b/debian/_base/applications/kpowersave.cmake/debian/menu
deleted file mode 100644
index 6ae0f9833..000000000
--- a/debian/_base/applications/kpowersave.cmake/debian/menu
+++ /dev/null
@@ -1,7 +0,0 @@
-?package(kpowersave):\
-  needs="X11"\
-  section="Applications/System/Monitoring"\
-  title="KPowersave"\
-  longtitle="Battery monitor and general power management"\
-  icon="/usr/share/pixmaps/kpowersave.xpm"\
-  command="/opt/trinity/bin/kpowersave"
diff --git a/debian/_base/applications/kpowersave.cmake/debian/preinst b/debian/_base/applications/kpowersave.cmake/debian/preinst
deleted file mode 100644
index b007ccf90..000000000
--- a/debian/_base/applications/kpowersave.cmake/debian/preinst
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kpowersave-trinity
-
-if [ -z "$package_name" ]; then
-    print >&2 "Internal Error. Please report a bug."
-    exit 1;
-fi
-
-case "$1" in
-  install)
-    dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
-    ;;
-  upgrade)
-    dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
-    ;;
-  abort-upgrade)
-    ;;
-  *) echo "$0: didn't understand being called with \`$1'" 1>&2
-     exit 0;;
-esac
-
-exit 0
diff --git a/debian/_base/applications/kpowersave.cmake/debian/rules b/debian/_base/applications/kpowersave.cmake/debian/rules
deleted file mode 100755
index 9be4bb2cb..000000000
--- a/debian/_base/applications/kpowersave.cmake/debian/rules
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/make -f
-  
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include debian/cdbs/debian-tde.mk
-
-DEB_INSTALL_DOCS_ALL := AUTHORS NEWS
-
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
-
-install/kpowersave-trinity::
-	install -p -D -m644 debian/$(cdbs_curpkg).lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
-	install -p -D -m644 debian/$(cdbs_curpkg).linda debian/$(cdbs_curpkg)/usr/share/linda/overrides/$(cdbs_curpkg)
diff --git a/debian/_base/applications/bibletime/debian/bibletime.xpm b/debian/_base/applications/misc/bibletime/debian/bibletime.xpm
index e782dea59..e782dea59 100644
--- a/debian/_base/applications/bibletime/debian/bibletime.xpm
+++ b/debian/_base/applications/misc/bibletime/debian/bibletime.xpm
diff --git a/debian/_base/applications/gwenview/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/gwenview/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/gwenview-i18n/debian/cdbs/versions.pl b/debian/_base/applications/misc/bibletime/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/gwenview-i18n/debian/cdbs/versions.pl
+++ b/debian/_base/applications/misc/bibletime/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/bibletime/debian/changelog b/debian/_base/applications/misc/bibletime/debian/changelog
index 0592f7738..0592f7738 100644
--- a/debian/_base/applications/bibletime/debian/changelog
+++ b/debian/_base/applications/misc/bibletime/debian/changelog
diff --git a/debian/_base/applications/katapult/debian/compat b/debian/_base/applications/misc/bibletime/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/katapult/debian/compat
+++ b/debian/_base/applications/misc/bibletime/debian/compat
diff --git a/debian/_base/applications/bibletime/debian/control b/debian/_base/applications/misc/bibletime/debian/control
index 22a9c035c..22a9c035c 100644
--- a/debian/_base/applications/bibletime/debian/control
+++ b/debian/_base/applications/misc/bibletime/debian/control
diff --git a/debian/_base/applications/bibletime/debian/copyright b/debian/_base/applications/misc/bibletime/debian/copyright
index c256c741a..c256c741a 100644
--- a/debian/_base/applications/bibletime/debian/copyright
+++ b/debian/_base/applications/misc/bibletime/debian/copyright
diff --git a/debian/_base/applications/bibletime/debian/de/bibletime.1 b/debian/_base/applications/misc/bibletime/debian/de/bibletime.1
index 6b662b132..6b662b132 100644
--- a/debian/_base/applications/bibletime/debian/de/bibletime.1
+++ b/debian/_base/applications/misc/bibletime/debian/de/bibletime.1
diff --git a/debian/_base/applications/bibletime/debian/dirs b/debian/_base/applications/misc/bibletime/debian/dirs
index b870fa9c8..b870fa9c8 100644
--- a/debian/_base/applications/bibletime/debian/dirs
+++ b/debian/_base/applications/misc/bibletime/debian/dirs
diff --git a/debian/_base/applications/bibletime/debian/en/bibletime.1 b/debian/_base/applications/misc/bibletime/debian/en/bibletime.1
index b71192301..b71192301 100644
--- a/debian/_base/applications/bibletime/debian/en/bibletime.1
+++ b/debian/_base/applications/misc/bibletime/debian/en/bibletime.1
diff --git a/debian/_base/applications/bibletime/debian/install b/debian/_base/applications/misc/bibletime/debian/install
index dc727ccec..dc727ccec 100644
--- a/debian/_base/applications/bibletime/debian/install
+++ b/debian/_base/applications/misc/bibletime/debian/install
diff --git a/debian/_base/applications/bibletime/debian/menu b/debian/_base/applications/misc/bibletime/debian/menu
index 7ba4e395f..7ba4e395f 100644
--- a/debian/_base/applications/bibletime/debian/menu
+++ b/debian/_base/applications/misc/bibletime/debian/menu
diff --git a/debian/_base/applications/filelight-l10n/debian/patches/series b/debian/_base/applications/misc/bibletime/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/filelight-l10n/debian/patches/series
+++ b/debian/_base/applications/misc/bibletime/debian/patches/series
diff --git a/debian/_base/applications/bibletime/debian/rules b/debian/_base/applications/misc/bibletime/debian/rules
index aff1ecb66..aff1ecb66 100755
--- a/debian/_base/applications/bibletime/debian/rules
+++ b/debian/_base/applications/misc/bibletime/debian/rules
diff --git a/debian/_base/applications/katapult/debian/source/format b/debian/_base/applications/misc/bibletime/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/katapult/debian/source/format
+++ b/debian/_base/applications/misc/bibletime/debian/source/format
diff --git a/debian/_base/applications/katapult/debian/source/options b/debian/_base/applications/misc/bibletime/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/katapult/debian/source/options
+++ b/debian/_base/applications/misc/bibletime/debian/source/options
diff --git a/debian/_base/applications/k3b/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/k3b/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/gwenview/debian/cdbs/versions.pl b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/gwenview/debian/cdbs/versions.pl
+++ b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/compizconfig-backend-kconfig/debian/changelog b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/changelog
index d234636a4..d234636a4 100644
--- a/debian/_base/applications/compizconfig-backend-kconfig/debian/changelog
+++ b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/changelog
diff --git a/debian/_base/applications/kbarcode/debian/compat b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kbarcode/debian/compat
+++ b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/compat
diff --git a/debian/_base/applications/compizconfig-backend-kconfig/debian/control b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/control
index f3914231e..f3914231e 100644
--- a/debian/_base/applications/compizconfig-backend-kconfig/debian/control
+++ b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/control
diff --git a/debian/_base/applications/compizconfig-backend-kconfig/debian/copyright b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/copyright
index 68f70d9c0..68f70d9c0 100644
--- a/debian/_base/applications/compizconfig-backend-kconfig/debian/copyright
+++ b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/copyright
diff --git a/debian/_base/applications/filelight/debian/patches/series b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/filelight/debian/patches/series
+++ b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/patches/series
diff --git a/debian/_base/applications/compizconfig-backend-kconfig/debian/rules b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/rules
index 5076c1b32..5076c1b32 100755
--- a/debian/_base/applications/compizconfig-backend-kconfig/debian/rules
+++ b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/rules
diff --git a/debian/_base/applications/kbarcode/debian/source/format b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kbarcode/debian/source/format
+++ b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/source/format
diff --git a/debian/_base/applications/kbarcode/debian/source/options b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kbarcode/debian/source/options
+++ b/debian/_base/applications/misc/compizconfig-backend-kconfig/debian/source/options
diff --git a/debian/_base/applications/desktop-effects-kde/debian/changelog b/debian/_base/applications/misc/desktop-effects-kde/debian/changelog
index 4f20cbb6a..4f20cbb6a 100644
--- a/debian/_base/applications/desktop-effects-kde/debian/changelog
+++ b/debian/_base/applications/misc/desktop-effects-kde/debian/changelog
diff --git a/debian/_base/applications/kbfx/debian/compat b/debian/_base/applications/misc/desktop-effects-kde/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kbfx/debian/compat
+++ b/debian/_base/applications/misc/desktop-effects-kde/debian/compat
diff --git a/debian/_base/applications/desktop-effects-kde/debian/control b/debian/_base/applications/misc/desktop-effects-kde/debian/control
index 51dafb9e5..51dafb9e5 100644
--- a/debian/_base/applications/desktop-effects-kde/debian/control
+++ b/debian/_base/applications/misc/desktop-effects-kde/debian/control
diff --git a/debian/_base/applications/desktop-effects-kde/debian/copyright b/debian/_base/applications/misc/desktop-effects-kde/debian/copyright
index b2569f52f..b2569f52f 100644
--- a/debian/_base/applications/desktop-effects-kde/debian/copyright
+++ b/debian/_base/applications/misc/desktop-effects-kde/debian/copyright
diff --git a/debian/_base/applications/desktop-effects-kde/debian/desktop-effects-kde-trinity.install b/debian/_base/applications/misc/desktop-effects-kde/debian/desktop-effects-kde-trinity.install
index e6d16e467..e6d16e467 100644
--- a/debian/_base/applications/desktop-effects-kde/debian/desktop-effects-kde-trinity.install
+++ b/debian/_base/applications/misc/desktop-effects-kde/debian/desktop-effects-kde-trinity.install
diff --git a/debian/_base/applications/desktop-effects-kde/debian/rules b/debian/_base/applications/misc/desktop-effects-kde/debian/rules
index 25fa64a44..25fa64a44 100755
--- a/debian/_base/applications/desktop-effects-kde/debian/rules
+++ b/debian/_base/applications/misc/desktop-effects-kde/debian/rules
diff --git a/debian/_base/applications/kbfx/debian/source/format b/debian/_base/applications/misc/desktop-effects-kde/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kbfx/debian/source/format
+++ b/debian/_base/applications/misc/desktop-effects-kde/debian/source/format
diff --git a/debian/_base/applications/kbfx/debian/source/options b/debian/_base/applications/misc/desktop-effects-kde/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kbfx/debian/source/options
+++ b/debian/_base/applications/misc/desktop-effects-kde/debian/source/options
diff --git a/debian/_base/applications/fusion-icon/debian/changelog b/debian/_base/applications/misc/fusion-icon/debian/changelog
index 87f2b117a..87f2b117a 100644
--- a/debian/_base/applications/fusion-icon/debian/changelog
+++ b/debian/_base/applications/misc/fusion-icon/debian/changelog
diff --git a/debian/_base/applications/kbibtex/debian/compat b/debian/_base/applications/misc/fusion-icon/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kbibtex/debian/compat
+++ b/debian/_base/applications/misc/fusion-icon/debian/compat
diff --git a/debian/_base/applications/fusion-icon/debian/control b/debian/_base/applications/misc/fusion-icon/debian/control
index 247483d23..247483d23 100644
--- a/debian/_base/applications/fusion-icon/debian/control
+++ b/debian/_base/applications/misc/fusion-icon/debian/control
diff --git a/debian/_base/applications/fusion-icon/debian/copyright b/debian/_base/applications/misc/fusion-icon/debian/copyright
index ae1ce34fa..ae1ce34fa 100644
--- a/debian/_base/applications/fusion-icon/debian/copyright
+++ b/debian/_base/applications/misc/fusion-icon/debian/copyright
diff --git a/debian/_base/applications/fusion-icon/debian/fusion-icon.1 b/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.1
index 1b15860e1..1b15860e1 100644
--- a/debian/_base/applications/fusion-icon/debian/fusion-icon.1
+++ b/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.1
diff --git a/debian/_base/applications/fusion-icon/debian/fusion-icon.xpm b/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm
index fe0843739..fe0843739 100644
--- a/debian/_base/applications/fusion-icon/debian/fusion-icon.xpm
+++ b/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm
diff --git a/debian/_base/applications/fusion-icon/debian/install b/debian/_base/applications/misc/fusion-icon/debian/install
index 7d4e26567..7d4e26567 100644
--- a/debian/_base/applications/fusion-icon/debian/install
+++ b/debian/_base/applications/misc/fusion-icon/debian/install
diff --git a/debian/_base/applications/fusion-icon/debian/links b/debian/_base/applications/misc/fusion-icon/debian/links
index 51627e83a..51627e83a 100644
--- a/debian/_base/applications/fusion-icon/debian/links
+++ b/debian/_base/applications/misc/fusion-icon/debian/links
diff --git a/debian/_base/applications/fusion-icon/debian/manpages b/debian/_base/applications/misc/fusion-icon/debian/manpages
index 3ba122a39..3ba122a39 100644
--- a/debian/_base/applications/fusion-icon/debian/manpages
+++ b/debian/_base/applications/misc/fusion-icon/debian/manpages
diff --git a/debian/_base/applications/fusion-icon/debian/menu b/debian/_base/applications/misc/fusion-icon/debian/menu
index e85a21dbf..e85a21dbf 100644
--- a/debian/_base/applications/fusion-icon/debian/menu
+++ b/debian/_base/applications/misc/fusion-icon/debian/menu
diff --git a/debian/_base/applications/fusion-icon/debian/patches/series b/debian/_base/applications/misc/fusion-icon/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/fusion-icon/debian/patches/series
+++ b/debian/_base/applications/misc/fusion-icon/debian/patches/series
diff --git a/debian/_base/applications/fusion-icon/debian/pycompat b/debian/_base/applications/misc/fusion-icon/debian/pycompat
index 0cfbf0888..0cfbf0888 100644
--- a/debian/_base/applications/fusion-icon/debian/pycompat
+++ b/debian/_base/applications/misc/fusion-icon/debian/pycompat
diff --git a/debian/_base/applications/fusion-icon/debian/python-distutils-custom.mk b/debian/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk
index fbc70a624..fbc70a624 100644
--- a/debian/_base/applications/fusion-icon/debian/python-distutils-custom.mk
+++ b/debian/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk
diff --git a/debian/_base/applications/fusion-icon/debian/rules b/debian/_base/applications/misc/fusion-icon/debian/rules
index 88040a563..88040a563 100755
--- a/debian/_base/applications/fusion-icon/debian/rules
+++ b/debian/_base/applications/misc/fusion-icon/debian/rules
diff --git a/debian/_base/applications/kbibtex/debian/source/format b/debian/_base/applications/misc/fusion-icon/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kbibtex/debian/source/format
+++ b/debian/_base/applications/misc/fusion-icon/debian/source/format
diff --git a/debian/_base/applications/kbibtex/debian/source/options b/debian/_base/applications/misc/fusion-icon/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kbibtex/debian/source/options
+++ b/debian/_base/applications/misc/fusion-icon/debian/source/options
diff --git a/debian/_base/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/multimedia/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
index ca324be99..ca324be99 100644
--- a/debian/_base/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/applications/multimedia/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/_base/applications/amarok.cmake/debian/README.Debian b/debian/_base/applications/multimedia/amarok/debian/README.Debian
index 7dc17fb17..7dc17fb17 100644
--- a/debian/_base/applications/amarok.cmake/debian/README.Debian
+++ b/debian/_base/applications/multimedia/amarok/debian/README.Debian
diff --git a/debian/_base/applications/amarok.cmake/debian/amarok-common-trinity.install b/debian/_base/applications/multimedia/amarok/debian/amarok-common-trinity.install
index 3b473baa0..3b473baa0 100644
--- a/debian/_base/applications/amarok.cmake/debian/amarok-common-trinity.install
+++ b/debian/_base/applications/multimedia/amarok/debian/amarok-common-trinity.install
diff --git a/debian/_base/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install b/debian/_base/applications/multimedia/amarok/debian/amarok-engine-xine-trinity.install
index c5e46604f..c5e46604f 100644
--- a/debian/_base/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install
+++ b/debian/_base/applications/multimedia/amarok/debian/amarok-engine-xine-trinity.install
diff --git a/debian/_base/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install b/debian/_base/applications/multimedia/amarok/debian/amarok-engine-yauap-trinity.install
index ab71ca6f9..ab71ca6f9 100644
--- a/debian/_base/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install
+++ b/debian/_base/applications/multimedia/amarok/debian/amarok-engine-yauap-trinity.install
diff --git a/debian/_base/applications/amarok.cmake/debian/amarok-trinity.install b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
index f5aeb567f..f5aeb567f 100644
--- a/debian/_base/applications/amarok.cmake/debian/amarok-trinity.install
+++ b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
diff --git a/debian/_base/applications/amarok.cmake/debian/amarok-trinity.manpages b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
index 8094eebb9..8094eebb9 100644
--- a/debian/_base/applications/amarok.cmake/debian/amarok-trinity.manpages
+++ b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
diff --git a/debian/_base/applications/amarok.cmake/debian/amarok-trinity.menu b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.menu
index f78ef6060..f78ef6060 100644
--- a/debian/_base/applications/amarok.cmake/debian/amarok-trinity.menu
+++ b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.menu
diff --git a/debian/_base/applications/amarok.cmake/debian/amarok_play_audiocd.desktop b/debian/_base/applications/multimedia/amarok/debian/amarok_play_audiocd.desktop
index 434630b60..434630b60 100644
--- a/debian/_base/applications/amarok.cmake/debian/amarok_play_audiocd.desktop
+++ b/debian/_base/applications/multimedia/amarok/debian/amarok_play_audiocd.desktop
diff --git a/debian/_base/applications/k9copy/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/k9copy/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/k3b/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/amarok/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/k3b/debian/cdbs/versions.pl
+++ b/debian/_base/applications/multimedia/amarok/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/amarok/debian/changelog b/debian/_base/applications/multimedia/amarok/debian/changelog
index 9551fe7f3..9551fe7f3 100644
--- a/debian/_base/applications/amarok/debian/changelog
+++ b/debian/_base/applications/multimedia/amarok/debian/changelog
diff --git a/debian/_base/applications/kbiff/debian/compat b/debian/_base/applications/multimedia/amarok/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kbiff/debian/compat
+++ b/debian/_base/applications/multimedia/amarok/debian/compat
diff --git a/debian/_base/applications/amarok/debian/control b/debian/_base/applications/multimedia/amarok/debian/control
index bbf0ffcc7..bbf0ffcc7 100644
--- a/debian/_base/applications/amarok/debian/control
+++ b/debian/_base/applications/multimedia/amarok/debian/control
diff --git a/debian/_base/applications/amarok.cmake/debian/copyright b/debian/_base/applications/multimedia/amarok/debian/copyright
index 2775890ba..2775890ba 100644
--- a/debian/_base/applications/amarok.cmake/debian/copyright
+++ b/debian/_base/applications/multimedia/amarok/debian/copyright
diff --git a/debian/_base/applications/amarok.cmake/debian/icons/amarok-16.xpm b/debian/_base/applications/multimedia/amarok/debian/icons/amarok-16.xpm
index 80a228f20..80a228f20 100644
--- a/debian/_base/applications/amarok.cmake/debian/icons/amarok-16.xpm
+++ b/debian/_base/applications/multimedia/amarok/debian/icons/amarok-16.xpm
diff --git a/debian/_base/applications/amarok.cmake/debian/icons/amarok.xpm b/debian/_base/applications/multimedia/amarok/debian/icons/amarok.xpm
index 6411e36d0..6411e36d0 100644
--- a/debian/_base/applications/amarok.cmake/debian/icons/amarok.xpm
+++ b/debian/_base/applications/multimedia/amarok/debian/icons/amarok.xpm
diff --git a/debian/_base/applications/amarok.cmake/debian/install-mp3 b/debian/_base/applications/multimedia/amarok/debian/install-mp3
index 7b06cbd2f..7b06cbd2f 100644
--- a/debian/_base/applications/amarok.cmake/debian/install-mp3
+++ b/debian/_base/applications/multimedia/amarok/debian/install-mp3
diff --git a/debian/_base/applications/amarok.cmake/debian/kubuntu-media-amarok b/debian/_base/applications/multimedia/amarok/debian/kubuntu-media-amarok
index dacf7fc55..dacf7fc55 100644
--- a/debian/_base/applications/amarok.cmake/debian/kubuntu-media-amarok
+++ b/debian/_base/applications/multimedia/amarok/debian/kubuntu-media-amarok
diff --git a/debian/_base/applications/amarok.cmake/debian/man/amarok-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
index dac3bb8aa..dac3bb8aa 100644
--- a/debian/_base/applications/amarok.cmake/debian/man/amarok-trinity.1
+++ b/debian/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
diff --git a/debian/_base/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
index c932b9b0c..c932b9b0c 100644
--- a/debian/_base/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1
+++ b/debian/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
diff --git a/debian/_base/applications/amarok.cmake/debian/man/amarokapp-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
index 0850440dd..0850440dd 100644
--- a/debian/_base/applications/amarok.cmake/debian/man/amarokapp-trinity.1
+++ b/debian/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
diff --git a/debian/_base/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
index f4abfd1b2..f4abfd1b2 100644
--- a/debian/_base/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1
+++ b/debian/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
diff --git a/debian/_base/applications/gtk-qt-engine/debian/patches/series b/debian/_base/applications/multimedia/amarok/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/gtk-qt-engine/debian/patches/series
+++ b/debian/_base/applications/multimedia/amarok/debian/patches/series
diff --git a/debian/_base/applications/amarok/debian/rules b/debian/_base/applications/multimedia/amarok/debian/rules
index cbe19f288..cbe19f288 100755
--- a/debian/_base/applications/amarok/debian/rules
+++ b/debian/_base/applications/multimedia/amarok/debian/rules
diff --git a/debian/_base/applications/kbiff/debian/source/format b/debian/_base/applications/multimedia/amarok/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kbiff/debian/source/format
+++ b/debian/_base/applications/multimedia/amarok/debian/source/format
diff --git a/debian/_base/applications/kbiff/debian/source/options b/debian/_base/applications/multimedia/amarok/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kbiff/debian/source/options
+++ b/debian/_base/applications/multimedia/amarok/debian/source/options
diff --git a/debian/_base/applications/amarok.cmake/debian/watch b/debian/_base/applications/multimedia/amarok/debian/watch
index b0a7420bb..b0a7420bb 100644
--- a/debian/_base/applications/amarok.cmake/debian/watch
+++ b/debian/_base/applications/multimedia/amarok/debian/watch
diff --git a/debian/_base/applications/k3b-i18n/debian/changelog b/debian/_base/applications/multimedia/k3b-i18n/debian/changelog
index 3d2a61f28..3d2a61f28 100644
--- a/debian/_base/applications/k3b-i18n/debian/changelog
+++ b/debian/_base/applications/multimedia/k3b-i18n/debian/changelog
diff --git a/debian/_base/applications/kbookreader/debian/compat b/debian/_base/applications/multimedia/k3b-i18n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kbookreader/debian/compat
+++ b/debian/_base/applications/multimedia/k3b-i18n/debian/compat
diff --git a/debian/_base/applications/k3b-i18n/debian/control b/debian/_base/applications/multimedia/k3b-i18n/debian/control
index 8c2643680..8c2643680 100644
--- a/debian/_base/applications/k3b-i18n/debian/control
+++ b/debian/_base/applications/multimedia/k3b-i18n/debian/control
diff --git a/debian/_base/applications/k3b-i18n/debian/copyright b/debian/_base/applications/multimedia/k3b-i18n/debian/copyright
index c4a57636b..c4a57636b 100644
--- a/debian/_base/applications/k3b-i18n/debian/copyright
+++ b/debian/_base/applications/multimedia/k3b-i18n/debian/copyright
diff --git a/debian/_base/applications/k3b-i18n/debian/rules b/debian/_base/applications/multimedia/k3b-i18n/debian/rules
index c1a9a4afc..c1a9a4afc 100755
--- a/debian/_base/applications/k3b-i18n/debian/rules
+++ b/debian/_base/applications/multimedia/k3b-i18n/debian/rules
diff --git a/debian/_base/applications/kbookreader/debian/source/format b/debian/_base/applications/multimedia/k3b-i18n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kbookreader/debian/source/format
+++ b/debian/_base/applications/multimedia/k3b-i18n/debian/source/format
diff --git a/debian/_base/applications/kbookreader/debian/source/options b/debian/_base/applications/multimedia/k3b-i18n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kbookreader/debian/source/options
+++ b/debian/_base/applications/multimedia/k3b-i18n/debian/source/options
diff --git a/debian/_base/applications/k3b-i18n/debian/watch b/debian/_base/applications/multimedia/k3b-i18n/debian/watch
index cdaaf355a..cdaaf355a 100644
--- a/debian/_base/applications/k3b-i18n/debian/watch
+++ b/debian/_base/applications/multimedia/k3b-i18n/debian/watch
diff --git a/debian/_base/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 0cf0bd0a6..0cf0bd0a6 100644
--- a/debian/_base/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/_base/applications/k3b/debian/README.Debian b/debian/_base/applications/multimedia/k3b/debian/README.Debian
index f87a80e77..f87a80e77 100644
--- a/debian/_base/applications/k3b/debian/README.Debian
+++ b/debian/_base/applications/multimedia/k3b/debian/README.Debian
diff --git a/debian/_base/applications/kaffeine/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kaffeine/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/k9copy/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/k3b/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/k9copy/debian/cdbs/versions.pl
+++ b/debian/_base/applications/multimedia/k3b/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/k3b/debian/changelog b/debian/_base/applications/multimedia/k3b/debian/changelog
index c1b283bb1..c1b283bb1 100644
--- a/debian/_base/applications/k3b/debian/changelog
+++ b/debian/_base/applications/multimedia/k3b/debian/changelog
diff --git a/debian/_base/applications/kchmviewer/debian/compat b/debian/_base/applications/multimedia/k3b/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kchmviewer/debian/compat
+++ b/debian/_base/applications/multimedia/k3b/debian/compat
diff --git a/debian/_base/applications/k3b/debian/control b/debian/_base/applications/multimedia/k3b/debian/control
index d03d19446..d03d19446 100644
--- a/debian/_base/applications/k3b/debian/control
+++ b/debian/_base/applications/multimedia/k3b/debian/control
diff --git a/debian/_base/applications/k3b/debian/copyright b/debian/_base/applications/multimedia/k3b/debian/copyright
index b5022ab93..b5022ab93 100644
--- a/debian/_base/applications/k3b/debian/copyright
+++ b/debian/_base/applications/multimedia/k3b/debian/copyright
diff --git a/debian/_base/applications/k3b/debian/docs b/debian/_base/applications/multimedia/k3b/debian/docs
index 623fe2da9..623fe2da9 100644
--- a/debian/_base/applications/k3b/debian/docs
+++ b/debian/_base/applications/multimedia/k3b/debian/docs
diff --git a/debian/_base/applications/k3b/debian/k3b-data-trinity.install b/debian/_base/applications/multimedia/k3b/debian/k3b-data-trinity.install
index af584fe32..af584fe32 100644
--- a/debian/_base/applications/k3b/debian/k3b-data-trinity.install
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b-data-trinity.install
diff --git a/debian/_base/applications/k3b/debian/k3b-data.files b/debian/_base/applications/multimedia/k3b/debian/k3b-data.files
index 3b3a0add7..3b3a0add7 100644
--- a/debian/_base/applications/k3b/debian/k3b-data.files
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b-data.files
diff --git a/debian/_base/applications/k3b/debian/k3b-data.install b/debian/_base/applications/multimedia/k3b/debian/k3b-data.install
index b7175c514..b7175c514 100644
--- a/debian/_base/applications/k3b/debian/k3b-data.install
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b-data.install
diff --git a/debian/_base/applications/k3b/debian/k3b-rip-audiocd.desktop b/debian/_base/applications/multimedia/k3b/debian/k3b-rip-audiocd.desktop
index 2d7d24def..2d7d24def 100644
--- a/debian/_base/applications/k3b/debian/k3b-rip-audiocd.desktop
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b-rip-audiocd.desktop
diff --git a/debian/_base/applications/k3b/debian/k3b-rip-videodvd.desktop b/debian/_base/applications/multimedia/k3b/debian/k3b-rip-videodvd.desktop
index 627ed3a24..627ed3a24 100644
--- a/debian/_base/applications/k3b/debian/k3b-rip-videodvd.desktop
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b-rip-videodvd.desktop
diff --git a/debian/_base/applications/k3b/debian/k3b-trinity.1 b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.1
index abbd41f07..abbd41f07 100644
--- a/debian/_base/applications/k3b/debian/k3b-trinity.1
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.1
diff --git a/debian/_base/applications/k3b/debian/k3b-trinity.install b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.install
index 8e0b27b98..8e0b27b98 100644
--- a/debian/_base/applications/k3b/debian/k3b-trinity.install
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.install
diff --git a/debian/_base/applications/k3b/debian/k3b-trinity.manpages b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages
index 328f16efe..328f16efe 100644
--- a/debian/_base/applications/k3b/debian/k3b-trinity.manpages
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages
diff --git a/debian/_base/applications/k3b/debian/k3b-trinity.menu b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.menu
index f07382ed8..f07382ed8 100644
--- a/debian/_base/applications/k3b/debian/k3b-trinity.menu
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.menu
diff --git a/debian/_base/applications/k3b/debian/k3b-trinity.postinst b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.postinst
index 3807d55e6..3807d55e6 100644
--- a/debian/_base/applications/k3b/debian/k3b-trinity.postinst
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.postinst
diff --git a/debian/_base/applications/k3b/debian/k3b-write-bin-image.desktop b/debian/_base/applications/multimedia/k3b/debian/k3b-write-bin-image.desktop
index f1223957d..f1223957d 100644
--- a/debian/_base/applications/k3b/debian/k3b-write-bin-image.desktop
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b-write-bin-image.desktop
diff --git a/debian/_base/applications/k3b/debian/k3b-write-iso-image.desktop b/debian/_base/applications/multimedia/k3b/debian/k3b-write-iso-image.desktop
index bc8b04a50..bc8b04a50 100644
--- a/debian/_base/applications/k3b/debian/k3b-write-iso-image.desktop
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b-write-iso-image.desktop
diff --git a/debian/_base/applications/k3b/debian/k3b.files b/debian/_base/applications/multimedia/k3b/debian/k3b.files
index d6388a5b6..d6388a5b6 100644
--- a/debian/_base/applications/k3b/debian/k3b.files
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b.files
diff --git a/debian/_base/applications/k3b/debian/k3b.install b/debian/_base/applications/multimedia/k3b/debian/k3b.install
index 72cf96bb3..72cf96bb3 100644
--- a/debian/_base/applications/k3b/debian/k3b.install
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b.install
diff --git a/debian/_base/applications/k3b/debian/k3b.manpages b/debian/_base/applications/multimedia/k3b/debian/k3b.manpages
index 60dde70bc..60dde70bc 100644
--- a/debian/_base/applications/k3b/debian/k3b.manpages
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b.manpages
diff --git a/debian/_base/applications/k3b/debian/k3b.menu b/debian/_base/applications/multimedia/k3b/debian/k3b.menu
index c6f95c029..c6f95c029 100644
--- a/debian/_base/applications/k3b/debian/k3b.menu
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b.menu
diff --git a/debian/_base/applications/k3b/debian/k3b.postinst b/debian/_base/applications/multimedia/k3b/debian/k3b.postinst
index 3807d55e6..3807d55e6 100644
--- a/debian/_base/applications/k3b/debian/k3b.postinst
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b.postinst
diff --git a/debian/_base/applications/k3b/debian/k3b.xpm b/debian/_base/applications/multimedia/k3b/debian/k3b.xpm
index a7748bac4..a7748bac4 100644
--- a/debian/_base/applications/k3b/debian/k3b.xpm
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b.xpm
diff --git a/debian/_base/applications/k3b/debian/libk3b-dev.files b/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.files
index d45003d06..d45003d06 100644
--- a/debian/_base/applications/k3b/debian/libk3b-dev.files
+++ b/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.files
diff --git a/debian/_base/applications/k3b/debian/libk3b-dev.install b/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.install
index 6257a06d1..6257a06d1 100644
--- a/debian/_base/applications/k3b/debian/libk3b-dev.install
+++ b/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.install
diff --git a/debian/_base/applications/k3b/debian/libk3b-trinity-dev.install b/debian/_base/applications/multimedia/k3b/debian/libk3b-trinity-dev.install
index 575f91fdb..575f91fdb 100644
--- a/debian/_base/applications/k3b/debian/libk3b-trinity-dev.install
+++ b/debian/_base/applications/multimedia/k3b/debian/libk3b-trinity-dev.install
diff --git a/debian/_base/applications/k3b/debian/libk3b3-extracodecs-trinity.install b/debian/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs-trinity.install
index d806398ef..d806398ef 100644
--- a/debian/_base/applications/k3b/debian/libk3b3-extracodecs-trinity.install
+++ b/debian/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs-trinity.install
diff --git a/debian/_base/applications/k3b/debian/libk3b3-extracodecs.install b/debian/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install
index 0e57a97dc..0e57a97dc 100644
--- a/debian/_base/applications/k3b/debian/libk3b3-extracodecs.install
+++ b/debian/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install
diff --git a/debian/_base/applications/k3b/debian/libk3b3-trinity.install b/debian/_base/applications/multimedia/k3b/debian/libk3b3-trinity.install
index e18a34c1c..e18a34c1c 100644
--- a/debian/_base/applications/k3b/debian/libk3b3-trinity.install
+++ b/debian/_base/applications/multimedia/k3b/debian/libk3b3-trinity.install
diff --git a/debian/_base/applications/k3b/debian/libk3b3.files b/debian/_base/applications/multimedia/k3b/debian/libk3b3.files
index d77e53e7c..d77e53e7c 100644
--- a/debian/_base/applications/k3b/debian/libk3b3.files
+++ b/debian/_base/applications/multimedia/k3b/debian/libk3b3.files
diff --git a/debian/_base/applications/k3b/debian/libk3b3.install b/debian/_base/applications/multimedia/k3b/debian/libk3b3.install
index f5c557815..f5c557815 100644
--- a/debian/_base/applications/k3b/debian/libk3b3.install
+++ b/debian/_base/applications/multimedia/k3b/debian/libk3b3.install
diff --git a/debian/_base/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff b/debian/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
index dc44bfdb8..dc44bfdb8 100644
--- a/debian/_base/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
+++ b/debian/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
diff --git a/debian/_base/applications/k3b/debian/patches/series b/debian/_base/applications/multimedia/k3b/debian/patches/series
index bff63cb8c..bff63cb8c 100644
--- a/debian/_base/applications/k3b/debian/patches/series
+++ b/debian/_base/applications/multimedia/k3b/debian/patches/series
diff --git a/debian/_base/applications/k3b/debian/rules b/debian/_base/applications/multimedia/k3b/debian/rules
index e40095080..e40095080 100755
--- a/debian/_base/applications/k3b/debian/rules
+++ b/debian/_base/applications/multimedia/k3b/debian/rules
diff --git a/debian/_base/applications/kchmviewer/debian/source/format b/debian/_base/applications/multimedia/k3b/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kchmviewer/debian/source/format
+++ b/debian/_base/applications/multimedia/k3b/debian/source/format
diff --git a/debian/_base/applications/kchmviewer/debian/source/options b/debian/_base/applications/multimedia/k3b/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kchmviewer/debian/source/options
+++ b/debian/_base/applications/multimedia/k3b/debian/source/options
diff --git a/debian/_base/applications/k3b/debian/watch b/debian/_base/applications/multimedia/k3b/debian/watch
index 7e3c554ae..7e3c554ae 100644
--- a/debian/_base/applications/k3b/debian/watch
+++ b/debian/_base/applications/multimedia/k3b/debian/watch
diff --git a/debian/_base/applications/katapult/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/katapult/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kaffeine/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/k9copy/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kaffeine/debian/cdbs/versions.pl
+++ b/debian/_base/applications/multimedia/k9copy/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/k9copy/debian/changelog b/debian/_base/applications/multimedia/k9copy/debian/changelog
index 5220703ba..5220703ba 100644
--- a/debian/_base/applications/k9copy/debian/changelog
+++ b/debian/_base/applications/multimedia/k9copy/debian/changelog
diff --git a/debian/_base/applications/kcpuload/debian/compat b/debian/_base/applications/multimedia/k9copy/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kcpuload/debian/compat
+++ b/debian/_base/applications/multimedia/k9copy/debian/compat
diff --git a/debian/_base/applications/k9copy/debian/control b/debian/_base/applications/multimedia/k9copy/debian/control
index 0170482bb..0170482bb 100644
--- a/debian/_base/applications/k9copy/debian/control
+++ b/debian/_base/applications/multimedia/k9copy/debian/control
diff --git a/debian/_base/applications/k9copy/debian/copyright b/debian/_base/applications/multimedia/k9copy/debian/copyright
index c08901dd0..c08901dd0 100644
--- a/debian/_base/applications/k9copy/debian/copyright
+++ b/debian/_base/applications/multimedia/k9copy/debian/copyright
diff --git a/debian/_base/applications/k9copy/debian/k9copy.1.docbook b/debian/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook
index d3fd4d792..d3fd4d792 100644
--- a/debian/_base/applications/k9copy/debian/k9copy.1.docbook
+++ b/debian/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook
diff --git a/debian/_base/applications/gwenview-i18n/debian/patches/series b/debian/_base/applications/multimedia/k9copy/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/gwenview-i18n/debian/patches/series
+++ b/debian/_base/applications/multimedia/k9copy/debian/patches/series
diff --git a/debian/_base/applications/k9copy/debian/rules b/debian/_base/applications/multimedia/k9copy/debian/rules
index e0b9d3f6f..e0b9d3f6f 100755
--- a/debian/_base/applications/k9copy/debian/rules
+++ b/debian/_base/applications/multimedia/k9copy/debian/rules
diff --git a/debian/_base/applications/kcpuload/debian/source/format b/debian/_base/applications/multimedia/k9copy/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kcpuload/debian/source/format
+++ b/debian/_base/applications/multimedia/k9copy/debian/source/format
diff --git a/debian/_base/applications/kcpuload/debian/source/options b/debian/_base/applications/multimedia/k9copy/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kcpuload/debian/source/options
+++ b/debian/_base/applications/multimedia/k9copy/debian/source/options
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/changelog b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/changelog
index 7e3c2a0fd..7e3c2a0fd 100644
--- a/debian/_base/applications/kaffeine-mozilla/debian/changelog
+++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/changelog
diff --git a/debian/_base/applications/kdbg/debian/compat b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kdbg/debian/compat
+++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/control b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control
index 28fc31cd0..28fc31cd0 100644
--- a/debian/_base/applications/kaffeine-mozilla/debian/control
+++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/copyright b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/copyright
index d7092f934..d7092f934 100644
--- a/debian/_base/applications/kaffeine-mozilla/debian/copyright
+++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/copyright
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/docs b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/docs
index e845566c0..e845566c0 100644
--- a/debian/_base/applications/kaffeine-mozilla/debian/docs
+++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/docs
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/kaffeine-mozilla.install
index 30f14a91f..30f14a91f 100644
--- a/debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install
+++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/kaffeine-mozilla.install
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/kaffeine-mozilla.links
index 372fe38d5..372fe38d5 100644
--- a/debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links
+++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/kaffeine-mozilla.links
diff --git a/debian/_base/applications/kaffeine-mozilla/debian/rules b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/rules
index 08c10c248..08c10c248 100755
--- a/debian/_base/applications/kaffeine-mozilla/debian/rules
+++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/rules
diff --git a/debian/_base/applications/kdbg/debian/source/format b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kdbg/debian/source/format
+++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/source/format
diff --git a/debian/_base/applications/kdbg/debian/source/options b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kdbg/debian/source/options
+++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/source/options
diff --git a/debian/_base/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/multimedia/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 1d06672c7..1d06672c7 100644
--- a/debian/_base/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/applications/multimedia/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/_base/applications/kaffeine/debian/README.Debian b/debian/_base/applications/multimedia/kaffeine/debian/README.Debian
index 74cac614e..74cac614e 100644
--- a/debian/_base/applications/kaffeine/debian/README.Debian
+++ b/debian/_base/applications/multimedia/kaffeine/debian/README.Debian
diff --git a/debian/_base/applications/kbarcode/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kbarcode/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/katapult/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/kaffeine/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/katapult/debian/cdbs/versions.pl
+++ b/debian/_base/applications/multimedia/kaffeine/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kaffeine/debian/changelog b/debian/_base/applications/multimedia/kaffeine/debian/changelog
index 63b3d1a72..63b3d1a72 100644
--- a/debian/_base/applications/kaffeine/debian/changelog
+++ b/debian/_base/applications/multimedia/kaffeine/debian/changelog
diff --git a/debian/_base/applications/kdbusnotification/debian/compat b/debian/_base/applications/multimedia/kaffeine/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kdbusnotification/debian/compat
+++ b/debian/_base/applications/multimedia/kaffeine/debian/compat
diff --git a/debian/_base/applications/kaffeine/debian/control b/debian/_base/applications/multimedia/kaffeine/debian/control
index 56ee6c3e3..56ee6c3e3 100644
--- a/debian/_base/applications/kaffeine/debian/control
+++ b/debian/_base/applications/multimedia/kaffeine/debian/control
diff --git a/debian/_base/applications/kaffeine/debian/copyright b/debian/_base/applications/multimedia/kaffeine/debian/copyright
index 8b7ddae56..8b7ddae56 100644
--- a/debian/_base/applications/kaffeine/debian/copyright
+++ b/debian/_base/applications/multimedia/kaffeine/debian/copyright
diff --git a/debian/_base/applications/kaffeine/debian/docs b/debian/_base/applications/multimedia/kaffeine/debian/docs
index 194085499..194085499 100644
--- a/debian/_base/applications/kaffeine/debian/docs
+++ b/debian/_base/applications/multimedia/kaffeine/debian/docs
diff --git a/debian/_base/applications/kaffeine/debian/install-codecs b/debian/_base/applications/multimedia/kaffeine/debian/install-codecs
index 271285c4e..271285c4e 100644
--- a/debian/_base/applications/kaffeine/debian/install-codecs
+++ b/debian/_base/applications/multimedia/kaffeine/debian/install-codecs
diff --git a/debian/_base/applications/kaffeine/debian/install-css.sh b/debian/_base/applications/multimedia/kaffeine/debian/install-css.sh
index f374562ff..f374562ff 100644
--- a/debian/_base/applications/kaffeine/debian/install-css.sh
+++ b/debian/_base/applications/multimedia/kaffeine/debian/install-css.sh
diff --git a/debian/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine-gstreamer-trinity.install
index cddfdc50f..cddfdc50f 100644
--- a/debian/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
+++ b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine-gstreamer-trinity.install
diff --git a/debian/_base/applications/kaffeine/debian/kaffeine-iso.desktop b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine-iso.desktop
index c1d407f15..c1d407f15 100644
--- a/debian/_base/applications/kaffeine/debian/kaffeine-iso.desktop
+++ b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine-iso.desktop
diff --git a/debian/_base/applications/kaffeine/debian/kaffeine-trinity.install b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.install
index 825837cba..825837cba 100644
--- a/debian/_base/applications/kaffeine/debian/kaffeine-trinity.install
+++ b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.install
diff --git a/debian/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.lintian-overrides
index 2e7541445..2e7541445 100644
--- a/debian/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides
+++ b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.lintian-overrides
diff --git a/debian/_base/applications/kaffeine/debian/kaffeine.1 b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine.1
index ca6de5bc7..ca6de5bc7 100644
--- a/debian/_base/applications/kaffeine/debian/kaffeine.1
+++ b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine.1
diff --git a/debian/_base/applications/kaffeine/debian/kaffeine.xpm b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine.xpm
index 255d651d9..255d651d9 100644
--- a/debian/_base/applications/kaffeine/debian/kaffeine.xpm
+++ b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine.xpm
diff --git a/debian/_base/applications/kaffeine/debian/kaffeine_codecinstall.desktop b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine_codecinstall.desktop
index 25ec5689c..25ec5689c 100644
--- a/debian/_base/applications/kaffeine/debian/kaffeine_codecinstall.desktop
+++ b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine_codecinstall.desktop
diff --git a/debian/_base/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
index 7b4adb8d9..7b4adb8d9 100644
--- a/debian/_base/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
+++ b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
diff --git a/debian/_base/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
index a022ecda3..a022ecda3 100644
--- a/debian/_base/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
+++ b/debian/_base/applications/multimedia/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
diff --git a/debian/_base/applications/kaffeine/debian/menu b/debian/_base/applications/multimedia/kaffeine/debian/menu
index 4314c464a..4314c464a 100644
--- a/debian/_base/applications/kaffeine/debian/menu
+++ b/debian/_base/applications/multimedia/kaffeine/debian/menu
diff --git a/debian/_base/applications/gwenview/debian/patches/series b/debian/_base/applications/multimedia/kaffeine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/gwenview/debian/patches/series
+++ b/debian/_base/applications/multimedia/kaffeine/debian/patches/series
diff --git a/debian/_base/applications/kaffeine/debian/rules b/debian/_base/applications/multimedia/kaffeine/debian/rules
index 56947e0e5..56947e0e5 100755
--- a/debian/_base/applications/kaffeine/debian/rules
+++ b/debian/_base/applications/multimedia/kaffeine/debian/rules
diff --git a/debian/_base/applications/kdbusnotification/debian/source/format b/debian/_base/applications/multimedia/kaffeine/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kdbusnotification/debian/source/format
+++ b/debian/_base/applications/multimedia/kaffeine/debian/source/format
diff --git a/debian/_base/applications/kdbusnotification/debian/source/options b/debian/_base/applications/multimedia/kaffeine/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kdbusnotification/debian/source/options
+++ b/debian/_base/applications/multimedia/kaffeine/debian/source/options
diff --git a/debian/_base/applications/kaffeine/debian/watch b/debian/_base/applications/multimedia/kaffeine/debian/watch
index 3f054ccd4..3f054ccd4 100644
--- a/debian/_base/applications/kaffeine/debian/watch
+++ b/debian/_base/applications/multimedia/kaffeine/debian/watch
diff --git a/debian/_base/applications/kbarcode/debian/README.Debian b/debian/_base/applications/multimedia/kmplayer/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/_base/applications/kbarcode/debian/README.Debian
+++ b/debian/_base/applications/multimedia/kmplayer/debian/README.Debian
diff --git a/debian/_base/applications/kbibtex/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kbibtex/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kbarcode/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/kmplayer/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kbarcode/debian/cdbs/versions.pl
+++ b/debian/_base/applications/multimedia/kmplayer/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kmplayer/debian/changelog b/debian/_base/applications/multimedia/kmplayer/debian/changelog
index 6084762a7..6084762a7 100644
--- a/debian/_base/applications/kmplayer/debian/changelog
+++ b/debian/_base/applications/multimedia/kmplayer/debian/changelog
diff --git a/debian/_base/applications/kde-guidance/debian/compat b/debian/_base/applications/multimedia/kmplayer/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kde-guidance/debian/compat
+++ b/debian/_base/applications/multimedia/kmplayer/debian/compat
diff --git a/debian/_base/applications/kmplayer/debian/control b/debian/_base/applications/multimedia/kmplayer/debian/control
index 9f49f5143..9f49f5143 100644
--- a/debian/_base/applications/kmplayer/debian/control
+++ b/debian/_base/applications/multimedia/kmplayer/debian/control
diff --git a/debian/_base/applications/kmplayer/debian/copyright b/debian/_base/applications/multimedia/kmplayer/debian/copyright
index 749b0db05..749b0db05 100644
--- a/debian/_base/applications/kmplayer/debian/copyright
+++ b/debian/_base/applications/multimedia/kmplayer/debian/copyright
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer-base-trinity.install b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer-base-trinity.install
index 7e7f44aec..7e7f44aec 100644
--- a/debian/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
+++ b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer-base-trinity.install
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer-konq-plugins-trinity.install
index 4590b56f4..4590b56f4 100644
--- a/debian/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
+++ b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer-konq-plugins-trinity.install
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity-doc.install
index 9b26532f3..9b26532f3 100644
--- a/debian/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install
+++ b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity-doc.install
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer-trinity.install b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity.install
index 3c2a5f5ff..3c2a5f5ff 100644
--- a/debian/_base/applications/kmplayer/debian/kmplayer-trinity.install
+++ b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity.install
diff --git a/debian/_base/applications/kmplayer/debian/kmplayer.1.docbook b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer.1.docbook
index eda152760..eda152760 100644
--- a/debian/_base/applications/kmplayer/debian/kmplayer.1.docbook
+++ b/debian/_base/applications/multimedia/kmplayer/debian/kmplayer.1.docbook
diff --git a/debian/_base/applications/kmplayer/debian/menu b/debian/_base/applications/multimedia/kmplayer/debian/menu
index 444b60fb5..444b60fb5 100644
--- a/debian/_base/applications/kmplayer/debian/menu
+++ b/debian/_base/applications/multimedia/kmplayer/debian/menu
diff --git a/debian/_base/applications/k9copy/debian/patches/series b/debian/_base/applications/multimedia/kmplayer/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/k9copy/debian/patches/series
+++ b/debian/_base/applications/multimedia/kmplayer/debian/patches/series
diff --git a/debian/_base/applications/kmplayer/debian/rules b/debian/_base/applications/multimedia/kmplayer/debian/rules
index 3b37fa87e..3b37fa87e 100755
--- a/debian/_base/applications/kmplayer/debian/rules
+++ b/debian/_base/applications/multimedia/kmplayer/debian/rules
diff --git a/debian/_base/applications/kde-guidance/debian/source/format b/debian/_base/applications/multimedia/kmplayer/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kde-guidance/debian/source/format
+++ b/debian/_base/applications/multimedia/kmplayer/debian/source/format
diff --git a/debian/_base/applications/kde-guidance/debian/source/options b/debian/_base/applications/multimedia/kmplayer/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kde-guidance/debian/source/options
+++ b/debian/_base/applications/multimedia/kmplayer/debian/source/options
diff --git a/debian/_base/applications/kmplayer/debian/watch b/debian/_base/applications/multimedia/kmplayer/debian/watch
index d809e2ca1..d809e2ca1 100644
--- a/debian/_base/applications/kmplayer/debian/watch
+++ b/debian/_base/applications/multimedia/kmplayer/debian/watch
diff --git a/debian/_base/applications/kradio/debian/changelog b/debian/_base/applications/multimedia/kradio/debian/changelog
index ad7c7832c..ad7c7832c 100644
--- a/debian/_base/applications/kradio/debian/changelog
+++ b/debian/_base/applications/multimedia/kradio/debian/changelog
diff --git a/debian/_base/applications/kde-style-lipstik/debian/compat b/debian/_base/applications/multimedia/kradio/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kde-style-lipstik/debian/compat
+++ b/debian/_base/applications/multimedia/kradio/debian/compat
diff --git a/debian/_base/applications/kradio/debian/control b/debian/_base/applications/multimedia/kradio/debian/control
index 25515173b..25515173b 100644
--- a/debian/_base/applications/kradio/debian/control
+++ b/debian/_base/applications/multimedia/kradio/debian/control
diff --git a/debian/_base/applications/kradio/debian/convert-presets.1 b/debian/_base/applications/multimedia/kradio/debian/convert-presets.1
index 1f605127f..1f605127f 100644
--- a/debian/_base/applications/kradio/debian/convert-presets.1
+++ b/debian/_base/applications/multimedia/kradio/debian/convert-presets.1
diff --git a/debian/_base/applications/kradio/debian/copyright b/debian/_base/applications/multimedia/kradio/debian/copyright
index 932ce3d04..932ce3d04 100644
--- a/debian/_base/applications/kradio/debian/copyright
+++ b/debian/_base/applications/multimedia/kradio/debian/copyright
diff --git a/debian/_base/applications/kradio/debian/docs b/debian/_base/applications/multimedia/kradio/debian/docs
index bc4a4e465..bc4a4e465 100644
--- a/debian/_base/applications/kradio/debian/docs
+++ b/debian/_base/applications/multimedia/kradio/debian/docs
diff --git a/debian/_base/applications/kradio/debian/kradio.1 b/debian/_base/applications/multimedia/kradio/debian/kradio.1
index 3b715d05d..3b715d05d 100644
--- a/debian/_base/applications/kradio/debian/kradio.1
+++ b/debian/_base/applications/multimedia/kradio/debian/kradio.1
diff --git a/debian/_base/applications/kradio/debian/manpages b/debian/_base/applications/multimedia/kradio/debian/manpages
index f37e7cfcf..f37e7cfcf 100644
--- a/debian/_base/applications/kradio/debian/manpages
+++ b/debian/_base/applications/multimedia/kradio/debian/manpages
diff --git a/debian/_base/applications/kradio/debian/menu b/debian/_base/applications/multimedia/kradio/debian/menu
index 9c29dc73c..9c29dc73c 100644
--- a/debian/_base/applications/kradio/debian/menu
+++ b/debian/_base/applications/multimedia/kradio/debian/menu
diff --git a/debian/_base/applications/kradio/debian/rules b/debian/_base/applications/multimedia/kradio/debian/rules
index f3c1f73d7..f3c1f73d7 100755
--- a/debian/_base/applications/kradio/debian/rules
+++ b/debian/_base/applications/multimedia/kradio/debian/rules
diff --git a/debian/_base/applications/kde-style-lipstik/debian/source/format b/debian/_base/applications/multimedia/kradio/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kde-style-lipstik/debian/source/format
+++ b/debian/_base/applications/multimedia/kradio/debian/source/format
diff --git a/debian/_base/applications/kde-style-lipstik/debian/source/options b/debian/_base/applications/multimedia/kradio/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kde-style-lipstik/debian/source/options
+++ b/debian/_base/applications/multimedia/kradio/debian/source/options
diff --git a/debian/_base/applications/kradio/debian/watch b/debian/_base/applications/multimedia/kradio/debian/watch
index 49f735f61..49f735f61 100644
--- a/debian/_base/applications/kradio/debian/watch
+++ b/debian/_base/applications/multimedia/kradio/debian/watch
diff --git a/debian/_base/applications/rosegarden/debian/README.Debian b/debian/_base/applications/multimedia/rosegarden/debian/README.Debian
index 64768c7c2..64768c7c2 100644
--- a/debian/_base/applications/rosegarden/debian/README.Debian
+++ b/debian/_base/applications/multimedia/rosegarden/debian/README.Debian
diff --git a/debian/_base/applications/kbiff/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kbiff/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/rosegarden/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/rosegarden/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/debian/_base/applications/rosegarden/debian/cdbs/versions.pl
+++ b/debian/_base/applications/multimedia/rosegarden/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/rosegarden/debian/changelog b/debian/_base/applications/multimedia/rosegarden/debian/changelog
index c91341594..c91341594 100644
--- a/debian/_base/applications/rosegarden/debian/changelog
+++ b/debian/_base/applications/multimedia/rosegarden/debian/changelog
diff --git a/debian/_base/applications/kde-style-qtcurve/debian/compat b/debian/_base/applications/multimedia/rosegarden/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kde-style-qtcurve/debian/compat
+++ b/debian/_base/applications/multimedia/rosegarden/debian/compat
diff --git a/debian/_base/applications/rosegarden/debian/control b/debian/_base/applications/multimedia/rosegarden/debian/control
index fdafc1946..fdafc1946 100644
--- a/debian/_base/applications/rosegarden/debian/control
+++ b/debian/_base/applications/multimedia/rosegarden/debian/control
diff --git a/debian/_base/applications/rosegarden/debian/copyright b/debian/_base/applications/multimedia/rosegarden/debian/copyright
index df2a7e77d..df2a7e77d 100644
--- a/debian/_base/applications/rosegarden/debian/copyright
+++ b/debian/_base/applications/multimedia/rosegarden/debian/copyright
diff --git a/debian/_base/applications/rosegarden/debian/lintianoverrides b/debian/_base/applications/multimedia/rosegarden/debian/lintianoverrides
index 135ea69e9..135ea69e9 100644
--- a/debian/_base/applications/rosegarden/debian/lintianoverrides
+++ b/debian/_base/applications/multimedia/rosegarden/debian/lintianoverrides
diff --git a/debian/_base/applications/kaffeine/debian/patches/series b/debian/_base/applications/multimedia/rosegarden/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kaffeine/debian/patches/series
+++ b/debian/_base/applications/multimedia/rosegarden/debian/patches/series
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-audiofile-importer.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1
index b420ba197..b420ba197 100644
--- a/debian/_base/applications/rosegarden/debian/rosegarden-audiofile-importer.1
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-data-trinity.install b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-data-trinity.install
index 59a4a5943..59a4a5943 100644
--- a/debian/_base/applications/rosegarden/debian/rosegarden-data-trinity.install
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-data-trinity.install
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-lilypondview.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1
index e2aa9f951..e2aa9f951 100644
--- a/debian/_base/applications/rosegarden/debian/rosegarden-lilypondview.1
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-project-package.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1
index 0da30c2a5..0da30c2a5 100644
--- a/debian/_base/applications/rosegarden/debian/rosegarden-project-package.1
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.dirs b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.dirs
index 1dffbd19c..1dffbd19c 100644
--- a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.dirs
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.dirs
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.docs b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.docs
index 23da6d676..23da6d676 100644
--- a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.docs
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.docs
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.examples b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.examples
index 1e660fdcf..1e660fdcf 100644
--- a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.examples
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.examples
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.install b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
index 50a0bcdaa..50a0bcdaa 100644
--- a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.install
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.links b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.links
index f3d6d1228..f3d6d1228 100644
--- a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.links
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.links
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.menu b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.menu
index ca56a8f26..ca56a8f26 100644
--- a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.menu
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.menu
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
index 3b3894dec..3b3894dec 100644
--- a/debian/_base/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
diff --git a/debian/_base/applications/rosegarden/debian/rosegarden.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden.1
index 91916b271..91916b271 100644
--- a/debian/_base/applications/rosegarden/debian/rosegarden.1
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden.1
diff --git a/debian/_base/applications/rosegarden/debian/rules b/debian/_base/applications/multimedia/rosegarden/debian/rules
index 4a0ea2f93..4a0ea2f93 100755
--- a/debian/_base/applications/rosegarden/debian/rules
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rules
diff --git a/debian/_base/applications/rosegarden/debian/semantic.cache b/debian/_base/applications/multimedia/rosegarden/debian/semantic.cache
index e7b76d07a..e7b76d07a 100644
--- a/debian/_base/applications/rosegarden/debian/semantic.cache
+++ b/debian/_base/applications/multimedia/rosegarden/debian/semantic.cache
diff --git a/debian/_base/applications/kde-style-qtcurve/debian/source/format b/debian/_base/applications/multimedia/rosegarden/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kde-style-qtcurve/debian/source/format
+++ b/debian/_base/applications/multimedia/rosegarden/debian/source/format
diff --git a/debian/_base/applications/kde-style-qtcurve/debian/source/options b/debian/_base/applications/multimedia/rosegarden/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kde-style-qtcurve/debian/source/options
+++ b/debian/_base/applications/multimedia/rosegarden/debian/source/options
diff --git a/debian/_base/applications/rosegarden/debian/watch b/debian/_base/applications/multimedia/rosegarden/debian/watch
index f0021dfd7..f0021dfd7 100644
--- a/debian/_base/applications/rosegarden/debian/watch
+++ b/debian/_base/applications/multimedia/rosegarden/debian/watch
diff --git a/debian/_base/applications/rosegarden/debian/x-rosegarden.desktop b/debian/_base/applications/multimedia/rosegarden/debian/x-rosegarden.desktop
index b6b766909..b6b766909 100644
--- a/debian/_base/applications/rosegarden/debian/x-rosegarden.desktop
+++ b/debian/_base/applications/multimedia/rosegarden/debian/x-rosegarden.desktop
diff --git a/debian/_base/applications/soundkonverter/debian/README.Debian b/debian/_base/applications/multimedia/soundkonverter/debian/README.Debian
index 079784d5b..079784d5b 100644
--- a/debian/_base/applications/soundkonverter/debian/README.Debian
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/README.Debian
diff --git a/debian/_base/applications/kbookreader/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kbookreader/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kbibtex/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kbibtex/debian/cdbs/versions.pl
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/soundkonverter/debian/changelog b/debian/_base/applications/multimedia/soundkonverter/debian/changelog
index 585438bcf..585438bcf 100644
--- a/debian/_base/applications/soundkonverter/debian/changelog
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/changelog
diff --git a/debian/_base/applications/kde-systemsettings/debian/compat b/debian/_base/applications/multimedia/soundkonverter/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kde-systemsettings/debian/compat
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/compat
diff --git a/debian/_base/applications/soundkonverter/debian/control b/debian/_base/applications/multimedia/soundkonverter/debian/control
index 1a2daf802..1a2daf802 100644
--- a/debian/_base/applications/soundkonverter/debian/control
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/control
diff --git a/debian/_base/applications/soundkonverter/debian/copyright b/debian/_base/applications/multimedia/soundkonverter/debian/copyright
index 05bf08795..05bf08795 100644
--- a/debian/_base/applications/soundkonverter/debian/copyright
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/copyright
diff --git a/debian/_base/applications/kdiff3/debian/docs b/debian/_base/applications/multimedia/soundkonverter/debian/docs
index e845566c0..e845566c0 100644
--- a/debian/_base/applications/kdiff3/debian/docs
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/docs
diff --git a/debian/_base/applications/kile/debian/patches/.gitignore b/debian/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kile/debian/patches/.gitignore
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore
diff --git a/debian/_base/applications/soundkonverter/debian/rules b/debian/_base/applications/multimedia/soundkonverter/debian/rules
index 2294f77ba..2294f77ba 100755
--- a/debian/_base/applications/soundkonverter/debian/rules
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/rules
diff --git a/debian/_base/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install b/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-amarok-trinity.install
index 38b81a194..38b81a194 100644
--- a/debian/_base/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-amarok-trinity.install
diff --git a/debian/_base/applications/soundkonverter/debian/soundkonverter-trinity.install b/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
index 0f6801b72..0f6801b72 100644
--- a/debian/_base/applications/soundkonverter/debian/soundkonverter-trinity.install
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
diff --git a/debian/_base/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides b/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
index 6a12cd7d8..6a12cd7d8 100644
--- a/debian/_base/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
diff --git a/debian/_base/applications/kde-systemsettings/debian/source/format b/debian/_base/applications/multimedia/soundkonverter/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kde-systemsettings/debian/source/format
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/source/format
diff --git a/debian/_base/applications/kde-systemsettings/debian/source/options b/debian/_base/applications/multimedia/soundkonverter/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kde-systemsettings/debian/source/options
+++ b/debian/_base/applications/multimedia/soundkonverter/debian/source/options
diff --git a/debian/_base/applications/basket/debian/basket-kontact-integration-trinity.install b/debian/_base/applications/office/basket/debian/basket-kontact-integration-trinity.install
index 846f111d3..846f111d3 100644
--- a/debian/_base/applications/basket/debian/basket-kontact-integration-trinity.install
+++ b/debian/_base/applications/office/basket/debian/basket-kontact-integration-trinity.install
diff --git a/debian/_base/applications/basket/debian/basket-trinity.install b/debian/_base/applications/office/basket/debian/basket-trinity.install
index a24d7e924..a24d7e924 100644
--- a/debian/_base/applications/basket/debian/basket-trinity.install
+++ b/debian/_base/applications/office/basket/debian/basket-trinity.install
diff --git a/debian/_base/applications/basket/debian/basket.1 b/debian/_base/applications/office/basket/debian/basket.1
index 46f5a3754..46f5a3754 100644
--- a/debian/_base/applications/basket/debian/basket.1
+++ b/debian/_base/applications/office/basket/debian/basket.1
diff --git a/debian/_base/applications/basket/debian/changelog b/debian/_base/applications/office/basket/debian/changelog
index e39578cba..e39578cba 100644
--- a/debian/_base/applications/basket/debian/changelog
+++ b/debian/_base/applications/office/basket/debian/changelog
diff --git a/debian/_base/applications/kdesudo/debian/compat b/debian/_base/applications/office/basket/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kdesudo/debian/compat
+++ b/debian/_base/applications/office/basket/debian/compat
diff --git a/debian/_base/applications/basket/debian/control b/debian/_base/applications/office/basket/debian/control
index 5f29d0e65..5f29d0e65 100644
--- a/debian/_base/applications/basket/debian/control
+++ b/debian/_base/applications/office/basket/debian/control
diff --git a/debian/_base/applications/basket/debian/copyright b/debian/_base/applications/office/basket/debian/copyright
index 32425ad0a..32425ad0a 100644
--- a/debian/_base/applications/basket/debian/copyright
+++ b/debian/_base/applications/office/basket/debian/copyright
diff --git a/debian/_base/applications/kbiff/debian/dirs b/debian/_base/applications/office/basket/debian/dirs
index f583045fe..f583045fe 100644
--- a/debian/_base/applications/kbiff/debian/dirs
+++ b/debian/_base/applications/office/basket/debian/dirs
diff --git a/debian/_base/applications/kile/debian/docs b/debian/_base/applications/office/basket/debian/docs
index 724e08449..724e08449 100644
--- a/debian/_base/applications/kile/debian/docs
+++ b/debian/_base/applications/office/basket/debian/docs
diff --git a/debian/_base/applications/basket/debian/menu b/debian/_base/applications/office/basket/debian/menu
index a7e14117e..a7e14117e 100644
--- a/debian/_base/applications/basket/debian/menu
+++ b/debian/_base/applications/office/basket/debian/menu
diff --git a/debian/_base/applications/katapult/debian/patches/series b/debian/_base/applications/office/basket/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/katapult/debian/patches/series
+++ b/debian/_base/applications/office/basket/debian/patches/series
diff --git a/debian/_base/applications/basket/debian/rules b/debian/_base/applications/office/basket/debian/rules
index 200c5baf7..200c5baf7 100755
--- a/debian/_base/applications/basket/debian/rules
+++ b/debian/_base/applications/office/basket/debian/rules
diff --git a/debian/_base/applications/kdesudo/debian/source/format b/debian/_base/applications/office/basket/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kdesudo/debian/source/format
+++ b/debian/_base/applications/office/basket/debian/source/format
diff --git a/debian/_base/applications/kdesudo/debian/source/options b/debian/_base/applications/office/basket/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kdesudo/debian/source/options
+++ b/debian/_base/applications/office/basket/debian/source/options
diff --git a/debian/_base/applications/basket/debian/watch b/debian/_base/applications/office/basket/debian/watch
index a620b0d5a..a620b0d5a 100644
--- a/debian/_base/applications/basket/debian/watch
+++ b/debian/_base/applications/office/basket/debian/watch
diff --git a/debian/_base/applications/kcpuload/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kcpuload/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kbiff/debian/cdbs/versions.pl b/debian/_base/applications/office/kbibtex/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kbiff/debian/cdbs/versions.pl
+++ b/debian/_base/applications/office/kbibtex/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kbibtex/debian/changelog b/debian/_base/applications/office/kbibtex/debian/changelog
index c06f2a183..c06f2a183 100644
--- a/debian/_base/applications/kbibtex/debian/changelog
+++ b/debian/_base/applications/office/kbibtex/debian/changelog
diff --git a/debian/_base/applications/kdesvn/debian/compat b/debian/_base/applications/office/kbibtex/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kdesvn/debian/compat
+++ b/debian/_base/applications/office/kbibtex/debian/compat
diff --git a/debian/_base/applications/kbibtex/debian/control b/debian/_base/applications/office/kbibtex/debian/control
index a85448cb6..a85448cb6 100644
--- a/debian/_base/applications/kbibtex/debian/control
+++ b/debian/_base/applications/office/kbibtex/debian/control
diff --git a/debian/_base/applications/kbibtex/debian/copyright b/debian/_base/applications/office/kbibtex/debian/copyright
index a3860eab7..a3860eab7 100644
--- a/debian/_base/applications/kbibtex/debian/copyright
+++ b/debian/_base/applications/office/kbibtex/debian/copyright
diff --git a/debian/_base/applications/kbibtex/debian/docs b/debian/_base/applications/office/kbibtex/debian/docs
index 166765aba..166765aba 100644
--- a/debian/_base/applications/kbibtex/debian/docs
+++ b/debian/_base/applications/office/kbibtex/debian/docs
diff --git a/debian/_base/applications/kbibtex/debian/menu b/debian/_base/applications/office/kbibtex/debian/menu
index 63d91bc0c..63d91bc0c 100644
--- a/debian/_base/applications/kbibtex/debian/menu
+++ b/debian/_base/applications/office/kbibtex/debian/menu
diff --git a/debian/_base/applications/kbibtex/debian/rules b/debian/_base/applications/office/kbibtex/debian/rules
index b3b256352..b3b256352 100755
--- a/debian/_base/applications/kbibtex/debian/rules
+++ b/debian/_base/applications/office/kbibtex/debian/rules
diff --git a/debian/_base/applications/kdesvn/debian/source/format b/debian/_base/applications/office/kbibtex/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kdesvn/debian/source/format
+++ b/debian/_base/applications/office/kbibtex/debian/source/format
diff --git a/debian/_base/applications/kdesvn/debian/source/options b/debian/_base/applications/office/kbibtex/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kdesvn/debian/source/options
+++ b/debian/_base/applications/office/kbibtex/debian/source/options
diff --git a/debian/_base/applications/kbibtex/debian/watch b/debian/_base/applications/office/kbibtex/debian/watch
index a0b02fa2d..a0b02fa2d 100644
--- a/debian/_base/applications/kbibtex/debian/watch
+++ b/debian/_base/applications/office/kbibtex/debian/watch
diff --git a/debian/_base/applications/kdbg/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kdbg/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kbookreader/debian/cdbs/versions.pl b/debian/_base/applications/office/kbookreader/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kbookreader/debian/cdbs/versions.pl
+++ b/debian/_base/applications/office/kbookreader/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kbookreader/debian/changelog b/debian/_base/applications/office/kbookreader/debian/changelog
index 2d836d558..2d836d558 100644
--- a/debian/_base/applications/kbookreader/debian/changelog
+++ b/debian/_base/applications/office/kbookreader/debian/changelog
diff --git a/debian/_base/applications/kdiff3/debian/compat b/debian/_base/applications/office/kbookreader/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kdiff3/debian/compat
+++ b/debian/_base/applications/office/kbookreader/debian/compat
diff --git a/debian/_base/applications/kbookreader/debian/control b/debian/_base/applications/office/kbookreader/debian/control
index f3c8439df..f3c8439df 100644
--- a/debian/_base/applications/kbookreader/debian/control
+++ b/debian/_base/applications/office/kbookreader/debian/control
diff --git a/debian/_base/applications/kbookreader/debian/copyright b/debian/_base/applications/office/kbookreader/debian/copyright
index 8d31bf1da..8d31bf1da 100644
--- a/debian/_base/applications/kbookreader/debian/copyright
+++ b/debian/_base/applications/office/kbookreader/debian/copyright
diff --git a/debian/_base/applications/kbfx/debian/patches/series b/debian/_base/applications/office/kbookreader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kbfx/debian/patches/series
+++ b/debian/_base/applications/office/kbookreader/debian/patches/series
diff --git a/debian/_base/applications/kbookreader/debian/rules b/debian/_base/applications/office/kbookreader/debian/rules
index ea135866a..ea135866a 100755
--- a/debian/_base/applications/kbookreader/debian/rules
+++ b/debian/_base/applications/office/kbookreader/debian/rules
diff --git a/debian/_base/applications/kdiff3/debian/source/format b/debian/_base/applications/office/kbookreader/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kdiff3/debian/source/format
+++ b/debian/_base/applications/office/kbookreader/debian/source/format
diff --git a/debian/_base/applications/kdiff3/debian/source/options b/debian/_base/applications/office/kbookreader/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kdiff3/debian/source/options
+++ b/debian/_base/applications/office/kbookreader/debian/source/options
diff --git a/debian/_base/applications/kile/debian/README.Debian b/debian/_base/applications/office/kile/debian/README.Debian
index 8e55c77bc..8e55c77bc 100644
--- a/debian/_base/applications/kile/debian/README.Debian
+++ b/debian/_base/applications/office/kile/debian/README.Debian
diff --git a/debian/_base/applications/kile/debian/TODO.Debian b/debian/_base/applications/office/kile/debian/TODO.Debian
index bbfc0d8dd..bbfc0d8dd 100644
--- a/debian/_base/applications/kile/debian/TODO.Debian
+++ b/debian/_base/applications/office/kile/debian/TODO.Debian
diff --git a/debian/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/kile/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/kile/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kcpuload/debian/cdbs/versions.pl b/debian/_base/applications/office/kile/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kcpuload/debian/cdbs/versions.pl
+++ b/debian/_base/applications/office/kile/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kile/debian/changelog b/debian/_base/applications/office/kile/debian/changelog
index 5fc398065..5fc398065 100644
--- a/debian/_base/applications/kile/debian/changelog
+++ b/debian/_base/applications/office/kile/debian/changelog
diff --git a/debian/_base/applications/kdirstat/debian/compat b/debian/_base/applications/office/kile/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kdirstat/debian/compat
+++ b/debian/_base/applications/office/kile/debian/compat
diff --git a/debian/_base/applications/kile/debian/control b/debian/_base/applications/office/kile/debian/control
index 5ec2a9ffe..5ec2a9ffe 100644
--- a/debian/_base/applications/kile/debian/control
+++ b/debian/_base/applications/office/kile/debian/control
diff --git a/debian/_base/applications/kile/debian/copyright b/debian/_base/applications/office/kile/debian/copyright
index 513a8f2ca..513a8f2ca 100644
--- a/debian/_base/applications/kile/debian/copyright
+++ b/debian/_base/applications/office/kile/debian/copyright
diff --git a/debian/_base/applications/kmyfirewall/debian/docs b/debian/_base/applications/office/kile/debian/docs
index 724e08449..724e08449 100644
--- a/debian/_base/applications/kmyfirewall/debian/docs
+++ b/debian/_base/applications/office/kile/debian/docs
diff --git a/debian/_base/applications/kile/debian/kile-trinity.install b/debian/_base/applications/office/kile/debian/kile-trinity.install
index 3d82db5d5..3d82db5d5 100644
--- a/debian/_base/applications/kile/debian/kile-trinity.install
+++ b/debian/_base/applications/office/kile/debian/kile-trinity.install
diff --git a/debian/_base/applications/kile/debian/kile-trinity.links b/debian/_base/applications/office/kile/debian/kile-trinity.links
index ebafda14f..ebafda14f 100644
--- a/debian/_base/applications/kile/debian/kile-trinity.links
+++ b/debian/_base/applications/office/kile/debian/kile-trinity.links
diff --git a/debian/_base/applications/kile/debian/kile.1 b/debian/_base/applications/office/kile/debian/kile.1
index bbcde5836..bbcde5836 100644
--- a/debian/_base/applications/kile/debian/kile.1
+++ b/debian/_base/applications/office/kile/debian/kile.1
diff --git a/debian/_base/applications/kile/debian/kile.xpm b/debian/_base/applications/office/kile/debian/kile.xpm
index 408d2710b..408d2710b 100644
--- a/debian/_base/applications/kile/debian/kile.xpm
+++ b/debian/_base/applications/office/kile/debian/kile.xpm
diff --git a/debian/_base/applications/kile/debian/menu b/debian/_base/applications/office/kile/debian/menu
index 8ddf08ad7..8ddf08ad7 100644
--- a/debian/_base/applications/kile/debian/menu
+++ b/debian/_base/applications/office/kile/debian/menu
diff --git a/debian/_base/applications/knights/debian/patches/.gitignore b/debian/_base/applications/office/kile/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/knights/debian/patches/.gitignore
+++ b/debian/_base/applications/office/kile/debian/patches/.gitignore
diff --git a/debian/_base/applications/kile/debian/rules b/debian/_base/applications/office/kile/debian/rules
index 581aec434..581aec434 100755
--- a/debian/_base/applications/kile/debian/rules
+++ b/debian/_base/applications/office/kile/debian/rules
diff --git a/debian/_base/applications/kdirstat/debian/source/format b/debian/_base/applications/office/kile/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kdirstat/debian/source/format
+++ b/debian/_base/applications/office/kile/debian/source/format
diff --git a/debian/_base/applications/kdirstat/debian/source/options b/debian/_base/applications/office/kile/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kdirstat/debian/source/options
+++ b/debian/_base/applications/office/kile/debian/source/options
diff --git a/debian/_base/applications/kile/debian/watch b/debian/_base/applications/office/kile/debian/watch
index e372a7062..e372a7062 100644
--- a/debian/_base/applications/kile/debian/watch
+++ b/debian/_base/applications/office/kile/debian/watch
diff --git a/debian/_base/applications/kmymoney/debian/NEWS b/debian/_base/applications/office/kmymoney/debian/NEWS
index a10bb6f91..a10bb6f91 100644
--- a/debian/_base/applications/kmymoney/debian/NEWS
+++ b/debian/_base/applications/office/kmymoney/debian/NEWS
diff --git a/debian/_base/applications/kmymoney/debian/README.source b/debian/_base/applications/office/kmymoney/debian/README.source
index 2a0f24655..2a0f24655 100644
--- a/debian/_base/applications/kmymoney/debian/README.source
+++ b/debian/_base/applications/office/kmymoney/debian/README.source
diff --git a/debian/_base/applications/kde-style-qtcurve/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kde-style-qtcurve/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kdbg/debian/cdbs/versions.pl b/debian/_base/applications/office/kmymoney/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kdbg/debian/cdbs/versions.pl
+++ b/debian/_base/applications/office/kmymoney/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kmymoney/debian/changelog b/debian/_base/applications/office/kmymoney/debian/changelog
index ff799841f..ff799841f 100644
--- a/debian/_base/applications/kmymoney/debian/changelog
+++ b/debian/_base/applications/office/kmymoney/debian/changelog
diff --git a/debian/_base/applications/kdmtheme/debian/compat b/debian/_base/applications/office/kmymoney/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kdmtheme/debian/compat
+++ b/debian/_base/applications/office/kmymoney/debian/compat
diff --git a/debian/_base/applications/kmymoney/debian/control b/debian/_base/applications/office/kmymoney/debian/control
index 156707ea3..156707ea3 100644
--- a/debian/_base/applications/kmymoney/debian/control
+++ b/debian/_base/applications/office/kmymoney/debian/control
diff --git a/debian/_base/applications/kmymoney/debian/copyright b/debian/_base/applications/office/kmymoney/debian/copyright
index 6ba1a0edf..6ba1a0edf 100644
--- a/debian/_base/applications/kmymoney/debian/copyright
+++ b/debian/_base/applications/office/kmymoney/debian/copyright
diff --git a/debian/_base/applications/kmymoney/debian/kmymoney2-common-trinity.install b/debian/_base/applications/office/kmymoney/debian/kmymoney2-common-trinity.install
index f8c7e9a01..f8c7e9a01 100644
--- a/debian/_base/applications/kmymoney/debian/kmymoney2-common-trinity.install
+++ b/debian/_base/applications/office/kmymoney/debian/kmymoney2-common-trinity.install
diff --git a/debian/_base/applications/kmymoney/debian/kmymoney2-trinity-dev.install b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
index 4c3b73990..4c3b73990 100644
--- a/debian/_base/applications/kmymoney/debian/kmymoney2-trinity-dev.install
+++ b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
diff --git a/debian/_base/applications/kmymoney/debian/kmymoney2-trinity.docs b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs
index cbc02b603..cbc02b603 100644
--- a/debian/_base/applications/kmymoney/debian/kmymoney2-trinity.docs
+++ b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs
diff --git a/debian/_base/applications/kmymoney/debian/kmymoney2-trinity.install b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity.install
index 89ecca2de..89ecca2de 100644
--- a/debian/_base/applications/kmymoney/debian/kmymoney2-trinity.install
+++ b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity.install
diff --git a/debian/_base/applications/kmymoney/debian/kmymoney2.xpm b/debian/_base/applications/office/kmymoney/debian/kmymoney2.xpm
index 8bf0321d5..8bf0321d5 100644
--- a/debian/_base/applications/kmymoney/debian/kmymoney2.xpm
+++ b/debian/_base/applications/office/kmymoney/debian/kmymoney2.xpm
diff --git a/debian/_base/applications/kmymoney/debian/menu b/debian/_base/applications/office/kmymoney/debian/menu
index 3a6b25af8..3a6b25af8 100644
--- a/debian/_base/applications/kmymoney/debian/menu
+++ b/debian/_base/applications/office/kmymoney/debian/menu
diff --git a/debian/_base/applications/kbookreader/debian/patches/series b/debian/_base/applications/office/kmymoney/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kbookreader/debian/patches/series
+++ b/debian/_base/applications/office/kmymoney/debian/patches/series
diff --git a/debian/_base/applications/kmymoney/debian/rules b/debian/_base/applications/office/kmymoney/debian/rules
index 2788384f7..2788384f7 100755
--- a/debian/_base/applications/kmymoney/debian/rules
+++ b/debian/_base/applications/office/kmymoney/debian/rules
diff --git a/debian/_base/applications/kdmtheme/debian/source/format b/debian/_base/applications/office/kmymoney/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kdmtheme/debian/source/format
+++ b/debian/_base/applications/office/kmymoney/debian/source/format
diff --git a/debian/_base/applications/kdmtheme/debian/source/options b/debian/_base/applications/office/kmymoney/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kdmtheme/debian/source/options
+++ b/debian/_base/applications/office/kmymoney/debian/source/options
diff --git a/debian/_base/applications/kmymoney/debian/watch b/debian/_base/applications/office/kmymoney/debian/watch
index b80efc65c..b80efc65c 100644
--- a/debian/_base/applications/kmymoney/debian/watch
+++ b/debian/_base/applications/office/kmymoney/debian/watch
diff --git a/debian/_base/applications/knowit/debian/changelog b/debian/_base/applications/office/knowit/debian/changelog
index b5d67442f..b5d67442f 100644
--- a/debian/_base/applications/knowit/debian/changelog
+++ b/debian/_base/applications/office/knowit/debian/changelog
diff --git a/debian/_base/applications/kdpkg/debian/compat b/debian/_base/applications/office/knowit/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kdpkg/debian/compat
+++ b/debian/_base/applications/office/knowit/debian/compat
diff --git a/debian/_base/applications/knowit/debian/control b/debian/_base/applications/office/knowit/debian/control
index 7772cf0da..7772cf0da 100644
--- a/debian/_base/applications/knowit/debian/control
+++ b/debian/_base/applications/office/knowit/debian/control
diff --git a/debian/_base/applications/knowit/debian/copyright b/debian/_base/applications/office/knowit/debian/copyright
index 008edff30..008edff30 100644
--- a/debian/_base/applications/knowit/debian/copyright
+++ b/debian/_base/applications/office/knowit/debian/copyright
diff --git a/debian/_base/applications/knowit/debian/docs b/debian/_base/applications/office/knowit/debian/docs
index 5502ed8f4..5502ed8f4 100644
--- a/debian/_base/applications/knowit/debian/docs
+++ b/debian/_base/applications/office/knowit/debian/docs
diff --git a/debian/_base/applications/knowit/debian/knowit.1 b/debian/_base/applications/office/knowit/debian/knowit.1
index a19da8be1..a19da8be1 100644
--- a/debian/_base/applications/knowit/debian/knowit.1
+++ b/debian/_base/applications/office/knowit/debian/knowit.1
diff --git a/debian/_base/applications/knowit/debian/rules b/debian/_base/applications/office/knowit/debian/rules
index 77f1d05a4..77f1d05a4 100755
--- a/debian/_base/applications/knowit/debian/rules
+++ b/debian/_base/applications/office/knowit/debian/rules
diff --git a/debian/_base/applications/kdpkg/debian/source/format b/debian/_base/applications/office/knowit/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kdpkg/debian/source/format
+++ b/debian/_base/applications/office/knowit/debian/source/format
diff --git a/debian/_base/applications/kdpkg/debian/source/options b/debian/_base/applications/office/knowit/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kdpkg/debian/source/options
+++ b/debian/_base/applications/office/knowit/debian/source/options
diff --git a/debian/_base/applications/knowit/debian/watch b/debian/_base/applications/office/knowit/debian/watch
index 0c83833f0..0c83833f0 100644
--- a/debian/_base/applications/knowit/debian/watch
+++ b/debian/_base/applications/office/knowit/debian/watch
diff --git a/debian/_base/applications/koffice-i18n/debian/changelog b/debian/_base/applications/office/koffice-i18n/debian/changelog
index 26f667147..26f667147 100644
--- a/debian/_base/applications/koffice-i18n/debian/changelog
+++ b/debian/_base/applications/office/koffice-i18n/debian/changelog
diff --git a/debian/_base/applications/keep/debian/compat b/debian/_base/applications/office/koffice-i18n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/keep/debian/compat
+++ b/debian/_base/applications/office/koffice-i18n/debian/compat
diff --git a/debian/_base/applications/koffice-i18n/debian/control b/debian/_base/applications/office/koffice-i18n/debian/control
index f0d1f9757..f0d1f9757 100644
--- a/debian/_base/applications/koffice-i18n/debian/control
+++ b/debian/_base/applications/office/koffice-i18n/debian/control
diff --git a/debian/_base/applications/koffice-i18n/debian/copyright b/debian/_base/applications/office/koffice-i18n/debian/copyright
index 2ab72642a..2ab72642a 100644
--- a/debian/_base/applications/koffice-i18n/debian/copyright
+++ b/debian/_base/applications/office/koffice-i18n/debian/copyright
diff --git a/debian/_base/applications/knights/debian/debiandirs b/debian/_base/applications/office/koffice-i18n/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/debian/_base/applications/knights/debian/debiandirs
+++ b/debian/_base/applications/office/koffice-i18n/debian/debiandirs
diff --git a/debian/_base/applications/koffice-i18n/debian/rules b/debian/_base/applications/office/koffice-i18n/debian/rules
index 478c97b9d..478c97b9d 100755
--- a/debian/_base/applications/koffice-i18n/debian/rules
+++ b/debian/_base/applications/office/koffice-i18n/debian/rules
diff --git a/debian/_base/applications/keep/debian/source/format b/debian/_base/applications/office/koffice-i18n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/keep/debian/source/format
+++ b/debian/_base/applications/office/koffice-i18n/debian/source/format
diff --git a/debian/_base/applications/keep/debian/source/options b/debian/_base/applications/office/koffice-i18n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/keep/debian/source/options
+++ b/debian/_base/applications/office/koffice-i18n/debian/source/options
diff --git a/debian/_base/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/office/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
index ec579c644..ec579c644 100644
--- a/debian/_base/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/applications/office/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/_base/applications/koffice/debian/README.MimeType b/debian/_base/applications/office/koffice/debian/README.MimeType
index 7d9888658..7d9888658 100644
--- a/debian/_base/applications/koffice/debian/README.MimeType
+++ b/debian/_base/applications/office/koffice/debian/README.MimeType
diff --git a/debian/_base/applications/kde-systemsettings/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kde-systemsettings/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kdbusnotification/debian/cdbs/versions.pl b/debian/_base/applications/office/koffice/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kdbusnotification/debian/cdbs/versions.pl
+++ b/debian/_base/applications/office/koffice/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/koffice/debian/chalk-data-trinity.install b/debian/_base/applications/office/koffice/debian/chalk-data-trinity.install
index a37b11ace..a37b11ace 100644
--- a/debian/_base/applications/koffice/debian/chalk-data-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/chalk-data-trinity.install
diff --git a/debian/_base/applications/koffice/debian/chalk-data-trinity.lintian b/debian/_base/applications/office/koffice/debian/chalk-data-trinity.lintian
index 909a9062a..909a9062a 100644
--- a/debian/_base/applications/koffice/debian/chalk-data-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/chalk-data-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/chalk-trinity.docs b/debian/_base/applications/office/koffice/debian/chalk-trinity.docs
index 99cd93d41..99cd93d41 100644
--- a/debian/_base/applications/koffice/debian/chalk-trinity.docs
+++ b/debian/_base/applications/office/koffice/debian/chalk-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/chalk-trinity.install b/debian/_base/applications/office/koffice/debian/chalk-trinity.install
index a36c77eb8..a36c77eb8 100644
--- a/debian/_base/applications/koffice/debian/chalk-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/chalk-trinity.install
diff --git a/debian/_base/applications/koffice/debian/chalk-trinity.lintian b/debian/_base/applications/office/koffice/debian/chalk-trinity.lintian
index ef467a3e1..ef467a3e1 100644
--- a/debian/_base/applications/koffice/debian/chalk-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/chalk-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/chalk-trinity.menu b/debian/_base/applications/office/koffice/debian/chalk-trinity.menu
index 2354092d2..2354092d2 100644
--- a/debian/_base/applications/koffice/debian/chalk-trinity.menu
+++ b/debian/_base/applications/office/koffice/debian/chalk-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/chalk-trinity.mime b/debian/_base/applications/office/koffice/debian/chalk-trinity.mime
index 86a95ce5b..86a95ce5b 100644
--- a/debian/_base/applications/koffice/debian/chalk-trinity.mime
+++ b/debian/_base/applications/office/koffice/debian/chalk-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/chalk.xpm b/debian/_base/applications/office/koffice/debian/chalk.xpm
index 0edc4f49a..0edc4f49a 100644
--- a/debian/_base/applications/koffice/debian/chalk.xpm
+++ b/debian/_base/applications/office/koffice/debian/chalk.xpm
diff --git a/debian/_base/applications/koffice/debian/changelog b/debian/_base/applications/office/koffice/debian/changelog
index 8ce61b75e..8ce61b75e 100644
--- a/debian/_base/applications/koffice/debian/changelog
+++ b/debian/_base/applications/office/koffice/debian/changelog
diff --git a/debian/_base/applications/kerry/debian/compat b/debian/_base/applications/office/koffice/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kerry/debian/compat
+++ b/debian/_base/applications/office/koffice/debian/compat
diff --git a/debian/_base/applications/koffice/debian/control b/debian/_base/applications/office/koffice/debian/control
index 19fe327ab..19fe327ab 100644
--- a/debian/_base/applications/koffice/debian/control
+++ b/debian/_base/applications/office/koffice/debian/control
diff --git a/debian/_base/applications/koffice/debian/copyright b/debian/_base/applications/office/koffice/debian/copyright
index 900ced776..900ced776 100644
--- a/debian/_base/applications/koffice/debian/copyright
+++ b/debian/_base/applications/office/koffice/debian/copyright
diff --git a/debian/_base/applications/koffice/debian/fogra27l.icm.uu b/debian/_base/applications/office/koffice/debian/fogra27l.icm.uu
index 39417fc89..39417fc89 100644
--- a/debian/_base/applications/koffice/debian/fogra27l.icm.uu
+++ b/debian/_base/applications/office/koffice/debian/fogra27l.icm.uu
diff --git a/debian/_base/applications/koffice/debian/karbon-trinity.docs b/debian/_base/applications/office/koffice/debian/karbon-trinity.docs
index 975685c5b..975685c5b 100644
--- a/debian/_base/applications/koffice/debian/karbon-trinity.docs
+++ b/debian/_base/applications/office/koffice/debian/karbon-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/karbon-trinity.install b/debian/_base/applications/office/koffice/debian/karbon-trinity.install
index 669e5d49d..669e5d49d 100644
--- a/debian/_base/applications/koffice/debian/karbon-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/karbon-trinity.install
diff --git a/debian/_base/applications/koffice/debian/karbon-trinity.lintian b/debian/_base/applications/office/koffice/debian/karbon-trinity.lintian
index f399de402..f399de402 100644
--- a/debian/_base/applications/koffice/debian/karbon-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/karbon-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/karbon-trinity.manpages b/debian/_base/applications/office/koffice/debian/karbon-trinity.manpages
index 8a212a2b2..8a212a2b2 100644
--- a/debian/_base/applications/koffice/debian/karbon-trinity.manpages
+++ b/debian/_base/applications/office/koffice/debian/karbon-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/karbon-trinity.menu b/debian/_base/applications/office/koffice/debian/karbon-trinity.menu
index 0329fc505..0329fc505 100644
--- a/debian/_base/applications/koffice/debian/karbon-trinity.menu
+++ b/debian/_base/applications/office/koffice/debian/karbon-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/karbon-trinity.mime b/debian/_base/applications/office/koffice/debian/karbon-trinity.mime
index 30e0e75b0..30e0e75b0 100644
--- a/debian/_base/applications/koffice/debian/karbon-trinity.mime
+++ b/debian/_base/applications/office/koffice/debian/karbon-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/karbon.1 b/debian/_base/applications/office/koffice/debian/karbon.1
index fa077706a..fa077706a 100644
--- a/debian/_base/applications/koffice/debian/karbon.1
+++ b/debian/_base/applications/office/koffice/debian/karbon.1
diff --git a/debian/_base/applications/koffice/debian/karbon.xpm b/debian/_base/applications/office/koffice/debian/karbon.xpm
index 92f24765d..92f24765d 100644
--- a/debian/_base/applications/koffice/debian/karbon.xpm
+++ b/debian/_base/applications/office/koffice/debian/karbon.xpm
diff --git a/debian/_base/applications/koffice/debian/kchart-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/kchart-trinity.README.Debian
index ab998f150..ab998f150 100644
--- a/debian/_base/applications/koffice/debian/kchart-trinity.README.Debian
+++ b/debian/_base/applications/office/koffice/debian/kchart-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/kchart-trinity.docs b/debian/_base/applications/office/koffice/debian/kchart-trinity.docs
index d79e8fa24..d79e8fa24 100644
--- a/debian/_base/applications/koffice/debian/kchart-trinity.docs
+++ b/debian/_base/applications/office/koffice/debian/kchart-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kchart-trinity.install b/debian/_base/applications/office/koffice/debian/kchart-trinity.install
index cc59b8a8f..cc59b8a8f 100644
--- a/debian/_base/applications/koffice/debian/kchart-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kchart-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kchart-trinity.lintian b/debian/_base/applications/office/koffice/debian/kchart-trinity.lintian
index f81d8d6f7..f81d8d6f7 100644
--- a/debian/_base/applications/koffice/debian/kchart-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kchart-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kchart-trinity.manpages b/debian/_base/applications/office/koffice/debian/kchart-trinity.manpages
index 38c864763..38c864763 100644
--- a/debian/_base/applications/koffice/debian/kchart-trinity.manpages
+++ b/debian/_base/applications/office/koffice/debian/kchart-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kchart-trinity.menu b/debian/_base/applications/office/koffice/debian/kchart-trinity.menu
index 405e19fec..405e19fec 100644
--- a/debian/_base/applications/koffice/debian/kchart-trinity.menu
+++ b/debian/_base/applications/office/koffice/debian/kchart-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kchart-trinity.mime b/debian/_base/applications/office/koffice/debian/kchart-trinity.mime
index 7b0f739ff..7b0f739ff 100644
--- a/debian/_base/applications/koffice/debian/kchart-trinity.mime
+++ b/debian/_base/applications/office/koffice/debian/kchart-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/kchart.1 b/debian/_base/applications/office/koffice/debian/kchart.1
index 0b2c8a4c3..0b2c8a4c3 100644
--- a/debian/_base/applications/koffice/debian/kchart.1
+++ b/debian/_base/applications/office/koffice/debian/kchart.1
diff --git a/debian/_base/applications/koffice/debian/kchart.xpm b/debian/_base/applications/office/koffice/debian/kchart.xpm
index 4b1c6e11d..4b1c6e11d 100644
--- a/debian/_base/applications/koffice/debian/kchart.xpm
+++ b/debian/_base/applications/office/koffice/debian/kchart.xpm
diff --git a/debian/_base/applications/koffice/debian/kexi-trinity.docs b/debian/_base/applications/office/koffice/debian/kexi-trinity.docs
index 2633ffdfd..2633ffdfd 100644
--- a/debian/_base/applications/koffice/debian/kexi-trinity.docs
+++ b/debian/_base/applications/office/koffice/debian/kexi-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kexi-trinity.install b/debian/_base/applications/office/koffice/debian/kexi-trinity.install
index fb80fb2bc..fb80fb2bc 100644
--- a/debian/_base/applications/koffice/debian/kexi-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kexi-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kexi-trinity.lintian b/debian/_base/applications/office/koffice/debian/kexi-trinity.lintian
index 07d1301aa..07d1301aa 100644
--- a/debian/_base/applications/koffice/debian/kexi-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kexi-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kformula-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/kformula-trinity.README.Debian
index bfd5bb7e5..bfd5bb7e5 100644
--- a/debian/_base/applications/koffice/debian/kformula-trinity.README.Debian
+++ b/debian/_base/applications/office/koffice/debian/kformula-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/kformula-trinity.docs b/debian/_base/applications/office/koffice/debian/kformula-trinity.docs
index a5ddd1f27..a5ddd1f27 100644
--- a/debian/_base/applications/koffice/debian/kformula-trinity.docs
+++ b/debian/_base/applications/office/koffice/debian/kformula-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kformula-trinity.install b/debian/_base/applications/office/koffice/debian/kformula-trinity.install
index 0ec37116a..0ec37116a 100644
--- a/debian/_base/applications/koffice/debian/kformula-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kformula-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kformula-trinity.lintian b/debian/_base/applications/office/koffice/debian/kformula-trinity.lintian
index ec8c2f644..ec8c2f644 100644
--- a/debian/_base/applications/koffice/debian/kformula-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kformula-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kformula-trinity.manpages b/debian/_base/applications/office/koffice/debian/kformula-trinity.manpages
index 35c78eaa9..35c78eaa9 100644
--- a/debian/_base/applications/koffice/debian/kformula-trinity.manpages
+++ b/debian/_base/applications/office/koffice/debian/kformula-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kformula-trinity.menu b/debian/_base/applications/office/koffice/debian/kformula-trinity.menu
index 37f699400..37f699400 100644
--- a/debian/_base/applications/koffice/debian/kformula-trinity.menu
+++ b/debian/_base/applications/office/koffice/debian/kformula-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kformula-trinity.mime b/debian/_base/applications/office/koffice/debian/kformula-trinity.mime
index 5687b0f24..5687b0f24 100644
--- a/debian/_base/applications/koffice/debian/kformula-trinity.mime
+++ b/debian/_base/applications/office/koffice/debian/kformula-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/kformula.1 b/debian/_base/applications/office/koffice/debian/kformula.1
index 801df0727..801df0727 100644
--- a/debian/_base/applications/koffice/debian/kformula.1
+++ b/debian/_base/applications/office/koffice/debian/kformula.1
diff --git a/debian/_base/applications/koffice/debian/kformula.xpm b/debian/_base/applications/office/koffice/debian/kformula.xpm
index b42f4e220..b42f4e220 100644
--- a/debian/_base/applications/koffice/debian/kformula.xpm
+++ b/debian/_base/applications/office/koffice/debian/kformula.xpm
diff --git a/debian/_base/applications/koffice/debian/kivio-data-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/kivio-data-trinity.README.Debian
index 0b97a4e69..0b97a4e69 100644
--- a/debian/_base/applications/koffice/debian/kivio-data-trinity.README.Debian
+++ b/debian/_base/applications/office/koffice/debian/kivio-data-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/kivio-data-trinity.docs b/debian/_base/applications/office/koffice/debian/kivio-data-trinity.docs
index db5dbf658..db5dbf658 100644
--- a/debian/_base/applications/koffice/debian/kivio-data-trinity.docs
+++ b/debian/_base/applications/office/koffice/debian/kivio-data-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kivio-data-trinity.install b/debian/_base/applications/office/koffice/debian/kivio-data-trinity.install
index 02f3c0322..02f3c0322 100644
--- a/debian/_base/applications/koffice/debian/kivio-data-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kivio-data-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kivio-data-trinity.lintian b/debian/_base/applications/office/koffice/debian/kivio-data-trinity.lintian
index 4eb29a57e..4eb29a57e 100644
--- a/debian/_base/applications/koffice/debian/kivio-data-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kivio-data-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kivio-trinity.docs b/debian/_base/applications/office/koffice/debian/kivio-trinity.docs
index 0ec5716cd..0ec5716cd 100644
--- a/debian/_base/applications/koffice/debian/kivio-trinity.docs
+++ b/debian/_base/applications/office/koffice/debian/kivio-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kivio-trinity.install b/debian/_base/applications/office/koffice/debian/kivio-trinity.install
index 510c85320..510c85320 100644
--- a/debian/_base/applications/koffice/debian/kivio-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kivio-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kivio-trinity.lintian b/debian/_base/applications/office/koffice/debian/kivio-trinity.lintian
index 00d1d2875..00d1d2875 100644
--- a/debian/_base/applications/koffice/debian/kivio-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kivio-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kivio-trinity.manpages b/debian/_base/applications/office/koffice/debian/kivio-trinity.manpages
index 1f348c0ca..1f348c0ca 100644
--- a/debian/_base/applications/koffice/debian/kivio-trinity.manpages
+++ b/debian/_base/applications/office/koffice/debian/kivio-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kivio-trinity.menu b/debian/_base/applications/office/koffice/debian/kivio-trinity.menu
index db45a4245..db45a4245 100644
--- a/debian/_base/applications/koffice/debian/kivio-trinity.menu
+++ b/debian/_base/applications/office/koffice/debian/kivio-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kivio-trinity.mime b/debian/_base/applications/office/koffice/debian/kivio-trinity.mime
index 637162677..637162677 100644
--- a/debian/_base/applications/koffice/debian/kivio-trinity.mime
+++ b/debian/_base/applications/office/koffice/debian/kivio-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/kivio.1 b/debian/_base/applications/office/koffice/debian/kivio.1
index 0ae1aa215..0ae1aa215 100644
--- a/debian/_base/applications/koffice/debian/kivio.1
+++ b/debian/_base/applications/office/koffice/debian/kivio.1
diff --git a/debian/_base/applications/koffice/debian/kivio.xpm b/debian/_base/applications/office/koffice/debian/kivio.xpm
index 0d9c9b122..0d9c9b122 100644
--- a/debian/_base/applications/koffice/debian/kivio.xpm
+++ b/debian/_base/applications/office/koffice/debian/kivio.xpm
diff --git a/debian/_base/applications/koffice/debian/koconverter.1 b/debian/_base/applications/office/koffice/debian/koconverter.1
index 95eab71a2..95eab71a2 100644
--- a/debian/_base/applications/koffice/debian/koconverter.1
+++ b/debian/_base/applications/office/koffice/debian/koconverter.1
diff --git a/debian/_base/applications/koffice/debian/koffice-data-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/koffice-data-trinity.README.Debian
index eb49daa16..eb49daa16 100644
--- a/debian/_base/applications/koffice/debian/koffice-data-trinity.README.Debian
+++ b/debian/_base/applications/office/koffice/debian/koffice-data-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/koffice-data-trinity.docs b/debian/_base/applications/office/koffice/debian/koffice-data-trinity.docs
index e845566c0..e845566c0 100644
--- a/debian/_base/applications/koffice/debian/koffice-data-trinity.docs
+++ b/debian/_base/applications/office/koffice/debian/koffice-data-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/koffice-data-trinity.install b/debian/_base/applications/office/koffice/debian/koffice-data-trinity.install
index 2f17354e2..2f17354e2 100644
--- a/debian/_base/applications/koffice/debian/koffice-data-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/koffice-data-trinity.install
diff --git a/debian/_base/applications/koffice/debian/koffice-data-trinity.links b/debian/_base/applications/office/koffice/debian/koffice-data-trinity.links
index f85e205f2..f85e205f2 100644
--- a/debian/_base/applications/koffice/debian/koffice-data-trinity.links
+++ b/debian/_base/applications/office/koffice/debian/koffice-data-trinity.links
diff --git a/debian/_base/applications/koffice/debian/koffice-dev-trinity.install b/debian/_base/applications/office/koffice/debian/koffice-dev-trinity.install
index c65cbd3d3..c65cbd3d3 100644
--- a/debian/_base/applications/koffice/debian/koffice-dev-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/koffice-dev-trinity.install
diff --git a/debian/_base/applications/koffice/debian/koffice-libs-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.README.Debian
index 1feeb83d9..1feeb83d9 100644
--- a/debian/_base/applications/koffice/debian/koffice-libs-trinity.README.Debian
+++ b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/koffice-libs-trinity.docs b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.docs
index 53238b144..53238b144 100644
--- a/debian/_base/applications/koffice/debian/koffice-libs-trinity.docs
+++ b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/koffice-libs-trinity.install b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.install
index 8d1ecc1d3..8d1ecc1d3 100644
--- a/debian/_base/applications/koffice/debian/koffice-libs-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.install
diff --git a/debian/_base/applications/koffice/debian/koffice-libs-trinity.links b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.links
index b0df87ed7..b0df87ed7 100644
--- a/debian/_base/applications/koffice/debian/koffice-libs-trinity.links
+++ b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.links
diff --git a/debian/_base/applications/koffice/debian/koffice-libs-trinity.lintian b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.lintian
index 1137a9b12..1137a9b12 100644
--- a/debian/_base/applications/koffice/debian/koffice-libs-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/koffice-libs-trinity.manpages b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
index 52c63b5d7..52c63b5d7 100644
--- a/debian/_base/applications/koffice/debian/koffice-libs-trinity.manpages
+++ b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
index bedc6cae9..bedc6cae9 100644
--- a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
+++ b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
index 65271eda0..65271eda0 100644
--- a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
+++ b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
index 0b6a7dbaa..0b6a7dbaa 100644
--- a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
+++ b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
index f6b06085b..f6b06085b 100644
--- a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
+++ b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
index 561d95388..561d95388 100644
--- a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
+++ b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
index 1e5b4ef84..1e5b4ef84 100644
--- a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
+++ b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
index 4d4e5727b..4d4e5727b 100644
--- a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
+++ b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kword
index 09953babd..09953babd 100644
--- a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
+++ b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kword
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
index 9e168a19f..9e168a19f 100644
--- a/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
+++ b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity-doc.install b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc.install
index a3aaf470b..a3aaf470b 100644
--- a/debian/_base/applications/koffice/debian/koffice-trinity-doc.install
+++ b/debian/_base/applications/office/koffice/debian/koffice-trinity-doc.install
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/koffice-trinity.README.Debian
index 7d5f525a3..7d5f525a3 100644
--- a/debian/_base/applications/koffice/debian/koffice-trinity.README.Debian
+++ b/debian/_base/applications/office/koffice/debian/koffice-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/koffice-trinity.docs b/debian/_base/applications/office/koffice/debian/koffice-trinity.docs
index 53238b144..53238b144 100644
--- a/debian/_base/applications/koffice/debian/koffice-trinity.docs
+++ b/debian/_base/applications/office/koffice/debian/koffice-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/koscript.1 b/debian/_base/applications/office/koffice/debian/koscript.1
index 9517c3f74..9517c3f74 100644
--- a/debian/_base/applications/koffice/debian/koscript.1
+++ b/debian/_base/applications/office/koffice/debian/koscript.1
diff --git a/debian/_base/applications/koffice/debian/koshell-trinity.docs b/debian/_base/applications/office/koffice/debian/koshell-trinity.docs
index 6ade957d9..6ade957d9 100644
--- a/debian/_base/applications/koffice/debian/koshell-trinity.docs
+++ b/debian/_base/applications/office/koffice/debian/koshell-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/koshell-trinity.install b/debian/_base/applications/office/koffice/debian/koshell-trinity.install
index a6670c1ae..a6670c1ae 100644
--- a/debian/_base/applications/koffice/debian/koshell-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/koshell-trinity.install
diff --git a/debian/_base/applications/koffice/debian/koshell-trinity.lintian b/debian/_base/applications/office/koffice/debian/koshell-trinity.lintian
index 073ee53ab..073ee53ab 100644
--- a/debian/_base/applications/koffice/debian/koshell-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/koshell-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/koshell-trinity.manpages b/debian/_base/applications/office/koffice/debian/koshell-trinity.manpages
index fc332a5cc..fc332a5cc 100644
--- a/debian/_base/applications/koffice/debian/koshell-trinity.manpages
+++ b/debian/_base/applications/office/koffice/debian/koshell-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/koshell-trinity.menu b/debian/_base/applications/office/koffice/debian/koshell-trinity.menu
index ec838c038..ec838c038 100644
--- a/debian/_base/applications/koffice/debian/koshell-trinity.menu
+++ b/debian/_base/applications/office/koffice/debian/koshell-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/koshell.1 b/debian/_base/applications/office/koffice/debian/koshell.1
index 2213dc554..2213dc554 100644
--- a/debian/_base/applications/koffice/debian/koshell.1
+++ b/debian/_base/applications/office/koffice/debian/koshell.1
diff --git a/debian/_base/applications/koffice/debian/koshell.xpm b/debian/_base/applications/office/koffice/debian/koshell.xpm
index 25dc6e976..25dc6e976 100644
--- a/debian/_base/applications/koffice/debian/koshell.xpm
+++ b/debian/_base/applications/office/koffice/debian/koshell.xpm
diff --git a/debian/_base/applications/koffice/debian/kplato-trinity.install b/debian/_base/applications/office/koffice/debian/kplato-trinity.install
index c4b1bc359..c4b1bc359 100644
--- a/debian/_base/applications/koffice/debian/kplato-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kplato-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kplato-trinity.lintian b/debian/_base/applications/office/koffice/debian/kplato-trinity.lintian
index 5237efd72..5237efd72 100644
--- a/debian/_base/applications/koffice/debian/kplato-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kplato-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kprconverter.pl.1 b/debian/_base/applications/office/koffice/debian/kprconverter.pl.1
index bd6bdfd66..bd6bdfd66 100644
--- a/debian/_base/applications/koffice/debian/kprconverter.pl.1
+++ b/debian/_base/applications/office/koffice/debian/kprconverter.pl.1
diff --git a/debian/_base/applications/koffice/debian/kpresenter-data-trinity.install b/debian/_base/applications/office/koffice/debian/kpresenter-data-trinity.install
index 3322113fc..3322113fc 100644
--- a/debian/_base/applications/koffice/debian/kpresenter-data-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kpresenter-data-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kpresenter-data-trinity.lintian b/debian/_base/applications/office/koffice/debian/kpresenter-data-trinity.lintian
index 0756d2647..0756d2647 100644
--- a/debian/_base/applications/koffice/debian/kpresenter-data-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kpresenter-data-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kpresenter-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.README.Debian
index d1142abfb..d1142abfb 100644
--- a/debian/_base/applications/koffice/debian/kpresenter-trinity.README.Debian
+++ b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/kpresenter-trinity.docs b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.docs
index b1fdb5570..b1fdb5570 100644
--- a/debian/_base/applications/koffice/debian/kpresenter-trinity.docs
+++ b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kpresenter-trinity.install b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.install
index fc90edce6..fc90edce6 100644
--- a/debian/_base/applications/koffice/debian/kpresenter-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kpresenter-trinity.lintian b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.lintian
index 2445c57ce..2445c57ce 100644
--- a/debian/_base/applications/koffice/debian/kpresenter-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kpresenter-trinity.manpages b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
index 3357e6954..3357e6954 100644
--- a/debian/_base/applications/koffice/debian/kpresenter-trinity.manpages
+++ b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kpresenter-trinity.menu b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.menu
index 52bff66e1..52bff66e1 100644
--- a/debian/_base/applications/koffice/debian/kpresenter-trinity.menu
+++ b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kpresenter-trinity.mime b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.mime
index 9ddd38545..9ddd38545 100644
--- a/debian/_base/applications/koffice/debian/kpresenter-trinity.mime
+++ b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/kpresenter.1 b/debian/_base/applications/office/koffice/debian/kpresenter.1
index 7eb96d7f2..7eb96d7f2 100644
--- a/debian/_base/applications/koffice/debian/kpresenter.1
+++ b/debian/_base/applications/office/koffice/debian/kpresenter.1
diff --git a/debian/_base/applications/koffice/debian/kpresenter.xpm b/debian/_base/applications/office/koffice/debian/kpresenter.xpm
index c1465a6f3..c1465a6f3 100644
--- a/debian/_base/applications/koffice/debian/kpresenter.xpm
+++ b/debian/_base/applications/office/koffice/debian/kpresenter.xpm
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/kspread-trinity.README.Debian
index 697074b1e..697074b1e 100644
--- a/debian/_base/applications/koffice/debian/kspread-trinity.README.Debian
+++ b/debian/_base/applications/office/koffice/debian/kspread-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.docs b/debian/_base/applications/office/koffice/debian/kspread-trinity.docs
index 96e2fe386..96e2fe386 100644
--- a/debian/_base/applications/koffice/debian/kspread-trinity.docs
+++ b/debian/_base/applications/office/koffice/debian/kspread-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.examples b/debian/_base/applications/office/koffice/debian/kspread-trinity.examples
index ad588b752..ad588b752 100644
--- a/debian/_base/applications/koffice/debian/kspread-trinity.examples
+++ b/debian/_base/applications/office/koffice/debian/kspread-trinity.examples
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.install b/debian/_base/applications/office/koffice/debian/kspread-trinity.install
index eee4ef24f..eee4ef24f 100644
--- a/debian/_base/applications/koffice/debian/kspread-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kspread-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.lintian b/debian/_base/applications/office/koffice/debian/kspread-trinity.lintian
index 370d6a7f9..370d6a7f9 100644
--- a/debian/_base/applications/koffice/debian/kspread-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kspread-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.manpages b/debian/_base/applications/office/koffice/debian/kspread-trinity.manpages
index 833228aec..833228aec 100644
--- a/debian/_base/applications/koffice/debian/kspread-trinity.manpages
+++ b/debian/_base/applications/office/koffice/debian/kspread-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.menu b/debian/_base/applications/office/koffice/debian/kspread-trinity.menu
index 8a6987024..8a6987024 100644
--- a/debian/_base/applications/koffice/debian/kspread-trinity.menu
+++ b/debian/_base/applications/office/koffice/debian/kspread-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kspread-trinity.mime b/debian/_base/applications/office/koffice/debian/kspread-trinity.mime
index 14b369e46..14b369e46 100644
--- a/debian/_base/applications/koffice/debian/kspread-trinity.mime
+++ b/debian/_base/applications/office/koffice/debian/kspread-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/kspread.1 b/debian/_base/applications/office/koffice/debian/kspread.1
index 3ae324559..3ae324559 100644
--- a/debian/_base/applications/koffice/debian/kspread.1
+++ b/debian/_base/applications/office/koffice/debian/kspread.1
diff --git a/debian/_base/applications/koffice/debian/kspread.xpm b/debian/_base/applications/office/koffice/debian/kspread.xpm
index ddc117b6b..ddc117b6b 100644
--- a/debian/_base/applications/koffice/debian/kspread.xpm
+++ b/debian/_base/applications/office/koffice/debian/kspread.xpm
diff --git a/debian/_base/applications/koffice/debian/kthesaurus-trinity.install b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.install
index c5190eb05..c5190eb05 100644
--- a/debian/_base/applications/koffice/debian/kthesaurus-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kthesaurus-trinity.lintian b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
index ba2ff8197..ba2ff8197 100644
--- a/debian/_base/applications/koffice/debian/kthesaurus-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kthesaurus-trinity.manpages b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
index 4fb6feb79..4fb6feb79 100644
--- a/debian/_base/applications/koffice/debian/kthesaurus-trinity.manpages
+++ b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kthesaurus-trinity.menu b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.menu
index e2e0f4256..e2e0f4256 100644
--- a/debian/_base/applications/koffice/debian/kthesaurus-trinity.menu
+++ b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kthesaurus.1 b/debian/_base/applications/office/koffice/debian/kthesaurus.1
index f5fba2153..f5fba2153 100644
--- a/debian/_base/applications/koffice/debian/kthesaurus.1
+++ b/debian/_base/applications/office/koffice/debian/kthesaurus.1
diff --git a/debian/_base/applications/koffice/debian/kthesaurus.xpm b/debian/_base/applications/office/koffice/debian/kthesaurus.xpm
index fec4f069b..fec4f069b 100644
--- a/debian/_base/applications/koffice/debian/kthesaurus.xpm
+++ b/debian/_base/applications/office/koffice/debian/kthesaurus.xpm
diff --git a/debian/_base/applications/koffice/debian/kudesigner.1 b/debian/_base/applications/office/koffice/debian/kudesigner.1
index b293d0016..b293d0016 100644
--- a/debian/_base/applications/koffice/debian/kudesigner.1
+++ b/debian/_base/applications/office/koffice/debian/kudesigner.1
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/kugar-trinity.README.Debian
index fd3e6b053..fd3e6b053 100644
--- a/debian/_base/applications/koffice/debian/kugar-trinity.README.Debian
+++ b/debian/_base/applications/office/koffice/debian/kugar-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.docs b/debian/_base/applications/office/koffice/debian/kugar-trinity.docs
index 9943eb16c..9943eb16c 100644
--- a/debian/_base/applications/koffice/debian/kugar-trinity.docs
+++ b/debian/_base/applications/office/koffice/debian/kugar-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.examples b/debian/_base/applications/office/koffice/debian/kugar-trinity.examples
index a96de7575..a96de7575 100644
--- a/debian/_base/applications/koffice/debian/kugar-trinity.examples
+++ b/debian/_base/applications/office/koffice/debian/kugar-trinity.examples
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.examples.README b/debian/_base/applications/office/koffice/debian/kugar-trinity.examples.README
index 9b7cb6fe6..9b7cb6fe6 100644
--- a/debian/_base/applications/koffice/debian/kugar-trinity.examples.README
+++ b/debian/_base/applications/office/koffice/debian/kugar-trinity.examples.README
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.install b/debian/_base/applications/office/koffice/debian/kugar-trinity.install
index 99a9264f1..99a9264f1 100644
--- a/debian/_base/applications/koffice/debian/kugar-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kugar-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.links b/debian/_base/applications/office/koffice/debian/kugar-trinity.links
index 9a06b3e2f..9a06b3e2f 100644
--- a/debian/_base/applications/koffice/debian/kugar-trinity.links
+++ b/debian/_base/applications/office/koffice/debian/kugar-trinity.links
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.lintian b/debian/_base/applications/office/koffice/debian/kugar-trinity.lintian
index a0cd38a78..a0cd38a78 100644
--- a/debian/_base/applications/koffice/debian/kugar-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kugar-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.manpages b/debian/_base/applications/office/koffice/debian/kugar-trinity.manpages
index 2a72a7d1b..2a72a7d1b 100644
--- a/debian/_base/applications/koffice/debian/kugar-trinity.manpages
+++ b/debian/_base/applications/office/koffice/debian/kugar-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.menu b/debian/_base/applications/office/koffice/debian/kugar-trinity.menu
index c378a94a1..c378a94a1 100644
--- a/debian/_base/applications/koffice/debian/kugar-trinity.menu
+++ b/debian/_base/applications/office/koffice/debian/kugar-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kugar-trinity.mime b/debian/_base/applications/office/koffice/debian/kugar-trinity.mime
index f731d744f..f731d744f 100644
--- a/debian/_base/applications/koffice/debian/kugar-trinity.mime
+++ b/debian/_base/applications/office/koffice/debian/kugar-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/kugar.1 b/debian/_base/applications/office/koffice/debian/kugar.1
index c3903a3d1..c3903a3d1 100644
--- a/debian/_base/applications/koffice/debian/kugar.1
+++ b/debian/_base/applications/office/koffice/debian/kugar.1
diff --git a/debian/_base/applications/koffice/debian/kugar.xpm b/debian/_base/applications/office/koffice/debian/kugar.xpm
index ee5a5a9f6..ee5a5a9f6 100644
--- a/debian/_base/applications/koffice/debian/kugar.xpm
+++ b/debian/_base/applications/office/koffice/debian/kugar.xpm
diff --git a/debian/_base/applications/koffice/debian/kword-data-trinity.install b/debian/_base/applications/office/koffice/debian/kword-data-trinity.install
index 32f9e2f9c..32f9e2f9c 100644
--- a/debian/_base/applications/koffice/debian/kword-data-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kword-data-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kword-data-trinity.lintian b/debian/_base/applications/office/koffice/debian/kword-data-trinity.lintian
index 34a1f7f57..34a1f7f57 100644
--- a/debian/_base/applications/koffice/debian/kword-data-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kword-data-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.README.Debian b/debian/_base/applications/office/koffice/debian/kword-trinity.README.Debian
index 14ad609c3..14ad609c3 100644
--- a/debian/_base/applications/koffice/debian/kword-trinity.README.Debian
+++ b/debian/_base/applications/office/koffice/debian/kword-trinity.README.Debian
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.docs b/debian/_base/applications/office/koffice/debian/kword-trinity.docs
index 8c00bbf2b..8c00bbf2b 100644
--- a/debian/_base/applications/koffice/debian/kword-trinity.docs
+++ b/debian/_base/applications/office/koffice/debian/kword-trinity.docs
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.examples b/debian/_base/applications/office/koffice/debian/kword-trinity.examples
index 81458fe9f..81458fe9f 100644
--- a/debian/_base/applications/koffice/debian/kword-trinity.examples
+++ b/debian/_base/applications/office/koffice/debian/kword-trinity.examples
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.install b/debian/_base/applications/office/koffice/debian/kword-trinity.install
index d003812cd..d003812cd 100644
--- a/debian/_base/applications/koffice/debian/kword-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kword-trinity.install
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.lintian b/debian/_base/applications/office/koffice/debian/kword-trinity.lintian
index a187698f4..a187698f4 100644
--- a/debian/_base/applications/koffice/debian/kword-trinity.lintian
+++ b/debian/_base/applications/office/koffice/debian/kword-trinity.lintian
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.manpages b/debian/_base/applications/office/koffice/debian/kword-trinity.manpages
index a9bf36729..a9bf36729 100644
--- a/debian/_base/applications/koffice/debian/kword-trinity.manpages
+++ b/debian/_base/applications/office/koffice/debian/kword-trinity.manpages
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.menu b/debian/_base/applications/office/koffice/debian/kword-trinity.menu
index 2dfdc2579..2dfdc2579 100644
--- a/debian/_base/applications/koffice/debian/kword-trinity.menu
+++ b/debian/_base/applications/office/koffice/debian/kword-trinity.menu
diff --git a/debian/_base/applications/koffice/debian/kword-trinity.mime b/debian/_base/applications/office/koffice/debian/kword-trinity.mime
index 026ac0d2b..026ac0d2b 100644
--- a/debian/_base/applications/koffice/debian/kword-trinity.mime
+++ b/debian/_base/applications/office/koffice/debian/kword-trinity.mime
diff --git a/debian/_base/applications/koffice/debian/kword.1 b/debian/_base/applications/office/koffice/debian/kword.1
index c191e2978..c191e2978 100644
--- a/debian/_base/applications/koffice/debian/kword.1
+++ b/debian/_base/applications/office/koffice/debian/kword.1
diff --git a/debian/_base/applications/koffice/debian/kword.xpm b/debian/_base/applications/office/koffice/debian/kword.xpm
index 38d4f830c..38d4f830c 100644
--- a/debian/_base/applications/koffice/debian/kword.xpm
+++ b/debian/_base/applications/office/koffice/debian/kword.xpm
diff --git a/debian/_base/applications/koffice/debian/not-installed.list b/debian/_base/applications/office/koffice/debian/not-installed.list
index de62d185f..de62d185f 100644
--- a/debian/_base/applications/koffice/debian/not-installed.list
+++ b/debian/_base/applications/office/koffice/debian/not-installed.list
diff --git a/debian/_base/applications/kde-guidance/debian/patches/series b/debian/_base/applications/office/koffice/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kde-guidance/debian/patches/series
+++ b/debian/_base/applications/office/koffice/debian/patches/series
diff --git a/debian/_base/applications/koffice/debian/rules b/debian/_base/applications/office/koffice/debian/rules
index fd6a0d37c..fd6a0d37c 100755
--- a/debian/_base/applications/koffice/debian/rules
+++ b/debian/_base/applications/office/koffice/debian/rules
diff --git a/debian/_base/applications/kerry/debian/source/format b/debian/_base/applications/office/koffice/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kerry/debian/source/format
+++ b/debian/_base/applications/office/koffice/debian/source/format
diff --git a/debian/_base/applications/kerry/debian/source/options b/debian/_base/applications/office/koffice/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kerry/debian/source/options
+++ b/debian/_base/applications/office/koffice/debian/source/options
diff --git a/debian/_base/applications/kdesudo/debian/cdbs/debian-tde.mk b/debian/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kdesudo/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kde-style-qtcurve/debian/cdbs/versions.pl b/debian/_base/applications/office/kpilot/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kde-style-qtcurve/debian/cdbs/versions.pl
+++ b/debian/_base/applications/office/kpilot/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kpilot/debian/changelog b/debian/_base/applications/office/kpilot/debian/changelog
index 033be0529..033be0529 100644
--- a/debian/_base/applications/kpilot/debian/changelog
+++ b/debian/_base/applications/office/kpilot/debian/changelog
diff --git a/debian/_base/applications/kgtk-qt3/debian/compat b/debian/_base/applications/office/kpilot/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kgtk-qt3/debian/compat
+++ b/debian/_base/applications/office/kpilot/debian/compat
diff --git a/debian/_base/applications/kpilot/debian/control b/debian/_base/applications/office/kpilot/debian/control
index f46458778..f46458778 100644
--- a/debian/_base/applications/kpilot/debian/control
+++ b/debian/_base/applications/office/kpilot/debian/control
diff --git a/debian/_base/applications/kpilot/debian/copyright b/debian/_base/applications/office/kpilot/debian/copyright
index 86dcae02e..86dcae02e 100644
--- a/debian/_base/applications/kpilot/debian/copyright
+++ b/debian/_base/applications/office/kpilot/debian/copyright
diff --git a/debian/_base/applications/kpilot/debian/rules b/debian/_base/applications/office/kpilot/debian/rules
index 7a6c3e8e4..7a6c3e8e4 100755
--- a/debian/_base/applications/kpilot/debian/rules
+++ b/debian/_base/applications/office/kpilot/debian/rules
diff --git a/debian/_base/applications/kgtk-qt3/debian/source/format b/debian/_base/applications/office/kpilot/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kgtk-qt3/debian/source/format
+++ b/debian/_base/applications/office/kpilot/debian/source/format
diff --git a/debian/_base/applications/kgtk-qt3/debian/source/options b/debian/_base/applications/office/kpilot/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kgtk-qt3/debian/source/options
+++ b/debian/_base/applications/office/kpilot/debian/source/options
diff --git a/debian/_base/applications/tellico/debian/changelog b/debian/_base/applications/office/tellico/debian/changelog
index e8f8697e8..e8f8697e8 100644
--- a/debian/_base/applications/tellico/debian/changelog
+++ b/debian/_base/applications/office/tellico/debian/changelog
diff --git a/debian/_base/applications/kile/debian/compat b/debian/_base/applications/office/tellico/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kile/debian/compat
+++ b/debian/_base/applications/office/tellico/debian/compat
diff --git a/debian/_base/applications/tellico/debian/control b/debian/_base/applications/office/tellico/debian/control
index ec254fafe..ec254fafe 100644
--- a/debian/_base/applications/tellico/debian/control
+++ b/debian/_base/applications/office/tellico/debian/control
diff --git a/debian/_base/applications/tellico/debian/copyright b/debian/_base/applications/office/tellico/debian/copyright
index 69496b35c..69496b35c 100644
--- a/debian/_base/applications/tellico/debian/copyright
+++ b/debian/_base/applications/office/tellico/debian/copyright
diff --git a/debian/_base/applications/tellico/debian/menu b/debian/_base/applications/office/tellico/debian/menu
index 430884153..430884153 100644
--- a/debian/_base/applications/tellico/debian/menu
+++ b/debian/_base/applications/office/tellico/debian/menu
diff --git a/debian/_base/applications/tellico/debian/rules b/debian/_base/applications/office/tellico/debian/rules
index 4dfb7936d..4dfb7936d 100755
--- a/debian/_base/applications/tellico/debian/rules
+++ b/debian/_base/applications/office/tellico/debian/rules
diff --git a/debian/_base/applications/kile/debian/source/format b/debian/_base/applications/office/tellico/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kile/debian/source/format
+++ b/debian/_base/applications/office/tellico/debian/source/format
diff --git a/debian/_base/applications/kile/debian/source/options b/debian/_base/applications/office/tellico/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kile/debian/source/options
+++ b/debian/_base/applications/office/tellico/debian/source/options
diff --git a/debian/_base/applications/tellico/debian/tellico-data-trinity.install b/debian/_base/applications/office/tellico/debian/tellico-data-trinity.install
index 152ef011b..152ef011b 100644
--- a/debian/_base/applications/tellico/debian/tellico-data-trinity.install
+++ b/debian/_base/applications/office/tellico/debian/tellico-data-trinity.install
diff --git a/debian/_base/applications/tellico/debian/tellico-scripts-trinity.install b/debian/_base/applications/office/tellico/debian/tellico-scripts-trinity.install
index 71c51d5eb..71c51d5eb 100644
--- a/debian/_base/applications/tellico/debian/tellico-scripts-trinity.install
+++ b/debian/_base/applications/office/tellico/debian/tellico-scripts-trinity.install
diff --git a/debian/_base/applications/tellico/debian/tellico-trinity.install b/debian/_base/applications/office/tellico/debian/tellico-trinity.install
index a45d88c99..a45d88c99 100644
--- a/debian/_base/applications/tellico/debian/tellico-trinity.install
+++ b/debian/_base/applications/office/tellico/debian/tellico-trinity.install
diff --git a/debian/_base/applications/tellico/debian/tellico.1x b/debian/_base/applications/office/tellico/debian/tellico.1x
index e102af2c5..e102af2c5 100644
--- a/debian/_base/applications/tellico/debian/tellico.1x
+++ b/debian/_base/applications/office/tellico/debian/tellico.1x
diff --git a/debian/_base/applications/tellico/debian/tellico.xpm b/debian/_base/applications/office/tellico/debian/tellico.xpm
index 589d66eeb..589d66eeb 100644
--- a/debian/_base/applications/tellico/debian/tellico.xpm
+++ b/debian/_base/applications/office/tellico/debian/tellico.xpm
diff --git a/debian/_base/applications/tellico/debian/watch b/debian/_base/applications/office/tellico/debian/watch
index 8e67307f5..8e67307f5 100644
--- a/debian/_base/applications/tellico/debian/watch
+++ b/debian/_base/applications/office/tellico/debian/watch
diff --git a/debian/_base/applications/kbfx/debian/README.Debian b/debian/_base/applications/settings/kde-guidance/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/_base/applications/kbfx/debian/README.Debian
+++ b/debian/_base/applications/settings/kde-guidance/debian/README.Debian
diff --git a/debian/_base/applications/kde-guidance/debian/changelog b/debian/_base/applications/settings/kde-guidance/debian/changelog
index fbd50fb8f..fbd50fb8f 100644
--- a/debian/_base/applications/kde-guidance/debian/changelog
+++ b/debian/_base/applications/settings/kde-guidance/debian/changelog
diff --git a/debian/_base/applications/kima/debian/compat b/debian/_base/applications/settings/kde-guidance/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kima/debian/compat
+++ b/debian/_base/applications/settings/kde-guidance/debian/compat
diff --git a/debian/_base/applications/kde-guidance/debian/control b/debian/_base/applications/settings/kde-guidance/debian/control
index 89838b959..89838b959 100644
--- a/debian/_base/applications/kde-guidance/debian/control
+++ b/debian/_base/applications/settings/kde-guidance/debian/control
diff --git a/debian/_base/applications/kde-guidance/debian/copyright b/debian/_base/applications/settings/kde-guidance/debian/copyright
index 38c1d30e8..38c1d30e8 100644
--- a/debian/_base/applications/kde-guidance/debian/copyright
+++ b/debian/_base/applications/settings/kde-guidance/debian/copyright
diff --git a/debian/_base/applications/kde-guidance/debian/dirs b/debian/_base/applications/settings/kde-guidance/debian/dirs
index 3dd0bc793..3dd0bc793 100644
--- a/debian/_base/applications/kde-guidance/debian/dirs
+++ b/debian/_base/applications/settings/kde-guidance/debian/dirs
diff --git a/debian/_base/applications/kde-guidance/debian/displayconfig-trinity.1 b/debian/_base/applications/settings/kde-guidance/debian/displayconfig-trinity.1
index 3670902b8..3670902b8 100644
--- a/debian/_base/applications/kde-guidance/debian/displayconfig-trinity.1
+++ b/debian/_base/applications/settings/kde-guidance/debian/displayconfig-trinity.1
diff --git a/debian/_base/applications/knights/debian/docs b/debian/_base/applications/settings/kde-guidance/debian/docs
index 724e08449..724e08449 100644
--- a/debian/_base/applications/knights/debian/docs
+++ b/debian/_base/applications/settings/kde-guidance/debian/docs
diff --git a/debian/_base/applications/kde-guidance/debian/guidance-backends-trinity.install b/debian/_base/applications/settings/kde-guidance/debian/guidance-backends-trinity.install
index de6cbc63e..de6cbc63e 100644
--- a/debian/_base/applications/kde-guidance/debian/guidance-backends-trinity.install
+++ b/debian/_base/applications/settings/kde-guidance/debian/guidance-backends-trinity.install
diff --git a/debian/_base/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install b/debian/_base/applications/settings/kde-guidance/debian/kde-guidance-powermanager-trinity.install
index 8c707520e..8c707520e 100644
--- a/debian/_base/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install
+++ b/debian/_base/applications/settings/kde-guidance/debian/kde-guidance-powermanager-trinity.install
diff --git a/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.init b/debian/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.init
index 30a3854d1..30a3854d1 100644
--- a/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.init
+++ b/debian/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.init
diff --git a/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.install b/debian/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.install
index ddf96826a..ddf96826a 100644
--- a/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.install
+++ b/debian/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.install
diff --git a/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides b/debian/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.lintian-overrides
index 6131946c2..6131946c2 100644
--- a/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides
+++ b/debian/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.lintian-overrides
diff --git a/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.postinst b/debian/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.postinst
index de2804fc4..de2804fc4 100644
--- a/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.postinst
+++ b/debian/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.postinst
diff --git a/debian/_base/applications/kde-guidance/debian/mountconfig-trinity.1 b/debian/_base/applications/settings/kde-guidance/debian/mountconfig-trinity.1
index 7f1fb728c..7f1fb728c 100644
--- a/debian/_base/applications/kde-guidance/debian/mountconfig-trinity.1
+++ b/debian/_base/applications/settings/kde-guidance/debian/mountconfig-trinity.1
diff --git a/debian/_base/applications/kde-style-qtcurve/debian/patches/series b/debian/_base/applications/settings/kde-guidance/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kde-style-qtcurve/debian/patches/series
+++ b/debian/_base/applications/settings/kde-guidance/debian/patches/series
diff --git a/debian/_base/applications/kde-guidance/debian/pycompat b/debian/_base/applications/settings/kde-guidance/debian/pycompat
index 0cfbf0888..0cfbf0888 100644
--- a/debian/_base/applications/kde-guidance/debian/pycompat
+++ b/debian/_base/applications/settings/kde-guidance/debian/pycompat
diff --git a/debian/_base/applications/kde-guidance/debian/python-distutils-jaunty.mk b/debian/_base/applications/settings/kde-guidance/debian/python-distutils-jaunty.mk
index db329306c..db329306c 100644
--- a/debian/_base/applications/kde-guidance/debian/python-distutils-jaunty.mk
+++ b/debian/_base/applications/settings/kde-guidance/debian/python-distutils-jaunty.mk
diff --git a/debian/_base/applications/kde-guidance/debian/pyversions b/debian/_base/applications/settings/kde-guidance/debian/pyversions
index 0c043f18c..0c043f18c 100644
--- a/debian/_base/applications/kde-guidance/debian/pyversions
+++ b/debian/_base/applications/settings/kde-guidance/debian/pyversions
diff --git a/debian/_base/applications/kde-guidance/debian/rules b/debian/_base/applications/settings/kde-guidance/debian/rules
index 48e5e31d7..48e5e31d7 100755
--- a/debian/_base/applications/kde-guidance/debian/rules
+++ b/debian/_base/applications/settings/kde-guidance/debian/rules
diff --git a/debian/_base/applications/kde-guidance/debian/serviceconfig-trinity.1 b/debian/_base/applications/settings/kde-guidance/debian/serviceconfig-trinity.1
index 776a01998..776a01998 100644
--- a/debian/_base/applications/kde-guidance/debian/serviceconfig-trinity.1
+++ b/debian/_base/applications/settings/kde-guidance/debian/serviceconfig-trinity.1
diff --git a/debian/_base/applications/kima/debian/source/format b/debian/_base/applications/settings/kde-guidance/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kima/debian/source/format
+++ b/debian/_base/applications/settings/kde-guidance/debian/source/format
diff --git a/debian/_base/applications/kima/debian/source/options b/debian/_base/applications/settings/kde-guidance/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kima/debian/source/options
+++ b/debian/_base/applications/settings/kde-guidance/debian/source/options
diff --git a/debian/_base/applications/kde-guidance/debian/userconfig-trinity.1 b/debian/_base/applications/settings/kde-guidance/debian/userconfig-trinity.1
index 3b950add1..3b950add1 100644
--- a/debian/_base/applications/kde-guidance/debian/userconfig-trinity.1
+++ b/debian/_base/applications/settings/kde-guidance/debian/userconfig-trinity.1
diff --git a/debian/_base/applications/kde-guidance/debian/watch b/debian/_base/applications/settings/kde-guidance/debian/watch
index 19912c171..19912c171 100644
--- a/debian/_base/applications/kde-guidance/debian/watch
+++ b/debian/_base/applications/settings/kde-guidance/debian/watch
diff --git a/debian/_base/applications/kdesvn/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/kde-systemsettings/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kdesvn/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/settings/kde-systemsettings/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kde-systemsettings/debian/cdbs/versions.pl b/debian/_base/applications/settings/kde-systemsettings/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kde-systemsettings/debian/cdbs/versions.pl
+++ b/debian/_base/applications/settings/kde-systemsettings/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kde-systemsettings/debian/changelog b/debian/_base/applications/settings/kde-systemsettings/debian/changelog
index 932e17449..932e17449 100644
--- a/debian/_base/applications/kde-systemsettings/debian/changelog
+++ b/debian/_base/applications/settings/kde-systemsettings/debian/changelog
diff --git a/debian/_base/applications/kio-apt/debian/compat b/debian/_base/applications/settings/kde-systemsettings/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kio-apt/debian/compat
+++ b/debian/_base/applications/settings/kde-systemsettings/debian/compat
diff --git a/debian/_base/applications/kde-systemsettings/debian/control b/debian/_base/applications/settings/kde-systemsettings/debian/control
index b1d4eec0a..b1d4eec0a 100644
--- a/debian/_base/applications/kde-systemsettings/debian/control
+++ b/debian/_base/applications/settings/kde-systemsettings/debian/control
diff --git a/debian/_base/applications/kde-systemsettings/debian/copyright b/debian/_base/applications/settings/kde-systemsettings/debian/copyright
index 04a4bdce1..04a4bdce1 100644
--- a/debian/_base/applications/kde-systemsettings/debian/copyright
+++ b/debian/_base/applications/settings/kde-systemsettings/debian/copyright
diff --git a/debian/_base/applications/kde-systemsettings/debian/docs b/debian/_base/applications/settings/kde-systemsettings/debian/docs
index 0eb1e7d11..0eb1e7d11 100644
--- a/debian/_base/applications/kde-systemsettings/debian/docs
+++ b/debian/_base/applications/settings/kde-systemsettings/debian/docs
diff --git a/debian/_base/applications/kde-systemsettings/debian/kde-settings-laptops.directory b/debian/_base/applications/settings/kde-systemsettings/debian/kde-settings-laptops.directory
index 687a493c4..687a493c4 100644
--- a/debian/_base/applications/kde-systemsettings/debian/kde-settings-laptops.directory
+++ b/debian/_base/applications/settings/kde-systemsettings/debian/kde-settings-laptops.directory
diff --git a/debian/_base/applications/kde-systemsettings/debian/kde-systemsettings-trinity.preinst b/debian/_base/applications/settings/kde-systemsettings/debian/kde-systemsettings-trinity.preinst
index f7b840ea2..f7b840ea2 100644
--- a/debian/_base/applications/kde-systemsettings/debian/kde-systemsettings-trinity.preinst
+++ b/debian/_base/applications/settings/kde-systemsettings/debian/kde-systemsettings-trinity.preinst
diff --git a/debian/_base/applications/kde-systemsettings/debian/patches/series b/debian/_base/applications/settings/kde-systemsettings/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kde-systemsettings/debian/patches/series
+++ b/debian/_base/applications/settings/kde-systemsettings/debian/patches/series
diff --git a/debian/_base/applications/kde-systemsettings/debian/rules b/debian/_base/applications/settings/kde-systemsettings/debian/rules
index 5c5acf0de..5c5acf0de 100755
--- a/debian/_base/applications/kde-systemsettings/debian/rules
+++ b/debian/_base/applications/settings/kde-systemsettings/debian/rules
diff --git a/debian/_base/applications/kio-apt/debian/source/format b/debian/_base/applications/settings/kde-systemsettings/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kio-apt/debian/source/format
+++ b/debian/_base/applications/settings/kde-systemsettings/debian/source/format
diff --git a/debian/_base/applications/kio-apt/debian/source/options b/debian/_base/applications/settings/kde-systemsettings/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kio-apt/debian/source/options
+++ b/debian/_base/applications/settings/kde-systemsettings/debian/source/options
diff --git a/debian/_base/applications/kde-systemsettings/debian/systemsettings.1.docbook b/debian/_base/applications/settings/kde-systemsettings/debian/systemsettings.1.docbook
index 2b260e626..2b260e626 100644
--- a/debian/_base/applications/kde-systemsettings/debian/systemsettings.1.docbook
+++ b/debian/_base/applications/settings/kde-systemsettings/debian/systemsettings.1.docbook
diff --git a/debian/_base/applications/kdiff3/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/kdesudo/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kdiff3/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/settings/kdesudo/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kdesudo/debian/cdbs/versions.pl b/debian/_base/applications/settings/kdesudo/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kdesudo/debian/cdbs/versions.pl
+++ b/debian/_base/applications/settings/kdesudo/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kdesudo/debian/changelog b/debian/_base/applications/settings/kdesudo/debian/changelog
index d245ff2e7..d245ff2e7 100644
--- a/debian/_base/applications/kdesudo/debian/changelog
+++ b/debian/_base/applications/settings/kdesudo/debian/changelog
diff --git a/debian/_base/applications/kio-locate/debian/compat b/debian/_base/applications/settings/kdesudo/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kio-locate/debian/compat
+++ b/debian/_base/applications/settings/kdesudo/debian/compat
diff --git a/debian/_base/applications/kdesudo/debian/control b/debian/_base/applications/settings/kdesudo/debian/control
index 267ec5d4f..267ec5d4f 100644
--- a/debian/_base/applications/kdesudo/debian/control
+++ b/debian/_base/applications/settings/kdesudo/debian/control
diff --git a/debian/_base/applications/kdesudo/debian/copyright b/debian/_base/applications/settings/kdesudo/debian/copyright
index 9cd32407b..9cd32407b 100644
--- a/debian/_base/applications/kdesudo/debian/copyright
+++ b/debian/_base/applications/settings/kdesudo/debian/copyright
diff --git a/debian/_base/applications/kdesudo/debian/kdesudo-trinity.1.docbook b/debian/_base/applications/settings/kdesudo/debian/kdesudo-trinity.1.docbook
index 0e1ba2b60..0e1ba2b60 100644
--- a/debian/_base/applications/kdesudo/debian/kdesudo-trinity.1.docbook
+++ b/debian/_base/applications/settings/kdesudo/debian/kdesudo-trinity.1.docbook
diff --git a/debian/_base/applications/kdesudo/debian/links b/debian/_base/applications/settings/kdesudo/debian/links
index c30adf9c1..c30adf9c1 100644
--- a/debian/_base/applications/kdesudo/debian/links
+++ b/debian/_base/applications/settings/kdesudo/debian/links
diff --git a/debian/_base/applications/kdesudo/debian/patches/series b/debian/_base/applications/settings/kdesudo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kdesudo/debian/patches/series
+++ b/debian/_base/applications/settings/kdesudo/debian/patches/series
diff --git a/debian/_base/applications/kdesudo/debian/postinst b/debian/_base/applications/settings/kdesudo/debian/postinst
index 7ec0ace2f..7ec0ace2f 100644
--- a/debian/_base/applications/kdesudo/debian/postinst
+++ b/debian/_base/applications/settings/kdesudo/debian/postinst
diff --git a/debian/_base/applications/kdesudo/debian/postrm b/debian/_base/applications/settings/kdesudo/debian/postrm
index 526a8c60a..526a8c60a 100644
--- a/debian/_base/applications/kdesudo/debian/postrm
+++ b/debian/_base/applications/settings/kdesudo/debian/postrm
diff --git a/debian/_base/applications/kdesudo/debian/preinst b/debian/_base/applications/settings/kdesudo/debian/preinst
index 4ce843004..4ce843004 100644
--- a/debian/_base/applications/kdesudo/debian/preinst
+++ b/debian/_base/applications/settings/kdesudo/debian/preinst
diff --git a/debian/_base/applications/kdesudo/debian/rules b/debian/_base/applications/settings/kdesudo/debian/rules
index ddcdb7807..ddcdb7807 100755
--- a/debian/_base/applications/kdesudo/debian/rules
+++ b/debian/_base/applications/settings/kdesudo/debian/rules
diff --git a/debian/_base/applications/kio-locate/debian/source/format b/debian/_base/applications/settings/kdesudo/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kio-locate/debian/source/format
+++ b/debian/_base/applications/settings/kdesudo/debian/source/format
diff --git a/debian/_base/applications/kio-locate/debian/source/options b/debian/_base/applications/settings/kdesudo/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kio-locate/debian/source/options
+++ b/debian/_base/applications/settings/kdesudo/debian/source/options
diff --git a/debian/_base/applications/kdpkg/debian/changelog b/debian/_base/applications/settings/kdpkg/debian/changelog
index 2c3e7dd4d..2c3e7dd4d 100644
--- a/debian/_base/applications/kdpkg/debian/changelog
+++ b/debian/_base/applications/settings/kdpkg/debian/changelog
diff --git a/debian/_base/applications/kio-umountwrapper/debian/compat b/debian/_base/applications/settings/kdpkg/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kio-umountwrapper/debian/compat
+++ b/debian/_base/applications/settings/kdpkg/debian/compat
diff --git a/debian/_base/applications/kdpkg/debian/control b/debian/_base/applications/settings/kdpkg/debian/control
index 3ab929238..3ab929238 100644
--- a/debian/_base/applications/kdpkg/debian/control
+++ b/debian/_base/applications/settings/kdpkg/debian/control
diff --git a/debian/_base/applications/kdpkg/debian/copyright b/debian/_base/applications/settings/kdpkg/debian/copyright
index 6ca73edad..6ca73edad 100644
--- a/debian/_base/applications/kdpkg/debian/copyright
+++ b/debian/_base/applications/settings/kdpkg/debian/copyright
diff --git a/debian/_base/applications/kdpkg/debian/kdpkg-install.1 b/debian/_base/applications/settings/kdpkg/debian/kdpkg-install.1
index 0325170a5..0325170a5 100644
--- a/debian/_base/applications/kdpkg/debian/kdpkg-install.1
+++ b/debian/_base/applications/settings/kdpkg/debian/kdpkg-install.1
diff --git a/debian/_base/applications/kdpkg/debian/kdpkg.1 b/debian/_base/applications/settings/kdpkg/debian/kdpkg.1
index 0325170a5..0325170a5 100644
--- a/debian/_base/applications/kdpkg/debian/kdpkg.1
+++ b/debian/_base/applications/settings/kdpkg/debian/kdpkg.1
diff --git a/debian/_base/applications/kdpkg/debian/manpages b/debian/_base/applications/settings/kdpkg/debian/manpages
index 7835ccb72..7835ccb72 100644
--- a/debian/_base/applications/kdpkg/debian/manpages
+++ b/debian/_base/applications/settings/kdpkg/debian/manpages
diff --git a/debian/_base/applications/kdesvn/debian/patches/series b/debian/_base/applications/settings/kdpkg/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kdesvn/debian/patches/series
+++ b/debian/_base/applications/settings/kdpkg/debian/patches/series
diff --git a/debian/_base/applications/kdpkg/debian/rules b/debian/_base/applications/settings/kdpkg/debian/rules
index 8293bfe64..8293bfe64 100755
--- a/debian/_base/applications/kdpkg/debian/rules
+++ b/debian/_base/applications/settings/kdpkg/debian/rules
diff --git a/debian/_base/applications/kio-umountwrapper/debian/source/format b/debian/_base/applications/settings/kdpkg/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kio-umountwrapper/debian/source/format
+++ b/debian/_base/applications/settings/kdpkg/debian/source/format
diff --git a/debian/_base/applications/kio-umountwrapper/debian/source/options b/debian/_base/applications/settings/kdpkg/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kio-umountwrapper/debian/source/options
+++ b/debian/_base/applications/settings/kdpkg/debian/source/options
diff --git a/debian/_base/applications/kima/debian/changelog b/debian/_base/applications/settings/kima/debian/changelog
index 9cc006cef..9cc006cef 100644
--- a/debian/_base/applications/kima/debian/changelog
+++ b/debian/_base/applications/settings/kima/debian/changelog
diff --git a/debian/_base/applications/kiosktool/debian/compat b/debian/_base/applications/settings/kima/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kiosktool/debian/compat
+++ b/debian/_base/applications/settings/kima/debian/compat
diff --git a/debian/_base/applications/kima/debian/control b/debian/_base/applications/settings/kima/debian/control
index 1d77490fa..1d77490fa 100644
--- a/debian/_base/applications/kima/debian/control
+++ b/debian/_base/applications/settings/kima/debian/control
diff --git a/debian/_base/applications/kima/debian/copyright b/debian/_base/applications/settings/kima/debian/copyright
index 8facbcf30..8facbcf30 100644
--- a/debian/_base/applications/kima/debian/copyright
+++ b/debian/_base/applications/settings/kima/debian/copyright
diff --git a/debian/_base/applications/kima/debian/rules b/debian/_base/applications/settings/kima/debian/rules
index 27a3fe333..27a3fe333 100755
--- a/debian/_base/applications/kima/debian/rules
+++ b/debian/_base/applications/settings/kima/debian/rules
diff --git a/debian/_base/applications/kiosktool/debian/source/format b/debian/_base/applications/settings/kima/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kiosktool/debian/source/format
+++ b/debian/_base/applications/settings/kima/debian/source/format
diff --git a/debian/_base/applications/kiosktool/debian/source/options b/debian/_base/applications/settings/kima/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kiosktool/debian/source/options
+++ b/debian/_base/applications/settings/kima/debian/source/options
diff --git a/debian/_base/applications/kdirstat/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kdirstat/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kdiff3/debian/cdbs/versions.pl b/debian/_base/applications/settings/kiosktool/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kdiff3/debian/cdbs/versions.pl
+++ b/debian/_base/applications/settings/kiosktool/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kiosktool/debian/changelog b/debian/_base/applications/settings/kiosktool/debian/changelog
index a81e4659e..a81e4659e 100644
--- a/debian/_base/applications/kiosktool/debian/changelog
+++ b/debian/_base/applications/settings/kiosktool/debian/changelog
diff --git a/debian/_base/applications/kmplayer/debian/compat b/debian/_base/applications/settings/kiosktool/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kmplayer/debian/compat
+++ b/debian/_base/applications/settings/kiosktool/debian/compat
diff --git a/debian/_base/applications/kiosktool/debian/control b/debian/_base/applications/settings/kiosktool/debian/control
index 1005343c6..1005343c6 100644
--- a/debian/_base/applications/kiosktool/debian/control
+++ b/debian/_base/applications/settings/kiosktool/debian/control
diff --git a/debian/_base/applications/kiosktool/debian/copyright b/debian/_base/applications/settings/kiosktool/debian/copyright
index a88b1d8d2..a88b1d8d2 100644
--- a/debian/_base/applications/kiosktool/debian/copyright
+++ b/debian/_base/applications/settings/kiosktool/debian/copyright
diff --git a/debian/_base/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 b/debian/_base/applications/settings/kiosktool/debian/kiosktool-kdedirs-trinity.1
index 62faad5d3..62faad5d3 100644
--- a/debian/_base/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
+++ b/debian/_base/applications/settings/kiosktool/debian/kiosktool-kdedirs-trinity.1
diff --git a/debian/_base/applications/kiosktool/debian/kiosktool-trinity.1 b/debian/_base/applications/settings/kiosktool/debian/kiosktool-trinity.1
index 08ba2ec80..08ba2ec80 100644
--- a/debian/_base/applications/kiosktool/debian/kiosktool-trinity.1
+++ b/debian/_base/applications/settings/kiosktool/debian/kiosktool-trinity.1
diff --git a/debian/_base/applications/kiosktool/debian/kiosktool-trinity.manpages b/debian/_base/applications/settings/kiosktool/debian/kiosktool-trinity.manpages
index 2d009e1db..2d009e1db 100644
--- a/debian/_base/applications/kiosktool/debian/kiosktool-trinity.manpages
+++ b/debian/_base/applications/settings/kiosktool/debian/kiosktool-trinity.manpages
diff --git a/debian/_base/applications/kdirstat/debian/patches/series b/debian/_base/applications/settings/kiosktool/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kdirstat/debian/patches/series
+++ b/debian/_base/applications/settings/kiosktool/debian/patches/series
diff --git a/debian/_base/applications/kiosktool/debian/rules b/debian/_base/applications/settings/kiosktool/debian/rules
index 6bf27ed9c..6bf27ed9c 100755
--- a/debian/_base/applications/kiosktool/debian/rules
+++ b/debian/_base/applications/settings/kiosktool/debian/rules
diff --git a/debian/_base/applications/kmplayer/debian/source/format b/debian/_base/applications/settings/kiosktool/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kmplayer/debian/source/format
+++ b/debian/_base/applications/settings/kiosktool/debian/source/format
diff --git a/debian/_base/applications/kmplayer/debian/source/options b/debian/_base/applications/settings/kiosktool/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kmplayer/debian/source/options
+++ b/debian/_base/applications/settings/kiosktool/debian/source/options
diff --git a/debian/_base/applications/kmyfirewall/debian/changelog b/debian/_base/applications/settings/kmyfirewall/debian/changelog
index cfe55d3e4..cfe55d3e4 100644
--- a/debian/_base/applications/kmyfirewall/debian/changelog
+++ b/debian/_base/applications/settings/kmyfirewall/debian/changelog
diff --git a/debian/_base/applications/kmyfirewall/debian/compat b/debian/_base/applications/settings/kmyfirewall/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kmyfirewall/debian/compat
+++ b/debian/_base/applications/settings/kmyfirewall/debian/compat
diff --git a/debian/_base/applications/kmyfirewall/debian/control b/debian/_base/applications/settings/kmyfirewall/debian/control
index f482a51d5..f482a51d5 100644
--- a/debian/_base/applications/kmyfirewall/debian/control
+++ b/debian/_base/applications/settings/kmyfirewall/debian/control
diff --git a/debian/_base/applications/kmyfirewall/debian/copyright b/debian/_base/applications/settings/kmyfirewall/debian/copyright
index 8429d407e..8429d407e 100644
--- a/debian/_base/applications/kmyfirewall/debian/copyright
+++ b/debian/_base/applications/settings/kmyfirewall/debian/copyright
diff --git a/debian/_base/applications/koffice-i18n/debian/debiandirs b/debian/_base/applications/settings/kmyfirewall/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/debian/_base/applications/koffice-i18n/debian/debiandirs
+++ b/debian/_base/applications/settings/kmyfirewall/debian/debiandirs
diff --git a/debian/_base/applications/kmyfirewall/debian/dirs b/debian/_base/applications/settings/kmyfirewall/debian/dirs
index f0312285e..f0312285e 100644
--- a/debian/_base/applications/kmyfirewall/debian/dirs
+++ b/debian/_base/applications/settings/kmyfirewall/debian/dirs
diff --git a/debian/_base/applications/krename/debian/docs b/debian/_base/applications/settings/kmyfirewall/debian/docs
index 724e08449..724e08449 100644
--- a/debian/_base/applications/krename/debian/docs
+++ b/debian/_base/applications/settings/kmyfirewall/debian/docs
diff --git a/debian/_base/applications/kmyfirewall/debian/install b/debian/_base/applications/settings/kmyfirewall/debian/install
index 3a28b6931..3a28b6931 100644
--- a/debian/_base/applications/kmyfirewall/debian/install
+++ b/debian/_base/applications/settings/kmyfirewall/debian/install
diff --git a/debian/_base/applications/kmyfirewall/debian/kmfinstallerplugin.desktop b/debian/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop
index 77922f4b4..77922f4b4 100644
--- a/debian/_base/applications/kmyfirewall/debian/kmfinstallerplugin.desktop
+++ b/debian/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop
diff --git a/debian/_base/applications/kmyfirewall/debian/kmyfirewall.1 b/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1
index 31560bd7b..31560bd7b 100644
--- a/debian/_base/applications/kmyfirewall/debian/kmyfirewall.1
+++ b/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1
diff --git a/debian/_base/applications/kmyfirewall/debian/kmyfirewall.desktop b/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop
index 379235132..379235132 100644
--- a/debian/_base/applications/kmyfirewall/debian/kmyfirewall.desktop
+++ b/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop
diff --git a/debian/_base/applications/kmyfirewall/debian/kmyfirewall.xpm b/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm
index 3d58b81ff..3d58b81ff 100644
--- a/debian/_base/applications/kmyfirewall/debian/kmyfirewall.xpm
+++ b/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm
diff --git a/debian/_base/applications/kmyfirewall/debian/manpages b/debian/_base/applications/settings/kmyfirewall/debian/manpages
index fab755280..fab755280 100644
--- a/debian/_base/applications/kmyfirewall/debian/manpages
+++ b/debian/_base/applications/settings/kmyfirewall/debian/manpages
diff --git a/debian/_base/applications/kmyfirewall/debian/menu b/debian/_base/applications/settings/kmyfirewall/debian/menu
index 3d1feab6e..3d1feab6e 100644
--- a/debian/_base/applications/kmyfirewall/debian/menu
+++ b/debian/_base/applications/settings/kmyfirewall/debian/menu
diff --git a/debian/_base/applications/kmyfirewall/debian/rules b/debian/_base/applications/settings/kmyfirewall/debian/rules
index d03f14f42..d03f14f42 100755
--- a/debian/_base/applications/kmyfirewall/debian/rules
+++ b/debian/_base/applications/settings/kmyfirewall/debian/rules
diff --git a/debian/_base/applications/kmyfirewall/debian/source/format b/debian/_base/applications/settings/kmyfirewall/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kmyfirewall/debian/source/format
+++ b/debian/_base/applications/settings/kmyfirewall/debian/source/format
diff --git a/debian/_base/applications/kmyfirewall/debian/source/options b/debian/_base/applications/settings/kmyfirewall/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kmyfirewall/debian/source/options
+++ b/debian/_base/applications/settings/kmyfirewall/debian/source/options
diff --git a/debian/_base/applications/kmyfirewall/debian/watch b/debian/_base/applications/settings/kmyfirewall/debian/watch
index 42dfe005b..42dfe005b 100644
--- a/debian/_base/applications/kmyfirewall/debian/watch
+++ b/debian/_base/applications/settings/kmyfirewall/debian/watch
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/README.source b/debian/_base/applications/settings/knetworkmanager8/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/debian/_base/applications/knetworkmanager.cmake/debian/README.source
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/README.source
diff --git a/debian/_base/applications/kdmtheme/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kdmtheme/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kdirstat/debian/cdbs/versions.pl b/debian/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kdirstat/debian/cdbs/versions.pl
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/knetworkmanager8/debian/changelog b/debian/_base/applications/settings/knetworkmanager8/debian/changelog
index c65f5ff4a..c65f5ff4a 100644
--- a/debian/_base/applications/knetworkmanager8/debian/changelog
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/changelog
diff --git a/debian/_base/applications/kmymoney/debian/compat b/debian/_base/applications/settings/knetworkmanager8/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kmymoney/debian/compat
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/compat
diff --git a/debian/_base/applications/knetworkmanager8/debian/control b/debian/_base/applications/settings/knetworkmanager8/debian/control
index f495834f5..f495834f5 100644
--- a/debian/_base/applications/knetworkmanager8/debian/control
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/control
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/copyright b/debian/_base/applications/settings/knetworkmanager8/debian/copyright
index 2490de254..2490de254 100644
--- a/debian/_base/applications/knetworkmanager.cmake/debian/copyright
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/copyright
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/knetworkmanager.1 b/debian/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1
index 3cd261c89..3cd261c89 100644
--- a/debian/_base/applications/knetworkmanager.cmake/debian/knetworkmanager.1
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/manpages b/debian/_base/applications/settings/knetworkmanager8/debian/manpages
index e2859341f..e2859341f 100644
--- a/debian/_base/applications/knetworkmanager.cmake/debian/manpages
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/manpages
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/menu b/debian/_base/applications/settings/knetworkmanager8/debian/menu
index 9775e9c7c..9775e9c7c 100644
--- a/debian/_base/applications/knetworkmanager.cmake/debian/menu
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/menu
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides b/debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..9ae01a92b 100644
--- a/debian/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst b/debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst
index fdd4e51ca..fdd4e51ca 100644
--- a/debian/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst
diff --git a/debian/_base/applications/kdpkg/debian/patches/series b/debian/_base/applications/settings/knetworkmanager8/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kdpkg/debian/patches/series
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/patches/series
diff --git a/debian/_base/applications/knetworkmanager8/debian/rules b/debian/_base/applications/settings/knetworkmanager8/debian/rules
index 2e71c04ed..2e71c04ed 100755
--- a/debian/_base/applications/knetworkmanager8/debian/rules
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/rules
diff --git a/debian/_base/applications/kmymoney/debian/source/format b/debian/_base/applications/settings/knetworkmanager8/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kmymoney/debian/source/format
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/source/format
diff --git a/debian/_base/applications/kmymoney/debian/source/options b/debian/_base/applications/settings/knetworkmanager8/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kmymoney/debian/source/options
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/source/options
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/watch b/debian/_base/applications/settings/knetworkmanager8/debian/watch
index ad7a7be91..ad7a7be91 100644
--- a/debian/_base/applications/knetworkmanager.cmake/debian/watch
+++ b/debian/_base/applications/settings/knetworkmanager8/debian/watch
diff --git a/debian/_base/applications/kde-guidance/debian/README.Debian b/debian/_base/applications/settings/wlassistant/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/_base/applications/kde-guidance/debian/README.Debian
+++ b/debian/_base/applications/settings/wlassistant/debian/README.Debian
diff --git a/debian/_base/applications/keep/debian/cdbs/debian-tde.mk b/debian/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/keep/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kdmtheme/debian/cdbs/versions.pl b/debian/_base/applications/settings/wlassistant/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kdmtheme/debian/cdbs/versions.pl
+++ b/debian/_base/applications/settings/wlassistant/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/wlassistant/debian/changelog b/debian/_base/applications/settings/wlassistant/debian/changelog
index 69859afc3..69859afc3 100644
--- a/debian/_base/applications/wlassistant/debian/changelog
+++ b/debian/_base/applications/settings/wlassistant/debian/changelog
diff --git a/debian/_base/applications/knemo/debian/compat b/debian/_base/applications/settings/wlassistant/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/knemo/debian/compat
+++ b/debian/_base/applications/settings/wlassistant/debian/compat
diff --git a/debian/_base/applications/wlassistant/debian/control b/debian/_base/applications/settings/wlassistant/debian/control
index 334588f2b..334588f2b 100644
--- a/debian/_base/applications/wlassistant/debian/control
+++ b/debian/_base/applications/settings/wlassistant/debian/control
diff --git a/debian/_base/applications/wlassistant/debian/copyright b/debian/_base/applications/settings/wlassistant/debian/copyright
index 5179772ff..5179772ff 100644
--- a/debian/_base/applications/wlassistant/debian/copyright
+++ b/debian/_base/applications/settings/wlassistant/debian/copyright
diff --git a/debian/_base/applications/kerry/debian/patches/series b/debian/_base/applications/settings/wlassistant/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kerry/debian/patches/series
+++ b/debian/_base/applications/settings/wlassistant/debian/patches/series
diff --git a/debian/_base/applications/wlassistant/debian/rules b/debian/_base/applications/settings/wlassistant/debian/rules
index 6256246f6..6256246f6 100755
--- a/debian/_base/applications/wlassistant/debian/rules
+++ b/debian/_base/applications/settings/wlassistant/debian/rules
diff --git a/debian/_base/applications/knemo/debian/source/format b/debian/_base/applications/settings/wlassistant/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/knemo/debian/source/format
+++ b/debian/_base/applications/settings/wlassistant/debian/source/format
diff --git a/debian/_base/applications/knemo/debian/source/options b/debian/_base/applications/settings/wlassistant/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/knemo/debian/source/options
+++ b/debian/_base/applications/settings/wlassistant/debian/source/options
diff --git a/debian/_base/applications/wlassistant/debian/watch b/debian/_base/applications/settings/wlassistant/debian/watch
index 42304de6e..42304de6e 100644
--- a/debian/_base/applications/wlassistant/debian/watch
+++ b/debian/_base/applications/settings/wlassistant/debian/watch
diff --git a/debian/_base/applications/wlassistant/debian/wlassistant-16.xpm b/debian/_base/applications/settings/wlassistant/debian/wlassistant-16.xpm
index fcaa89b00..fcaa89b00 100644
--- a/debian/_base/applications/wlassistant/debian/wlassistant-16.xpm
+++ b/debian/_base/applications/settings/wlassistant/debian/wlassistant-16.xpm
diff --git a/debian/_base/applications/wlassistant/debian/wlassistant-trinity.dirs b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.dirs
index 57855aec4..57855aec4 100644
--- a/debian/_base/applications/wlassistant/debian/wlassistant-trinity.dirs
+++ b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.dirs
diff --git a/debian/_base/applications/wlassistant/debian/wlassistant-trinity.docs b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
index 8fa4b0c87..8fa4b0c87 100644
--- a/debian/_base/applications/wlassistant/debian/wlassistant-trinity.docs
+++ b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
diff --git a/debian/_base/applications/wlassistant/debian/wlassistant-trinity.install b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.install
index 7465386d3..7465386d3 100644
--- a/debian/_base/applications/wlassistant/debian/wlassistant-trinity.install
+++ b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.install
diff --git a/debian/_base/applications/wlassistant/debian/wlassistant-trinity.manpage b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.manpage
index fb021a15b..fb021a15b 100644
--- a/debian/_base/applications/wlassistant/debian/wlassistant-trinity.manpage
+++ b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.manpage
diff --git a/debian/_base/applications/wlassistant/debian/wlassistant-trinity.menu b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.menu
index dc43a7b0f..dc43a7b0f 100644
--- a/debian/_base/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.menu
diff --git a/debian/_base/applications/wlassistant/debian/wlassistant.xpm b/debian/_base/applications/settings/wlassistant/debian/wlassistant.xpm
index d1f52cbe8..d1f52cbe8 100644
--- a/debian/_base/applications/wlassistant/debian/wlassistant.xpm
+++ b/debian/_base/applications/settings/wlassistant/debian/wlassistant.xpm
diff --git a/debian/_base/applications/adept/debian/adept-batch-trinity.install b/debian/_base/applications/system/adept/debian/adept-batch-trinity.install
index 7f2ac31a4..7f2ac31a4 100644
--- a/debian/_base/applications/adept/debian/adept-batch-trinity.install
+++ b/debian/_base/applications/system/adept/debian/adept-batch-trinity.install
diff --git a/debian/_base/applications/adept/debian/adept-common-trinity.install b/debian/_base/applications/system/adept/debian/adept-common-trinity.install
index 535c10c7d..535c10c7d 100644
--- a/debian/_base/applications/adept/debian/adept-common-trinity.install
+++ b/debian/_base/applications/system/adept/debian/adept-common-trinity.install
diff --git a/debian/_base/applications/adept/debian/adept-installer-trinity.install b/debian/_base/applications/system/adept/debian/adept-installer-trinity.install
index a3de6d18c..a3de6d18c 100644
--- a/debian/_base/applications/adept/debian/adept-installer-trinity.install
+++ b/debian/_base/applications/system/adept/debian/adept-installer-trinity.install
diff --git a/debian/_base/applications/adept/debian/adept-manager-trinity.install b/debian/_base/applications/system/adept/debian/adept-manager-trinity.install
index 35fc0712b..35fc0712b 100644
--- a/debian/_base/applications/adept/debian/adept-manager-trinity.install
+++ b/debian/_base/applications/system/adept/debian/adept-manager-trinity.install
diff --git a/debian/_base/applications/adept/debian/adept-notifier-trinity.install b/debian/_base/applications/system/adept/debian/adept-notifier-trinity.install
index b1e97afac..b1e97afac 100644
--- a/debian/_base/applications/adept/debian/adept-notifier-trinity.install
+++ b/debian/_base/applications/system/adept/debian/adept-notifier-trinity.install
diff --git a/debian/_base/applications/adept/debian/adept-updater-trinity.install b/debian/_base/applications/system/adept/debian/adept-updater-trinity.install
index 0be740892..0be740892 100644
--- a/debian/_base/applications/adept/debian/adept-updater-trinity.install
+++ b/debian/_base/applications/system/adept/debian/adept-updater-trinity.install
diff --git a/debian/_base/applications/kerry/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/adept/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kerry/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/adept/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/keep/debian/cdbs/versions.pl b/debian/_base/applications/system/adept/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/keep/debian/cdbs/versions.pl
+++ b/debian/_base/applications/system/adept/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/adept/debian/changelog b/debian/_base/applications/system/adept/debian/changelog
index 58496db32..58496db32 100644
--- a/debian/_base/applications/adept/debian/changelog
+++ b/debian/_base/applications/system/adept/debian/changelog
diff --git a/debian/_base/applications/knetload/debian/compat b/debian/_base/applications/system/adept/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/knetload/debian/compat
+++ b/debian/_base/applications/system/adept/debian/compat
diff --git a/debian/_base/applications/adept/debian/control b/debian/_base/applications/system/adept/debian/control
index 490c3e103..490c3e103 100644
--- a/debian/_base/applications/adept/debian/control
+++ b/debian/_base/applications/system/adept/debian/control
diff --git a/debian/_base/applications/adept/debian/copyright b/debian/_base/applications/system/adept/debian/copyright
index 6f8ad6648..6f8ad6648 100644
--- a/debian/_base/applications/adept/debian/copyright
+++ b/debian/_base/applications/system/adept/debian/copyright
diff --git a/debian/_base/applications/adept/debian/dirs b/debian/_base/applications/system/adept/debian/dirs
index 73752c9ae..73752c9ae 100644
--- a/debian/_base/applications/adept/debian/dirs
+++ b/debian/_base/applications/system/adept/debian/dirs
diff --git a/debian/_base/applications/adept/debian/docs b/debian/_base/applications/system/adept/debian/docs
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/adept/debian/docs
+++ b/debian/_base/applications/system/adept/debian/docs
diff --git a/debian/_base/applications/adept/debian/patches/remove_apport.diff b/debian/_base/applications/system/adept/debian/patches/remove_apport.diff
index e768486eb..e768486eb 100644
--- a/debian/_base/applications/adept/debian/patches/remove_apport.diff
+++ b/debian/_base/applications/system/adept/debian/patches/remove_apport.diff
diff --git a/debian/_base/applications/adept/debian/patches/series b/debian/_base/applications/system/adept/debian/patches/series
index ad5b05138..ad5b05138 100644
--- a/debian/_base/applications/adept/debian/patches/series
+++ b/debian/_base/applications/system/adept/debian/patches/series
diff --git a/debian/_base/applications/adept/debian/rules b/debian/_base/applications/system/adept/debian/rules
index 83626c5cb..83626c5cb 100755
--- a/debian/_base/applications/adept/debian/rules
+++ b/debian/_base/applications/system/adept/debian/rules
diff --git a/debian/_base/applications/knetload/debian/source/format b/debian/_base/applications/system/adept/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/knetload/debian/source/format
+++ b/debian/_base/applications/system/adept/debian/source/format
diff --git a/debian/_base/applications/knetload/debian/source/options b/debian/_base/applications/system/adept/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/knetload/debian/source/options
+++ b/debian/_base/applications/system/adept/debian/source/options
diff --git a/debian/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kerry/debian/cdbs/versions.pl b/debian/_base/applications/system/dolphin/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kerry/debian/cdbs/versions.pl
+++ b/debian/_base/applications/system/dolphin/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/dolphin/debian/changelog b/debian/_base/applications/system/dolphin/debian/changelog
index 5a0a63c7d..5a0a63c7d 100644
--- a/debian/_base/applications/dolphin/debian/changelog
+++ b/debian/_base/applications/system/dolphin/debian/changelog
diff --git a/debian/_base/applications/knetstats/debian/compat b/debian/_base/applications/system/dolphin/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/knetstats/debian/compat
+++ b/debian/_base/applications/system/dolphin/debian/compat
diff --git a/debian/_base/applications/dolphin/debian/control b/debian/_base/applications/system/dolphin/debian/control
index 2390cb90a..2390cb90a 100644
--- a/debian/_base/applications/dolphin/debian/control
+++ b/debian/_base/applications/system/dolphin/debian/control
diff --git a/debian/_base/applications/dolphin/debian/copyright b/debian/_base/applications/system/dolphin/debian/copyright
index 970a6b5a2..970a6b5a2 100644
--- a/debian/_base/applications/dolphin/debian/copyright
+++ b/debian/_base/applications/system/dolphin/debian/copyright
diff --git a/debian/_base/applications/dolphin/debian/dolphin.1 b/debian/_base/applications/system/dolphin/debian/dolphin.1
index 2a1a972f0..2a1a972f0 100644
--- a/debian/_base/applications/dolphin/debian/dolphin.1
+++ b/debian/_base/applications/system/dolphin/debian/dolphin.1
diff --git a/debian/_base/applications/dolphin/debian/manpages b/debian/_base/applications/system/dolphin/debian/manpages
index 8b02277f2..8b02277f2 100644
--- a/debian/_base/applications/dolphin/debian/manpages
+++ b/debian/_base/applications/system/dolphin/debian/manpages
diff --git a/debian/_base/applications/kgtk-qt3/debian/patches/series b/debian/_base/applications/system/dolphin/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kgtk-qt3/debian/patches/series
+++ b/debian/_base/applications/system/dolphin/debian/patches/series
diff --git a/debian/_base/applications/dolphin/debian/rules b/debian/_base/applications/system/dolphin/debian/rules
index ffb1212cf..ffb1212cf 100755
--- a/debian/_base/applications/dolphin/debian/rules
+++ b/debian/_base/applications/system/dolphin/debian/rules
diff --git a/debian/_base/applications/knetstats/debian/source/format b/debian/_base/applications/system/dolphin/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/knetstats/debian/source/format
+++ b/debian/_base/applications/system/dolphin/debian/source/format
diff --git a/debian/_base/applications/knetstats/debian/source/options b/debian/_base/applications/system/dolphin/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/knetstats/debian/source/options
+++ b/debian/_base/applications/system/dolphin/debian/source/options
diff --git a/debian/_base/applications/kile/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/katapult/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kile/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/katapult/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kgtk-qt3/debian/cdbs/versions.pl b/debian/_base/applications/system/katapult/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kgtk-qt3/debian/cdbs/versions.pl
+++ b/debian/_base/applications/system/katapult/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/katapult/debian/changelog b/debian/_base/applications/system/katapult/debian/changelog
index 4452b8a56..4452b8a56 100644
--- a/debian/_base/applications/katapult/debian/changelog
+++ b/debian/_base/applications/system/katapult/debian/changelog
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/compat b/debian/_base/applications/system/katapult/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/knetworkmanager.cmake/debian/compat
+++ b/debian/_base/applications/system/katapult/debian/compat
diff --git a/debian/_base/applications/katapult/debian/control b/debian/_base/applications/system/katapult/debian/control
index 085d37c0d..085d37c0d 100644
--- a/debian/_base/applications/katapult/debian/control
+++ b/debian/_base/applications/system/katapult/debian/control
diff --git a/debian/_base/applications/katapult/debian/copyright b/debian/_base/applications/system/katapult/debian/copyright
index fa75bbec3..fa75bbec3 100644
--- a/debian/_base/applications/katapult/debian/copyright
+++ b/debian/_base/applications/system/katapult/debian/copyright
diff --git a/debian/_base/applications/katapult/debian/docs b/debian/_base/applications/system/katapult/debian/docs
index 022850854..022850854 100644
--- a/debian/_base/applications/katapult/debian/docs
+++ b/debian/_base/applications/system/katapult/debian/docs
diff --git a/debian/_base/applications/katapult/debian/katapult.1.docbook b/debian/_base/applications/system/katapult/debian/katapult.1.docbook
index 718ff8707..718ff8707 100644
--- a/debian/_base/applications/katapult/debian/katapult.1.docbook
+++ b/debian/_base/applications/system/katapult/debian/katapult.1.docbook
diff --git a/debian/_base/applications/katapult/debian/lintian b/debian/_base/applications/system/katapult/debian/lintian
index af70e7550..af70e7550 100644
--- a/debian/_base/applications/katapult/debian/lintian
+++ b/debian/_base/applications/system/katapult/debian/lintian
diff --git a/debian/_base/applications/katapult/debian/menu b/debian/_base/applications/system/katapult/debian/menu
index a76f261ac..a76f261ac 100644
--- a/debian/_base/applications/katapult/debian/menu
+++ b/debian/_base/applications/system/katapult/debian/menu
diff --git a/debian/_base/applications/kio-apt/debian/patches/series b/debian/_base/applications/system/katapult/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kio-apt/debian/patches/series
+++ b/debian/_base/applications/system/katapult/debian/patches/series
diff --git a/debian/_base/applications/katapult/debian/rules b/debian/_base/applications/system/katapult/debian/rules
index 3b1abb30a..3b1abb30a 100755
--- a/debian/_base/applications/katapult/debian/rules
+++ b/debian/_base/applications/system/katapult/debian/rules
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/source/format b/debian/_base/applications/system/katapult/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/knetworkmanager.cmake/debian/source/format
+++ b/debian/_base/applications/system/katapult/debian/source/format
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/source/options b/debian/_base/applications/system/katapult/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/knetworkmanager.cmake/debian/source/options
+++ b/debian/_base/applications/system/katapult/debian/source/options
diff --git a/debian/_base/applications/kmplayer/debian/README.Debian b/debian/_base/applications/system/kbfx/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/_base/applications/kmplayer/debian/README.Debian
+++ b/debian/_base/applications/system/kbfx/debian/README.Debian
diff --git a/debian/_base/applications/kbfx/debian/changelog b/debian/_base/applications/system/kbfx/debian/changelog
index cbb743bf9..cbb743bf9 100644
--- a/debian/_base/applications/kbfx/debian/changelog
+++ b/debian/_base/applications/system/kbfx/debian/changelog
diff --git a/debian/_base/applications/kbfx/debian/cmake.mk b/debian/_base/applications/system/kbfx/debian/cmake.mk
index 4c7e2e24c..4c7e2e24c 100644
--- a/debian/_base/applications/kbfx/debian/cmake.mk
+++ b/debian/_base/applications/system/kbfx/debian/cmake.mk
diff --git a/debian/_base/applications/knetworkmanager8/debian/compat b/debian/_base/applications/system/kbfx/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/knetworkmanager8/debian/compat
+++ b/debian/_base/applications/system/kbfx/debian/compat
diff --git a/debian/_base/applications/kbfx/debian/control b/debian/_base/applications/system/kbfx/debian/control
index 03b17574f..03b17574f 100644
--- a/debian/_base/applications/kbfx/debian/control
+++ b/debian/_base/applications/system/kbfx/debian/control
diff --git a/debian/_base/applications/kbfx/debian/copyright b/debian/_base/applications/system/kbfx/debian/copyright
index 11d23df1b..11d23df1b 100644
--- a/debian/_base/applications/kbfx/debian/copyright
+++ b/debian/_base/applications/system/kbfx/debian/copyright
diff --git a/debian/_base/applications/kbfx/debian/docs b/debian/_base/applications/system/kbfx/debian/docs
index 4182e08ae..4182e08ae 100644
--- a/debian/_base/applications/kbfx/debian/docs
+++ b/debian/_base/applications/system/kbfx/debian/docs
diff --git a/debian/_base/applications/kbfx/debian/kbfx.lintian-overrides b/debian/_base/applications/system/kbfx/debian/kbfx.lintian-overrides
index a2ecfe7dc..a2ecfe7dc 100644
--- a/debian/_base/applications/kbfx/debian/kbfx.lintian-overrides
+++ b/debian/_base/applications/system/kbfx/debian/kbfx.lintian-overrides
diff --git a/debian/_base/applications/kio-locate/debian/patches/series b/debian/_base/applications/system/kbfx/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kio-locate/debian/patches/series
+++ b/debian/_base/applications/system/kbfx/debian/patches/series
diff --git a/debian/_base/applications/kbfx/debian/postinst b/debian/_base/applications/system/kbfx/debian/postinst
index e95a6906b..e95a6906b 100644
--- a/debian/_base/applications/kbfx/debian/postinst
+++ b/debian/_base/applications/system/kbfx/debian/postinst
diff --git a/debian/_base/applications/kbfx/debian/rules b/debian/_base/applications/system/kbfx/debian/rules
index add50e909..add50e909 100755
--- a/debian/_base/applications/kbfx/debian/rules
+++ b/debian/_base/applications/system/kbfx/debian/rules
diff --git a/debian/_base/applications/knetworkmanager8/debian/source/format b/debian/_base/applications/system/kbfx/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/knetworkmanager8/debian/source/format
+++ b/debian/_base/applications/system/kbfx/debian/source/format
diff --git a/debian/_base/applications/knetworkmanager8/debian/source/options b/debian/_base/applications/system/kbfx/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/knetworkmanager8/debian/source/options
+++ b/debian/_base/applications/system/kbfx/debian/source/options
diff --git a/debian/_base/applications/kbfx/debian/watch b/debian/_base/applications/system/kbfx/debian/watch
index cfc9a7d7d..cfc9a7d7d 100644
--- a/debian/_base/applications/kbfx/debian/watch
+++ b/debian/_base/applications/system/kbfx/debian/watch
diff --git a/debian/_base/applications/kio-apt/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kio-apt/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kile/debian/cdbs/versions.pl b/debian/_base/applications/system/kdbusnotification/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kile/debian/cdbs/versions.pl
+++ b/debian/_base/applications/system/kdbusnotification/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kdbusnotification/debian/changelog b/debian/_base/applications/system/kdbusnotification/debian/changelog
index d98ce4aba..d98ce4aba 100644
--- a/debian/_base/applications/kdbusnotification/debian/changelog
+++ b/debian/_base/applications/system/kdbusnotification/debian/changelog
diff --git a/debian/_base/applications/knights/debian/compat b/debian/_base/applications/system/kdbusnotification/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/knights/debian/compat
+++ b/debian/_base/applications/system/kdbusnotification/debian/compat
diff --git a/debian/_base/applications/kdbusnotification/debian/control b/debian/_base/applications/system/kdbusnotification/debian/control
index 343c566a3..343c566a3 100644
--- a/debian/_base/applications/kdbusnotification/debian/control
+++ b/debian/_base/applications/system/kdbusnotification/debian/control
diff --git a/debian/_base/applications/kdbusnotification/debian/copyright b/debian/_base/applications/system/kdbusnotification/debian/copyright
index 760904ce9..760904ce9 100644
--- a/debian/_base/applications/kdbusnotification/debian/copyright
+++ b/debian/_base/applications/system/kdbusnotification/debian/copyright
diff --git a/debian/_base/applications/kcpuload/debian/links b/debian/_base/applications/system/kdbusnotification/debian/links
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kcpuload/debian/links
+++ b/debian/_base/applications/system/kdbusnotification/debian/links
diff --git a/debian/_base/applications/kdbusnotification/debian/rules b/debian/_base/applications/system/kdbusnotification/debian/rules
index 2750f623d..2750f623d 100755
--- a/debian/_base/applications/kdbusnotification/debian/rules
+++ b/debian/_base/applications/system/kdbusnotification/debian/rules
diff --git a/debian/_base/applications/knights/debian/source/format b/debian/_base/applications/system/kdbusnotification/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/knights/debian/source/format
+++ b/debian/_base/applications/system/kdbusnotification/debian/source/format
diff --git a/debian/_base/applications/knights/debian/source/options b/debian/_base/applications/system/kdbusnotification/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/knights/debian/source/options
+++ b/debian/_base/applications/system/kdbusnotification/debian/source/options
diff --git a/debian/_base/applications/knemo/debian/README.Debian b/debian/_base/applications/system/knemo/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/_base/applications/knemo/debian/README.Debian
+++ b/debian/_base/applications/system/knemo/debian/README.Debian
diff --git a/debian/_base/applications/kio-locate/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/knemo/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kio-locate/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/knemo/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kio-apt/debian/cdbs/versions.pl b/debian/_base/applications/system/knemo/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kio-apt/debian/cdbs/versions.pl
+++ b/debian/_base/applications/system/knemo/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/knemo/debian/changelog b/debian/_base/applications/system/knemo/debian/changelog
index fe6f4765f..fe6f4765f 100644
--- a/debian/_base/applications/knemo/debian/changelog
+++ b/debian/_base/applications/system/knemo/debian/changelog
diff --git a/debian/_base/applications/knowit/debian/compat b/debian/_base/applications/system/knemo/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/knowit/debian/compat
+++ b/debian/_base/applications/system/knemo/debian/compat
diff --git a/debian/_base/applications/knemo/debian/control b/debian/_base/applications/system/knemo/debian/control
index 6c77dcbc1..6c77dcbc1 100644
--- a/debian/_base/applications/knemo/debian/control
+++ b/debian/_base/applications/system/knemo/debian/control
diff --git a/debian/_base/applications/knemo/debian/copyright b/debian/_base/applications/system/knemo/debian/copyright
index 56f8c81f8..56f8c81f8 100644
--- a/debian/_base/applications/knemo/debian/copyright
+++ b/debian/_base/applications/system/knemo/debian/copyright
diff --git a/debian/_base/applications/knemo/debian/dirs b/debian/_base/applications/system/knemo/debian/dirs
index 57855aec4..57855aec4 100644
--- a/debian/_base/applications/knemo/debian/dirs
+++ b/debian/_base/applications/system/knemo/debian/dirs
diff --git a/debian/_base/applications/kio-umountwrapper/debian/patches/series b/debian/_base/applications/system/knemo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kio-umountwrapper/debian/patches/series
+++ b/debian/_base/applications/system/knemo/debian/patches/series
diff --git a/debian/_base/applications/knemo/debian/rules b/debian/_base/applications/system/knemo/debian/rules
index b8737a4a9..b8737a4a9 100755
--- a/debian/_base/applications/knemo/debian/rules
+++ b/debian/_base/applications/system/knemo/debian/rules
diff --git a/debian/_base/applications/knowit/debian/source/format b/debian/_base/applications/system/knemo/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/knowit/debian/source/format
+++ b/debian/_base/applications/system/knemo/debian/source/format
diff --git a/debian/_base/applications/knowit/debian/source/options b/debian/_base/applications/system/knemo/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/knowit/debian/source/options
+++ b/debian/_base/applications/system/knemo/debian/source/options
diff --git a/debian/_base/applications/knetload/debian/changelog b/debian/_base/applications/system/knetload/debian/changelog
index f5456314d..f5456314d 100644
--- a/debian/_base/applications/knetload/debian/changelog
+++ b/debian/_base/applications/system/knetload/debian/changelog
diff --git a/debian/_base/applications/knutclient/debian/compat b/debian/_base/applications/system/knetload/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/knutclient/debian/compat
+++ b/debian/_base/applications/system/knetload/debian/compat
diff --git a/debian/_base/applications/knetload/debian/control b/debian/_base/applications/system/knetload/debian/control
index 5bcb1fd81..5bcb1fd81 100644
--- a/debian/_base/applications/knetload/debian/control
+++ b/debian/_base/applications/system/knetload/debian/control
diff --git a/debian/_base/applications/knetload/debian/copyright b/debian/_base/applications/system/knetload/debian/copyright
index 7093501e6..7093501e6 100644
--- a/debian/_base/applications/knetload/debian/copyright
+++ b/debian/_base/applications/system/knetload/debian/copyright
diff --git a/debian/_base/applications/kde-style-lipstik/debian/dirs b/debian/_base/applications/system/knetload/debian/dirs
index 43e7f554c..43e7f554c 100644
--- a/debian/_base/applications/kde-style-lipstik/debian/dirs
+++ b/debian/_base/applications/system/knetload/debian/dirs
diff --git a/debian/_base/applications/knetload/debian/docs b/debian/_base/applications/system/knetload/debian/docs
index ca0272abf..ca0272abf 100644
--- a/debian/_base/applications/knetload/debian/docs
+++ b/debian/_base/applications/system/knetload/debian/docs
diff --git a/debian/_base/applications/knetload/debian/knetload-trinity.install b/debian/_base/applications/system/knetload/debian/knetload-trinity.install
index cdb14888d..cdb14888d 100644
--- a/debian/_base/applications/knetload/debian/knetload-trinity.install
+++ b/debian/_base/applications/system/knetload/debian/knetload-trinity.install
diff --git a/debian/_base/applications/knetload/debian/knetload-trinity.manpages b/debian/_base/applications/system/knetload/debian/knetload-trinity.manpages
index b0a6ac166..b0a6ac166 100644
--- a/debian/_base/applications/knetload/debian/knetload-trinity.manpages
+++ b/debian/_base/applications/system/knetload/debian/knetload-trinity.manpages
diff --git a/debian/_base/applications/knetload/debian/knetload.1 b/debian/_base/applications/system/knetload/debian/knetload.1
index 30b6c4e4d..30b6c4e4d 100644
--- a/debian/_base/applications/knetload/debian/knetload.1
+++ b/debian/_base/applications/system/knetload/debian/knetload.1
diff --git a/debian/_base/applications/knetload/debian/knetload.xpm b/debian/_base/applications/system/knetload/debian/knetload.xpm
index 3cc7ef17f..3cc7ef17f 100644
--- a/debian/_base/applications/knetload/debian/knetload.xpm
+++ b/debian/_base/applications/system/knetload/debian/knetload.xpm
diff --git a/debian/_base/applications/knetload/debian/menu b/debian/_base/applications/system/knetload/debian/menu
index a39b37e3c..a39b37e3c 100644
--- a/debian/_base/applications/knetload/debian/menu
+++ b/debian/_base/applications/system/knetload/debian/menu
diff --git a/debian/_base/applications/knetload/debian/rules b/debian/_base/applications/system/knetload/debian/rules
index 0a65d48d8..0a65d48d8 100755
--- a/debian/_base/applications/knetload/debian/rules
+++ b/debian/_base/applications/system/knetload/debian/rules
diff --git a/debian/_base/applications/knutclient/debian/source/format b/debian/_base/applications/system/knetload/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/knutclient/debian/source/format
+++ b/debian/_base/applications/system/knetload/debian/source/format
diff --git a/debian/_base/applications/knutclient/debian/source/options b/debian/_base/applications/system/knetload/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/knutclient/debian/source/options
+++ b/debian/_base/applications/system/knetload/debian/source/options
diff --git a/debian/_base/applications/kio-umountwrapper/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kio-umountwrapper/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kio-locate/debian/cdbs/versions.pl b/debian/_base/applications/system/knetstats/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kio-locate/debian/cdbs/versions.pl
+++ b/debian/_base/applications/system/knetstats/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/knetstats/debian/changelog b/debian/_base/applications/system/knetstats/debian/changelog
index d1015cb26..d1015cb26 100644
--- a/debian/_base/applications/knetstats/debian/changelog
+++ b/debian/_base/applications/system/knetstats/debian/changelog
diff --git a/debian/_base/applications/koffice-i18n/debian/compat b/debian/_base/applications/system/knetstats/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/koffice-i18n/debian/compat
+++ b/debian/_base/applications/system/knetstats/debian/compat
diff --git a/debian/_base/applications/knetstats/debian/control b/debian/_base/applications/system/knetstats/debian/control
index a6957e601..a6957e601 100644
--- a/debian/_base/applications/knetstats/debian/control
+++ b/debian/_base/applications/system/knetstats/debian/control
diff --git a/debian/_base/applications/knetstats/debian/copyright b/debian/_base/applications/system/knetstats/debian/copyright
index bf7dbe0ed..bf7dbe0ed 100644
--- a/debian/_base/applications/knetstats/debian/copyright
+++ b/debian/_base/applications/system/knetstats/debian/copyright
diff --git a/debian/_base/applications/knetstats/debian/knetstats.1.docbook b/debian/_base/applications/system/knetstats/debian/knetstats.1.docbook
index 28b721f53..28b721f53 100644
--- a/debian/_base/applications/knetstats/debian/knetstats.1.docbook
+++ b/debian/_base/applications/system/knetstats/debian/knetstats.1.docbook
diff --git a/debian/_base/applications/kiosktool/debian/patches/series b/debian/_base/applications/system/knetstats/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kiosktool/debian/patches/series
+++ b/debian/_base/applications/system/knetstats/debian/patches/series
diff --git a/debian/_base/applications/knetstats/debian/rules b/debian/_base/applications/system/knetstats/debian/rules
index 5a77222d6..5a77222d6 100755
--- a/debian/_base/applications/knetstats/debian/rules
+++ b/debian/_base/applications/system/knetstats/debian/rules
diff --git a/debian/_base/applications/koffice-i18n/debian/source/format b/debian/_base/applications/system/knetstats/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/koffice-i18n/debian/source/format
+++ b/debian/_base/applications/system/knetstats/debian/source/format
diff --git a/debian/_base/applications/koffice-i18n/debian/source/options b/debian/_base/applications/system/knetstats/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/koffice-i18n/debian/source/options
+++ b/debian/_base/applications/system/knetstats/debian/source/options
diff --git a/debian/_base/applications/knetstats/debian/watch b/debian/_base/applications/system/knetstats/debian/watch
index 8d12f40b0..8d12f40b0 100644
--- a/debian/_base/applications/knetstats/debian/watch
+++ b/debian/_base/applications/system/knetstats/debian/watch
diff --git a/debian/_base/applications/kiosktool/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kiosktool/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kio-umountwrapper/debian/cdbs/versions.pl b/debian/_base/applications/system/kpowersave/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kio-umountwrapper/debian/cdbs/versions.pl
+++ b/debian/_base/applications/system/kpowersave/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kpowersave/debian/changelog b/debian/_base/applications/system/kpowersave/debian/changelog
index d9b8099ef..d9b8099ef 100644
--- a/debian/_base/applications/kpowersave/debian/changelog
+++ b/debian/_base/applications/system/kpowersave/debian/changelog
diff --git a/debian/_base/applications/koffice/debian/compat b/debian/_base/applications/system/kpowersave/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/koffice/debian/compat
+++ b/debian/_base/applications/system/kpowersave/debian/compat
diff --git a/debian/_base/applications/kpowersave/debian/control b/debian/_base/applications/system/kpowersave/debian/control
index 387a4ffd0..387a4ffd0 100644
--- a/debian/_base/applications/kpowersave/debian/control
+++ b/debian/_base/applications/system/kpowersave/debian/control
diff --git a/debian/_base/applications/kpowersave.cmake/debian/copyright b/debian/_base/applications/system/kpowersave/debian/copyright
index a1557e62e..a1557e62e 100644
--- a/debian/_base/applications/kpowersave.cmake/debian/copyright
+++ b/debian/_base/applications/system/kpowersave/debian/copyright
diff --git a/debian/_base/applications/kpowersave/debian/install b/debian/_base/applications/system/kpowersave/debian/install
index 7b00dd534..7b00dd534 100644
--- a/debian/_base/applications/kpowersave/debian/install
+++ b/debian/_base/applications/system/kpowersave/debian/install
diff --git a/debian/_base/applications/kpowersave/debian/kpowersave-trinity.linda b/debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda
index 652f468f2..652f468f2 100644
--- a/debian/_base/applications/kpowersave/debian/kpowersave-trinity.linda
+++ b/debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda
diff --git a/debian/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian
index b0c32f61e..b0c32f61e 100644
--- a/debian/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
+++ b/debian/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian
diff --git a/debian/_base/applications/kpowersave.cmake/debian/kpowersave.1 b/debian/_base/applications/system/kpowersave/debian/kpowersave.1
index 0ab1d6f90..0ab1d6f90 100644
--- a/debian/_base/applications/kpowersave.cmake/debian/kpowersave.1
+++ b/debian/_base/applications/system/kpowersave/debian/kpowersave.1
diff --git a/debian/_base/applications/kpowersave.cmake/debian/kpowersave.xpm b/debian/_base/applications/system/kpowersave/debian/kpowersave.xpm
index 99d178492..99d178492 100644
--- a/debian/_base/applications/kpowersave.cmake/debian/kpowersave.xpm
+++ b/debian/_base/applications/system/kpowersave/debian/kpowersave.xpm
diff --git a/debian/_base/applications/kpowersave.cmake/debian/manpages b/debian/_base/applications/system/kpowersave/debian/manpages
index c8fa7b85f..c8fa7b85f 100644
--- a/debian/_base/applications/kpowersave.cmake/debian/manpages
+++ b/debian/_base/applications/system/kpowersave/debian/manpages
diff --git a/debian/_base/applications/kpowersave/debian/menu b/debian/_base/applications/system/kpowersave/debian/menu
index 0dbd62cc4..0dbd62cc4 100644
--- a/debian/_base/applications/kpowersave/debian/menu
+++ b/debian/_base/applications/system/kpowersave/debian/menu
diff --git a/debian/_base/applications/kmplayer/debian/patches/series b/debian/_base/applications/system/kpowersave/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kmplayer/debian/patches/series
+++ b/debian/_base/applications/system/kpowersave/debian/patches/series
diff --git a/debian/_base/applications/kpowersave.cmake/debian/postrm b/debian/_base/applications/system/kpowersave/debian/postrm
index 4e8eda799..4e8eda799 100644
--- a/debian/_base/applications/kpowersave.cmake/debian/postrm
+++ b/debian/_base/applications/system/kpowersave/debian/postrm
diff --git a/debian/_base/applications/kpowersave/debian/preinst b/debian/_base/applications/system/kpowersave/debian/preinst
index d0eb1227c..d0eb1227c 100644
--- a/debian/_base/applications/kpowersave/debian/preinst
+++ b/debian/_base/applications/system/kpowersave/debian/preinst
diff --git a/debian/_base/applications/kpowersave/debian/rules b/debian/_base/applications/system/kpowersave/debian/rules
index 368c2a532..368c2a532 100755
--- a/debian/_base/applications/kpowersave/debian/rules
+++ b/debian/_base/applications/system/kpowersave/debian/rules
diff --git a/debian/_base/applications/koffice/debian/source/format b/debian/_base/applications/system/kpowersave/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/koffice/debian/source/format
+++ b/debian/_base/applications/system/kpowersave/debian/source/format
diff --git a/debian/_base/applications/koffice/debian/source/options b/debian/_base/applications/system/kpowersave/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/koffice/debian/source/options
+++ b/debian/_base/applications/system/kpowersave/debian/source/options
diff --git a/debian/_base/applications/kpowersave.cmake/debian/watch b/debian/_base/applications/system/kpowersave/debian/watch
index 832285e63..832285e63 100644
--- a/debian/_base/applications/kpowersave.cmake/debian/watch
+++ b/debian/_base/applications/system/kpowersave/debian/watch
diff --git a/debian/_base/applications/krusader/debian/README.Debian b/debian/_base/applications/system/krusader/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/_base/applications/krusader/debian/README.Debian
+++ b/debian/_base/applications/system/krusader/debian/README.Debian
diff --git a/debian/_base/applications/kmplayer/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/krusader/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kmplayer/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/krusader/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kiosktool/debian/cdbs/versions.pl b/debian/_base/applications/system/krusader/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kiosktool/debian/cdbs/versions.pl
+++ b/debian/_base/applications/system/krusader/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/krusader/debian/changelog b/debian/_base/applications/system/krusader/debian/changelog
index 33154f756..33154f756 100644
--- a/debian/_base/applications/krusader/debian/changelog
+++ b/debian/_base/applications/system/krusader/debian/changelog
diff --git a/debian/_base/applications/konversation/debian/compat b/debian/_base/applications/system/krusader/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/konversation/debian/compat
+++ b/debian/_base/applications/system/krusader/debian/compat
diff --git a/debian/_base/applications/krusader/debian/control b/debian/_base/applications/system/krusader/debian/control
index 2097f5451..2097f5451 100644
--- a/debian/_base/applications/krusader/debian/control
+++ b/debian/_base/applications/system/krusader/debian/control
diff --git a/debian/_base/applications/krusader/debian/copyright b/debian/_base/applications/system/krusader/debian/copyright
index 127bd8f63..127bd8f63 100644
--- a/debian/_base/applications/krusader/debian/copyright
+++ b/debian/_base/applications/system/krusader/debian/copyright
diff --git a/debian/_base/applications/krusader/debian/docs b/debian/_base/applications/system/krusader/debian/docs
index 623fe2da9..623fe2da9 100644
--- a/debian/_base/applications/krusader/debian/docs
+++ b/debian/_base/applications/system/krusader/debian/docs
diff --git a/debian/_base/applications/krusader/debian/krusader.lintian-overrides b/debian/_base/applications/system/krusader/debian/krusader.lintian-overrides
index ab5986658..ab5986658 100644
--- a/debian/_base/applications/krusader/debian/krusader.lintian-overrides
+++ b/debian/_base/applications/system/krusader/debian/krusader.lintian-overrides
diff --git a/debian/_base/applications/krusader/debian/menu b/debian/_base/applications/system/krusader/debian/menu
index 92d07892f..92d07892f 100644
--- a/debian/_base/applications/krusader/debian/menu
+++ b/debian/_base/applications/system/krusader/debian/menu
diff --git a/debian/_base/applications/kmymoney/debian/patches/series b/debian/_base/applications/system/krusader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kmymoney/debian/patches/series
+++ b/debian/_base/applications/system/krusader/debian/patches/series
diff --git a/debian/_base/applications/krusader/debian/rules b/debian/_base/applications/system/krusader/debian/rules
index c4d62cbf5..c4d62cbf5 100755
--- a/debian/_base/applications/krusader/debian/rules
+++ b/debian/_base/applications/system/krusader/debian/rules
diff --git a/debian/_base/applications/krusader/debian/source.lintian-overrides b/debian/_base/applications/system/krusader/debian/source.lintian-overrides
index 01d57f16c..01d57f16c 100644
--- a/debian/_base/applications/krusader/debian/source.lintian-overrides
+++ b/debian/_base/applications/system/krusader/debian/source.lintian-overrides
diff --git a/debian/_base/applications/konversation/debian/source/format b/debian/_base/applications/system/krusader/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/konversation/debian/source/format
+++ b/debian/_base/applications/system/krusader/debian/source/format
diff --git a/debian/_base/applications/konversation/debian/source/options b/debian/_base/applications/system/krusader/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/konversation/debian/source/options
+++ b/debian/_base/applications/system/krusader/debian/source/options
diff --git a/debian/_base/applications/krusader/debian/watch b/debian/_base/applications/system/krusader/debian/watch
index d19bef39d..d19bef39d 100644
--- a/debian/_base/applications/krusader/debian/watch
+++ b/debian/_base/applications/system/krusader/debian/watch
diff --git a/debian/_base/applications/kmymoney/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kmymoney/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kmplayer/debian/cdbs/versions.pl b/debian/_base/applications/system/ksystemlog/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kmplayer/debian/cdbs/versions.pl
+++ b/debian/_base/applications/system/ksystemlog/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/ksystemlog/debian/changelog b/debian/_base/applications/system/ksystemlog/debian/changelog
index d067e585b..d067e585b 100644
--- a/debian/_base/applications/ksystemlog/debian/changelog
+++ b/debian/_base/applications/system/ksystemlog/debian/changelog
diff --git a/debian/_base/applications/kopete-otr/debian/compat b/debian/_base/applications/system/ksystemlog/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kopete-otr/debian/compat
+++ b/debian/_base/applications/system/ksystemlog/debian/compat
diff --git a/debian/_base/applications/ksystemlog/debian/control b/debian/_base/applications/system/ksystemlog/debian/control
index e5cd48aa9..e5cd48aa9 100644
--- a/debian/_base/applications/ksystemlog/debian/control
+++ b/debian/_base/applications/system/ksystemlog/debian/control
diff --git a/debian/_base/applications/ksystemlog/debian/copyright b/debian/_base/applications/system/ksystemlog/debian/copyright
index 0aac949f5..0aac949f5 100644
--- a/debian/_base/applications/ksystemlog/debian/copyright
+++ b/debian/_base/applications/system/ksystemlog/debian/copyright
diff --git a/debian/_base/applications/ksystemlog/debian/docs b/debian/_base/applications/system/ksystemlog/debian/docs
index 5502ed8f4..5502ed8f4 100644
--- a/debian/_base/applications/ksystemlog/debian/docs
+++ b/debian/_base/applications/system/ksystemlog/debian/docs
diff --git a/debian/_base/applications/ksystemlog/debian/ksystemlog.xml b/debian/_base/applications/system/ksystemlog/debian/ksystemlog.xml
index f412afcd4..f412afcd4 100644
--- a/debian/_base/applications/ksystemlog/debian/ksystemlog.xml
+++ b/debian/_base/applications/system/ksystemlog/debian/ksystemlog.xml
diff --git a/debian/_base/applications/ksystemlog/debian/menu b/debian/_base/applications/system/ksystemlog/debian/menu
index 57aa688f9..57aa688f9 100644
--- a/debian/_base/applications/ksystemlog/debian/menu
+++ b/debian/_base/applications/system/ksystemlog/debian/menu
diff --git a/debian/_base/applications/knemo/debian/patches/series b/debian/_base/applications/system/ksystemlog/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/knemo/debian/patches/series
+++ b/debian/_base/applications/system/ksystemlog/debian/patches/series
diff --git a/debian/_base/applications/ksystemlog/debian/rules b/debian/_base/applications/system/ksystemlog/debian/rules
index 32df64dbd..32df64dbd 100755
--- a/debian/_base/applications/ksystemlog/debian/rules
+++ b/debian/_base/applications/system/ksystemlog/debian/rules
diff --git a/debian/_base/applications/kopete-otr/debian/source/format b/debian/_base/applications/system/ksystemlog/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kopete-otr/debian/source/format
+++ b/debian/_base/applications/system/ksystemlog/debian/source/format
diff --git a/debian/_base/applications/kopete-otr/debian/source/options b/debian/_base/applications/system/ksystemlog/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kopete-otr/debian/source/options
+++ b/debian/_base/applications/system/ksystemlog/debian/source/options
diff --git a/debian/_base/applications/ksystemlog/debian/watch b/debian/_base/applications/system/ksystemlog/debian/watch
index b15cf467b..b15cf467b 100644
--- a/debian/_base/applications/ksystemlog/debian/watch
+++ b/debian/_base/applications/system/ksystemlog/debian/watch
diff --git a/debian/_base/applications/knemo/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/knemo/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kmymoney/debian/cdbs/versions.pl b/debian/_base/applications/system/kvkbd/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kmymoney/debian/cdbs/versions.pl
+++ b/debian/_base/applications/system/kvkbd/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kvkbd/debian/changelog b/debian/_base/applications/system/kvkbd/debian/changelog
index 9d94af90e..9d94af90e 100644
--- a/debian/_base/applications/kvkbd/debian/changelog
+++ b/debian/_base/applications/system/kvkbd/debian/changelog
diff --git a/debian/_base/applications/kpicosim/debian/compat b/debian/_base/applications/system/kvkbd/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kpicosim/debian/compat
+++ b/debian/_base/applications/system/kvkbd/debian/compat
diff --git a/debian/_base/applications/kvkbd/debian/control b/debian/_base/applications/system/kvkbd/debian/control
index 1b3adaf2b..1b3adaf2b 100644
--- a/debian/_base/applications/kvkbd/debian/control
+++ b/debian/_base/applications/system/kvkbd/debian/control
diff --git a/debian/_base/applications/kvkbd/debian/copyright b/debian/_base/applications/system/kvkbd/debian/copyright
index 6b22ad784..6b22ad784 100644
--- a/debian/_base/applications/kvkbd/debian/copyright
+++ b/debian/_base/applications/system/kvkbd/debian/copyright
diff --git a/debian/_base/applications/konversation/debian/patches/.gitignore b/debian/_base/applications/system/kvkbd/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/konversation/debian/patches/.gitignore
+++ b/debian/_base/applications/system/kvkbd/debian/patches/.gitignore
diff --git a/debian/_base/applications/kvkbd/debian/rules b/debian/_base/applications/system/kvkbd/debian/rules
index 7a6c3e8e4..7a6c3e8e4 100755
--- a/debian/_base/applications/kvkbd/debian/rules
+++ b/debian/_base/applications/system/kvkbd/debian/rules
diff --git a/debian/_base/applications/kpicosim/debian/source/format b/debian/_base/applications/system/kvkbd/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kpicosim/debian/source/format
+++ b/debian/_base/applications/system/kvkbd/debian/source/format
diff --git a/debian/_base/applications/kpicosim/debian/source/options b/debian/_base/applications/system/kvkbd/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kpicosim/debian/source/options
+++ b/debian/_base/applications/system/kvkbd/debian/source/options
diff --git a/debian/_base/applications/smartcardauth/debian/changelog b/debian/_base/applications/system/smartcardauth/debian/changelog
index 4d5f37dad..4d5f37dad 100755
--- a/debian/_base/applications/smartcardauth/debian/changelog
+++ b/debian/_base/applications/system/smartcardauth/debian/changelog
diff --git a/debian/_base/applications/kpilot/debian/compat b/debian/_base/applications/system/smartcardauth/debian/compat
index 7f8f011eb..7f8f011eb 100644..100755
--- a/debian/_base/applications/kpilot/debian/compat
+++ b/debian/_base/applications/system/smartcardauth/debian/compat
diff --git a/debian/_base/applications/smartcardauth/debian/control b/debian/_base/applications/system/smartcardauth/debian/control
index 938ebada5..938ebada5 100755
--- a/debian/_base/applications/smartcardauth/debian/control
+++ b/debian/_base/applications/system/smartcardauth/debian/control
diff --git a/debian/_base/applications/smartcardauth/debian/dirs b/debian/_base/applications/system/smartcardauth/debian/dirs
index 73752c9ae..73752c9ae 100755
--- a/debian/_base/applications/smartcardauth/debian/dirs
+++ b/debian/_base/applications/system/smartcardauth/debian/dirs
diff --git a/debian/_base/applications/smartcardauth/debian/rules b/debian/_base/applications/system/smartcardauth/debian/rules
index fe74e584a..fe74e584a 100755
--- a/debian/_base/applications/smartcardauth/debian/rules
+++ b/debian/_base/applications/system/smartcardauth/debian/rules
diff --git a/debian/_base/applications/smartcardauth/debian/smartcardauth.postinst b/debian/_base/applications/system/smartcardauth/debian/smartcardauth.postinst
index 842e0017d..842e0017d 100755
--- a/debian/_base/applications/smartcardauth/debian/smartcardauth.postinst
+++ b/debian/_base/applications/system/smartcardauth/debian/smartcardauth.postinst
diff --git a/debian/_base/applications/kpilot/debian/source/format b/debian/_base/applications/system/smartcardauth/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kpilot/debian/source/format
+++ b/debian/_base/applications/system/smartcardauth/debian/source/format
diff --git a/debian/_base/applications/kpilot/debian/source/options b/debian/_base/applications/system/smartcardauth/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kpilot/debian/source/options
+++ b/debian/_base/applications/system/smartcardauth/debian/source/options
diff --git a/debian/_base/applications/yakuake/debian/README b/debian/_base/applications/system/yakuake/debian/README
index 85f0e1b9f..85f0e1b9f 100644
--- a/debian/_base/applications/yakuake/debian/README
+++ b/debian/_base/applications/system/yakuake/debian/README
diff --git a/debian/_base/applications/knetstats/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/knetstats/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/knemo/debian/cdbs/versions.pl b/debian/_base/applications/system/yakuake/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/knemo/debian/cdbs/versions.pl
+++ b/debian/_base/applications/system/yakuake/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/yakuake/debian/changelog b/debian/_base/applications/system/yakuake/debian/changelog
index fcb60a3f9..fcb60a3f9 100644
--- a/debian/_base/applications/yakuake/debian/changelog
+++ b/debian/_base/applications/system/yakuake/debian/changelog
diff --git a/debian/_base/applications/kpowersave/debian/compat b/debian/_base/applications/system/yakuake/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kpowersave/debian/compat
+++ b/debian/_base/applications/system/yakuake/debian/compat
diff --git a/debian/_base/applications/yakuake/debian/control b/debian/_base/applications/system/yakuake/debian/control
index ca8c62943..ca8c62943 100644
--- a/debian/_base/applications/yakuake/debian/control
+++ b/debian/_base/applications/system/yakuake/debian/control
diff --git a/debian/_base/applications/yakuake/debian/copyright b/debian/_base/applications/system/yakuake/debian/copyright
index df27b9653..df27b9653 100644
--- a/debian/_base/applications/yakuake/debian/copyright
+++ b/debian/_base/applications/system/yakuake/debian/copyright
diff --git a/debian/_base/applications/yakuake/debian/icons/yakuake-16.xpm b/debian/_base/applications/system/yakuake/debian/icons/yakuake-16.xpm
index a16b98fef..a16b98fef 100644
--- a/debian/_base/applications/yakuake/debian/icons/yakuake-16.xpm
+++ b/debian/_base/applications/system/yakuake/debian/icons/yakuake-16.xpm
diff --git a/debian/_base/applications/yakuake/debian/icons/yakuake.xpm b/debian/_base/applications/system/yakuake/debian/icons/yakuake.xpm
index 6745c7c0e..6745c7c0e 100644
--- a/debian/_base/applications/yakuake/debian/icons/yakuake.xpm
+++ b/debian/_base/applications/system/yakuake/debian/icons/yakuake.xpm
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/patches/.gitignore b/debian/_base/applications/system/yakuake/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/ksplash-engine-moodin/debian/patches/.gitignore
+++ b/debian/_base/applications/system/yakuake/debian/patches/.gitignore
diff --git a/debian/_base/applications/yakuake/debian/rules b/debian/_base/applications/system/yakuake/debian/rules
index 2bbfee612..2bbfee612 100755
--- a/debian/_base/applications/yakuake/debian/rules
+++ b/debian/_base/applications/system/yakuake/debian/rules
diff --git a/debian/_base/applications/kpowersave.cmake/debian/source/format b/debian/_base/applications/system/yakuake/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kpowersave.cmake/debian/source/format
+++ b/debian/_base/applications/system/yakuake/debian/source/format
diff --git a/debian/_base/applications/kpowersave.cmake/debian/source/options b/debian/_base/applications/system/yakuake/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kpowersave.cmake/debian/source/options
+++ b/debian/_base/applications/system/yakuake/debian/source/options
diff --git a/debian/_base/applications/yakuake/debian/yakuake-trinity.1 b/debian/_base/applications/system/yakuake/debian/yakuake-trinity.1
index 7b404d01e..7b404d01e 100644
--- a/debian/_base/applications/yakuake/debian/yakuake-trinity.1
+++ b/debian/_base/applications/system/yakuake/debian/yakuake-trinity.1
diff --git a/debian/_base/applications/yakuake/debian/yakuake-trinity.install b/debian/_base/applications/system/yakuake/debian/yakuake-trinity.install
index e5e863463..e5e863463 100644
--- a/debian/_base/applications/yakuake/debian/yakuake-trinity.install
+++ b/debian/_base/applications/system/yakuake/debian/yakuake-trinity.install
diff --git a/debian/_base/applications/yakuake/debian/yakuake-trinity.manpages b/debian/_base/applications/system/yakuake/debian/yakuake-trinity.manpages
index f9a1365b5..f9a1365b5 100644
--- a/debian/_base/applications/yakuake/debian/yakuake-trinity.manpages
+++ b/debian/_base/applications/system/yakuake/debian/yakuake-trinity.manpages
diff --git a/debian/_base/applications/yakuake/debian/yakuake-trinity.menu b/debian/_base/applications/system/yakuake/debian/yakuake-trinity.menu
index 80d76482b..80d76482b 100644
--- a/debian/_base/applications/yakuake/debian/yakuake-trinity.menu
+++ b/debian/_base/applications/system/yakuake/debian/yakuake-trinity.menu
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/kio-apt/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/knetworkmanager.cmake/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/tdeio/kio-apt/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/knetstats/debian/cdbs/versions.pl b/debian/_base/applications/tdeio/kio-apt/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/knetstats/debian/cdbs/versions.pl
+++ b/debian/_base/applications/tdeio/kio-apt/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kio-apt/debian/changelog b/debian/_base/applications/tdeio/kio-apt/debian/changelog
index 1b3d932c4..1b3d932c4 100644
--- a/debian/_base/applications/kio-apt/debian/changelog
+++ b/debian/_base/applications/tdeio/kio-apt/debian/changelog
diff --git a/debian/_base/applications/kradio/debian/compat b/debian/_base/applications/tdeio/kio-apt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kradio/debian/compat
+++ b/debian/_base/applications/tdeio/kio-apt/debian/compat
diff --git a/debian/_base/applications/kio-apt/debian/control b/debian/_base/applications/tdeio/kio-apt/debian/control
index d2bab27d8..d2bab27d8 100644
--- a/debian/_base/applications/kio-apt/debian/control
+++ b/debian/_base/applications/tdeio/kio-apt/debian/control
diff --git a/debian/_base/applications/kio-apt/debian/copyright b/debian/_base/applications/tdeio/kio-apt/debian/copyright
index b461d84ed..b461d84ed 100644
--- a/debian/_base/applications/kio-apt/debian/copyright
+++ b/debian/_base/applications/tdeio/kio-apt/debian/copyright
diff --git a/debian/_base/applications/kio-apt/debian/docs b/debian/_base/applications/tdeio/kio-apt/debian/docs
index 62deb0497..62deb0497 100644
--- a/debian/_base/applications/kio-apt/debian/docs
+++ b/debian/_base/applications/tdeio/kio-apt/debian/docs
diff --git a/debian/_base/applications/kio-apt/debian/fixrpath b/debian/_base/applications/tdeio/kio-apt/debian/fixrpath
index 0ca44359e..0ca44359e 100755
--- a/debian/_base/applications/kio-apt/debian/fixrpath
+++ b/debian/_base/applications/tdeio/kio-apt/debian/fixrpath
diff --git a/debian/_base/applications/kio-apt/debian/kdedeb_logo.png.uu b/debian/_base/applications/tdeio/kio-apt/debian/kdedeb_logo.png.uu
index 85ac9ca79..85ac9ca79 100644
--- a/debian/_base/applications/kio-apt/debian/kdedeb_logo.png.uu
+++ b/debian/_base/applications/tdeio/kio-apt/debian/kdedeb_logo.png.uu
diff --git a/debian/_base/applications/knetstats/debian/patches/series b/debian/_base/applications/tdeio/kio-apt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/knetstats/debian/patches/series
+++ b/debian/_base/applications/tdeio/kio-apt/debian/patches/series
diff --git a/debian/_base/applications/kio-apt/debian/rules b/debian/_base/applications/tdeio/kio-apt/debian/rules
index e519cb2fe..e519cb2fe 100755
--- a/debian/_base/applications/kio-apt/debian/rules
+++ b/debian/_base/applications/tdeio/kio-apt/debian/rules
diff --git a/debian/_base/applications/kpowersave/debian/source/format b/debian/_base/applications/tdeio/kio-apt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kpowersave/debian/source/format
+++ b/debian/_base/applications/tdeio/kio-apt/debian/source/format
diff --git a/debian/_base/applications/kpowersave/debian/source/options b/debian/_base/applications/tdeio/kio-apt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kpowersave/debian/source/options
+++ b/debian/_base/applications/tdeio/kio-apt/debian/source/options
diff --git a/debian/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/kio-locate/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/tdeio/kio-locate/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/cdbs/versions.pl b/debian/_base/applications/tdeio/kio-locate/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
+++ b/debian/_base/applications/tdeio/kio-locate/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kio-locate/debian/changelog b/debian/_base/applications/tdeio/kio-locate/debian/changelog
index 6fe22089e..6fe22089e 100644
--- a/debian/_base/applications/kio-locate/debian/changelog
+++ b/debian/_base/applications/tdeio/kio-locate/debian/changelog
diff --git a/debian/_base/applications/krename/debian/compat b/debian/_base/applications/tdeio/kio-locate/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/krename/debian/compat
+++ b/debian/_base/applications/tdeio/kio-locate/debian/compat
diff --git a/debian/_base/applications/kio-locate/debian/control b/debian/_base/applications/tdeio/kio-locate/debian/control
index f45414984..f45414984 100644
--- a/debian/_base/applications/kio-locate/debian/control
+++ b/debian/_base/applications/tdeio/kio-locate/debian/control
diff --git a/debian/_base/applications/kio-locate/debian/copyright b/debian/_base/applications/tdeio/kio-locate/debian/copyright
index 17e1fdc15..17e1fdc15 100644
--- a/debian/_base/applications/kio-locate/debian/copyright
+++ b/debian/_base/applications/tdeio/kio-locate/debian/copyright
diff --git a/debian/_base/applications/knetworkmanager.cmake/debian/patches/series b/debian/_base/applications/tdeio/kio-locate/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/knetworkmanager.cmake/debian/patches/series
+++ b/debian/_base/applications/tdeio/kio-locate/debian/patches/series
diff --git a/debian/_base/applications/kio-locate/debian/rules b/debian/_base/applications/tdeio/kio-locate/debian/rules
index b13f963a0..b13f963a0 100755
--- a/debian/_base/applications/kio-locate/debian/rules
+++ b/debian/_base/applications/tdeio/kio-locate/debian/rules
diff --git a/debian/_base/applications/kradio/debian/source/format b/debian/_base/applications/tdeio/kio-locate/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kradio/debian/source/format
+++ b/debian/_base/applications/tdeio/kio-locate/debian/source/format
diff --git a/debian/_base/applications/kradio/debian/source/options b/debian/_base/applications/tdeio/kio-locate/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kradio/debian/source/options
+++ b/debian/_base/applications/tdeio/kio-locate/debian/source/options
diff --git a/debian/_base/applications/koffice/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/kio-umountwrapper/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/koffice/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/tdeio/kio-umountwrapper/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/knetworkmanager8/debian/cdbs/versions.pl b/debian/_base/applications/tdeio/kio-umountwrapper/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/knetworkmanager8/debian/cdbs/versions.pl
+++ b/debian/_base/applications/tdeio/kio-umountwrapper/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kio-umountwrapper/debian/changelog b/debian/_base/applications/tdeio/kio-umountwrapper/debian/changelog
index 44969da09..44969da09 100644
--- a/debian/_base/applications/kio-umountwrapper/debian/changelog
+++ b/debian/_base/applications/tdeio/kio-umountwrapper/debian/changelog
diff --git a/debian/_base/applications/krusader/debian/compat b/debian/_base/applications/tdeio/kio-umountwrapper/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/krusader/debian/compat
+++ b/debian/_base/applications/tdeio/kio-umountwrapper/debian/compat
diff --git a/debian/_base/applications/kio-umountwrapper/debian/control b/debian/_base/applications/tdeio/kio-umountwrapper/debian/control
index 22ef0d26c..22ef0d26c 100644
--- a/debian/_base/applications/kio-umountwrapper/debian/control
+++ b/debian/_base/applications/tdeio/kio-umountwrapper/debian/control
diff --git a/debian/_base/applications/kio-umountwrapper/debian/copyright b/debian/_base/applications/tdeio/kio-umountwrapper/debian/copyright
index 08e471ac6..08e471ac6 100644
--- a/debian/_base/applications/kio-umountwrapper/debian/copyright
+++ b/debian/_base/applications/tdeio/kio-umountwrapper/debian/copyright
diff --git a/debian/_base/applications/kio-umountwrapper/debian/media_safelyremove.desktop b/debian/_base/applications/tdeio/kio-umountwrapper/debian/media_safelyremove.desktop
index 970caf8a5..970caf8a5 100644
--- a/debian/_base/applications/kio-umountwrapper/debian/media_safelyremove.desktop
+++ b/debian/_base/applications/tdeio/kio-umountwrapper/debian/media_safelyremove.desktop
diff --git a/debian/_base/applications/knetworkmanager8/debian/patches/series b/debian/_base/applications/tdeio/kio-umountwrapper/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/knetworkmanager8/debian/patches/series
+++ b/debian/_base/applications/tdeio/kio-umountwrapper/debian/patches/series
diff --git a/debian/_base/applications/kio-umountwrapper/debian/postrm b/debian/_base/applications/tdeio/kio-umountwrapper/debian/postrm
index 2baeddc3e..2baeddc3e 100644
--- a/debian/_base/applications/kio-umountwrapper/debian/postrm
+++ b/debian/_base/applications/tdeio/kio-umountwrapper/debian/postrm
diff --git a/debian/_base/applications/kio-umountwrapper/debian/preinst b/debian/_base/applications/tdeio/kio-umountwrapper/debian/preinst
index 78e02c765..78e02c765 100644
--- a/debian/_base/applications/kio-umountwrapper/debian/preinst
+++ b/debian/_base/applications/tdeio/kio-umountwrapper/debian/preinst
diff --git a/debian/_base/applications/kio-umountwrapper/debian/rules b/debian/_base/applications/tdeio/kio-umountwrapper/debian/rules
index aef1a4538..aef1a4538 100755
--- a/debian/_base/applications/kio-umountwrapper/debian/rules
+++ b/debian/_base/applications/tdeio/kio-umountwrapper/debian/rules
diff --git a/debian/_base/applications/krename/debian/source/format b/debian/_base/applications/tdeio/kio-umountwrapper/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/krename/debian/source/format
+++ b/debian/_base/applications/tdeio/kio-umountwrapper/debian/source/format
diff --git a/debian/_base/applications/krename/debian/source/options b/debian/_base/applications/tdeio/kio-umountwrapper/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/krename/debian/source/options
+++ b/debian/_base/applications/tdeio/kio-umountwrapper/debian/source/options
diff --git a/debian/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 b/debian/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
index a34c9c81c..a34c9c81c 100644
--- a/debian/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
diff --git a/debian/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4 b/debian/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
index 874f83934..874f83934 100644
--- a/debian/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
diff --git a/debian/_base/applications/konversation/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/konversation/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/koffice/debian/cdbs/versions.pl b/debian/_base/applications/themes/gtk-qt-engine/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/koffice/debian/cdbs/versions.pl
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/gtk-qt-engine/debian/changelog b/debian/_base/applications/themes/gtk-qt-engine/debian/changelog
index cf3d30a9a..cf3d30a9a 100644
--- a/debian/_base/applications/gtk-qt-engine/debian/changelog
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/changelog
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/compat b/debian/_base/applications/themes/gtk-qt-engine/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/ksplash-engine-moodin/debian/compat
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/compat
diff --git a/debian/_base/applications/gtk-qt-engine/debian/control b/debian/_base/applications/themes/gtk-qt-engine/debian/control
index 48a508e2b..48a508e2b 100644
--- a/debian/_base/applications/gtk-qt-engine/debian/control
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/control
diff --git a/debian/_base/applications/gtk-qt-engine/debian/copyright b/debian/_base/applications/themes/gtk-qt-engine/debian/copyright
index aa4e449ee..aa4e449ee 100644
--- a/debian/_base/applications/gtk-qt-engine/debian/copyright
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/copyright
diff --git a/debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs b/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
index 5502ed8f4..5502ed8f4 100644
--- a/debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
diff --git a/debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh b/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
index b477f5ce2..b477f5ce2 100644
--- a/debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
diff --git a/debian/_base/applications/koffice/debian/patches/series b/debian/_base/applications/themes/gtk-qt-engine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/koffice/debian/patches/series
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/patches/series
diff --git a/debian/_base/applications/gtk-qt-engine/debian/rules b/debian/_base/applications/themes/gtk-qt-engine/debian/rules
index d193b164f..d193b164f 100755
--- a/debian/_base/applications/gtk-qt-engine/debian/rules
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/rules
diff --git a/debian/_base/applications/krusader/debian/source/format b/debian/_base/applications/themes/gtk-qt-engine/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/krusader/debian/source/format
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/source/format
diff --git a/debian/_base/applications/krusader/debian/source/options b/debian/_base/applications/themes/gtk-qt-engine/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/krusader/debian/source/options
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/source/options
diff --git a/debian/_base/applications/kde-style-lipstik/debian/changelog b/debian/_base/applications/themes/kde-style-lipstik/debian/changelog
index 8df3a0424..8df3a0424 100644
--- a/debian/_base/applications/kde-style-lipstik/debian/changelog
+++ b/debian/_base/applications/themes/kde-style-lipstik/debian/changelog
diff --git a/debian/_base/applications/ksquirrel/debian/compat b/debian/_base/applications/themes/kde-style-lipstik/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/ksquirrel/debian/compat
+++ b/debian/_base/applications/themes/kde-style-lipstik/debian/compat
diff --git a/debian/_base/applications/kde-style-lipstik/debian/control b/debian/_base/applications/themes/kde-style-lipstik/debian/control
index 6bf98b714..6bf98b714 100644
--- a/debian/_base/applications/kde-style-lipstik/debian/control
+++ b/debian/_base/applications/themes/kde-style-lipstik/debian/control
diff --git a/debian/_base/applications/kde-style-lipstik/debian/copyright b/debian/_base/applications/themes/kde-style-lipstik/debian/copyright
index 446318fca..446318fca 100644
--- a/debian/_base/applications/kde-style-lipstik/debian/copyright
+++ b/debian/_base/applications/themes/kde-style-lipstik/debian/copyright
diff --git a/debian/_base/applications/knetload/debian/dirs b/debian/_base/applications/themes/kde-style-lipstik/debian/dirs
index 43e7f554c..43e7f554c 100644
--- a/debian/_base/applications/knetload/debian/dirs
+++ b/debian/_base/applications/themes/kde-style-lipstik/debian/dirs
diff --git a/debian/_base/applications/kde-style-lipstik/debian/docs b/debian/_base/applications/themes/kde-style-lipstik/debian/docs
index 0948b8ef4..0948b8ef4 100644
--- a/debian/_base/applications/kde-style-lipstik/debian/docs
+++ b/debian/_base/applications/themes/kde-style-lipstik/debian/docs
diff --git a/debian/_base/applications/ksquirrel/debian/patches/.gitignore b/debian/_base/applications/themes/kde-style-lipstik/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/ksquirrel/debian/patches/.gitignore
+++ b/debian/_base/applications/themes/kde-style-lipstik/debian/patches/.gitignore
diff --git a/debian/_base/applications/kde-style-lipstik/debian/rules b/debian/_base/applications/themes/kde-style-lipstik/debian/rules
index 620265e8e..620265e8e 100755
--- a/debian/_base/applications/kde-style-lipstik/debian/rules
+++ b/debian/_base/applications/themes/kde-style-lipstik/debian/rules
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/source/format b/debian/_base/applications/themes/kde-style-lipstik/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/ksplash-engine-moodin/debian/source/format
+++ b/debian/_base/applications/themes/kde-style-lipstik/debian/source/format
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/source/options b/debian/_base/applications/themes/kde-style-lipstik/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/ksplash-engine-moodin/debian/source/options
+++ b/debian/_base/applications/themes/kde-style-lipstik/debian/source/options
diff --git a/debian/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/kde-style-qtcurve/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/kde-style-qtcurve/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/konversation/debian/cdbs/versions.pl b/debian/_base/applications/themes/kde-style-qtcurve/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/konversation/debian/cdbs/versions.pl
+++ b/debian/_base/applications/themes/kde-style-qtcurve/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kde-style-qtcurve/debian/changelog b/debian/_base/applications/themes/kde-style-qtcurve/debian/changelog
index b89b8bc90..b89b8bc90 100644
--- a/debian/_base/applications/kde-style-qtcurve/debian/changelog
+++ b/debian/_base/applications/themes/kde-style-qtcurve/debian/changelog
diff --git a/debian/_base/applications/kstreamripper/debian/compat b/debian/_base/applications/themes/kde-style-qtcurve/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kstreamripper/debian/compat
+++ b/debian/_base/applications/themes/kde-style-qtcurve/debian/compat
diff --git a/debian/_base/applications/kde-style-qtcurve/debian/control b/debian/_base/applications/themes/kde-style-qtcurve/debian/control
index 527a558e0..527a558e0 100644
--- a/debian/_base/applications/kde-style-qtcurve/debian/control
+++ b/debian/_base/applications/themes/kde-style-qtcurve/debian/control
diff --git a/debian/_base/applications/kde-style-qtcurve/debian/copyright b/debian/_base/applications/themes/kde-style-qtcurve/debian/copyright
index 055d8a659..055d8a659 100644
--- a/debian/_base/applications/kde-style-qtcurve/debian/copyright
+++ b/debian/_base/applications/themes/kde-style-qtcurve/debian/copyright
diff --git a/debian/_base/applications/ksquirrel/debian/docs b/debian/_base/applications/themes/kde-style-qtcurve/debian/docs
index 724e08449..724e08449 100644
--- a/debian/_base/applications/ksquirrel/debian/docs
+++ b/debian/_base/applications/themes/kde-style-qtcurve/debian/docs
diff --git a/debian/_base/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install b/debian/_base/applications/themes/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
index 003761370..003761370 100644
--- a/debian/_base/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
+++ b/debian/_base/applications/themes/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
diff --git a/debian/_base/applications/kpowersave.cmake/debian/patches/series b/debian/_base/applications/themes/kde-style-qtcurve/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kpowersave.cmake/debian/patches/series
+++ b/debian/_base/applications/themes/kde-style-qtcurve/debian/patches/series
diff --git a/debian/_base/applications/kde-style-qtcurve/debian/rules b/debian/_base/applications/themes/kde-style-qtcurve/debian/rules
index f9774bf4b..f9774bf4b 100755
--- a/debian/_base/applications/kde-style-qtcurve/debian/rules
+++ b/debian/_base/applications/themes/kde-style-qtcurve/debian/rules
diff --git a/debian/_base/applications/kde-style-qtcurve/debian/scan-version b/debian/_base/applications/themes/kde-style-qtcurve/debian/scan-version
index 640ea27c7..640ea27c7 100644
--- a/debian/_base/applications/kde-style-qtcurve/debian/scan-version
+++ b/debian/_base/applications/themes/kde-style-qtcurve/debian/scan-version
diff --git a/debian/_base/applications/ksquirrel/debian/source/format b/debian/_base/applications/themes/kde-style-qtcurve/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/ksquirrel/debian/source/format
+++ b/debian/_base/applications/themes/kde-style-qtcurve/debian/source/format
diff --git a/debian/_base/applications/ksquirrel/debian/source/options b/debian/_base/applications/themes/kde-style-qtcurve/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/ksquirrel/debian/source/options
+++ b/debian/_base/applications/themes/kde-style-qtcurve/debian/source/options
diff --git a/debian/_base/applications/kdmtheme/debian/README.Debian b/debian/_base/applications/themes/kdmtheme/debian/README.Debian
index 1291b6a32..1291b6a32 100644
--- a/debian/_base/applications/kdmtheme/debian/README.Debian
+++ b/debian/_base/applications/themes/kdmtheme/debian/README.Debian
diff --git a/debian/_base/applications/kpilot/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/kdmtheme/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kpilot/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/kdmtheme/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kopete-otr/debian/cdbs/versions.pl b/debian/_base/applications/themes/kdmtheme/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kopete-otr/debian/cdbs/versions.pl
+++ b/debian/_base/applications/themes/kdmtheme/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kdmtheme/debian/changelog b/debian/_base/applications/themes/kdmtheme/debian/changelog
index e14e2952b..e14e2952b 100644
--- a/debian/_base/applications/kdmtheme/debian/changelog
+++ b/debian/_base/applications/themes/kdmtheme/debian/changelog
diff --git a/debian/_base/applications/ksystemlog/debian/compat b/debian/_base/applications/themes/kdmtheme/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/ksystemlog/debian/compat
+++ b/debian/_base/applications/themes/kdmtheme/debian/compat
diff --git a/debian/_base/applications/kdmtheme/debian/control b/debian/_base/applications/themes/kdmtheme/debian/control
index 9be4637d9..9be4637d9 100644
--- a/debian/_base/applications/kdmtheme/debian/control
+++ b/debian/_base/applications/themes/kdmtheme/debian/control
diff --git a/debian/_base/applications/kdmtheme/debian/copyright b/debian/_base/applications/themes/kdmtheme/debian/copyright
index 23265e2b6..23265e2b6 100644
--- a/debian/_base/applications/kdmtheme/debian/copyright
+++ b/debian/_base/applications/themes/kdmtheme/debian/copyright
diff --git a/debian/_base/applications/kdmtheme/debian/docs b/debian/_base/applications/themes/kdmtheme/debian/docs
index e845566c0..e845566c0 100644
--- a/debian/_base/applications/kdmtheme/debian/docs
+++ b/debian/_base/applications/themes/kdmtheme/debian/docs
diff --git a/debian/_base/applications/kdmtheme/debian/kdmtheme.lintian-overrides b/debian/_base/applications/themes/kdmtheme/debian/kdmtheme.lintian-overrides
index d033183c7..d033183c7 100644
--- a/debian/_base/applications/kdmtheme/debian/kdmtheme.lintian-overrides
+++ b/debian/_base/applications/themes/kdmtheme/debian/kdmtheme.lintian-overrides
diff --git a/debian/_base/applications/ktechlab/debian/patches/.gitignore b/debian/_base/applications/themes/kdmtheme/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/ktechlab/debian/patches/.gitignore
+++ b/debian/_base/applications/themes/kdmtheme/debian/patches/.gitignore
diff --git a/debian/_base/applications/kdmtheme/debian/rules b/debian/_base/applications/themes/kdmtheme/debian/rules
index dc62a73d6..dc62a73d6 100755
--- a/debian/_base/applications/kdmtheme/debian/rules
+++ b/debian/_base/applications/themes/kdmtheme/debian/rules
diff --git a/debian/_base/applications/kstreamripper/debian/source/format b/debian/_base/applications/themes/kdmtheme/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kstreamripper/debian/source/format
+++ b/debian/_base/applications/themes/kdmtheme/debian/source/format
diff --git a/debian/_base/applications/kstreamripper/debian/source/options b/debian/_base/applications/themes/kdmtheme/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kstreamripper/debian/source/options
+++ b/debian/_base/applications/themes/kdmtheme/debian/source/options
diff --git a/debian/_base/applications/kdmtheme/debian/watch b/debian/_base/applications/themes/kdmtheme/debian/watch
index 5cf8d8c80..5cf8d8c80 100644
--- a/debian/_base/applications/kdmtheme/debian/watch
+++ b/debian/_base/applications/themes/kdmtheme/debian/watch
diff --git a/debian/_base/applications/kpowersave.cmake/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kpowersave.cmake/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kpilot/debian/cdbs/versions.pl b/debian/_base/applications/themes/kgtk-qt3/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kpilot/debian/cdbs/versions.pl
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kgtk-qt3/debian/changelog b/debian/_base/applications/themes/kgtk-qt3/debian/changelog
index e2c2e4920..e2c2e4920 100644
--- a/debian/_base/applications/kgtk-qt3/debian/changelog
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/changelog
diff --git a/debian/_base/applications/ktechlab/debian/compat b/debian/_base/applications/themes/kgtk-qt3/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/ktechlab/debian/compat
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/compat
diff --git a/debian/_base/applications/kgtk-qt3/debian/control b/debian/_base/applications/themes/kgtk-qt3/debian/control
index 08dc281ca..08dc281ca 100644
--- a/debian/_base/applications/kgtk-qt3/debian/control
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/control
diff --git a/debian/_base/applications/kgtk-qt3/debian/copyright b/debian/_base/applications/themes/kgtk-qt3/debian/copyright
index 0e93ef880..0e93ef880 100644
--- a/debian/_base/applications/kgtk-qt3/debian/copyright
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/copyright
diff --git a/debian/_base/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian b/debian/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
index f7e4ea7f5..f7e4ea7f5 100644
--- a/debian/_base/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
diff --git a/debian/_base/applications/kpowersave/debian/patches/series b/debian/_base/applications/themes/kgtk-qt3/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kpowersave/debian/patches/series
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/patches/series
diff --git a/debian/_base/applications/kgtk-qt3/debian/preload b/debian/_base/applications/themes/kgtk-qt3/debian/preload
index 9508902de..9508902de 100644
--- a/debian/_base/applications/kgtk-qt3/debian/preload
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/preload
diff --git a/debian/_base/applications/kgtk-qt3/debian/rules b/debian/_base/applications/themes/kgtk-qt3/debian/rules
index 4967ded6b..4967ded6b 100755
--- a/debian/_base/applications/kgtk-qt3/debian/rules
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/rules
diff --git a/debian/_base/applications/ksystemlog/debian/source/format b/debian/_base/applications/themes/kgtk-qt3/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/ksystemlog/debian/source/format
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/source/format
diff --git a/debian/_base/applications/ksystemlog/debian/source/options b/debian/_base/applications/themes/kgtk-qt3/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/ksystemlog/debian/source/options
+++ b/debian/_base/applications/themes/kgtk-qt3/debian/source/options
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/changelog b/debian/_base/applications/themes/ksplash-engine-moodin/debian/changelog
index 690318477..690318477 100644
--- a/debian/_base/applications/ksplash-engine-moodin/debian/changelog
+++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/changelog
diff --git a/debian/_base/applications/ktorrent/debian/compat b/debian/_base/applications/themes/ksplash-engine-moodin/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/ktorrent/debian/compat
+++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/compat
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/control b/debian/_base/applications/themes/ksplash-engine-moodin/debian/control
index fb3ee17f8..fb3ee17f8 100644
--- a/debian/_base/applications/ksplash-engine-moodin/debian/control
+++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/control
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/copyright b/debian/_base/applications/themes/ksplash-engine-moodin/debian/copyright
index 087e70775..087e70775 100644
--- a/debian/_base/applications/ksplash-engine-moodin/debian/copyright
+++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/copyright
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/debiandirs b/debian/_base/applications/themes/ksplash-engine-moodin/debian/debiandirs
index 0e561941d..0e561941d 100644
--- a/debian/_base/applications/ksplash-engine-moodin/debian/debiandirs
+++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/debiandirs
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/dirs b/debian/_base/applications/themes/ksplash-engine-moodin/debian/dirs
index 29183d0bc..29183d0bc 100644
--- a/debian/_base/applications/ksplash-engine-moodin/debian/dirs
+++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/dirs
diff --git a/debian/_base/applications/kvkbd/debian/patches/.gitignore b/debian/_base/applications/themes/ksplash-engine-moodin/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kvkbd/debian/patches/.gitignore
+++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/patches/.gitignore
diff --git a/debian/_base/applications/ksplash-engine-moodin/debian/rules b/debian/_base/applications/themes/ksplash-engine-moodin/debian/rules
index 2e7053e8b..2e7053e8b 100755
--- a/debian/_base/applications/ksplash-engine-moodin/debian/rules
+++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/rules
diff --git a/debian/_base/applications/ktechlab/debian/source/format b/debian/_base/applications/themes/ksplash-engine-moodin/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/ktechlab/debian/source/format
+++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/source/format
diff --git a/debian/_base/applications/ktechlab/debian/source/options b/debian/_base/applications/themes/ksplash-engine-moodin/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/ktechlab/debian/source/options
+++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/source/options
diff --git a/debian/_base/applications/kpowersave/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/kwin-style-crystal/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kpowersave/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/themes/kwin-style-crystal/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kpowersave.cmake/debian/cdbs/versions.pl b/debian/_base/applications/themes/kwin-style-crystal/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kpowersave.cmake/debian/cdbs/versions.pl
+++ b/debian/_base/applications/themes/kwin-style-crystal/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kwin-style-crystal/debian/changelog b/debian/_base/applications/themes/kwin-style-crystal/debian/changelog
index acdd7341d..acdd7341d 100644
--- a/debian/_base/applications/kwin-style-crystal/debian/changelog
+++ b/debian/_base/applications/themes/kwin-style-crystal/debian/changelog
diff --git a/debian/_base/applications/kuickshow/debian/compat b/debian/_base/applications/themes/kwin-style-crystal/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kuickshow/debian/compat
+++ b/debian/_base/applications/themes/kwin-style-crystal/debian/compat
diff --git a/debian/_base/applications/kwin-style-crystal/debian/control b/debian/_base/applications/themes/kwin-style-crystal/debian/control
index a2725b2ee..a2725b2ee 100644
--- a/debian/_base/applications/kwin-style-crystal/debian/control
+++ b/debian/_base/applications/themes/kwin-style-crystal/debian/control
diff --git a/debian/_base/applications/kwin-style-crystal/debian/copyright b/debian/_base/applications/themes/kwin-style-crystal/debian/copyright
index dbb28c22d..dbb28c22d 100644
--- a/debian/_base/applications/kwin-style-crystal/debian/copyright
+++ b/debian/_base/applications/themes/kwin-style-crystal/debian/copyright
diff --git a/debian/_base/applications/kwin-style-crystal/debian/dirs b/debian/_base/applications/themes/kwin-style-crystal/debian/dirs
index cbf4aa905..cbf4aa905 100644
--- a/debian/_base/applications/kwin-style-crystal/debian/dirs
+++ b/debian/_base/applications/themes/kwin-style-crystal/debian/dirs
diff --git a/debian/_base/applications/kwin-style-crystal/debian/docs b/debian/_base/applications/themes/kwin-style-crystal/debian/docs
index e845566c0..e845566c0 100644
--- a/debian/_base/applications/kwin-style-crystal/debian/docs
+++ b/debian/_base/applications/themes/kwin-style-crystal/debian/docs
diff --git a/debian/_base/applications/krename/debian/patches/series b/debian/_base/applications/themes/kwin-style-crystal/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/krename/debian/patches/series
+++ b/debian/_base/applications/themes/kwin-style-crystal/debian/patches/series
diff --git a/debian/_base/applications/kwin-style-crystal/debian/rules b/debian/_base/applications/themes/kwin-style-crystal/debian/rules
index 6a0576064..6a0576064 100755
--- a/debian/_base/applications/kwin-style-crystal/debian/rules
+++ b/debian/_base/applications/themes/kwin-style-crystal/debian/rules
diff --git a/debian/_base/applications/ktorrent/debian/source/format b/debian/_base/applications/themes/kwin-style-crystal/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/ktorrent/debian/source/format
+++ b/debian/_base/applications/themes/kwin-style-crystal/debian/source/format
diff --git a/debian/_base/applications/ktorrent/debian/source/options b/debian/_base/applications/themes/kwin-style-crystal/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/ktorrent/debian/source/options
+++ b/debian/_base/applications/themes/kwin-style-crystal/debian/source/options
diff --git a/debian/_base/applications/abakus/debian/abakus-trinity.manpages b/debian/_base/applications/utilities/abakus/debian/abakus-trinity.manpages
index 0737a321e..0737a321e 100644
--- a/debian/_base/applications/abakus/debian/abakus-trinity.manpages
+++ b/debian/_base/applications/utilities/abakus/debian/abakus-trinity.manpages
diff --git a/debian/_base/applications/abakus/debian/abakus-trinity.menu b/debian/_base/applications/utilities/abakus/debian/abakus-trinity.menu
index fb1dcd130..fb1dcd130 100644
--- a/debian/_base/applications/abakus/debian/abakus-trinity.menu
+++ b/debian/_base/applications/utilities/abakus/debian/abakus-trinity.menu
diff --git a/debian/_base/applications/abakus/debian/abakus.1 b/debian/_base/applications/utilities/abakus/debian/abakus.1
index 74afe7056..74afe7056 100644
--- a/debian/_base/applications/abakus/debian/abakus.1
+++ b/debian/_base/applications/utilities/abakus/debian/abakus.1
diff --git a/debian/_base/applications/krename/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/krename/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kpowersave/debian/cdbs/versions.pl b/debian/_base/applications/utilities/abakus/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kpowersave/debian/cdbs/versions.pl
+++ b/debian/_base/applications/utilities/abakus/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/abakus/debian/changelog b/debian/_base/applications/utilities/abakus/debian/changelog
index 4bca3dc33..4bca3dc33 100644
--- a/debian/_base/applications/abakus/debian/changelog
+++ b/debian/_base/applications/utilities/abakus/debian/changelog
diff --git a/debian/_base/applications/kvirc/debian/compat b/debian/_base/applications/utilities/abakus/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kvirc/debian/compat
+++ b/debian/_base/applications/utilities/abakus/debian/compat
diff --git a/debian/_base/applications/abakus/debian/control b/debian/_base/applications/utilities/abakus/debian/control
index 5dfcb47c4..5dfcb47c4 100644
--- a/debian/_base/applications/abakus/debian/control
+++ b/debian/_base/applications/utilities/abakus/debian/control
diff --git a/debian/_base/applications/abakus/debian/copyright b/debian/_base/applications/utilities/abakus/debian/copyright
index 5d11ec083..5d11ec083 100644
--- a/debian/_base/applications/abakus/debian/copyright
+++ b/debian/_base/applications/utilities/abakus/debian/copyright
diff --git a/debian/_base/applications/soundkonverter/debian/docs b/debian/_base/applications/utilities/abakus/debian/docs
index e845566c0..e845566c0 100644
--- a/debian/_base/applications/soundkonverter/debian/docs
+++ b/debian/_base/applications/utilities/abakus/debian/docs
diff --git a/debian/_base/applications/krusader/debian/patches/series b/debian/_base/applications/utilities/abakus/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/krusader/debian/patches/series
+++ b/debian/_base/applications/utilities/abakus/debian/patches/series
diff --git a/debian/_base/applications/abakus/debian/rules b/debian/_base/applications/utilities/abakus/debian/rules
index b836e500f..b836e500f 100755
--- a/debian/_base/applications/abakus/debian/rules
+++ b/debian/_base/applications/utilities/abakus/debian/rules
diff --git a/debian/_base/applications/kuickshow/debian/source/format b/debian/_base/applications/utilities/abakus/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kuickshow/debian/source/format
+++ b/debian/_base/applications/utilities/abakus/debian/source/format
diff --git a/debian/_base/applications/kuickshow/debian/source/options b/debian/_base/applications/utilities/abakus/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kuickshow/debian/source/options
+++ b/debian/_base/applications/utilities/abakus/debian/source/options
diff --git a/debian/_base/applications/krusader/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/krusader/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/krename/debian/cdbs/versions.pl b/debian/_base/applications/utilities/filelight/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/krename/debian/cdbs/versions.pl
+++ b/debian/_base/applications/utilities/filelight/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/filelight/debian/changelog b/debian/_base/applications/utilities/filelight/debian/changelog
index d59a45c8e..d59a45c8e 100644
--- a/debian/_base/applications/filelight/debian/changelog
+++ b/debian/_base/applications/utilities/filelight/debian/changelog
diff --git a/debian/_base/applications/kvkbd/debian/compat b/debian/_base/applications/utilities/filelight/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kvkbd/debian/compat
+++ b/debian/_base/applications/utilities/filelight/debian/compat
diff --git a/debian/_base/applications/filelight/debian/control b/debian/_base/applications/utilities/filelight/debian/control
index 1d39d2fe9..1d39d2fe9 100644
--- a/debian/_base/applications/filelight/debian/control
+++ b/debian/_base/applications/utilities/filelight/debian/control
diff --git a/debian/_base/applications/filelight/debian/copyright b/debian/_base/applications/utilities/filelight/debian/copyright
index c02dc5949..c02dc5949 100644
--- a/debian/_base/applications/filelight/debian/copyright
+++ b/debian/_base/applications/utilities/filelight/debian/copyright
diff --git a/debian/_base/applications/filelight/debian/filelight.1 b/debian/_base/applications/utilities/filelight/debian/filelight.1
index ce932984b..ce932984b 100644
--- a/debian/_base/applications/filelight/debian/filelight.1
+++ b/debian/_base/applications/utilities/filelight/debian/filelight.1
diff --git a/debian/_base/applications/filelight/debian/menu b/debian/_base/applications/utilities/filelight/debian/menu
index 4db4c3f62..4db4c3f62 100644
--- a/debian/_base/applications/filelight/debian/menu
+++ b/debian/_base/applications/utilities/filelight/debian/menu
diff --git a/debian/_base/applications/ksystemlog/debian/patches/series b/debian/_base/applications/utilities/filelight/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/ksystemlog/debian/patches/series
+++ b/debian/_base/applications/utilities/filelight/debian/patches/series
diff --git a/debian/_base/applications/filelight/debian/rules b/debian/_base/applications/utilities/filelight/debian/rules
index 9f556724c..9f556724c 100755
--- a/debian/_base/applications/filelight/debian/rules
+++ b/debian/_base/applications/utilities/filelight/debian/rules
diff --git a/debian/_base/applications/kvirc/debian/source/format b/debian/_base/applications/utilities/filelight/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kvirc/debian/source/format
+++ b/debian/_base/applications/utilities/filelight/debian/source/format
diff --git a/debian/_base/applications/kvirc/debian/source/options b/debian/_base/applications/utilities/filelight/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kvirc/debian/source/options
+++ b/debian/_base/applications/utilities/filelight/debian/source/options
diff --git a/debian/_base/applications/wlassistant/debian/README.Debian b/debian/_base/applications/utilities/kbarcode/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/_base/applications/wlassistant/debian/README.Debian
+++ b/debian/_base/applications/utilities/kbarcode/debian/README.Debian
diff --git a/debian/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/krusader/debian/cdbs/versions.pl b/debian/_base/applications/utilities/kbarcode/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/krusader/debian/cdbs/versions.pl
+++ b/debian/_base/applications/utilities/kbarcode/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kbarcode/debian/changelog b/debian/_base/applications/utilities/kbarcode/debian/changelog
index df15715c2..df15715c2 100644
--- a/debian/_base/applications/kbarcode/debian/changelog
+++ b/debian/_base/applications/utilities/kbarcode/debian/changelog
diff --git a/debian/_base/applications/kwin-style-crystal/debian/compat b/debian/_base/applications/utilities/kbarcode/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/kwin-style-crystal/debian/compat
+++ b/debian/_base/applications/utilities/kbarcode/debian/compat
diff --git a/debian/_base/applications/kbarcode/debian/control b/debian/_base/applications/utilities/kbarcode/debian/control
index f1e938799..f1e938799 100644
--- a/debian/_base/applications/kbarcode/debian/control
+++ b/debian/_base/applications/utilities/kbarcode/debian/control
diff --git a/debian/_base/applications/kbarcode/debian/copyright b/debian/_base/applications/utilities/kbarcode/debian/copyright
index 37bf717a2..37bf717a2 100644
--- a/debian/_base/applications/kbarcode/debian/copyright
+++ b/debian/_base/applications/utilities/kbarcode/debian/copyright
diff --git a/debian/_base/applications/kstreamripper/debian/docs b/debian/_base/applications/utilities/kbarcode/debian/docs
index 724e08449..724e08449 100644
--- a/debian/_base/applications/kstreamripper/debian/docs
+++ b/debian/_base/applications/utilities/kbarcode/debian/docs
diff --git a/debian/_base/applications/kbarcode/debian/kbarcode.1 b/debian/_base/applications/utilities/kbarcode/debian/kbarcode.1
index 12d3bfaad..12d3bfaad 100644
--- a/debian/_base/applications/kbarcode/debian/kbarcode.1
+++ b/debian/_base/applications/utilities/kbarcode/debian/kbarcode.1
diff --git a/debian/_base/applications/kbarcode/debian/menu b/debian/_base/applications/utilities/kbarcode/debian/menu
index 48b3f8eff..48b3f8eff 100644
--- a/debian/_base/applications/kbarcode/debian/menu
+++ b/debian/_base/applications/utilities/kbarcode/debian/menu
diff --git a/debian/_base/applications/soundkonverter/debian/patches/.gitignore b/debian/_base/applications/utilities/kbarcode/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/soundkonverter/debian/patches/.gitignore
+++ b/debian/_base/applications/utilities/kbarcode/debian/patches/.gitignore
diff --git a/debian/_base/applications/kbarcode/debian/rules b/debian/_base/applications/utilities/kbarcode/debian/rules
index 10dc9a9a8..10dc9a9a8 100755
--- a/debian/_base/applications/kbarcode/debian/rules
+++ b/debian/_base/applications/utilities/kbarcode/debian/rules
diff --git a/debian/_base/applications/kbarcode/debian/source.lintian-overrides b/debian/_base/applications/utilities/kbarcode/debian/source.lintian-overrides
index cb165370f..cb165370f 100644
--- a/debian/_base/applications/kbarcode/debian/source.lintian-overrides
+++ b/debian/_base/applications/utilities/kbarcode/debian/source.lintian-overrides
diff --git a/debian/_base/applications/kvkbd/debian/source/format b/debian/_base/applications/utilities/kbarcode/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kvkbd/debian/source/format
+++ b/debian/_base/applications/utilities/kbarcode/debian/source/format
diff --git a/debian/_base/applications/kvkbd/debian/source/options b/debian/_base/applications/utilities/kbarcode/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kvkbd/debian/source/options
+++ b/debian/_base/applications/utilities/kbarcode/debian/source/options
diff --git a/debian/_base/applications/kbarcode/debian/watch b/debian/_base/applications/utilities/kbarcode/debian/watch
index f0291570e..f0291570e 100644
--- a/debian/_base/applications/kbarcode/debian/watch
+++ b/debian/_base/applications/utilities/kbarcode/debian/watch
diff --git a/debian/_base/applications/kchmviewer/debian/additions/kchmviewer.1 b/debian/_base/applications/utilities/kchmviewer/debian/additions/kchmviewer.1
index 8598644e6..8598644e6 100644
--- a/debian/_base/applications/kchmviewer/debian/additions/kchmviewer.1
+++ b/debian/_base/applications/utilities/kchmviewer/debian/additions/kchmviewer.1
diff --git a/debian/_base/applications/kchmviewer/debian/changelog b/debian/_base/applications/utilities/kchmviewer/debian/changelog
index 91fe29383..91fe29383 100644
--- a/debian/_base/applications/kchmviewer/debian/changelog
+++ b/debian/_base/applications/utilities/kchmviewer/debian/changelog
diff --git a/debian/_base/applications/piklab/debian/compat b/debian/_base/applications/utilities/kchmviewer/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/piklab/debian/compat
+++ b/debian/_base/applications/utilities/kchmviewer/debian/compat
diff --git a/debian/_base/applications/kchmviewer/debian/control b/debian/_base/applications/utilities/kchmviewer/debian/control
index 717e0f3ba..717e0f3ba 100644
--- a/debian/_base/applications/kchmviewer/debian/control
+++ b/debian/_base/applications/utilities/kchmviewer/debian/control
diff --git a/debian/_base/applications/kchmviewer/debian/copyright b/debian/_base/applications/utilities/kchmviewer/debian/copyright
index b221828b7..b221828b7 100644
--- a/debian/_base/applications/kchmviewer/debian/copyright
+++ b/debian/_base/applications/utilities/kchmviewer/debian/copyright
diff --git a/debian/_base/applications/kchmviewer/debian/debiandirs b/debian/_base/applications/utilities/kchmviewer/debian/debiandirs
index 22e3692f0..22e3692f0 100644
--- a/debian/_base/applications/kchmviewer/debian/debiandirs
+++ b/debian/_base/applications/utilities/kchmviewer/debian/debiandirs
diff --git a/debian/_base/applications/kchmviewer/debian/dirs b/debian/_base/applications/utilities/kchmviewer/debian/dirs
index 9d345cd36..9d345cd36 100644
--- a/debian/_base/applications/kchmviewer/debian/dirs
+++ b/debian/_base/applications/utilities/kchmviewer/debian/dirs
diff --git a/debian/_base/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages b/debian/_base/applications/utilities/kchmviewer/debian/kchmviewer-nokde-trinity.manpages
index eb0e0bf59..eb0e0bf59 100644
--- a/debian/_base/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages
+++ b/debian/_base/applications/utilities/kchmviewer/debian/kchmviewer-nokde-trinity.manpages
diff --git a/debian/_base/applications/kchmviewer/debian/manpages b/debian/_base/applications/utilities/kchmviewer/debian/manpages
index eb0e0bf59..eb0e0bf59 100644
--- a/debian/_base/applications/kchmviewer/debian/manpages
+++ b/debian/_base/applications/utilities/kchmviewer/debian/manpages
diff --git a/debian/_base/applications/kchmviewer/debian/menu b/debian/_base/applications/utilities/kchmviewer/debian/menu
index 00508b25c..00508b25c 100644
--- a/debian/_base/applications/kchmviewer/debian/menu
+++ b/debian/_base/applications/utilities/kchmviewer/debian/menu
diff --git a/debian/_base/applications/yakuake/debian/patches/.gitignore b/debian/_base/applications/utilities/kchmviewer/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/yakuake/debian/patches/.gitignore
+++ b/debian/_base/applications/utilities/kchmviewer/debian/patches/.gitignore
diff --git a/debian/_base/applications/kchmviewer/debian/rules b/debian/_base/applications/utilities/kchmviewer/debian/rules
index 0fdbf1173..0fdbf1173 100755
--- a/debian/_base/applications/kchmviewer/debian/rules
+++ b/debian/_base/applications/utilities/kchmviewer/debian/rules
diff --git a/debian/_base/applications/kvpnc/debian/source/format b/debian/_base/applications/utilities/kchmviewer/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kvpnc/debian/source/format
+++ b/debian/_base/applications/utilities/kchmviewer/debian/source/format
diff --git a/debian/_base/applications/kvpnc/debian/source/options b/debian/_base/applications/utilities/kchmviewer/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kvpnc/debian/source/options
+++ b/debian/_base/applications/utilities/kchmviewer/debian/source/options
diff --git a/debian/_base/applications/kchmviewer/debian/watch b/debian/_base/applications/utilities/kchmviewer/debian/watch
index e55a5c924..e55a5c924 100644
--- a/debian/_base/applications/kchmviewer/debian/watch
+++ b/debian/_base/applications/utilities/kchmviewer/debian/watch
diff --git a/debian/_base/applications/ktorrent/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/ktorrent/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/ksystemlog/debian/cdbs/versions.pl b/debian/_base/applications/utilities/kcpuload/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/ksystemlog/debian/cdbs/versions.pl
+++ b/debian/_base/applications/utilities/kcpuload/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kcpuload/debian/changelog b/debian/_base/applications/utilities/kcpuload/debian/changelog
index 16264ec9d..16264ec9d 100644
--- a/debian/_base/applications/kcpuload/debian/changelog
+++ b/debian/_base/applications/utilities/kcpuload/debian/changelog
diff --git a/debian/_base/applications/potracegui/debian/compat b/debian/_base/applications/utilities/kcpuload/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/potracegui/debian/compat
+++ b/debian/_base/applications/utilities/kcpuload/debian/compat
diff --git a/debian/_base/applications/kcpuload/debian/control b/debian/_base/applications/utilities/kcpuload/debian/control
index e29335e61..e29335e61 100644
--- a/debian/_base/applications/kcpuload/debian/control
+++ b/debian/_base/applications/utilities/kcpuload/debian/control
diff --git a/debian/_base/applications/kcpuload/debian/copyright b/debian/_base/applications/utilities/kcpuload/debian/copyright
index a5ee5d69c..a5ee5d69c 100644
--- a/debian/_base/applications/kcpuload/debian/copyright
+++ b/debian/_base/applications/utilities/kcpuload/debian/copyright
diff --git a/debian/_base/applications/kcpuload/debian/doc-base b/debian/_base/applications/utilities/kcpuload/debian/doc-base
index 59af0de31..59af0de31 100644
--- a/debian/_base/applications/kcpuload/debian/doc-base
+++ b/debian/_base/applications/utilities/kcpuload/debian/doc-base
diff --git a/debian/_base/applications/kcpuload/debian/docs b/debian/_base/applications/utilities/kcpuload/debian/docs
index 63c61960c..63c61960c 100644
--- a/debian/_base/applications/kcpuload/debian/docs
+++ b/debian/_base/applications/utilities/kcpuload/debian/docs
diff --git a/debian/_base/applications/kcpuload/debian/kcpuload.1 b/debian/_base/applications/utilities/kcpuload/debian/kcpuload.1
index 0eb630559..0eb630559 100644
--- a/debian/_base/applications/kcpuload/debian/kcpuload.1
+++ b/debian/_base/applications/utilities/kcpuload/debian/kcpuload.1
diff --git a/debian/_base/applications/kcpuload/debian/kcpuload.install b/debian/_base/applications/utilities/kcpuload/debian/kcpuload.install
index d3c2fb81c..d3c2fb81c 100644
--- a/debian/_base/applications/kcpuload/debian/kcpuload.install
+++ b/debian/_base/applications/utilities/kcpuload/debian/kcpuload.install
diff --git a/debian/_base/applications/kcpuload/debian/kcpuload.xpm b/debian/_base/applications/utilities/kcpuload/debian/kcpuload.xpm
index 3c49eab7e..3c49eab7e 100644
--- a/debian/_base/applications/kcpuload/debian/kcpuload.xpm
+++ b/debian/_base/applications/utilities/kcpuload/debian/kcpuload.xpm
diff --git a/debian/_base/applications/kdbusnotification/debian/links b/debian/_base/applications/utilities/kcpuload/debian/links
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kdbusnotification/debian/links
+++ b/debian/_base/applications/utilities/kcpuload/debian/links
diff --git a/debian/_base/applications/kcpuload/debian/menu b/debian/_base/applications/utilities/kcpuload/debian/menu
index 684348e2f..684348e2f 100644
--- a/debian/_base/applications/kcpuload/debian/menu
+++ b/debian/_base/applications/utilities/kcpuload/debian/menu
diff --git a/debian/_base/applications/kcpuload/debian/override b/debian/_base/applications/utilities/kcpuload/debian/override
index e3c6bcea4..e3c6bcea4 100644
--- a/debian/_base/applications/kcpuload/debian/override
+++ b/debian/_base/applications/utilities/kcpuload/debian/override
diff --git a/debian/_base/applications/kcpuload/debian/rules b/debian/_base/applications/utilities/kcpuload/debian/rules
index bc0e82531..bc0e82531 100755
--- a/debian/_base/applications/kcpuload/debian/rules
+++ b/debian/_base/applications/utilities/kcpuload/debian/rules
diff --git a/debian/_base/applications/kcpuload/debian/source.lintian-overrides b/debian/_base/applications/utilities/kcpuload/debian/source.lintian-overrides
index 417f308dc..417f308dc 100644
--- a/debian/_base/applications/kcpuload/debian/source.lintian-overrides
+++ b/debian/_base/applications/utilities/kcpuload/debian/source.lintian-overrides
diff --git a/debian/_base/applications/kwin-style-crystal/debian/source/format b/debian/_base/applications/utilities/kcpuload/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/kwin-style-crystal/debian/source/format
+++ b/debian/_base/applications/utilities/kcpuload/debian/source/format
diff --git a/debian/_base/applications/kwin-style-crystal/debian/source/options b/debian/_base/applications/utilities/kcpuload/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/kwin-style-crystal/debian/source/options
+++ b/debian/_base/applications/utilities/kcpuload/debian/source/options
diff --git a/debian/_base/applications/kuickshow/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kuickshow/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/ktorrent/debian/cdbs/versions.pl b/debian/_base/applications/utilities/kdirstat/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/ktorrent/debian/cdbs/versions.pl
+++ b/debian/_base/applications/utilities/kdirstat/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kdirstat/debian/changelog b/debian/_base/applications/utilities/kdirstat/debian/changelog
index bf0c6d43b..bf0c6d43b 100644
--- a/debian/_base/applications/kdirstat/debian/changelog
+++ b/debian/_base/applications/utilities/kdirstat/debian/changelog
diff --git a/debian/_base/applications/rosegarden/debian/compat b/debian/_base/applications/utilities/kdirstat/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/rosegarden/debian/compat
+++ b/debian/_base/applications/utilities/kdirstat/debian/compat
diff --git a/debian/_base/applications/kdirstat/debian/control b/debian/_base/applications/utilities/kdirstat/debian/control
index afda493ee..afda493ee 100644
--- a/debian/_base/applications/kdirstat/debian/control
+++ b/debian/_base/applications/utilities/kdirstat/debian/control
diff --git a/debian/_base/applications/kdirstat/debian/copyright b/debian/_base/applications/utilities/kdirstat/debian/copyright
index 5230f7951..5230f7951 100644
--- a/debian/_base/applications/kdirstat/debian/copyright
+++ b/debian/_base/applications/utilities/kdirstat/debian/copyright
diff --git a/debian/_base/applications/kdirstat/debian/kdirstat.1 b/debian/_base/applications/utilities/kdirstat/debian/kdirstat.1
index e58ff535c..e58ff535c 100644
--- a/debian/_base/applications/kdirstat/debian/kdirstat.1
+++ b/debian/_base/applications/utilities/kdirstat/debian/kdirstat.1
diff --git a/debian/_base/applications/kdirstat/debian/kdirstat.manpages b/debian/_base/applications/utilities/kdirstat/debian/kdirstat.manpages
index 3e4bf7ff8..3e4bf7ff8 100644
--- a/debian/_base/applications/kdirstat/debian/kdirstat.manpages
+++ b/debian/_base/applications/utilities/kdirstat/debian/kdirstat.manpages
diff --git a/debian/_base/applications/ktorrent/debian/patches/series b/debian/_base/applications/utilities/kdirstat/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/ktorrent/debian/patches/series
+++ b/debian/_base/applications/utilities/kdirstat/debian/patches/series
diff --git a/debian/_base/applications/kdirstat/debian/rules b/debian/_base/applications/utilities/kdirstat/debian/rules
index efa4effa0..efa4effa0 100755
--- a/debian/_base/applications/kdirstat/debian/rules
+++ b/debian/_base/applications/utilities/kdirstat/debian/rules
diff --git a/debian/_base/applications/kdirstat/debian/source.lintian-overrides b/debian/_base/applications/utilities/kdirstat/debian/source.lintian-overrides
index aad24dd30..aad24dd30 100644
--- a/debian/_base/applications/kdirstat/debian/source.lintian-overrides
+++ b/debian/_base/applications/utilities/kdirstat/debian/source.lintian-overrides
diff --git a/debian/_base/applications/piklab/debian/source/format b/debian/_base/applications/utilities/kdirstat/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/piklab/debian/source/format
+++ b/debian/_base/applications/utilities/kdirstat/debian/source/format
diff --git a/debian/_base/applications/piklab/debian/source/options b/debian/_base/applications/utilities/kdirstat/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/piklab/debian/source/options
+++ b/debian/_base/applications/utilities/kdirstat/debian/source/options
diff --git a/debian/_base/applications/kdirstat/debian/watch b/debian/_base/applications/utilities/kdirstat/debian/watch
index 6dc72cf03..6dc72cf03 100644
--- a/debian/_base/applications/kdirstat/debian/watch
+++ b/debian/_base/applications/utilities/kdirstat/debian/watch
diff --git a/debian/_base/applications/kvkbd/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kvkbd/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kuickshow/debian/cdbs/versions.pl b/debian/_base/applications/utilities/keep/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kuickshow/debian/cdbs/versions.pl
+++ b/debian/_base/applications/utilities/keep/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/keep/debian/changelog b/debian/_base/applications/utilities/keep/debian/changelog
index 4cbeb0449..4cbeb0449 100644
--- a/debian/_base/applications/keep/debian/changelog
+++ b/debian/_base/applications/utilities/keep/debian/changelog
diff --git a/debian/_base/applications/smartcardauth/debian/compat b/debian/_base/applications/utilities/keep/debian/compat
index 7f8f011eb..7f8f011eb 100755..100644
--- a/debian/_base/applications/smartcardauth/debian/compat
+++ b/debian/_base/applications/utilities/keep/debian/compat
diff --git a/debian/_base/applications/keep/debian/control b/debian/_base/applications/utilities/keep/debian/control
index 40c489eb6..40c489eb6 100644
--- a/debian/_base/applications/keep/debian/control
+++ b/debian/_base/applications/utilities/keep/debian/control
diff --git a/debian/_base/applications/keep/debian/copyright b/debian/_base/applications/utilities/keep/debian/copyright
index ee2494fd8..ee2494fd8 100644
--- a/debian/_base/applications/keep/debian/copyright
+++ b/debian/_base/applications/utilities/keep/debian/copyright
diff --git a/debian/_base/applications/ktechlab/debian/docs b/debian/_base/applications/utilities/keep/debian/docs
index 724e08449..724e08449 100644
--- a/debian/_base/applications/ktechlab/debian/docs
+++ b/debian/_base/applications/utilities/keep/debian/docs
diff --git a/debian/_base/applications/keep/debian/keep.xml b/debian/_base/applications/utilities/keep/debian/keep.xml
index 31432279d..31432279d 100644
--- a/debian/_base/applications/keep/debian/keep.xml
+++ b/debian/_base/applications/utilities/keep/debian/keep.xml
diff --git a/debian/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/debian/_base/applications/utilities/keep/debian/patches/kubuntu_01_kdepot.diff
index 55238c41a..55238c41a 100644
--- a/debian/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff
+++ b/debian/_base/applications/utilities/keep/debian/patches/kubuntu_01_kdepot.diff
diff --git a/debian/_base/applications/keep/debian/patches/series b/debian/_base/applications/utilities/keep/debian/patches/series
index 9ccf4a125..9ccf4a125 100644
--- a/debian/_base/applications/keep/debian/patches/series
+++ b/debian/_base/applications/utilities/keep/debian/patches/series
diff --git a/debian/_base/applications/keep/debian/rules b/debian/_base/applications/utilities/keep/debian/rules
index de615b1f4..de615b1f4 100755
--- a/debian/_base/applications/keep/debian/rules
+++ b/debian/_base/applications/utilities/keep/debian/rules
diff --git a/debian/_base/applications/potracegui/debian/source/format b/debian/_base/applications/utilities/keep/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/potracegui/debian/source/format
+++ b/debian/_base/applications/utilities/keep/debian/source/format
diff --git a/debian/_base/applications/potracegui/debian/source/options b/debian/_base/applications/utilities/keep/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/potracegui/debian/source/options
+++ b/debian/_base/applications/utilities/keep/debian/source/options
diff --git a/debian/_base/applications/keep/debian/watch b/debian/_base/applications/utilities/keep/debian/watch
index db207d2d8..db207d2d8 100644
--- a/debian/_base/applications/keep/debian/watch
+++ b/debian/_base/applications/utilities/keep/debian/watch
diff --git a/debian/_base/applications/kwin-style-crystal/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/kerry/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/kwin-style-crystal/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/kerry/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kvkbd/debian/cdbs/versions.pl b/debian/_base/applications/utilities/kerry/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kvkbd/debian/cdbs/versions.pl
+++ b/debian/_base/applications/utilities/kerry/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/kerry/debian/changelog b/debian/_base/applications/utilities/kerry/debian/changelog
index 3f36fe40e..3f36fe40e 100644
--- a/debian/_base/applications/kerry/debian/changelog
+++ b/debian/_base/applications/utilities/kerry/debian/changelog
diff --git a/debian/_base/applications/smb4k/debian/compat b/debian/_base/applications/utilities/kerry/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/smb4k/debian/compat
+++ b/debian/_base/applications/utilities/kerry/debian/compat
diff --git a/debian/_base/applications/kerry/debian/control b/debian/_base/applications/utilities/kerry/debian/control
index 009796741..009796741 100644
--- a/debian/_base/applications/kerry/debian/control
+++ b/debian/_base/applications/utilities/kerry/debian/control
diff --git a/debian/_base/applications/kerry/debian/copyright b/debian/_base/applications/utilities/kerry/debian/copyright
index 96a9180c9..96a9180c9 100644
--- a/debian/_base/applications/kerry/debian/copyright
+++ b/debian/_base/applications/utilities/kerry/debian/copyright
diff --git a/debian/_base/applications/kerry/debian/kerry.1.docbook b/debian/_base/applications/utilities/kerry/debian/kerry.1.docbook
index 49eb68460..49eb68460 100644
--- a/debian/_base/applications/kerry/debian/kerry.1.docbook
+++ b/debian/_base/applications/utilities/kerry/debian/kerry.1.docbook
diff --git a/debian/_base/applications/kuickshow/debian/patches/series b/debian/_base/applications/utilities/kerry/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kuickshow/debian/patches/series
+++ b/debian/_base/applications/utilities/kerry/debian/patches/series
diff --git a/debian/_base/applications/kerry/debian/postinst b/debian/_base/applications/utilities/kerry/debian/postinst
index 98c4063a3..98c4063a3 100644
--- a/debian/_base/applications/kerry/debian/postinst
+++ b/debian/_base/applications/utilities/kerry/debian/postinst
diff --git a/debian/_base/applications/kerry/debian/postrm b/debian/_base/applications/utilities/kerry/debian/postrm
index d1ae3b96c..d1ae3b96c 100644
--- a/debian/_base/applications/kerry/debian/postrm
+++ b/debian/_base/applications/utilities/kerry/debian/postrm
diff --git a/debian/_base/applications/kerry/debian/rules b/debian/_base/applications/utilities/kerry/debian/rules
index 547944ca0..547944ca0 100755
--- a/debian/_base/applications/kerry/debian/rules
+++ b/debian/_base/applications/utilities/kerry/debian/rules
diff --git a/debian/_base/applications/rosegarden/debian/source/format b/debian/_base/applications/utilities/kerry/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/rosegarden/debian/source/format
+++ b/debian/_base/applications/utilities/kerry/debian/source/format
diff --git a/debian/_base/applications/rosegarden/debian/source/options b/debian/_base/applications/utilities/kerry/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/rosegarden/debian/source/options
+++ b/debian/_base/applications/utilities/kerry/debian/source/options
diff --git a/debian/_base/applications/knutclient/debian/changelog b/debian/_base/applications/utilities/knutclient/debian/changelog
index e63f05435..e63f05435 100644
--- a/debian/_base/applications/knutclient/debian/changelog
+++ b/debian/_base/applications/utilities/knutclient/debian/changelog
diff --git a/debian/_base/applications/soundkonverter/debian/compat b/debian/_base/applications/utilities/knutclient/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/soundkonverter/debian/compat
+++ b/debian/_base/applications/utilities/knutclient/debian/compat
diff --git a/debian/_base/applications/knutclient/debian/control b/debian/_base/applications/utilities/knutclient/debian/control
index 5312ffe33..5312ffe33 100644
--- a/debian/_base/applications/knutclient/debian/control
+++ b/debian/_base/applications/utilities/knutclient/debian/control
diff --git a/debian/_base/applications/knutclient/debian/copyright b/debian/_base/applications/utilities/knutclient/debian/copyright
index 2d9b4b658..2d9b4b658 100644
--- a/debian/_base/applications/knutclient/debian/copyright
+++ b/debian/_base/applications/utilities/knutclient/debian/copyright
diff --git a/debian/_base/applications/knutclient/debian/knutclient.1x b/debian/_base/applications/utilities/knutclient/debian/knutclient.1x
index 231658277..231658277 100644
--- a/debian/_base/applications/knutclient/debian/knutclient.1x
+++ b/debian/_base/applications/utilities/knutclient/debian/knutclient.1x
diff --git a/debian/_base/applications/knutclient/debian/knutclient.menu b/debian/_base/applications/utilities/knutclient/debian/knutclient.menu
index a520f80ba..a520f80ba 100644
--- a/debian/_base/applications/knutclient/debian/knutclient.menu
+++ b/debian/_base/applications/utilities/knutclient/debian/knutclient.menu
diff --git a/debian/_base/applications/knutclient/debian/preinst b/debian/_base/applications/utilities/knutclient/debian/preinst
index 17d2ead82..17d2ead82 100644
--- a/debian/_base/applications/knutclient/debian/preinst
+++ b/debian/_base/applications/utilities/knutclient/debian/preinst
diff --git a/debian/_base/applications/knutclient/debian/rules b/debian/_base/applications/utilities/knutclient/debian/rules
index a009dbf98..a009dbf98 100755
--- a/debian/_base/applications/knutclient/debian/rules
+++ b/debian/_base/applications/utilities/knutclient/debian/rules
diff --git a/debian/_base/applications/smartcardauth/debian/source/format b/debian/_base/applications/utilities/knutclient/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/smartcardauth/debian/source/format
+++ b/debian/_base/applications/utilities/knutclient/debian/source/format
diff --git a/debian/_base/applications/smartcardauth/debian/source/options b/debian/_base/applications/utilities/knutclient/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/smartcardauth/debian/source/options
+++ b/debian/_base/applications/utilities/knutclient/debian/source/options
diff --git a/debian/_base/applications/knutclient/debian/watch b/debian/_base/applications/utilities/knutclient/debian/watch
index 231bd3e50..231bd3e50 100644
--- a/debian/_base/applications/knutclient/debian/watch
+++ b/debian/_base/applications/utilities/knutclient/debian/watch
diff --git a/debian/_base/applications/rosegarden/debian/cdbs/debian-tde.mk b/debian/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/rosegarden/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/kwin-style-crystal/debian/cdbs/versions.pl b/debian/_base/applications/utilities/krename/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/kwin-style-crystal/debian/cdbs/versions.pl
+++ b/debian/_base/applications/utilities/krename/debian/cdbs/versions.pl
diff --git a/debian/_base/applications/krename/debian/changelog b/debian/_base/applications/utilities/krename/debian/changelog
index d574638b6..d574638b6 100644
--- a/debian/_base/applications/krename/debian/changelog
+++ b/debian/_base/applications/utilities/krename/debian/changelog
diff --git a/debian/_base/applications/tellico/debian/compat b/debian/_base/applications/utilities/krename/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/tellico/debian/compat
+++ b/debian/_base/applications/utilities/krename/debian/compat
diff --git a/debian/_base/applications/krename/debian/control b/debian/_base/applications/utilities/krename/debian/control
index a05fa0309..a05fa0309 100644
--- a/debian/_base/applications/krename/debian/control
+++ b/debian/_base/applications/utilities/krename/debian/control
diff --git a/debian/_base/applications/krename/debian/copyright b/debian/_base/applications/utilities/krename/debian/copyright
index e90f32cab..e90f32cab 100644
--- a/debian/_base/applications/krename/debian/copyright
+++ b/debian/_base/applications/utilities/krename/debian/copyright
diff --git a/debian/_base/applications/piklab/debian/docs b/debian/_base/applications/utilities/krename/debian/docs
index 724e08449..724e08449 100644
--- a/debian/_base/applications/piklab/debian/docs
+++ b/debian/_base/applications/utilities/krename/debian/docs
diff --git a/debian/_base/applications/krename/debian/krename.1 b/debian/_base/applications/utilities/krename/debian/krename.1
index 153c74797..153c74797 100644
--- a/debian/_base/applications/krename/debian/krename.1
+++ b/debian/_base/applications/utilities/krename/debian/krename.1
diff --git a/debian/_base/applications/krename/debian/krename.manpages b/debian/_base/applications/utilities/krename/debian/krename.manpages
index ded8f6473..ded8f6473 100644
--- a/debian/_base/applications/krename/debian/krename.manpages
+++ b/debian/_base/applications/utilities/krename/debian/krename.manpages
diff --git a/debian/_base/applications/kvirc/debian/patches/series b/debian/_base/applications/utilities/krename/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kvirc/debian/patches/series
+++ b/debian/_base/applications/utilities/krename/debian/patches/series
diff --git a/debian/_base/applications/krename/debian/rules b/debian/_base/applications/utilities/krename/debian/rules
index d43628ccb..d43628ccb 100755
--- a/debian/_base/applications/krename/debian/rules
+++ b/debian/_base/applications/utilities/krename/debian/rules
diff --git a/debian/_base/applications/smb4k/debian/source/format b/debian/_base/applications/utilities/krename/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/smb4k/debian/source/format
+++ b/debian/_base/applications/utilities/krename/debian/source/format
diff --git a/debian/_base/applications/smb4k/debian/source/options b/debian/_base/applications/utilities/krename/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/smb4k/debian/source/options
+++ b/debian/_base/applications/utilities/krename/debian/source/options
diff --git a/debian/_base/applications/krename/debian/watch b/debian/_base/applications/utilities/krename/debian/watch
index 47a31479a..47a31479a 100644
--- a/debian/_base/applications/krename/debian/watch
+++ b/debian/_base/applications/utilities/krename/debian/watch
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
deleted file mode 100644
index ca324be99..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ /dev/null
@@ -1,14 +0,0 @@
-debian/install-mp3			/usr/lib/amarok
-amarok/src/engine/xine/amarok_xine-mp3_install.desktop /usr/share/services
-Depend on amarok-xine | amarok-engine
-export KUBUNTU_DESKTOP_POT=extragear-multimedia_amarok
-install debian/kubuntu-media-amarok and debian/amarok_play_audiocd.desktop in amarok.install
-chmod x debian/amarok/usr/bin/kubuntu-media-amarok in debian/rules in section
-	common-binary-post-install-arch::
-remove amarok-common.lintian, amarok.lintian
-make watch file actually work
-
-#### due to removal of KDE 3 packages ####
-remove kdemultimedia-dev, kdebase-dev from Build-Depends
-remove amarok-konqsidebar, kdemultimedia-kio-plugins from Recommends
-remove complete amarok-konqsidebar package
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/README.Debian b/ubuntu/_base/applications/amarok.cmake/debian/README.Debian
deleted file mode 100644
index 7dc17fb17..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/README.Debian
+++ /dev/null
@@ -1,28 +0,0 @@
-Amarok packages for Debian
-==========================
-
-  A couple of notes which you may find useful:
-
-    - starting with Amarok 1.4, lyrics downloading is implemented in a
-      separate Ruby script;
-
-    - Last.fm stream support is also implemented with the help of a Ruby
-      script.
-
-    - if you want amarok to be able to play CDs, you need to install the
-      kdemultimedia-kio-plugins package.
-
-    - the scripts available in the 'Scripts' menu need that you install
-      some other packages for them to work. Those packages are listed in
-      the Suggests: field of the amarok package.
-
-  Also, users not using the full KDE environment may get the following
-  error when executing amarok for the first time: "Socket-path is not a
-  link or a directory: /home/$USER/.kde/socket-$HOSTNAME". Just execute:
-
-    $ lnusertemp socket
-
-  Note that you only need to execute it once, not each time that you
-  start Amarok.
-
- -- Adeodato Simó <dato@net.com.org.es>
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/amarok-common-trinity.install b/ubuntu/_base/applications/amarok.cmake/debian/amarok-common-trinity.install
deleted file mode 100644
index 3b473baa0..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/amarok-common-trinity.install
+++ /dev/null
@@ -1,24 +0,0 @@
-debian/tmp/opt/trinity/share/apps/amarok/*
-debian/tmp/opt/trinity/share/apps/profiles/*
-debian/tmp/opt/trinity/share/doc/*
-debian/tmp/opt/trinity/share/icons/*
-debian/tmp/opt/trinity/share/locale/*
-debian/tmp/opt/trinity/share/config.kcfg/amarok.kcfg
-debian/tmp/opt/trinity/share/services/amarok_void-engine_plugin.desktop
-debian/tmp/opt/trinity/share/services/amarok_generic-mediadevice.desktop
-debian/tmp/opt/trinity/share/services/amarok_ifp-mediadevice.desktop
-debian/tmp/opt/trinity/share/services/amarok_ipod-mediadevice.desktop
-debian/tmp/opt/trinity/share/services/amarok_njb-mediadevice.desktop
-debian/tmp/opt/trinity/share/services/amarok_smb-device.desktop
-debian/tmp/opt/trinity/share/services/amarok_massstorage-device.desktop
-debian/tmp/opt/trinity/share/services/amarok_nfs-device.desktop
-debian/tmp/opt/trinity/share/services/amarok_daap-mediadevice.desktop
-
-#libkarma is not in MAIN yet
-#debian/tmp/opt/trinity/share/services/amarok_riokarma-mediadevice.desktop
-
-debian/tmp/opt/trinity/share/services/amarok_mtp-mediadevice.desktop
-debian/tmp/opt/trinity/bin/amarok_proxy.rb
-debian/tmp/opt/trinity/bin/amarok_daapserver.rb
-debian/tmp/etc/*
-
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install b/ubuntu/_base/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install
deleted file mode 100644
index c5e46604f..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/opt/trinity/share/services/amarok_xine-engine.desktop
-debian/tmp/opt/trinity/share/config.kcfg/xinecfg.kcfg
-debian/tmp/opt/trinity/lib/trinity/libamarok_xine-engine.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_xine-engine.la
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install b/ubuntu/_base/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install
deleted file mode 100644
index ab71ca6f9..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/opt/trinity/share/services/amarok_yauap-engine_plugin.desktop
-debian/tmp/opt/trinity/lib/trinity/libamarok_yauap-engine_plugin.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_yauap-engine_plugin.so
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/amarok-trinity.install b/ubuntu/_base/applications/amarok.cmake/debian/amarok-trinity.install
deleted file mode 100644
index f5aeb567f..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/amarok-trinity.install
+++ /dev/null
@@ -1,48 +0,0 @@
-debian/tmp/opt/trinity/share/applications/kde/amarok.desktop
-debian/tmp/opt/trinity/share/services/amarokitpc.protocol
-debian/tmp/opt/trinity/share/services/amaroklastfm.protocol
-debian/tmp/opt/trinity/share/services/amarokpcast.protocol
-debian/tmp/opt/trinity/share/servicetypes/amarok_plugin.desktop
-debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop 
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_ifp-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_ifp-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
-
-#libkarma is not in MAIN yet
-#debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.la
-#debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.so
-
-debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.so
-debian/tmp/opt/trinity/lib/ruby_lib/*           /opt/trinity/lib/ruby_lib/
-debian/tmp/opt/trinity/lib/libamarok.so.0
-debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
-debian/tmp/opt/trinity/bin/amarok
-debian/tmp/opt/trinity/bin/amarokapp
-debian/tmp/opt/trinity/bin/amarok_libvisual
-debian/tmp/opt/trinity/bin/amarokcollectionscanner
-
-debian/icons/*                          /opt/trinity/share/pixmaps
-
-amarok/src/engine/xine/amarok_xine-mp3_install.desktop /opt/trinity/share/services
-debian/amarok_play_audiocd.desktop /opt/trinity/share/apps/konqueror/servicemenus
-debian/kubuntu-media-amarok /opt/trinity/bin
-debian/install-mp3 /opt/trinity/lib/amarok
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/amarok-trinity.manpages b/ubuntu/_base/applications/amarok.cmake/debian/amarok-trinity.manpages
deleted file mode 100644
index 8094eebb9..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/amarok-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/amarokapp-trinity.1
-debian/man/amarok-trinity.1
-debian/man/amarokcollectionscanner-trinity.1
-debian/man/amarok_libvisual-trinity.1
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/amarok-trinity.menu b/ubuntu/_base/applications/amarok.cmake/debian/amarok-trinity.menu
deleted file mode 100644
index f78ef6060..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/amarok-trinity.menu
+++ /dev/null
@@ -1,8 +0,0 @@
-?package(amarok):\
-	needs="X11"\
-	section="Applications/Sound"\
-	hints="KDE"\
-	title="Amarok"\
-	icon32x32="/usr/share/pixmaps/amarok.xpm"\
-	icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
-	command="/opt/trinity/bin/amarok"
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/amarok_play_audiocd.desktop b/ubuntu/_base/applications/amarok.cmake/debian/amarok_play_audiocd.desktop
deleted file mode 100644
index 434630b60..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/amarok_play_audiocd.desktop
+++ /dev/null
@@ -1,46 +0,0 @@
-[Desktop Entry]
-ServiceTypes=media/audiocd
-Actions=Play;
-Encoding=UTF-8
-X-KDE-Priority=TopLevel
-
-[Desktop Action Play]
-Name=Play Audio CD with amaroK
-Name[ar]=قراءة قرص مدمج صوتي بواسطة amaroK
-Name[bg]=Възпроизвеждане на аудио CD с amaroK
-Name[bn]=ক্যাফিন দিয়ে অডিও সিডি চালাও
-Name[br]=Seniñ ur bladenn klevet gant amaroK
-Name[ca]=Reprodueix Audio CD amb amaroK
-Name[cs]=Pehrát audio CD amaroK
-Name[da]=Spil lyd-cd med amaroK
-Name[de]=Audio-CD mit amaroK abspielen
-Name[el]=Αναπαραγωγή CD ήχου με το amaroK
-Name[es]=Reproducir CD de audio con amaroK
-Name[et]=Esita audio-CD amaroK'is
-Name[fi]=Soita musiikki-cd amaroKssa
-Name[fr]=Jouer un CD Audio avec amaroK
-Name[ga]=Seinn CD Fuaime le amaroK
-Name[gl]=Reproducir o CD de Áudio con amaroK
-Name[he]=נגן תקליטור שמע עם amaroK
-Name[is]=Spila tónlistardisk með amaroK
-Name[it]=Riproduci CD audio con amaroK
-Name[ja]=amaroKで音楽CDを再生
-Name[ka]=აუდიო CD-ის დაკვრა amaroK-ით
-Name[km]=ចាក់​ស៊ីឌី​អូឌីយ៉ូ​​ជាមួយ amaroK
-Name[nb]=Spill lyd-CD med amaroK
-Name[nl]=Audio-cd met amaroK afspelen
-Name[nn]=Spel lyd-CD med amaroK
-Name[pa]=ਕੈਫੀਨ ਨਾਲ ਆਡੀਓ CD ਚਲਾਓ
-Name[pl]=Odtwarzaj audio CD w amaroK
-Name[pt]=Tocar o CD de Áudio com o amaroK
-Name[pt_BR]=Reproduzir o CD de Áudio com o amaroK
-Name[sr]=Пустио аудио CD amaroK-ом
-Name[sr@Latn]=Pustio audio CD amaroK-om
-Name[sv]=Spela ljud-cd med amaroK
-Name[tr]=amaroK ile Ses CD'si Çal
-Name[uk]=Програти аудіо-КД з amaroK
-Name[xx]=xxPlay Audio CD with amaroKxx
-Name[zh_CN]=用 amaroK 播放音频 CD
-Name[zh_TW]=使用 amaroK 播放音樂 CD
-Icon=amarok
-Exec=bash kubuntu-media-amarok %u
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/changelog b/ubuntu/_base/applications/amarok.cmake/debian/changelog
deleted file mode 100644
index dfc13c56b..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/changelog
+++ /dev/null
@@ -1,1586 +0,0 @@
-amarok-trinity (2:1.4.10-1ubuntu0) karmic; urgency=low
-
-  * Karmic rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
-
-amarok-trinity (2:1.4.10-0ubuntu5) jaunty; urgency=low
-
-  * Jaunty rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 28 April 2009 13:23:00 -0600
-
-amarok-trinity (2:1.4.10-0ubuntu4) intrepid; urgency=low
-
-  * Moved Trinity to /opt/trinity
-  * Integrated properly with KDE4.2+
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 20:08:00 -0600
-
-amarok-trinity (2:1.4.10-0ubuntu2) intrepid; urgency=low
-
-  * Fixed Debian MP3 autoinstaller
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 08 Dec 2008 15:59:00 -0600
-
-amarok-trinity (2:1.4.10-0ubuntu1) intrepid; urgency=low
-
-  * Added -trinity prefix
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 02 Dec 2008 22:55:00 -0600
-
-amarok (2:1.4.10-0ubuntu3) intrepid; urgency=low
-
-  * Add kubuntu_12_eject_command.diff, change eject command to
-    umount, we no longer have kdeeject
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 13 Oct 2008 22:16:22 +0100
-
-amarok (2:1.4.10-0ubuntu2) intrepid; urgency=low
-
-  * Update install-mp3 to use install-package
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 08 Sep 2008 14:30:40 +0100
-
-amarok (2:1.4.10-0ubuntu1) intrepid; urgency=low
-
-  * New upstream release
-  * Add kubuntu_11_fix_libmtp-0.3.0-API.diff
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Thu, 14 Aug 2008 18:04:13 +0200
-
-amarok (2:1.4.9.1-2ubuntu3) intrepid; urgency=low
-
-  * Add moodbar to the feature list
-  * Remove the amarok-engine virtual package, see debian version 1.4.8-2 for
-    reasoning
-  * amarok-common conflicts with amarok packages older than -2ubuntu1, but
-    doesn't replace them (LP: #244628)
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Mon, 30 Jun 2008 19:19:04 +0200
-
-amarok (2:1.4.9.1-2ubuntu2) intrepid; urgency=low
-
-  * Add manpages - unbreak build
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Fri, 27 Jun 2008 15:34:42 +0200
-
-amarok (2:1.4.9.1-2ubuntu1) intrepid; urgency=low
-
-  * Merge with Debian, remaining changes in debian/KUBUNTU-DEBIAN-DIFFERENCES 
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Wed, 25 Jun 2008 21:16:38 +0200
-
-amarok (1.4.9.1-2) unstable; urgency=medium
-
-  * Add 15_temptables_more_indices.diff patch which creates more indices for
-    some temporary tables that are used extensively while building collection
-    database. Apparently, SQLite 3.5.x is slower than 3.4.x when doing
-    matches on unindexed temporary table fields. This should solve (or improve
-    situation significantly) major performance problems with SQLite 3.5.x
-    (Closes: #479068). Urgency medium because this problem affects many 
-    lenny and sid Amarok users having rather large (15k+ songs) collections.
-
- -- Modestas Vainius <modestas@vainius.eu>  Sun, 11 May 2008 04:07:01 +0300
-
-amarok (1.4.9.1-1) unstable; urgency=low
-
-  * New upstream bugfix release:
-    - The last.fm dialog did not always properly disable options when the
-      username was not entered.
-    - Fix Amazon Cover fetching by using their new web service api.
-      (Closes: #474186)
-    - Don't insert items into Dynamic Mode that don't exist.
-    - If unavailable tracks are in the Playlist and random mode is on, don't
-    - stop those tracks if selected; continue with available tracks.
-  * Repackage original tarball as orig.tar.gz instead of doing tarball-in-orig
-    tarball thing. The previous way made patch testing and debugging more
-    painful unnecessarily.
-  * Resynchronize patches:
-    - 11_bug403340_cancel_rename_when_deleting_items.diff - fix offsets.
-    - 97_automake_cleanup.diff - adopt to upstream changes, fix offsets.
-  * Improve debian/rules stamp-automake and clean targets a bit not to rm
-    automake generated files uselessly (if they were not regenerated)
-
- -- Modestas Vainius <modestas@vainius.eu>  Fri, 11 Apr 2008 10:12:31 +0300
-
-amarok (1.4.8-2) unstable; urgency=low
-
-  * Remove Adeodato Simó from Uploaders by his request. Thank you Adeodato for
-    all your hard work!
-  * Remove amarok-gstreamer.install because there is no gstreamer engine
-    anymore.
-  * Remove overrides/amarok-arts. arts engine is no longer available.
-  * Drop internal cdbs/kde.mk in favour of the one shipped with cdbs. Merge
-    missing functionality (cvs-make/automake) into debian/rules.
-  * Auto-guess automake /usr/share directory.
-  * Rework interdependences among amarok and its engines' packages:
-    - Drop amarok-engine virtual package. Amarok and its engines ABI are not
-      even compatible between Amarok point releases so virtual package, which,
-      unfortunately, is versionless by definition, is not practical here.
-    - Rename engine packages to amarok-engine-$engine. Make them conflict
-      and replace previous amarok-$engine packages. Also make amarok conflict
-      with amarok-engine virtual package. All these changes will ensure that
-      partial upgrades from etch are not allowed (Closes: #432219).
-    - Make amarok depend on any of its engines of the same binary version
-      via alternate dependences. Default engine is amarok-engine-xine. Edit
-      amarok-engine-xine description accordingly.
-    - Make all amarok engines recommend amarok strictly of the same binary
-      version. Recommends instead of Depends here breaks circular dependency
-      (Closes: #368485).
-    - Downgrade amarok-engines to amarok Suggests.
-    - Convert amarok-engines package to arch:all because it's a metapackage.
-      Edit amarok-engines description because it's no longer going to be
-      installed by default.
-    - Add amarok-yauap to amarok-engines Suggests.
-  * New binary packages:
-    - amarok-common - arch:all package for architecture independent files
-      split from amarok. It recommends amarok (>= ${source:Version}) to
-      avoid circular dependency as in case of stricter "Depends" relationship.
-    - amarok-konqsidebar - split konqsidebar into its own binary package. The
-      reason for this is that it's incompatible with konqueror (>= 4:4.0.0)
-      and needs to _conflict_ with it (due to *.desktop files). Add
-      amarok-konqsidebar to amarok Recommends and amarok to amarok-konqsidebar
-      Depends.
-    - amarok-dbg - package with debugging symbols (Closes: #368840).
-    - amarok-engine-yauap - Yauap Commandline Audio Player engine
-      (Closes: #445371):
-      * Add libdbus-qt-1-dev to Build-Depends
-      * Pass --with-yauap to configure
-      * Add amarok-yauap.install
-      * Depend on yauap.
-  * Add "Homepage" field to debian/control source section, remove homepage
-    reference from amarok binary package description.
-  * Disable /usr/share/doc/amarok-* symlinks in debian/rules. They just
-    complicate packaging unnecessarily and make lintian unhappy.
-  * Ship only README from upstream source in /usr/share/doc/amarok.
-  * debian/README.Debian: remove a note about installing ruby, because it's
-    a dependency and gets installed anyway.
-  * New patches:
-    - 01_libtool_update.diff - use ltmain.sh and libtool.m4.in from Debian
-      libtool. This patch is used instead of previous `cp` in debian/rules,
-      because the patch 02_ below depends on it.
-    - 02_admin_cleanup.diff - admin/* cleanup patch.
-    - 97_automake_cleanup.diff - automake cleanup patch to get rid of excess
-      dependencies and shut dpkg-shlibdeps up. Superseeds previous
-      03_no_libadd_in_convenience_libs.diff patch.
-    - 11_bug403340_cancel_rename_when_deleting_items.diff - cancel a pending
-      'rename' request for the playlist item that is about to be deleted.
-       The patch solves a popular crash. (Closes: #403340).
-    - 12_devicemanager_dcopcall_no_timeout.diff - do not use timeout for dcop
-      calls. It's very unsafe because it might break further dcop calls such
-      as the one in the debian bug #432752 (Closes: #432752).
-    - 13_lastfm_crash_434835.diff - resolve lastfm crash which could be
-      triggered by switching away from lastfm track while it was still
-      handshaking or buffering (Closes: #434835). Thanks to Raphael for the
-      excelent instructions how to reproduce the crash.
-    - 14_ruby_libs_not_scripts.diff - remove #! stanzas from ruby library
-      files.
-  * Prepend sequence number to the filenames of existing debian/patches/*.
-    Edit debian/patches/series accordingly.
-  * Move Depends/Recommends on ruby, python & friends from amarok to
-    amarok-common since they scripts have been moved here.
-  * Add moodbar to amarok Suggests (Closes: #421420). Tweak amarok package
-    description accordingly.
-  * Add DM-Upload-Allowed: yes to debian/control source section.
-  * s/XS-Vcs/Vcs/ in debian/control.
-  * Drop DEB_DH_SHLIBDEPS_ARGS_amarok from debian/rules. No longer needed with
-    recent dpkg-shlibdeps.
-  * Build-Depend on debhelper (>= 5.0.0)
-  * Add executable permissions for some amarok scripts to make lintian happy.
-  * s/.NF/.nf/ in debian/amarok.1
-  * Drop DEB_INSTALL_DIRS_amarok from debian/rules. No longer needed.
-  * Use more accurate method to exclude (-X) amarok engines from being handled
-    by dh_makeshlibs instead of just DEB_DH_MAKESHLIBS_ARGS_ALL = -n.
-  * Do not amarok.install /usr/lib/libamarok.so and /usr/lib/libamarok.la.
-    They are devel-only and, hence, useless in the private library like
-    libamarok case.
-  * Install *.lintian files with overrides.
-  * Add manual pages: amarokapp.1 amarokcollectionscanner.1 amarok_libvisual.1
-  * Do not install COPYING files which are present in some script directories.
-    Also remove useless (according to lintian) MacOS X resource fork file
-    rubygems/._gem_commands.rb
-  * Exclude amarok from amarok-engine-* packages dependency lists.
-
- -- Modestas Vainius <modestas@vainius.eu>  Tue, 04 Mar 2008 15:28:46 +0200
-
-amarok (1.4.8-1) unstable; urgency=low
-
-  [ Adeodato Simó ]
-  * Build against libgpod-nogtk-dev.
-
-  * Update Build-Standards to 3.7.3:
-    + move menu entry to Applications/Sound.
-
-  * Build-depend on automake instead of automake1.9.
-
-  [ Modestas Vainius ]
-  * Add myself as maintainer with the permission from Adeodato Simó.
-  * Add Adeodato Simó as uploader.
-  * debian/control: drop Vcs-Bazaar field. amarok debian packaging is
-    now hosted at kde-extras svn repo therefore I'm adding appropriate
-    XS-Vcs-Svn and XS-Vcs-Browser fields.
-
-  * New upstream release (1.4.8) (Closes: #457352).
-  * Resync patches:
-    - proxy_lyrics.diff - removed, merged upstream.
-    - fix_gcc4.3_ftbfs.diff - removed, resolved upstream.
-  * Drop kdemultimedia-dev from Build-Depends. It's no longer needed.
-  * debian/rules: use /usr/share/automake-1.10 instead of *-1.9
-    because 'automake' package provides version 1.10.
-
- -- Modestas Vainius <modestas@vainius.eu>  Mon, 24 Dec 2007 23:10:02 +0200
-
-amarok (2:1.4.9.1-0ubuntu3) hardy; urgency=low
-
-  * Added kdebase-kio-plugins as a recommened package 
-
- -- Jonathan Aquilina <eagles051387@gmail.com>  Tue, 15 Apr 2008 14:24:23 +0200
-
-amarok (2:1.4.9.1-0ubuntu2) hardy; urgency=low
-
-  [ Daniel Hahler]
-  * debian/patches/kubuntu_08_add_lastfm_recommended_radio.diff:
-    Add lastfm recommended radio station (LP: #103227)
-  * debian/patches/kubuntu_09_audio_mimetypes.diff:
-    - Add mimetypes audio/flac and audio/ogg (LP: #201291)
-
-  [ Harald Sitter ]
-  * Unbreak manual media device configuration by enhancing
-    kubuntu_08_luks_device_detection.diff (LP: #207704)
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Sat, 12 Apr 2008 13:47:12 +0200
-
-amarok (2:1.4.9.1-0ubuntu1) hardy; urgency=low
-
-  * Upstream patch release
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 10 Apr 2008 23:07:12 +0100
-
-amarok (2:1.4.9-0ubuntu1) hardy; urgency=low
-
-  * New upstream release
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Wed, 09 Apr 2008 13:09:03 +0200
-
-amarok (2:1.4.8-0ubuntu5) hardy; urgency=low
-
-  * Added kubuntu_08_luks_device_detection.diff to ajust Amarok's
-    media device detection to properly work with kdebase's
-    LUKS patch kubuntu_9913_kiomedialuks.diff) (LP: #186384)
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Tue, 18 Mar 2008 01:10:01 +0100
-
-amarok (2:1.4.8-0ubuntu4) hardy; urgency=low
-
-  * Update install-mp3 to correctly error when something goes wrong
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Mar 2008 13:11:08 +0000
-
-amarok (2:1.4.8-0ubuntu3) hardy; urgency=low
-
-  [ Sven Boden ]
-  * Fix for bug "187406: Amarok install-mp3 fails silently" (LP #187406)
-
-  [ Sarah Hobbs ]
-  * Sponsored upload.  (Closes LP: #187406)
-  * Reworked patch to avoid setting absolute paths (eg /usr/bin/kdesu) 
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 12 Mar 2008 00:50:22 +1100
-
-amarok (2:1.4.8-0ubuntu2) hardy; urgency=low
-
-  * Fix install-mp3 installation path (LP: #179624)
-
- -- Guillaume Martres <smarter3@gmail.com>  Mon, 31 Dec 2007 11:50:29 +0100
-
-amarok (2:1.4.8-0ubuntu1) hardy; urgency=low
-
-  * New upstream release.
-  * Removed kubuntu_05_utf8_to_mtp_devices_fix.diff (applied upstream).
-  * Removed kubuntu_06_fix_amarok_freeze_installing_mp3.diff (applied upstream).
-  * Removed proxy_lyrics.diff (applied upstream).
-  * Removed overrides/ and it's content since there is no amarok-arts anymore.
-  * Removed amarok-gstreamer.install since there is no amarok-gstreamer anymore.
-  * Changed Standards-Version to 3.7.3.
-  * Moved "Homepage" from Description stanza to the source section.
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Mon, 17 Dec 2007 16:19:44 +0100
-
-amarok (2:1.4.7-2ubuntu5) hardy; urgency=low
-
-  * build without the libkerma-dev build dpendancy also ( realy fixed this
-    upload )
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Mon, 10 Dec 2007 01:56:48 -0600
-
-amarok (2:1.4.7-2ubuntu4) hardy; urgency=low
-
-  * build with --without-libkarma, as it seems to be default if left blank.
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Sat, 08 Dec 2007 09:49:20 -0600
-
-amarok (2:1.4.7-2ubuntu3) hardy; urgency=low
-
-  * removed --with-libkarma, libkarma{0,-dev} is not in Main yet. 
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Wed, 05 Dec 2007 23:47:20 -0600
-
-amarok (2:1.4.7-2ubuntu2) hardy; urgency=low
-
-  * Rebuild for libmtp6 -> libmtp7 transition
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 04 Dec 2007 14:01:22 +0000
-
-amarok (2:1.4.7-2ubuntu1) hardy; urgency=low
-
-  * Merge with Debian, remaining changes in debian/KUBUNTU-DEBIAN-DIFFERENCES
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 03 Dec 2007 20:01:18 +0000
-
-amarok (1.4.7-2) UNRELEASED; urgency=low
-
-  * Build against libgpod-nogtk-dev.
-
- -- Adeodato Simó <dato@net.com.org.es>  Sun, 26 Aug 2007 16:16:54 +0200
-
-amarok (1.4.7-1) unstable; urgency=low
-
-  * The "Are you breaking up with me?" release.
-
- -- Adeodato Simó <dato@net.com.org.es>  Mon, 20 Aug 2007 11:00:49 +0200
-
-amarok (1.4.6-1) unstable; urgency=low
-
-  * New upstream version packaged.
-
-  * Drop magnatune_CVE-2006-6980.diff; a (better) fix was applied upstream.
-
- -- Adeodato Simó <dato@net.com.org.es>  Fri, 22 Jun 2007 22:12:29 +0100
-
-amarok (1.4.5-5) unstable; urgency=low
-
-  * Rebuild against libtunepimp 0.5; change Build-Depends from libtunepimp3-dev
-    to libtunepimp-dev. (Closes: #425884)
-
- -- Adeodato Simó <dato@net.com.org.es>  Fri, 25 May 2007 11:02:17 +0200
-
-amarok (1.4.5-4) unstable; urgency=low
-
-  * Upload to unstable.  (Closes: #421920)
-
-  * Remove build-dependency on dpkg-dev (the version in stable groks
-    ${binary:Version}), and drop version requirement on debhelper and
-    libtag1-dev as well.
-
-  * Drop the changes made to remove circular dependencies.  (Reopens: #368485,
-    closes: #415484, #412464)
-
-  * Add patch to fix FTBFS with gcc-4.3.  (Closes: #417684)
-
-  * Use ${binary:Version} instead of ${source:Version}.
-
-  * Add XS-VCS-Bzr field.
-
-  * Add watch file, and adjust download URL on debian/copyright.
-
- -- Adeodato Simó <dato@net.com.org.es>  Fri, 11 May 2007 11:57:31 +0200
-
-amarok (1.4.5-3) experimental; urgency=low
-
-  * Add support for devices using MTP, build-dep on libmtp-dev added. 
-    (Closes: #405399)
-  * Add support for karma devices, build-dep on libkarma-dev added.
-    (Closes: #400801)
-  * Added patch fixing CVE-2006-6980: amarok magnatune unsafe shell.
-    (Closes: #410850)
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Mon, 12 Mar 2007 02:38:05 +0100
-
-amarok (1.4.5-2) experimental; urgency=low
-
-  * iPod support is back. Added versioned build-dep on libgpod-dev (>=0.4.2).
-    (Closes: #409985)
-  * Add patch to add the "Queue Track" functionality to the Amarok DCOP API:
-    queuemedia.patch. Patch by Isaac Clerencia <isaac@debian.org>
-  * Add patch to allow amarok get lyrics via http proxy with authentication.
-    Thanks to Filipe Lautert <filipe@icewall.org>. (Closes: #409568)
-  * Added versioned dep on amarok-engines | amarok-engine, thanks to Andreas
-    Pakulat for pointing this. (Closes: #409996). 
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 10 Feb 2007 00:40:10 +0100
-
-amarok (1.4.5-1) experimental; urgency=low
-
-  * New upstream release:
-    - Remove patches merged by upstream: invoke_browser, sparc-asm, magnatune,
-      kde134333_negative_length_fix, revert-fix-for-bug-116127.
-  * The XMMS visualization interface has been removed by upstream:
-    - Remove xmms-dev build-dep.
-    - amarok's description updated.
-    - update amarok.install/rules.
-  * iPod support temporarily dropped. (It needs libgpod >= 0.4.2, which is not
-    yet in Debian).
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Fri,  2 Feb 2007 05:15:29 +0100
-
-amarok (1.4.4-4) unstable; urgency=high
-
-  * Include final version of the magnatune.patch and really apply it.
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 18 Feb 2007 01:17:49 +0100
-
-amarok (1.4.4-3) unstable; urgency=high
-
-  * Edited patch magnatune.patch fixing CVE-2006-6980: amarok magnatune 
-    unsafe shell. (Closes: #410850). 
-  	The reference to the ruby scripts pointed in the bug report, is a problem
-    that was already solved in amarok 1.4.4.
-  * Add dep on unzip (needed to uncompress albums).
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 15 Feb 2007 22:28:13 +0100
-
-amarok (1.4.4-2) unstable; urgency=high
-
-  * Patched magnatune code to avoid multiple credit-card charges.
-    (Closes: #402309)
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 12 Dec 2006 16:51:13 +0100
-
-amarok (1.4.4-1) unstable; urgency=medium
-  
-  * Adding myself as uploader. ACK my last three NMUs...
-  * Removed circular dependencies. Now amarok-engines and amarok-$engine 
-    Recommends: amarok, instead of depends on amarok (Closes: #368485).
-  * Fix kde#134333: properly compute total playlist length if there are
-    tracks dynamic lengths (e.g. last.fm streams) in the playlist. Patch by
-    Modestas Vainius <geromanas@mailas.com>.
-  * Replaced ${Source-Version} with ${source:Version} and added versioned
-    build-dependency on dpkg-dev accordingly.
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 26 Nov 2006 03:42:59 +0100
-
-amarok (2:1.4.7-0ubuntu3) gutsy; urgency=low
-
-  * Added kubuntu_05_utf8_to_mtp_devices_fix.diff from upstream.  (KDE
-    Bug #139722)
-  * Added kubuntu_06_fix_amarok_freeze_installing_mp3.diff from
-    upstream.  (KDE Bug #147126, LP: #58617)  Thanks markey for fixing
-    this!
-  * Added amarok Suggests: libxine1-ffmpeg.  (LP: #134741)
-  * Added kubuntu_07_gnome_multimedia_keys.diff, a script that lets the
-    multimedia keys in GNOME work in amarok.  (LP: #87299)
-  * Use adept_batch update in install-mp3 not apt-get update
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 01 Sep 2007 00:11:20 +1000
-
-amarok (2:1.4.7-0ubuntu2) gutsy; urgency=low
-
-  * Rebuild for libmtp5 -> libmtp6 library transition.
-
- -- Steve Kowalik <stevenk@ubuntu.com>  Sat, 18 Aug 2007 00:55:59 +1000
-
-amarok (2:1.4.7-0ubuntu1) gutsy; urgency=low
-
-  * New Upstream version
-  * debian/control: replaced automake1.8 with automake1.9
-
- -- Stephan Hermann <sh@sourcecode.de>  Wed, 15 Aug 2007 09:47:17 +0200
-
-amarok (2:1.4.6-0ubuntu2) gutsy; urgency=low
-
-  * Rebuild for the libgpod1 -> libgpod2 library transition.
-  * Bump required version of the libgpod development headers.
-
- -- Steve Kowalik <stevenk@ubuntu.com>  Tue, 17 Jul 2007 00:36:04 +1000
-
-amarok (2:1.4.6-0ubuntu1) gutsy; urgency=low
-
-  * New Upstream Release.  (LP: #46526)
-  * Fixed kubuntu-media-amarok syntax (LP: #112252)
-  * Removed kubuntu_05_magnatune_security_fix.diff - fixed upstream
-  * Removed kubuntu_06_right_click_sound_control_fix.diff - fixed upstream
-  * Removed kubuntu_07_monge_exports_correct_symbols.diff - fixed
-    upstream
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 19 Jun 2007 01:09:37 +1000
-
-amarok (2:1.4.5-0ubuntu7) feisty; urgency=low
-
-  * Spelling correction: amaroK -> Amarok
-  * Description update (no kio support with libxine - yet)
-
- -- Harald Sitter <sitter.harald@gmail.com>  Tue,  3 Apr 2007 17:45:46 +0200
-
-amarok (2:1.4.5-0ubuntu6) feisty; urgency=low
-
-  * Fixed the install-mp3 script 
-
- -- Ryan Kavanagh <ryan@kubuntu.org>  Tue,  6 Mar 2007 19:11:17 -0500
-
-amarok (2:1.4.5-0ubuntu5) feisty; urgency=low
-
-  * Added patches:
-    - kubuntu_05_magnatune_security_fix.diff.  Fixes CVE #-2006-6979, 
-      KDE Bug #138499
-    - kubuntu_06_right_click_sound_control_fix.diff.  KDE Bug #141672
-    - kubuntu_07_monge_exports_correct_symbols.diff
-  * All patches from amarok SVN.
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Thu, 15 Feb 2007 15:32:32 +1100
-
-amarok (2:1.4.5-0ubuntu4) feisty; urgency=low
-
-  * Correct thinko in .install for installing the missing files.
-
- -- Steve Kowalik <stevenk@ubuntu.com>  Wed, 14 Feb 2007 00:17:29 +1100
-
-amarok (2:1.4.5-0ubuntu3) feisty; urgency=low
-
-  * Update libmtp build-dep to 0.1.3-0ubuntu1
-  * Install missing files (cd player .desktop file, libhttp11, amarok_addaspodcast.desktop)
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  7 Feb 2007 11:45:28 +0000
-
-amarok (2:1.4.5-0ubuntu2) feisty; urgency=low
-
-  * Added Build-dep libgpod-dev
-  * Fixed amarok.install
-    - Install collection bin files in the correct path
-      (Closes Malone #83454)
-    - Added back ipod lib (Closes Malone #83515)
-
- -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 06 Feb 2007 19:36:32 +0100
-
-amarok (2:1.4.5-0ubuntu1) feisty; urgency=low
-
-  [ Brandon Holtsclaw ]
-  * New Upstream Release
-  * Removed the following patches , adopted upstream
-    - invoke_browser.patch
-    - kubuntu_05_lastfm_xine.diff
-    - some-binaries-in-usr-lib.patch
-    - sparc-asm.patch
-
-  [ Sarah Hobbs ]
-  * Added dependancy kdebase-kio-plugins.  Closes malone #66764
-  * Compiling without stack smashing protection.  Closes malone #81768
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Sun,  4 Feb 2007 00:46:12 -0600
-
-amarok (2:1.4.4-0.3ubuntu4) feisty; urgency=low
-
-  * No-change upload for the libpq4->libpq5 transition.
-
- -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 15 Jan 2007 15:39:10 +0000
-
-amarok (2:1.4.4-0.3ubuntu3) feisty; urgency=low
-
-  * Rebuild against libtunepimp5
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  8 Dec 2006 10:47:51 +0000
-
-amarok (2:1.4.4-0.3ubuntu2) feisty; urgency=low
-
-  * Add patch kubuntu_05_lastfm_xine.diff from upstream to make
-    last.fm streams work with Xine 1.1.3
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  5 Dec 2006 13:03:34 +0000
-
-amarok (2:1.4.4-0.3ubuntu1) feisty; urgency=low
-
-  * Fake Sync from debian unstable
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Thu, 23 Nov 2006 03:46:05 -0600
-
-amarok (2:1.4.4-0ubuntu3) feisty; urgency=low
-
-  * Compile with MTP Device Support
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Tue, 14 Nov 2006 22:13:11 -0600
-
-amarok (2:1.4.4-0ubuntu2) feisty; urgency=low
-
-  * Add debian/kubuntu-media-amarok and
-    debian amarok_play_audiocd.desktop for good KDE integration
-
- -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 03 Nov 2006 23:57:33 +0200
-
-amarok (2:1.4.4-0ubuntu1) feisty; urgency=low
-
-  * New Upstream Version
-  * Removed kubuntu_06_dapp_assert.diff and kubuntu_05_playlist_encoding.diff
-    adopted upstream
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Thu, 26 Oct 2006 16:19:30 -0500
-
-amarok (1.4.4-0.3) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Applied patch invoke_browser.patch to allow amarok open external URLs.
-    (Closes: #397266).
-  * Removed dependency on xmms and updated README.Debian. Thanks to Bryan
-    Donlan and Michael Biebl. (Closes: #393141)
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 19 Nov 2006 02:50:39 +0100
-
-amarok (1.4.4-0.2) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Applied patch to fix build on sparc. Thanks to Jurij Smakov for the patch.
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat,  4 Nov 2006 10:19:37 +0100
-
-amarok (1.4.4-0.1) unstable; urgency=low
-
-  * Non-maintainer upload with permission from the maintainer.
-  * New upstream release.
-  * Dropped patch 143_provided_upstream_playlist_encoding.diff,
-    merged by upstream.
-  * Moved architecture-dependent files from /usr/share to
-    /usr/lib. Thanks to Ted Percival. (Closes: #392392)
-  * Updated debian/compat to 5.
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 31 Oct 2006 21:59:59 +0100
-
-amarok (2:1.4.3-0ubuntu10) edgy; urgency=low
-
-  * Make sure amarok_njb support is installed to the correct location
-  * Closes Malone: #61492 
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Sat, 14 Oct 2006 13:46:21 -0500
-
-amarok (2:1.4.3-0ubuntu9) edgy; urgency=low
-
-  * Set .pot name in debian/rules
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  1 Oct 2006 12:44:07 +0100
-
-amarok (2:1.4.3-0ubuntu8) edgy; urgency=low
-
-  * The DAAP client would crash Amarok under certain conditions when
-    kdelibs was compiled with asserts on. Thanks to  Ian Monroe 
-  * Closes KDE: #132851
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Wed, 20 Sep 2006 21:10:11 -0500
-
-amarok (2:1.4.3-0ubuntu7) edgy; urgency=low
-
-  * Various fixes to install-mp3
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 20 Sep 2006 14:54:21 +0100
-
-amarok (2:1.4.3-0ubuntu6) edgy; urgency=low
-
-  * Added support for edgy ( and future TBA releases ) to install-mp3
-  * Closes Malone #60637
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Sat, 16 Sep 2006 03:56:07 -0500
-
-amarok (2:1.4.3-0ubuntu5) edgy; urgency=low
-
-  * Fixed a typo that prevented Amarok configuring Nomad Jukebox
-    in debian/rules
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Sat, 16 Sep 2006 01:48:11 -0500
-
-amarok (2:1.4.3-0ubuntu4) edgy; urgency=low
-
-  * Built --with-libnjb support ( Creative Nomad Devices )
-  * Added kubuntu_05_playlist_encoding.diff. This bug could result 
-    in failure to restore the current playlist. (BR 133613)
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Fri, 15 Sep 2006 10:53:56 -0500
-
-amarok (2:1.4.3-0ubuntu3) edgy; urgency=low
-
-  * Fixed little error in install-mp3, in the case multiverse is
-    already activated. Code could be really optimized, but it works
-    as it is. I will probably make something clean after edgy release.
-
- -- Anthony Mercatante <tonio@ubuntu.com>  Tue,  13 Sep 2006 22:26:14 +0200
-
-amarok (2:1.4.3-0ubuntu2) edgy; urgency=low
-
-  * Improved install-mp3 to manage ubuntu/gnome and other desktops correctly.
-    (closes #59007)
-
- -- Anthony Mercatante <tonio@ubuntu.com>  Mon,  11 Sep 2006 17:02:14 +0200
-
-amarok (2:1.4.3-0ubuntu1) edgy; urgency=low
-
-  [ Brandon Holtsclaw ]
-  * New Upstream Release
-  * Removed kubuntu_0{5,6,7,8}_*.diff patches as they have been applyed upstream
-  * Added build-dep ruby1.8-dev and automake-1.9 as now required to build amarok
-
-  [ Jonathan Riddell ]
-  * Remove automake1.7 build-dep
-  * Install all files
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Mon,  4 Sep 2006 22:08:14 -0500
-
-amarok (2:1.4.2-0ubuntu3) edgy; urgency=low
-
-  [ Jonathan Riddell ]
-  * Remove kubuntu_03_podir.diff, not built with tar in .orig
-	
-  [ Sarah Hobbs ]
-  * Added a more verbose error message when install-mp3 script fails
-
-  [ Brandon Holtsclaw ]
-  * Collection scanner would only restart a maximum of 2 times instead of
-    20. (fixed in SVN revision 578922) - kubuntu_08_scanner.diff
-  * MTP mediadevice support would not compile against libmtp versions gt
-    0.0.12. (fixed in SVN revision 576121) - kubuntu_06_mtp.diff
-  * AudioCD playback would stutter and sometimes freeze Amarok. (BR 133015)
-    - kubuntu_05_audiocd.diff
-  * Fixed bug which prevented Amarok from creating the collection database
-    in rare circumstances using SQLite. (BR 133072) - kubuntu_07_collection.diff
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Thu, 31 Aug 2006 12:01:16 -0500
-
-amarok (2:1.4.2-0ubuntu2) edgy; urgency=low
-
-  * amarok_libvisual helper added to amarok.install (malone #57636)
-  * Fixed typo in Sugests for libvisual-0.4-plugins Closes Last Half malone #55779 
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Sun, 27 Aug 2006 05:52:34 -0500
-
-amarok (2:1.4.2-0ubuntu1) edgy; urgency=low
- 
-  [ Brandon Holtsclaw ]
-  * Removed libgstreamer0.10-dev as its not needed anylonger 
-    gst support has been droped upstream and in kubuntu
-  * Added libhal-dev as a build dep (malone #55779)
- 
-  [ Daniel Molkentin ]
-  * Install DAAP media device
-
-  [ Sarah Hobbs ]
-  * New upstream version. Closes #24063, #49098, #47179, #52958 and other bugs
-  * Moved python-qt3 from recommends to depends.  Closes bugs #55075, #48724
-  * Removed python from suggests (already a dep of python-qt3)
-  * Changed suggests libvisual-0.2 to libvisual0.4.0-plugins.  Closes bug #55734
-  * Compiled with libvisual support.  Added build-dep libvisual-0.4-dev.  Closes other half of bug #55734
-  * Removed debian/amarok-gstreamer.install as we no longer distribute
-    amarok-gstreamer
-  * Change build-dep automake1.9 --> automake1.7
-  * Changed build-dep debhelper --> debhelper (>=5)
-  * Bumped Compat to 5
-
- -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Wed, 23 Aug 2006 07:11:02 -0500
-
-amarok (2:1.4.1-0ubuntu3) edgy; urgency=low
-
-  * Make debian/install-mp3 executable.  Closes bug #52994
-  * Install amarokapp in /usr/bin. Closes bugs #16474, #52360
-  * Stopped compiling with exscalibar support - upstream 
-    removed the moodbar
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 18 Jul 2006 13:55:53 +1000
-
-amarok (2:1.4.1-0ubuntu2) edgy; urgency=low
-
-  * Depend on amarok-xine not amarok-engines
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 12 Jul 2006 00:01:33 +0000
-
-amarok (2:1.4.1-0ubuntu1) edgy; urgency=low
-
-  * New upstream release
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Jul 2006 22:46:21 +0000
-
-amarok (1.4.0a-1) unstable; urgency=low
-
-  * Revised tarball for 1.4.0 (closes: #367897), fixing the following issues:
-
-    + does not botch migration from 1.3 SQLite collections, which in addition
-      caused further collection rebuilds to appear empty. (Closes: #368396)
-    + correctly closes database connections, thus not failing with "too many
-      open files" and deleting the collection after some hours in pause mode.
-      (Closes: #368086)
-    + audio CDs can be reproduced again. (Upstream #127388)
-
-  * Switch to included SQLite; for some reason, dynamic linking against 3.3.5
-    makes scores unfunctional. (Closes: #367468)
-
- -- Adeodato Simó <dato@net.com.org.es>  Sat, 27 May 2006 15:23:14 +0200
-
-amarok (1.4.0-1) unstable; urgency=low
-
-  * New upstream release. The upstream tarball no longer ships the GStreamer
-    engine, and aRts support was dropped a while ago, and this upload only
-    includes the XINE engine.
-
-    Bugs reported in the Debian BTS fixed in this version:
-
-    + collection is updated at start up. (Closes: #330017)
-    + metadata for icecast streams is displayed. (Closes: #349796)
-    + the correct charset is used for lyrics URLs. (Closes: #352882)
-    + iPods are recognized even after emptying them. (Closes: #350305)
-    + non-ascii characters are displayed correctly under non UTF-8
-      locales in the konqueror sidebar. (Closes: #353058)
-    + last.fm submission queue is flushed after network unavailability
-      even if no more tracks are played. (Closes: #344429)
-
-    Regressions fixed since the latest beta:
-
-    + iPod model detection works again, without needing libgpod-cvs.
-      (Closes: #364789)
-    + filling tags using MusicBrainz works again. (Closes: #364798)
-
-  * Enable Moodbar support, now that Exscalibar has entered unstable.
-    (Closes: #364588)
-
-  * Update Standards-Version to 3.7.2 (no changes required).
-
- -- Adeodato Simó <dato@net.com.org.es>  Sun, 14 May 2006 16:42:14 -0500
-
-amarok (1.4-beta3c-1) experimental; urgency=low
-
-  * Third beta for the upcoming 1.4 version packaged.
-
-  * Build against libtunepimp3-dev.
-
- -- Adeodato Simó <dato@net.com.org.es>  Sat, 15 Apr 2006 19:47:54 +0200
-
-amarok (1.4-beta2-3) experimental; urgency=low
-
-  * Rebuild against libmysqlclient15off. (Closes: #358490)
-
- -- Adeodato Simó <dato@net.com.org.es>  Thu, 23 Mar 2006 02:18:56 +0100
-
-amarok (1.4-beta2-2) experimental; urgency=low
-
-  * Fix yesterday's brainfart: aKode can't output to aRts, so remove this
-    statement from the description.
-    
-  * In addition, and after a bit of chit-chat with upstream, follow their
-    wishes and not package aKode at all (bye amarok-arts), and don't include
-    GStreamer 0.10 support for now.
-
- -- Adeodato Simó <dato@net.com.org.es>  Mon,  6 Mar 2006 23:37:43 +0100
-
-amarok (1.4-beta2-1) experimental; urgency=low
-
-  * Second beta for the upcoming 1.4 version packaged.
-
-    This release drops the aRts engine; in order to keep support for
-    outputting to aRts, ship the aKode engine in the amarok-arts package.
-
-    Also, GStreamer 0.8 support is dropped in favour of GStreamer 0.10. Update
-    build-dependencies and amarok-gstreamer's dependencies accordingly.
-
-  * Use strncpy instead of qstrdup in the patch for main.cpp, so that argv[0]
-    is overwritten correctly. This closes: #352171 (amaroK not remembering the
-    desktop it was on upon login), and incidentally makes Erich Schubert happy.
-
-  * Drop build-dependency on libgtk2.0-dev now that #353590 is fixed.
-
- -- Adeodato Simó <dato@net.com.org.es>  Mon,  6 Mar 2006 05:44:33 +0100
-
-amarok (1.4-beta1-r511476b) experimental; urgency=low
-
-  * First beta (plus SVN) for the upcoming 1.4 version packaged.
-    (Closes: #352590)
-
-  * Update build-depends to support iRiver iFP (B-D: libifp-dev, libusb-dev),
-    and iPod via libgpod (B-D: libgpod-dev; plus libgtk2.0-dev due to #353590).
-
-  * Since lyrics downloading is now implemented in a separate Ruby script,
-    promote ruby from Suggests to Recommends, so that functionality is ideally
-    not lost. Add a note with this information to README.Debian.
-
-  * Link against sqlite dynamically again, since amaroK 1.4 can cope with the
-    restriction explained in the changelog entry for 1.3.1-1 and Bug#326648.
-
- -- Adeodato Simó <dato@net.com.org.es>  Mon, 20 Feb 2006 05:42:15 +0100
-
-amarok (1.3.9-1) unstable; urgency=medium
-
-  * New upstream bugfix release.
-
-  * Build against libtunepimp3-dev. (Closes: #359086)
-
- -- Adeodato Simó <dato@net.com.org.es>  Thu, 27 Apr 2006 00:33:29 +0200
-
-amarok (1.3.8-1) unstable; urgency=low
-
-  * New upstream bugfix release:
-
-    + fetching lyrics works again. (Closes: #344509)
-
-  * Do not use g++-3.4 in arm, m68k and hppa anymore, sid's g++-4.0 is
-    expected to work. (Closes: #342953)
-
-  * Update MySQL build-dependency to libmysqlclient15-dev. (Closes: #343759)
-
-  * Switch patch management to quilt, and make use of patchsys-quilt.mk.
-
-  * Drop build-depends version constraints that are satisfied with stable.
-    Drop the ones for kdebase-dev and kdemultimedia-dev as well, which were
-    transient and all arches have the minimum required versions in sid now.
-
- -- Adeodato Simó <dato@net.com.org.es>  Wed, 18 Jan 2006 01:43:40 +0100
-
-amarok (1.3.7-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-
-  * Built against kdelibs4c2a, so installable in sid again. (Closes: #341959)
-    Temporarily bump build-deps on kdebase-dev and kdemultimedia-dev.
-
-  * Remove debian/patches/taglib-1.3.1-suffices.diff, since taglib 1.4 is in
-    testing and unstable, and I'll be using a backport for sarge packages.
-    Bump version constraint in debian/control.
-
-  * Again, update my e-mail address in debian/control, yada yada.
-
- -- Adeodato Simó <dato@net.com.org.es>  Wed, 07 Dec 2005 06:44:59 +0100
-
-amarok (2:1.3.9-0ubuntu4) dapper; urgency=low
-
-  * debian/cdbs/kde.mk:
-    - added dh_iconcache.
-
- -- Daniel Holbach <daniel.holbach@ubuntu.com>  Sun, 21 May 2006 16:16:47 +0200
-
-amarok (2:1.3.9-0ubuntu3) dapper; urgency=low
-
-  * Don't install hr translations, it's really Hindi
-    Closes Malone #44517
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 16 May 2006 00:14:56 +0300
-
-amarok (2:1.3.9-0ubuntu2) dapper; urgency=low
-
-  * Rebuild against the new libmysqlclient15off with correct symbols.
-
- -- Adam Conrad <adconrad@ubuntu.com>  Thu,  6 Apr 2006 12:46:44 +1000
-
-amarok (2:1.3.9-0ubuntu1) dapper; urgency=low
-
-  * New upstream release
-  * Use automake1.7, that's what the upstream file seems to use
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 25 Mar 2006 17:32:01 +0000
-
-amarok (2:1.3.8-0ubuntu7) dapper; urgency=low
-
-  * Re-uploaded for new language-pack scripts, no changes
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Mar 2006 18:49:41 +0000
-
-amarok (2:1.3.8-0ubuntu6) dapper; urgency=low
-
-  * Re-uploaded for new language-pack scripts, no changes
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 23 Feb 2006 12:28:47 +0000
-
-amarok (2:1.3.8-0ubuntu5) dapper; urgency=low
-
-  * Add kubuntu_03_podir.diff, change podir so .pot file gets
-    generated in a place that keeps the language pack scripts happy
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Feb 2006 19:09:30 +0000
-
-amarok (2:1.3.8-0ubuntu4) dapper; urgency=low
-
-  * Remove amarok-gstreamer from enginePackages substvars
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Feb 2006 11:44:19 +0000
-
-amarok (2:1.3.8-0ubuntu3) dapper; urgency=low
-
-  * Remove use of GCC 3.4
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 16 Feb 2006 10:52:51 +0000
-
-amarok (2:1.3.8-0ubuntu2) dapper; urgency=low
-
-  * Remove GStreamer 0.8 support, default to xine
-  * Change from libmysqlclient14-dev to libmysqlclient15-dev build-dep
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  1 Feb 2006 11:56:01 +0000
-
-amarok (2:1.3.8-0ubuntu1) dapper; urgency=low
-
-  * New upstream release
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 15 Jan 2006 19:10:14 +0000
-
-amarok (2:1.3.7-0ubuntu4) dapper; urgency=low
-
-  * weaken build dependencies
-
- -- Reinhard Tartler <siretart@ubuntu.com>  Fri, 30 Dec 2005 14:55:13 +0100
-
-amarok (2:1.3.7-0ubuntu3) dapper; urgency=low
-
-  * Add kubuntu_02_read_kubuntu_config.diff to make it read Debian's
-    amarokrc file, which hides the splash screen
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Dec 2005 20:13:28 +0000
-
-amarok (2:1.3.7-0ubuntu2) dapper; urgency=low
-
-  * debian/control: Removed the text about libvisual. There is no libvisual 
-    support right now in ubuntu
-
- -- Stephan Hermann <sh@sourcecode.de>  Wed,  7 Dec 2005 23:52:58 +0100
-
-amarok (2:1.3.7-0ubuntu1) dapper; urgency=low
-
-  * New upstream release
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  6 Dec 2005 20:59:31 +0000
-
-amarok (2:1.3.6-1ubuntu3) dapper; urgency=low
-
-  * Make amarok-gstreamer default engine
-  * Add kubuntu_01_kdepot.diff for pot generation
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 29 Nov 2005 19:18:38 +0000
-
-amarok (2:1.3.6-1ubuntu2) dapper; urgency=low
-
-  * debian/substvars: moved gstreamer0.8-mad to Suggests section
-  * Update kde.mk for .pot generation
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 26 Nov 2005 02:52:27 +0000
-
-amarok (2:1.3.6-1ubuntu1) dapper; urgency=low
-
-  * Sync with debian, and readded the Ubuntu specific Epoch
-  * Merged the debian/changelog
-  * debian/control:
-    - Removed libvisual-dev, libsdl1.2-dev from build-deps
-    - Removed libvisual-plugins from Suggests
-  * debian/amarok.install: prevent installing amarok_libvisual  
-
- -- Stephan Hermann <sh@sourcecode.de>  Sun, 20 Nov 2005 18:32:06 +0100
-
-amarok (1.3.6-1) unstable; urgency=low
-
-  * New upstream bugfix release:
-
-    + last.fm submissions are properly saved on disk while offline again; they
-      had been broken by Qt 3.3.5. (Closes: #334469, #337109)
-    + includes missing semicolon in amarok.desktop. (Closes: #336026)
-
-  * Update my e-mail address in debian/control.
-
- -- Adeodato Simó <dato@the-barrel.org>  Tue, 08 Nov 2005 10:40:42 +0100
-
-amarok (1.3.5-1) unstable; urgency=low
-
-  * New upstream bugfix release, quickly released to fix a potential crash at
-    startup (upstream #114983).
-
- -- Adeodato Simó <asp16@alu.ua.es>  Tue, 25 Oct 2005 14:55:29 +0200
-
-amarok (1.3.4-1) unstable; urgency=low
-
-  * New upstream bugfix release, which makes this maintainer of yours
-    immensely happy because a fix for upstream #114195 is included.
-    ("Collection scanner ignored files with non-ascii characters").
-
-  * Add libvisual support (closes: #335053). Thanks to Jean-Rémy Falleri for
-    the heads-up. Changes needed:
-
-    + add libvisual0.2-dev and libsdl1.2-dev to Build-Depends.
-    + add libvisual0.2-plugins to Suggests, and mention it in the paragraph
-      regarding visualization plugins in amarok's description.
-    + add the appropriate snippet to some-binaries-in-usr-lib.patch in order
-      to cope with amarok_libvisual installed in /usr/lib/amarok instead of
-      /usr/bin, as mandated by Policy. 
-
- -- Adeodato Simó <asp16@alu.ua.es>  Mon, 24 Oct 2005 09:30:22 +0200
-
-amarok (1.3.3-1) unstable; urgency=low
-
-  * New upstream bugfix release:
-
-    + does not loose playlist / podcasts on restart. (Closes: #329878)
-    + PostgreSQL configuration dialog no longer shows MySQL's. (Closes: #327630)
-
-  * Updated the Debian menu icons to the new logo.
-
-  * Updated copyright notice, list of authors, and FSF postal address in
-    debian/copyright.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Thu, 13 Oct 2005 00:04:34 +0200
-
-amarok (1.3.2-1) unstable; urgency=low
-
-  * New upstream bugfix release, featuring the return of alsasink support.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Wed, 21 Sep 2005 04:14:52 +0200
-
-amarok (1.3.1-2) unstable; urgency=low
-
-  * Use g++ 3.4 in arm, m68k and hppa.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Tue, 06 Sep 2005 00:21:03 +0200
-
-amarok (1.3.1-1) unstable; urgency=low
-
-  * New upstream bugfix release. Beware, though, that the GStreamer engine has
-    been rewritten (!), and ALSASINK SUPPORT REMOVED due to temporary breakage.
-
-  * Use the internal copy of sqlite for now. This fixes the collection being
-    non functional with SQLite 3.2.5 due to this version preventing a database
-    handle opened in one thread to be used in another. See Bug#326648 for
-    reference. (Closes: #326562, #312386)
-
-  * Enable PostgreSQL support (closes: #326612, #326713):
-
-    + debian/rules: pass --enable-postgresql to ./configure.
-    + debian/control: add libpq-dev to Build-Depends.
-
-    (Before somebody comes around with the word "bloat" ready, libpq4 is 6
-     times smaller than libmysqlclient14.)
-
-  * Regain preciousss "my `grep -c NEEDED` is smaller than yours" karma by not
-    using LIBADD in the statusbar convenience lib. The Depends line had gained
-    some weight in 1.2.3-1.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Mon, 05 Sep 2005 20:57:41 +0200
-
-amarok (2:1.3.1-0ubuntu4) breezy; urgency=low
-
-  * Add kubuntu_02_column_sort_crash.diff fix a
-    crash on column sort http://bugs.kde.org/113042
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  4 Oct 2005 16:14:12 +0100
-
-amarok (2:1.3.1-0ubuntu3) breezy; urgency=low
-
-  * Add kubuntu_01_alsasink.diff to fix and reenable alsasink
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  3 Oct 2005 22:40:05 +0100
-
-amarok (2:1.3.1-0ubuntu2) breezy; urgency=low
-
-  * debian/control: added khelpcenter as suggestion
-
- -- Stephan Hermann <sh@sourcecode.de>  Sat, 17 Sep 2005 02:23:08 +0200
-
-amarok (2:1.3.1-0ubuntu1) breezy; urgency=low
-
-  * New Upstream Release
-  * Merged the Debian package from Adeodato Simó
-  * debian/substvars: moved gstreamer0.8-mad to Suggests section
-
- -- Stephan Hermann <sh@sourcecode.de>  Fri, 16 Sep 2005 19:59:06 +0200
-
-amarok (1.3.0-1) unstable; urgency=low
-
-  * New upstream release packaged (closes: #323249). Bugs reported in the
-    Debian BTS fixed in this version:
-
-    + does not display advertisements in lyrics. (Closes: #321499)
-    + pre-amp in the equalizer works with XINE engine too. (Closes: #283750)
-    + includes PartyMode. (Closes: #293293)
-    + includes equalizer presets. (Closes: #283761)
-    + builds fine with GCC 4.0. (Closes: #314779)
-
-  * Updated Build-Dependencies:
-
-    + automake1.6 to automake1.9.
-    + libmysqlclient12-dev to libmysqlclient14-dev.
-    + temporarily bump version constraint in kdemultimedia-dev and kdebase-dev
-      in order to allow an early upload in the middle of the KDE transition.
-
-  * Adjustments to the build-system:
-
-    + do not require TagLib 1.4.0 since it's not in Debian yet (#323280).
-    + don't use KDE_FINAL in amarok/src since both MySQL and KDE have had the
-      brilliant idea to define a struct/class named "NET".
-
-  * This version links against libtunepimp2c2, so libtunepimp2 0.3.0-4
-    breakage does not affect us anymore. (Closes: #318000)
-
-  * Update Standards-Version to 3.6.2 (no changes required).
-
- -- Adeodato Simó <asp16@alu.ua.es>  Sat, 03 Sep 2005 01:42:56 +0200
-
-amarok (1.2.4-1) unstable; urgency=low
-
-  * The "following Debian Policy is cool, except when it's not" release.
-
-  * New upstream bugfix release:
-
-    + amaroK now correctly displays the name of the first available engine,
-      instead of an empty line. (Closes: #307949)
-
-  * The KDE Session Manager can now restore amaroK on login (closes: #302852,
-    #308099). Patch amarokapp to set its own argv[0] to 'amarok', since for the
-    session manager to restore an application the binary must be in the $PATH.
-
-  * Made the crash handler aware that amarokapp is in /usr/lib/amarok, and not
-    in /usr/bin.
-
-  * Include small patch to fix upstream bug 103510 ("systray icon continues
-    'playing' after songs end, if 'clear list' was hit while playing").
-
- -- Adeodato Simó <asp16@alu.ua.es>  Mon, 06 Jun 2005 00:08:28 +0200
-
-amarok (2:1.2.4-0ubuntu4) breezy; urgency=low
-
-  * Rebuild for the xorg -> mesa GL/GLU transition.
-
- -- Adam Conrad <adconrad@ubuntu.com>  Sun, 21 Aug 2005 19:34:41 +1000
-
-amarok (2:1.2.4-0ubuntu3) breezy; urgency=low
-
-  * Add kubuntu_02_gstreamer_output.patch to default GStreamer to alsasink
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 13 Jul 2005 18:19:28 +0000
-
-amarok (2:1.2.4-0ubuntu2) breezy; urgency=low
-
-  * Default to GStreamer plugin
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  6 Jul 2005 15:30:52 +0000
-
-amarok (2:1.2.4-0ubuntu1) breezy; urgency=low
-
-  * New upstream release
-  * Add kubuntu_01_gcc4_fixes.patch to fix compiler errors
-
- -- Jonathan Riddell <jr@jriddell.org>  Fri,  3 Jun 2005 17:22:10 +0000
-
-amarok (1.2.3-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-
-  * This version fixes an important memory leak in the GStreamer engine that
-    happened when a radio stream stalled. (Closes: #299931)
-
- -- Adeodato Simó <asp16@alu.ua.es>  Tue, 29 Mar 2005 01:43:28 +0200
-
-amarok (2:1.2.3-1ubuntu4) hoary; urgency=low
-
-  * Revert back to amarok-arts on request of mdz
-
- -- Chris Halls <chris.halls@credativ.co.uk>  Wed,  6 Apr 2005 09:33:35 +0100
-
-amarok (2:1.2.3-1ubuntu3) hoary; urgency=low
-
-  * Switch default engine to amarok-xine, which is better supported
-    upstream and is less buggy (Hoary: #8429, #8255)
-
- -- Chris Halls <chris.halls@credativ.co.uk>  Mon,  4 Apr 2005 20:01:48 +0100
-
-amarok (2:1.2.3-1ubuntu2) hoary; urgency=low
-
-  * Add build-depend on libtool.
-  * Remove automake1.6 patch
-
- -- Jonathan Riddell <jr@jriddell.org>  Wed, 30 Mar 2005 14:35:20 +0100
-
-amarok (2:1.2.3-1ubuntu1) hoary; urgency=low
-
-  * Sync with Debian
-
- -- Jonathan Riddell <jr@jriddell.org>  Wed, 30 Mar 2005 04:25:27 +0000
-
-amarok (1.2.2-1) kalyxo-unstable; urgency=low
-
-  * New upstream bugfix release.
-
-  * Added a menu file, plus XPM icons.
-
-  * Switched to tarball-in-tarball for the .orig.tar.gz (which is sensibly
-    smaller now, since upstream uses bz2). Added bzip2 to Build-Depends.
-
-  * Build-depend on automake1.6 and libtool, and regenerate configure and
-    Makefiles.in at build-time.
-
-  * Use the kde.mk class maintained by the Debian KDE Maintainers, instead
-    of the one shipped with cdbs.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Thu, 17 Mar 2005 19:38:34 +0100
-
-amarok (1.2.1-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-
-  * Include patch from CVS to make amaroK bind listening TCP connections to
-    the local interface only. Related to Bug#297693, but not the same.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Fri, 04 Mar 2005 14:54:34 +0100
-
-amarok (1.2.0-1) unstable; urgency=low
-
-  * New upstream release packaged (closes: #296139). Lots of improvements and
-    new functionality, see the changelog or http://amarok.kde.org for details.
-    Bugs reported in the Debian BTS fixed with in this version:
-
-    + the search text input element is now cleared when the user writes
-      something there. (Closes: #278359)
-
-    + analyzers work with the XINE engine. (Closes: #287091)
-
-  * amaroK's collection can be now stored in a MySQL database:
-
-    + Build-Depend on libmysqlclient12-dev
-
-    + Pass --enable-mysql to configure.
-
-  * amaroK now includes a sidebar plugin for Konqueror:
-
-    + debian/amarok.install:
-      - add files for the konqueror sidebar.
-
-    + debian/control:
-      - added kdebase-dev as Build-Dependency.
-
-    + debian/rules:
-      - exclude konqsidebar_universalamarok.so from dh_shlibdeps, so that
-        amarok doesn't end up depending on konqueror. (The plugin will be
-        ignored in systems without konqueror installed.)
-
-  * Other changes:
-
-    + amaroK now ships several scripts to enhance it. These are written in
-      Python and Ruby, so add those as suggested packages. Added note to
-      README.Debian about this, too.
-
-    + removed sqlite3_in_configure.in.patch, no longer necessary in 1.2.
-
-    + added www-browser as an alternative for the konqueror suggests, since
-      upstream fixed the code so that the configured browser is used.
-
-    + renamed debian/README to debian/README.Debian, so that it gets
-      installed. D'oh!
-
-    + debian/control:
-      - remove Build-Dependency on libkjsembed-dev, no longer needed.
-
-    + debian/amarok.install: 
-      - install amarok.profile.xml into /usr/share/apps/profiles.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Wed, 23 Feb 2005 03:03:37 +0100
-
-amarok (1.1.1-2) unstable; urgency=high
-
-  * Upload to get rid of the dependency on libflac4, which is not longer in
-    the archive (closes: #289344). Urgency set to high as other packages with
-    RC bug fixes can't enter testing because of the libflac6 transition not
-    being ready.
-
-    + Relibtoolized the package, so that binaries won't link against not
-      needed libraries. Introduced disable_no_undefined.patch, many thanks to
-      Daniel Schepler for his insight with this (and for providing the patch).
-      [This has reduced the number of NEEDED libraries from 45 to 18, libflac
-      being among them.]
-
-    + debian/control:
-      - version Build-Dependency on libtunepimp2-dev to (>= 0.3.0-2.1).
-
-  * Some new versions of libraries have become available in Debian since the
-    last upload:
-
-    + Taglib 1.3 is now in the archive:
-      - removed debian/patches/taglib-1.2-suffices.patch.
-      - update Build-Depends to libtag1-dev (>> 1.3.1).
-
-    + SQLite 3 is now in the archive:
-      - changed Build-Depends on libsqlite0-dev to libsqlite3-dev.
-      - pass --without-included-sqlite to ./configure.
-      - patch configure.in to check for sqlite3 (>= 3.0). Upstream forgot to
-        update this check in the 1.1 series. [sqlite3_in_configure.in.patch]
-  
-  * New package relationships:
-
-    + amarok now recommends kdemultimedia-kio-plugins, which is needed to play
-      audio CDs.
-
-    + amarok now suggests konqueror, since it's called in the MusicBrainz
-      dialog and some other places. (Closes: #282523)
-
-  * Created a README.Debian files with the following:
-
-    + Explain why the amarokapp and amarok_xmmswrapper2 binaries are shipped
-      in /usr/lib/amarok instead of /usr/bin, differing from upstream.
-
-    + Describe a fix for the 'Socket-path is not a link or a directory' error.
-
-    + Explicitly mention what is needed to play audio CDs in amarok.
-
-  * Other changes:
-
-    + Patched admin/configure.in.min to include AM_MAINTAINER_MODE. To make
-      the .diff.gz stuff smaller, force automake-1.6 (which upstream uses) in
-      admin/detect-autoconf.sh. [am_maintainer_mode.patch, automake-1.6.patch]
-
-    + Prevent admin/cvs.sh from creating .gmo files at "make dist" time, since
-      those can't be shipped in the .diff.gz. [gmo_files_at_build_time.patch]
-
-    + debian/amarok.1:
-      - correct "hyphen vs. minus sign" usage.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Fri, 14 Jan 2005 01:54:47 +0100
-
-amarok (1.1.1-1) unstable; urgency=low
-
-  * New upstream release packaged. Most notably, fixes several GStreamer
-    engine related bugs.
-
-  * debian/control: add to amarok-gstreamer's description that is not possible
-    to use artssink for output.
-
-  * debian/rules:
-    - call dh_install with --list-missing (DEB_DH_INSTALL_ARGS).
-
-  * debian/patches/:
-    - removed proper-otherlang-handbook-path.patch, issue fixed upstream.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Sat, 09 Oct 2004 22:51:06 +0200
-
-amarok (1.1.0-2) unstable; urgency=low
-
-  * Fix the location of translated amaroK handbook: tde/HTML/$LANG/amarok, not
-    tde/HTML/$LANG directly. [debian/patches/proper-otherlang-handbook-path.patch]
-
- -- Adeodato Simó <asp16@alu.ua.es>  Mon, 27 Sep 2004 14:02:30 +0200
-
-amarok (1.1.0-1) unstable; urgency=low
-
-  * New upstream version:
-    - several last minute fixes.
-    - includes handbook in several languages (da, et, fr, it, pt, sv).
-
-  * First upload to Debian (closes: #236696).
-
- -- Adeodato Simó <asp16@alu.ua.es>  Mon, 27 Sep 2004 01:53:56 +0200
-
-amarok (1.1-cvs-0+kalyxo1) experimental; urgency=low
-
-  * New maintainer. Thanks to Peter Rockai for his initial work.
-
-  * Updated to amaroK 1.1 CVS (2004-09-24):
-    - temporarily link statically against libsqlite, since sqlite >= 3.0.7 is
-      required and is not available in Debian (requested in #272271).
-    - added debian/patches/taglib-1.2-suffices.patch to lower the requirement
-      from taglib 1.3 (requested in #273029) to 1.2, which is enough.
-    - new package amarok-xine (yet another engine for amaroK, hurray!)
-    - added the following Build-Dependencies:
-      + libkjsembed-dev (amaroK is now JavaScript scriptable).
-      + libtunepimp2-dev (MusicBrainz support).
-      + libxine-dev (for the xine engine).
-      + libtag1-dev (missing).
-
-  * New package amarok-engines:
-    - depends on all the available engine packages and will be installed by
-      default unless the user specifies an specific engine.
-    - all the amarok-* packages Provide: amarok-engine, and amarok now
-      Depends: amarok-engines | amarok-engine.
-
-  * Removed the amarok-xmms package:
-    - its single binary amarok_xmmswrapper2 is now included in the main amarok
-      package.
-    - include some hackery to prevent amarok from depending on xmms (!).
-      amaroK just does a no-op and issues a warning on stderr if xmms is not
-      installed and user opens the visualizations menu, so this seems safe.
-      A xmms-lib package (in which amarok could easily depend) is requested in
-      #272913.
-
-  * Install amarokapp and amarok_xmmswrapper2 in /usr/lib/amarok instead of
-    /usr/bin:
-    - needed for FHS/Debian Policy compliance.
-    - added debian/patches/some-binaries-in-usr-lib.patch to fix locations in
-      source (amarok/src/loader/loader.cpp, amarok/src/socketserver.cpp).
-
-  * Added lintian overrides for an aRts module which must go in /usr/lib
-    despite not being a shared library. noatun and some other arts-related
-    packages have the same problem, if someone has a solution please share.
-
-  * Made /usr/share/doc/amarok-* symlinks to /usr/share/doc/amarok.
-
-  * Do not make amarok-arts depend on the meta-package "arts"; the
-    dependencies given by ${shlib:Depends} do suffice.
-
-  * debian/control: updated to Standars-Version 3.6.1.
-
- -- Adeodato Simó <asp16@alu.ua.es>  Fri, 24 Sep 2004 02:49:46 +0200
-
-amarok (1.0.2-1) unstable; urgency=low
-
-  * New upstream version.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Thu,  5 Aug 2004 14:23:23 +0200
-
-amarok (1.0.1-1) unstable; urgency=low
-
-  * New upstream version
-  * Make depends among amarok packages versioned
-  * Prepare to upload into Debian, closes: #236696
-  * Add manpage for amarok by Alejandro Exojo
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Wed, 30 Jun 2004 23:24:16 +0200
-
-amarok (1.0.0-3) unstable; urgency=low
-
-  * Dynamically link against libsqlite0
-  * Fix gstreamer dependencies
-  * Various small fixes (sections, descriptions, doc dirs)
-  * Thanks go to Adeodato Simó for help with various issues
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Sat, 26 Jun 2004 23:06:00 +0200
-
-amarok (1.0.0-2) unstable; urgency=low
-
-  * Make the depends on amarok-gstreamer a bit more tight. Only depend on
-    audiosink, recommend the decoder plugins.
-  * Make the amarok engines depend on amarok itself.
-  * Compile with xmms visualisation support.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Wed, 23 Jun 2004 13:58:12 +0200
-
-amarok (1.0.0-1) unstable; urgency=low
-
-  * Build official 1.0.0 release.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Wed, 16 Jun 2004 23:48:52 +0200
-
-amarok (1.0-pre1-2) unstable; urgency=low
-
-  * Fix amarok-arts package, was missing mcop files. Duh.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Wed, 16 Jun 2004 23:25:29 +0200
-
-amarok (1.0-pre1-1) unstable; urgency=low
-
-  * First 1.0.0 prerelease.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Wed, 16 Jun 2004 10:18:31 +0200
-
-amarok (1.0-beta4-2) unstable; urgency=low
-
-  * Patch to final beta4 version.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Tue,  1 Jun 2004 17:47:53 +0200
-
-amarok (1.0-beta4-1) unstable; urgency=low
-
-  * New upstream RC (beta4-rc1).
-  * Build with GST support.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Tue,  1 Jun 2004 10:24:09 +0200
-
-amarok (1.0-beta3-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Peter Rockai (mornfall) <mornfall@danill.sk>  Sat, 29 May 2004 17:08:55 +0200
-
-amarok (1.0-beta1-0) workstation-unstable; urgency=low
-
-  * Initial packaging
-
- -- Peter Rockai (mornfall) <mornfall@mornfall.homeip.net>  Sun, 11 Apr 2004  17:05:00 +0200
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/compat b/ubuntu/_base/applications/amarok.cmake/debian/compat
deleted file mode 100644
index 7ed6ff82d..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/control b/ubuntu/_base/applications/amarok.cmake/debian/control
deleted file mode 100644
index 2939261e1..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/control
+++ /dev/null
@@ -1,109 +0,0 @@
-Source: amarok-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu>
-Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, cmake-trinity, ninja-build, bzip2,
- kdelibs4-trinity-dev,
- libxine-dev, libdbus-tqt-1-dev,
- libtag1-dev, libsqlite3-dev, libtunepimp-dev,
- libmysqlclient15-dev | libmysqlclient16-dev, libpq-dev,
- libvisual-0.4-dev, libsdl1.2-dev,
- libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev,
- ruby, ruby1.8-dev, kdebase-trinity-dev
-Standards-Version: 3.8.4
-Homepage: http://amarok.kde.org
-
-Package: amarok-trinity
-Architecture: any
-Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
-Replaces: amarok-kde3 (<< 4:3.5.13)
-Breaks: amarok-kde3 (<< 4:3.5.13)
-Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
- python, python-qt3, libqt0-ruby1.8-trinity, libvisual-0.4-plugins
-Description: versatile and easy to use audio player for Trinity
- Amarok tries to be a little different, providing a simple drag and drop
- interface that really makes playlist handling easy.
- .
- Features include:
-   - rapid playlist creation, with drag and drop from a directory view
-   - nice playlist browser for your existing playlists (PLS or M3U formats)
-   - collection-indexing support, for smart browsing and playlist creation
-   - possibility of accessing media via kioslaves, allowing you to play
-     via smb:// or fish:// (normal streams are of course supported)
-   - inline ID3 tag editing, capable of retrieving tags via MusicBrainz
-   - album cover support: automatically displays album covers from the
-     filesystem, or downloaded on the fly
-   - miscellaneous audio effects, including crossfading
-   - easy bindable global shortcuts, rich DCOP interface
-   - On-Screen Display (OSD), on track change or at keypress
-   - iPod and iRiver support
-   - Last.fm stream playing support (if ruby is installed)
-   - Track "mood" display (requires moodbar package installed)
- .
- Support for libvisual visualization plugins is also compiled in (you need 
- to have libvisual-0.4-plugins installed to be able to use it).
-
-Package: amarok-common-trinity
-Architecture: all
-Depends: ruby
-Replaces: amarok-common-kde3 (<< 4:3.5.13)
-Breaks: amarok-common-kde3 (<< 4:3.5.13)
-Recommends: amarok-trinity (>= ${source:Version})
-Suggests: libqt0-ruby1.8-trinity, python, python-qt3
-Description: architecture independent files for Amarok [Trinity]
- This package contains architecture independent files needed for Amarok to run
- properly. It also provides Amarok documentation. Therefore, unless you have
- 'amarok' package installed, you will hardly find this package useful.
- .
- You need to install Python if you intend to use Zeroconf support, WebControl
- and/or playlist2html scripts. You will also need python-qt3 for the
- WebControl script.
-
-Package: amarok-engines-trinity
-Architecture: all
-Depends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
-Replaces: amarok-engines-kde3 (<< 4:3.5.13)
-Breaks: amarok-engines-kde3 (<< 4:3.5.13)
-Description: output engines for the Amarok music player [Trinity]
- This package serves merely as a reference point if you want to install
- all available Amarok engines. It depends on those Amarok engines that
- generally can be used by most users. You can safely remove this metapackage
- as you can remove the amarok-engine-$engine packages that you don't use.
-
-Package: amarok-engine-xine-trinity
-Architecture: any
-Depends: ${shlibs:Depends}
-Replaces: amarok-engine-xine-kde3 (<< 4:3.5.13)
-Breaks: amarok-engine-xine-kde3 (<< 4:3.5.13)
-Recommends: amarok-trinity (= ${binary:Version})
-Description: xine engine for the Amarok audio player [Trinity]
- This package provides the xine engine for Amarok, which you may prefer
- for some reason over the other engines (e.g., it is the lightest engine
- Dependency-wise).
-
-Package: amarok-engine-yauap-trinity
-Architecture: any
-Depends: yauap, ${shlibs:Depends}
-Replaces: amarok-engine-yauap-kde3 (<< 4:3.5.13)
-Breaks: amarok-engine-yauap-kde3 (<< 4:3.5.13)
-Recommends: amarok-trinity (= ${binary:Version})
-Description: Yauap engine for the Amarok audio player [Trinity]
- This package includes Amarok yauap engine, which provides a frontend
- to Yauap Commandline Audio Player. DBus is used as a means of communication
- between the engine and Yauap. Please note that some extra Amarok features 
- (like visualizations) might not be available while using this engine.
-
-Package: amarok-trinity-dbg
-Priority: extra
-Architecture: any
-Replaces: amarok-kde3-dbg (<< 4:3.5.13)
-Breaks: amarok-kde3-dbg (<< 4:3.5.13)
-Depends: amarok-trinity (= ${binary:Version})
-Recommends: kdelibs-trinity-dbg
-Description: debugging symbols for Amarok [Trinity]
- This package provides debugging symbols for all binary packages built from
- amarok source package. It's highly recommended to have this package installed
- before reporting any Amarok crashes to either Amarok developers or Debian
- package maintainers.
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/copyright b/ubuntu/_base/applications/amarok.cmake/debian/copyright
deleted file mode 100644
index 2775890ba..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/copyright
+++ /dev/null
@@ -1,51 +0,0 @@
-Debianized by Peter Rockai <mornfall@mornfall.homeip.net>    2004-04-11
-New maintainer Adeodato Simó <dato@net.com.org.es>           2004-09-22
-New maintainer Modestas Vainius <modestas@vainius.eu>        2007-12-24
-
-It was downloaded from:
-
-    <ftp://ftp.kde.org/pub/kde/stable/amarok/>
-
-And the project homepage is:
-
-    <http://amarok.kde.org>
-
-Upstream Authors:
-
-    | Alexandre Oliveira	<aleprj@gmail.com>
-    | Christian Muehlhaeuser	<chris@chris.de>
-    | Frederik Holljen		<fh@ez.no>
-    | Gábor Lehel		<illissius@gmail.com>
-    | Ian Monroe		<ian@monroe.nu>
-    | Jeff Mitchell		<kde-dev@emailgoeshere.com>
-    | Mark Kretschmann		<markey@web.de>
-    | Martin Aumueller		<aumuell@reserv.at>
-    | Max Howell		<max.howell@methylblue.com>
-    | Mike Diehl		<madpenguin8@yahoo.com>
-    | Pierpaolo Di Panfilo	<pippo_dp@libero.it>
-    | Roman Becker		<roman@formmorf.de>
-    | Seb Ruiz			<me@sebruiz.net>
-    | Stanislav Karchebny	<berkus@madfire.net>
-
-Copyright:
-
-    | © 2002-2003, Mark Kretschmann
-    | © 2003-2006, The Amarok Development Squad
-
-License terms:
-
-    | 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; 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 program; if not, write to the Free Software Foundation,
-    | Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-  The full text of the GNU General Public License version 2 is available on
-  Debian systems in /usr/share/common-licenses/GPL-2.
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/icons/amarok-16.xpm b/ubuntu/_base/applications/amarok.cmake/debian/icons/amarok-16.xpm
deleted file mode 100644
index 80a228f20..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/icons/amarok-16.xpm
+++ /dev/null
@@ -1,210 +0,0 @@
-/* XPM */
-static char *amarok-16[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 188 2",
-"   c black",
-".  c #010203",
-"X  c #010304",
-"o  c #030405",
-"O  c #030406",
-"+  c #05070A",
-"@  c #03080C",
-"#  c #05090D",
-"$  c #04090F",
-"%  c #050A10",
-"&  c #070F17",
-"*  c #071019",
-"=  c #0A1521",
-"-  c #0B1825",
-";  c #0D1824",
-":  c #0D1926",
-">  c #0F1A26",
-",  c #0F1E2C",
-"<  c #0E1F30",
-"1  c #101D2A",
-"2  c #0F2133",
-"3  c #102030",
-"4  c #132436",
-"5  c #132639",
-"6  c #142638",
-"7  c #17293B",
-"8  c #14283C",
-"9  c #152A40",
-"0  c #193047",
-"q  c #193149",
-"w  c #19324B",
-"e  c #203A55",
-"r  c #223D59",
-"t  c #26415E",
-"y  c #234562",
-"u  c #22456C",
-"i  c #23486F",
-"p  c #26486E",
-"a  c #284360",
-"s  c #294663",
-"d  c #244A71",
-"f  c #264F7A",
-"g  c #294A70",
-"h  c #2A4B71",
-"j  c #2D4D73",
-"k  c #29537B",
-"l  c #2D5178",
-"z  c #304F74",
-"x  c #35506D",
-"c  c #325176",
-"v  c #325277",
-"b  c #335377",
-"n  c #355377",
-"m  c #365575",
-"M  c #37567A",
-"N  c #32597F",
-"B  c #33587E",
-"V  c #375A7F",
-"C  c #385472",
-"Z  c #395572",
-"A  c #3A5675",
-"S  c #38567A",
-"D  c #3B5876",
-"F  c #3A597A",
-"G  c #3B587A",
-"H  c #3B5A7B",
-"J  c #3B587C",
-"K  c #405C7F",
-"L  c #445E7F",
-"P  c #46607E",
-"I  c #2B5781",
-"U  c #385C82",
-"Y  c #376088",
-"T  c #37628A",
-"R  c #3A688F",
-"E  c #3E6A90",
-"W  c #3F6B92",
-"Q  c #415D80",
-"!  c #435E81",
-"~  c #445F80",
-"^  c #445F82",
-"/  c #466686",
-"(  c #476687",
-")  c #4A6486",
-"_  c #4E6989",
-"`  c #4F6E8F",
-"'  c #42769E",
-"]  c #46769D",
-"[  c #50698A",
-"{  c #506A89",
-"}  c #516A89",
-"|  c #506F8F",
-" . c #546D8C",
-".. c #556E8E",
-"X. c #5B7088",
-"o. c #5B718A",
-"O. c #587591",
-"+. c #5B7491",
-"@. c #5E7B9A",
-"#. c #487BA2",
-"$. c #6F7D8C",
-"%. c #607790",
-"&. c #637B97",
-"*. c #627E9B",
-"=. c #6B7D90",
-"-. c #4980A8",
-";. c #4A83AA",
-":. c #5491B8",
-">. c #5693B9",
-",. c #5E99BE",
-"<. c #658DAC",
-"1. c #6A87A0",
-"2. c #6A87A4",
-"3. c #6D89A7",
-"4. c #758BA2",
-"5. c #758FA9",
-"6. c #7E8FA1",
-"7. c #7F93A7",
-"8. c #7997AC",
-"9. c #63A5CA",
-"0. c #6CA7CA",
-"q. c #6CA8CB",
-"w. c #8B949E",
-"e. c #8093A7",
-"r. c #8594A4",
-"t. c #8395A8",
-"y. c #8D99A6",
-"u. c #8F9DAB",
-"i. c #93A0AD",
-"p. c #9AA0A8",
-"a. c #9EA7B1",
-"s. c #A5A6A7",
-"d. c #A3ACB7",
-"f. c #A9AFB7",
-"g. c #A5B2BF",
-"h. c #B0B1B2",
-"j. c #B2B2B2",
-"k. c gray70",
-"l. c #B1B3B6",
-"z. c #B4B5B6",
-"x. c #B6B6B6",
-"c. c #BBBBBB",
-"v. c #B8BBBE",
-"b. c #BCBCBC",
-"n. c #BDBEBF",
-"m. c gray75",
-"M. c #A8B8C9",
-"N. c #B9BDC2",
-"B. c #BABEC3",
-"V. c #93C1D9",
-"C. c #9BC7DD",
-"Z. c #BFC5CB",
-"A. c #B9C4D0",
-"S. c #C1C1C1",
-"D. c #C3C3C3",
-"F. c #C6C6C6",
-"G. c gray78",
-"H. c #C5C8CB",
-"J. c gray79",
-"K. c #CACACA",
-"L. c #CBCBCB",
-"P. c gray80",
-"I. c #CDCDCD",
-"U. c #CECECE",
-"Y. c gray81",
-"T. c #C1C8D0",
-"R. c #D0D0D0",
-"E. c gray82",
-"W. c #D1D1D2",
-"Q. c #D2D2D2",
-"!. c LightGray",
-"~. c gray83",
-"^. c #D5D5D5",
-"/. c #D7D7D7",
-"(. c #DADADA",
-"). c gray86",
-"_. c gainsboro",
-"`. c gray87",
-"'. c #CFD8E1",
-"]. c #D0D9E1",
-"[. c #E4E4E4",
-"{. c gray90",
-"}. c gray91",
-"|. c gray92",
-" X c #EAEDF1",
-".X c gray94",
-"XX c gray97",
-"oX c None",
-/* pixels */
-"oXoXoXoXX 6 a D Z r 1   oXoXoXoX",
-"oXoXoX2 | i.n.D.n.l.t.F * oXoXoX",
-"oXoXw e.G.).).~.Q.L.D.z.*.- oXoX",
-"oX< 7.K._.(.(.~.Q.P.f.y.c.@.% oX",
-"X ` b._.(./.~.~.Q.r. .L b.v.s   ",
-"4 u.L./.~.~.Q.H.+.!  .$.z.G.5.# ",
-"t k.Y.Q.Q.d._ +.c _ ~ s.B.P.g.3 ",
-"Z k.P.B.6.n A.&.L ) z F o.G.H.9 ",
-"x j.d._ h b _ J K ~ ! w.D.~.T.8 ",
-"e X.j S h p c M J c p.).{.{.M.: ",
-"> 4.D u u l N U J H R..X.X|.3.O ",
-"  C =.d I T E E T O.`.XXXX].w   ",
-"oX& f k E ] -.;.#.1.[.XX X/   oX",
-"oXoX= I ' >.q.9.,.8.{.]./ @   oX",
-"oXoXoX# y :.V.C.0.<.2.w X   oXoX",
-"oXoXoXoX  + , 7 4 ; O   oXoXoXoX"
-};
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/icons/amarok.xpm b/ubuntu/_base/applications/amarok.cmake/debian/icons/amarok.xpm
deleted file mode 100644
index 6411e36d0..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/icons/amarok.xpm
+++ /dev/null
@@ -1,220 +0,0 @@
-/* XPM */
-static char *amarok[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 182 2",
-"   c #000000",
-".  c #020508",
-"X  c #03090E",
-"o  c #0E0E0E",
-"O  c #050A10",
-"+  c #09131E",
-"@  c #101112",
-"#  c #14191F",
-"$  c #0A1622",
-"%  c #0B1926",
-"&  c #0D1C2C",
-"*  c #0E1F30",
-"=  c #161E26",
-"-  c #0F2032",
-";  c #18222D",
-":  c #102336",
-">  c #12273C",
-",  c #1A2632",
-"<  c #1C2B3B",
-"1  c #142C44",
-"2  c #162F48",
-"3  c #16304A",
-"4  c #18324E",
-"5  c #183450",
-"6  c #1B3A5A",
-"7  c #20344A",
-"8  c #223A52",
-"9  c #1E4064",
-"0  c #22456B",
-"q  c #23486E",
-"w  c #28496F",
-"e  c #244A72",
-"r  c #244D78",
-"t  c #2B4C72",
-"y  c #26517E",
-"u  c #2C5077",
-"i  c #2B537B",
-"p  c #325175",
-"a  c #355479",
-"s  c #33587E",
-"d  c #395575",
-"f  c #38567A",
-"g  c #3B597C",
-"h  c #405C7D",
-"j  c #49627D",
-"k  c #52677E",
-"l  c #275280",
-"z  c #285685",
-"x  c #295788",
-"c  c #2D5982",
-"v  c #2A598A",
-"b  c #2C5D91",
-"n  c #355C83",
-"m  c #395E83",
-"M  c #2E6094",
-"N  c #336189",
-"B  c #3A658C",
-"V  c #336395",
-"C  c #356892",
-"Z  c #386798",
-"A  c #3C6C93",
-"S  c #3C6A9A",
-"D  c #3D729A",
-"F  c #425D80",
-"G  c #456083",
-"H  c #41678D",
-"J  c #496485",
-"K  c #4C6688",
-"L  c #4F6889",
-"P  c #466E93",
-"I  c #426E9B",
-"U  c #417096",
-"Y  c #42739B",
-"T  c #47789F",
-"R  c #4B749C",
-"E  c #506782",
-"W  c #536A84",
-"Q  c #536C8B",
-"!  c #586C82",
-"~  c #5D7084",
-"^  c #5D748D",
-"/  c #51769D",
-"(  c #55799E",
-")  c #5A7190",
-"_  c #447AA1",
-"`  c #457CA8",
-"'  c #4F78A2",
-"]  c #5C7EA1",
-"[  c #627B96",
-"{  c #6A7F96",
-"}  c #4681AB",
-"|  c #4984AB",
-" . c #4E8BB2",
-".. c #5082A7",
-"X. c #5084AA",
-"o. c #5E80A4",
-"O. c #5B81A9",
-"+. c #548CB2",
-"@. c #5390B6",
-"#. c #5594BD",
-"$. c #5B94BC",
-"%. c #5E99BE",
-"&. c #6C8197",
-"*. c #69809B",
-"=. c #758699",
-"-. c #778A9D",
-";. c #7C8691",
-":. c #798A9D",
-">. c #6080A2",
-",. c #6A86A3",
-"<. c #6E8CAB",
-"1. c #608FB2",
-"2. c #7389A3",
-"3. c #7B91A6",
-"4. c #7B9AB9",
-"5. c #579AC1",
-"6. c #5B9EC5",
-"7. c #669EC2",
-"8. c #68A8CC",
-"9. c #6AACD0",
-"0. c #72ABCD",
-"q. c #78AFCE",
-"w. c #71B0D2",
-"e. c #7BB4D4",
-"r. c #858F9B",
-"t. c #87909A",
-"y. c #8D949B",
-"u. c #94989C",
-"i. c #9D9D9D",
-"p. c #8493A3",
-"a. c #8395A8",
-"s. c #8798A9",
-"d. c #859FB9",
-"f. c #9199A3",
-"g. c #8EA2B7",
-"h. c #8CA5BF",
-"j. c #96A2AB",
-"k. c #9BA4AD",
-"l. c #9DA9B5",
-"z. c #A3A3A3",
-"x. c #A6A9AC",
-"c. c #ACACAC",
-"v. c #A3ABB2",
-"b. c #A4AEB8",
-"n. c #AAAEB1",
-"m. c #ADB0B3",
-"M. c #ADB4BB",
-"N. c #B3B3B3",
-"B. c #B0B7BE",
-"V. c #B6B8B9",
-"C. c #BBBBBB",
-"Z. c #8FA7C1",
-"A. c #87B6D1",
-"S. c #85BBD7",
-"D. c #A2B1C1",
-"F. c #AFBBC7",
-"G. c #ADBAC8",
-"H. c #B2BCC7",
-"J. c #B0BCCA",
-"K. c #B8BDC3",
-"L. c #93C2DA",
-"P. c #9EC9DE",
-"I. c #BFC3C7",
-"U. c #B0C1D3",
-"Y. c #AFD1E1",
-"T. c #B4D6E4",
-"R. c #C3C3C4",
-"E. c #C1C4C8",
-"W. c #CCCCCC",
-"Q. c #C1CEDC",
-"!. c #CFD4D9",
-"~. c #D3D3D3",
-"^. c #D6DADE",
-"/. c #DBDBDB",
-"(. c #DAE0E6",
-"). c #E2E3E3",
-"_. c #E2E5E8",
-"`. c #ECECEC",
-"'. c #EAEEF1",
-"]. c #F4F4F4",
-"[. c #FBFBFB",
-"{. c None",
-/* pixels */
-"{.{.{.{.{.{.{.{.{.{.{.o # , 7 8 8 < ; @ o {.{.{.{.{.{.{.{.{.{.{.",
-"{.{.{.{.{.{.{.{.{.X 4 l M I / ( ( R Z v 9 *     {.{.{.{.{.{.{.{.",
-"{.{.{.{.{.{.{.X 6 M ( s.n.N.N.N.N.N.N.k.,.S r &   {.{.{.{.{.{.{.",
-"{.{.{.{.{.{.- v ( k.N.C.W.W.~.~.W.R.R.V.N.N.3.Z 6 .   {.{.{.{.{.",
-"{.{.{.{.  3 V a.N.C.~.)./././.~.~.~.W.W.R.V.N.n./ r X   {.{.{.{.",
-"{.{.{.{.2 Z j.N.W./././././.~.~.~.W.W.W.W.R.K.N.N.o.y .   {.{.{.",
-"{.{.{.& V j.N.W.).)././.~.~.~.~.~.W.W.W.W.R.n.R.C.V.] q     {.{.",
-"{.{.. v a.N.R.)././././.~./.~.~.W.~.W.W.R.E q n.R.C.V.I 1   {.{.",
-"{.{.6 ( N.C././././.~.~.~.~.~.~.W.~.~.b.j ^ p j R.C.C.v.v X   {.",
-"{.X b k.N.W././././.~./.~.~.~.~.~.W.:.e Q ) K k x.R.R.R.o.5   {.",
-"{.4 ' N.V././.~.~./.~.~.~.~.~.~.E.J p F ) ) p y.i.R.R.R.b.v   . ",
-"o r s.N.R./.~.~.~.~.~.~.~.W.I.B.h d s Q Q K ! z.c.W.W.R.R.I %   ",
-"@ M n.N.W.~.~.~.~.~.~.E.Q g g f p w L Q Q t u.z.W.W.W.W.W.<.4 . ",
-", S N.N.W.~.~.~.~.~.K.h G &.D.Q 0 F K L j j z.C.l.M.~.W.W.g.0 . ",
-"< / N.N.W.W.W.W.W.M.f h [ [.'.a g K G L p 0 d g w &.~.~.~.M.0 . ",
-"8 ( N.N.W.W.W.p.Q w p w (.F.f f F F G K g a g d j t.c.!.~.K.i . ",
-"7 ( N.N.R.R.{ 2.F 0 0 Q H.e g g F F F F G g g u.c.n.C././.H.r . ",
-", I N.m.f.^ h 0 0 0 0 d t a f g g F F F p ! c.N.W./.)././.D.q   ",
-"= V y.h f t d m p 0 0 q p p d a g g F p ! N.C.).).).).).).d.6   ",
-"o x :.t w t a d t 0 q t p a d s f f a 0 c.C.).`.`.`.).).).] , . ",
-"o 8 ,.r.q 0 q 0 0 q t u p s s g m f e g V./.`.`.`.`.`._.^.M X . ",
-"{.% Z m.;.q 0 0 q e i i s N h N m s r ^ C.`.].].].].`.`.Z.9   . ",
-"{.  r 2.N.! q q t n c m N B B B B c s =.R.].].].].].]._.S $   {.",
-"{.. $ Z =.q q u m c H B A U U U B B n p.~.].].[.[.[.].4.9     {.",
-"{.{.  6 z q r i c P U Y Y T _ _ D Y N j.~.].[.[.[.].U.v X   {.{.",
-"{.{.{.. e y r c A Y T ..| @. . .| ..D l./.`.].].[.Q.V %     {.{.",
-"{.{.{.  . e c N A D @.@.8.6.6.%.%.+.T n./.`.].].J.Z *     {.{.{.",
-"{.{.{.{.  . 9 M D X.@.6.q.w.w.8.8.%.| N./.`.(.4.v %     {.{.{.{.",
-"{.{.{.{.{.    > N } #.9.S.L.L.S.w.0.@.c.~.h.S 9 X     {.{.{.{.{.",
-"{.{.{.{.{.{.    X 2 C $.A.Y.T.P.q.#.` ' b 0 +       {.{.{.{.{.{.",
-"{.{.{.{.{.{.{.{.      # < 9 p w w 0 5 - .       {.{.{.{.{.{.{.{.",
-"{.{.{.{.{.{.{.{.{.{.  . .   . .   . . .   . {.{.{.{.{.{.{.{.{.{."
-};
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/install-mp3 b/ubuntu/_base/applications/amarok.cmake/debian/install-mp3
deleted file mode 100644
index 7b06cbd2f..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/install-mp3
+++ /dev/null
@@ -1,40 +0,0 @@
-check_mp3() {
-
-   INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install`
-
-   if [ -z "$INSTALLED" ]; then
-     if [ -x /opt/trinity/bin/kdialog ]; then
-       kdialog --msgbox "There was an error installing MP3 support. You need to install the package \"libxine1-ffmpeg\" manually." --icon amarok
-     elif [ -x /usr/bin/zenity ]; then
-       zenity --info --text "There was an error installing MP3 support. You need to install the package \"libxine1-ffmpeg\" manually."
-     else
-       Xdialog --msgbox "There was an error installing MP3 support.\nYou need to install the package \"libxine1-ffmpeg\" manually." 10 60
-     fi
-     exit 1
-   else
-     if [ -x /opt/trinity/bin/kdialog ]; then
-       kdialog --msgbox "MP3 support now installed, you will need to restart Amarok." --icon amarok
-     elif [ -x /usr/bin/zenity ]; then
-       zenity --info --text "MP3 support now installed, you will need to restart Amarok."
-     else
-       Xdialog --msgbox "MP3 support now installed, you will need to restart Amarok." 5 60
-     fi
-     exit 0
-   fi
-}
-
-INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install`
-
-#is available, not installed
-if [ -z "$INSTALLED" ]; then
-  if [ -x /opt/trinity/bin/kdesu ] && [ -x /usr/bin/install-package ]; then
-    /opt/trinity/bin/kdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
-  elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then
-    gksudo "sh -c 'echo \"libxine1-ffmpeg i\"|synaptic --non-interactive --set-selections'"
-  else
-    xterm -e 'sudo apt-get install libxine1-ffmpeg'
-  fi
-  check_mp3
-fi
-
-exit 0
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/kubuntu-media-amarok b/ubuntu/_base/applications/amarok.cmake/debian/kubuntu-media-amarok
deleted file mode 100644
index dacf7fc55..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/kubuntu-media-amarok
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-DEVICE=$@
-
-if [ -n "$DEVICE" ];then
-	if [ ${DEVICE:0:7} = "audiocd" ]; then
-		amarok --cdplay ${DEVICE#*=}
-	elif [ ${DEVICE:0:1} = "/" ]; then
-		amarok --cdplay `dcop kded mediamanager fullList | grep -B1 $DEVICE | head -n1`
-	else
-		amarok --cdplay /dev/cdrom
-	fi
-else
-        amarok --cdplay /dev/cdrom
-fi
-
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/man/amarok-trinity.1 b/ubuntu/_base/applications/amarok.cmake/debian/man/amarok-trinity.1
deleted file mode 100644
index dac3bb8aa..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/man/amarok-trinity.1
+++ /dev/null
@@ -1,181 +0,0 @@
-.\" Generated by kdemangen.pl and edited by hand
-.TH AMAROK 1 "Mar 2004" "K Desktop Environment" "An audio player for KDE"
-.SH NAME
-amarok
-\- An audio player for KDE
-.SH SYNOPSIS
-amarok [Qt-options] [KDE-options] [URL(s)] 
-.SH DESCRIPTION
-amaroK is a multimedia player based on the soundserver-independent framework.
-There are many media players around these days, true. What's missing from most
-players is a user interface, that doesn't get in the way of the user.
-.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 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 
-.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 Arguments:
-URL(s)                    Files/URLs to Open
-.SS 
-.SS Options:
-.TP
-.B \-r,  \-\-previous  
-Skip backwards in playlist
-.TP
-.B \-p,  \-\-play  
-Start playing current playlist
-.TP
-.B \-s,  \-\-stop  
-Stop playback
-.TP
-.B  \-\-pause  
-Pause playback
-.TP
-.B \-f,  \-\-next  
-Skip forwards in playlist
-.SS 
-.SS Additional options:
-.TP
-.B \-e,  \-\-enqueue  
-Enqueue Files/URLs
-
-.SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
-.BR help:/amarok/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/amarok/'"
-from the command-line.
-.BR
-.SH AUTHORS
-.nf
-Christian Muehlhaeuser <chris@chris.de>
-.BR
-Mark Kretschmann <markey@web.de>
-.BR
-Max Howell <max.howell@methylblue.com>
-.BR
-Stanislav Karchebny <berk@upnet.ru>
-.BR
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
-.BR
-.SH OTHER
-This manual page was written by Alejandro Exojo <suy@badopi.org> for the Debian
-system (but may be used by others).
-.BR
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1 b/ubuntu/_base/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1
deleted file mode 100644
index c932b9b0c..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1
+++ /dev/null
@@ -1,14 +0,0 @@
-.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius
-.TH AMAROK_LIBVISUAL 1 "Feb 2008" "Amarok" "LibVisual support utility for Amarok"
-.SH NAME
-amarok_libvisual \- LibVisual support utility for Amarok
-.SH SYNOPSIS
-amarok_libvisual
-.SH DESCRIPTION
-This is LibVisual support helper utility for Amarok. It's used internally by Amarok 
-itself when needed and is not supposed to be invoked manually by user.
-.SS 
-.SH AUTHORS
-Amarok Developers
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/man/amarokapp-trinity.1 b/ubuntu/_base/applications/amarok.cmake/debian/man/amarokapp-trinity.1
deleted file mode 100644
index 0850440dd..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/man/amarokapp-trinity.1
+++ /dev/null
@@ -1,23 +0,0 @@
-.\" Generated by kdemangen.pl and edited by hand
-.TH AMAROK 1 "Feb 2008" "Amarok" "An audio player for KDE"
-.SH NAME
-amarokapp
-\- A direct executable for Amarok.
-.SH SYNOPSIS
-amarokapp [Qt-options] [KDE-options] [URL(s)] 
-.SH DESCRIPTION
-Amarok is a multimedia player based on the soundserver-independent framework.
-There are many media players around these days, true. What's missing from most
-players is a user interface, that doesn't get in the way of the user.
-.P
-This is direct Amarok executable. The recommend way to run Amarok is using
-\fBamarok(1)\fP, which is a wrapper script around \fBamarokapp\fP. However, if you're
-debugging Amarok with gdb, valgrind or similar program, you will probably want to
-run it against this binary directly.
-.P
-\fBamarokapp(1)\fP takes the same command line options and arguments as
-\fBamarok(1)\fP. See its manual page for more information how to run \fBamarokapp\fP.
-.SH SEE ALSO
-amarok(1)
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1 b/ubuntu/_base/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1
deleted file mode 100644
index f4abfd1b2..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius
-.TH AMAROKCOLLECTIONSCANNER 1 "Feb 2008" "Amarok" "Collection Scanner for Amarok"
-.SH NAME
-amarokcollectionscanner \- Collection Scanner for Amarok
-.SH SYNOPSIS
-amarokcollectionscanner [Qt\-options] [KDE\-options] Folder(s) 
-.SH DESCRIPTION
-This Amarok helper utility scans folder(s) given on the command line or
-restarts previous scan if \fB\-\-restart\fP option was given and writes a
-specially structured XML file to standard output with extensive information
-(including tags) about audio files it was able to find. XML file schema used
-by this utility is Amarok specific.
-.P
-You may find his utility useful if you need to retreive and/or display extended
-information about collection of audio files.
-.SH OPTIONS
-.SS
-.SS Arguments:
-Folder(s)                 Folders to scan
-.SS 
-.SS Options:
-.TP
-.B \-r,  \-\-recursive  
-Scan folders recursively
-.TP
-.B \-i,  \-\-incremental  
-Incremental Scan (modified folders only)
-.TP
-.B \-p,  \-\-importplaylists  
-Import playlist
-.TP
-.B \-s,  \-\-restart  
-Restart the scanner at last position, after a crash []
-.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 
-.SH AUTHORS
-Amarok Developers
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/rules b/ubuntu/_base/applications/amarok.cmake/debian/rules
deleted file mode 100755
index 3934caf74..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/rules
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/make -f
-
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include debian/cdbs/debian-tde.mk
-
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
--DWITH_IFP="ON" -DWITH_NJB="ON" -DWITH_MTP="ON" -DWITH_DAAP="ON" -DWITH_YAUAP="ON" \
--DWITH_LIBVISUAL="ON" -DWITH_KONQSIDEBAR="ON" -DWITH_XINE="ON" -DWITH_IPOD="ON"
-
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
-
-### VARIABLES
-# Exempt amarok engines from being handled as proper public libraries
-# by dh_makeshlibs
-DEB_DH_MAKESHLIBS_ARGS_ALL = -Xlibamarok_\\w*-engine-trinity
-
-export KUBUNTU_DESKTOP_POT=extragear-multimedia_amarok-trinity
-
-#DEB_CONFIGURE_EXTRA_FLAGS  :=	--without-included-sqlite \
-#				--disable-final \
-#				--without-akode \
-#				--without-gstreamer10 \
-#				--without-libkarma \
-#				--with-ifp      \
-#				--with-libgpod  \
-#				--with-libnjb   \
-#				--with-libmtp   \
-#				--enable-mysql  \
-#				--enable-postgresql \
-#				--with-yauap \
-#				--prefix=/opt/trinity \
-#				--with-extra-libs=/usr/lib/mesa
-
-# Ship upstream README in amarok docs
-DEB_INSTALL_DOCS_ALL =
-DEB_INSTALL_DOCS_amarok-trinity = $(DEB_SRCDIR)/README
-
-# Amarok engines should not auto-depend on amarok. 
-# Appropriate relationships are set manually in the control file.
-DEB_DH_SHLIBDEPS_ARGS_amarok-engine-xine-trinity = -- -xamarok-trinity
-DEB_DH_SHLIBDEPS_ARGS_amarok-engine-yauap-trinity = -- -xamarok-trinity
-
-binary-fixup/amarok-common-trinity::
-	# Fix permissions of some amarok scripts
-	chmod a+x  \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/playlist2html/Playlist.py \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/ruby_debug/debug.rb \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/templates/python_qt_template.py \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/templates/ruby_qt_template.rb \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/webcontrol/Playlist.py \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/webcontrol/RequestHandler.py
-
-binary-post-install/amarok-common-trinity::
-	# Remove excess COPYING files from script directories
-	rm -f \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/lyrics_astraweb/COPYING \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/lyrics_lyrc/COPYING \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/score_default/COPYING \
-	    debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/scripts/score_impulsive/COPYING
-	# Remove Mac OSX resource fork file
-	rm -f debian/$(cdbs_curpkg)/opt/trinity/share/apps/amarok/ruby_lib/rubygems/._gem_commands.rb
-
-### POST-INSTALL HACKING
-common-binary-post-install-arch::
-	# Check for not installed files
-	dh_install --no-act --list-missing
-
-	chmod a+x debian/amarok-trinity/opt/trinity/lib/amarok/install-mp3
-	chmod +x debian/amarok-trinity/opt/trinity/bin/kubuntu-media-amarok
-	ln -s /opt/trinity/bin/amarokapp debian/amarok-trinity/opt/trinity/lib/amarok/amarokapp
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/watch b/ubuntu/_base/applications/amarok.cmake/debian/watch
deleted file mode 100644
index b0a7420bb..000000000
--- a/ubuntu/_base/applications/amarok.cmake/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-opts=pasv ftp://ftp.kde.org/pub/kde/stable/amarok/([0-9.]+)/src/amarok-([0-9.]+)\.tar\.bz2
diff --git a/ubuntu/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
deleted file mode 100644
index ca324be99..000000000
--- a/ubuntu/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ /dev/null
@@ -1,14 +0,0 @@
-debian/install-mp3			/usr/lib/amarok
-amarok/src/engine/xine/amarok_xine-mp3_install.desktop /usr/share/services
-Depend on amarok-xine | amarok-engine
-export KUBUNTU_DESKTOP_POT=extragear-multimedia_amarok
-install debian/kubuntu-media-amarok and debian/amarok_play_audiocd.desktop in amarok.install
-chmod x debian/amarok/usr/bin/kubuntu-media-amarok in debian/rules in section
-	common-binary-post-install-arch::
-remove amarok-common.lintian, amarok.lintian
-make watch file actually work
-
-#### due to removal of KDE 3 packages ####
-remove kdemultimedia-dev, kdebase-dev from Build-Depends
-remove amarok-konqsidebar, kdemultimedia-kio-plugins from Recommends
-remove complete amarok-konqsidebar package
diff --git a/ubuntu/_base/applications/amarok/debian/README.Debian b/ubuntu/_base/applications/amarok/debian/README.Debian
deleted file mode 100644
index 7dc17fb17..000000000
--- a/ubuntu/_base/applications/amarok/debian/README.Debian
+++ /dev/null
@@ -1,28 +0,0 @@
-Amarok packages for Debian
-==========================
-
-  A couple of notes which you may find useful:
-
-    - starting with Amarok 1.4, lyrics downloading is implemented in a
-      separate Ruby script;
-
-    - Last.fm stream support is also implemented with the help of a Ruby
-      script.
-
-    - if you want amarok to be able to play CDs, you need to install the
-      kdemultimedia-kio-plugins package.
-
-    - the scripts available in the 'Scripts' menu need that you install
-      some other packages for them to work. Those packages are listed in
-      the Suggests: field of the amarok package.
-
-  Also, users not using the full KDE environment may get the following
-  error when executing amarok for the first time: "Socket-path is not a
-  link or a directory: /home/$USER/.kde/socket-$HOSTNAME". Just execute:
-
-    $ lnusertemp socket
-
-  Note that you only need to execute it once, not each time that you
-  start Amarok.
-
- -- Adeodato Simó <dato@net.com.org.es>
diff --git a/ubuntu/_base/applications/amarok/debian/amarok-common-trinity.install b/ubuntu/_base/applications/amarok/debian/amarok-common-trinity.install
deleted file mode 100644
index 3b473baa0..000000000
--- a/ubuntu/_base/applications/amarok/debian/amarok-common-trinity.install
+++ /dev/null
@@ -1,24 +0,0 @@
-debian/tmp/opt/trinity/share/apps/amarok/*
-debian/tmp/opt/trinity/share/apps/profiles/*
-debian/tmp/opt/trinity/share/doc/*
-debian/tmp/opt/trinity/share/icons/*
-debian/tmp/opt/trinity/share/locale/*
-debian/tmp/opt/trinity/share/config.kcfg/amarok.kcfg
-debian/tmp/opt/trinity/share/services/amarok_void-engine_plugin.desktop
-debian/tmp/opt/trinity/share/services/amarok_generic-mediadevice.desktop
-debian/tmp/opt/trinity/share/services/amarok_ifp-mediadevice.desktop
-debian/tmp/opt/trinity/share/services/amarok_ipod-mediadevice.desktop
-debian/tmp/opt/trinity/share/services/amarok_njb-mediadevice.desktop
-debian/tmp/opt/trinity/share/services/amarok_smb-device.desktop
-debian/tmp/opt/trinity/share/services/amarok_massstorage-device.desktop
-debian/tmp/opt/trinity/share/services/amarok_nfs-device.desktop
-debian/tmp/opt/trinity/share/services/amarok_daap-mediadevice.desktop
-
-#libkarma is not in MAIN yet
-#debian/tmp/opt/trinity/share/services/amarok_riokarma-mediadevice.desktop
-
-debian/tmp/opt/trinity/share/services/amarok_mtp-mediadevice.desktop
-debian/tmp/opt/trinity/bin/amarok_proxy.rb
-debian/tmp/opt/trinity/bin/amarok_daapserver.rb
-debian/tmp/etc/*
-
diff --git a/ubuntu/_base/applications/amarok/debian/amarok-engine-xine-trinity.install b/ubuntu/_base/applications/amarok/debian/amarok-engine-xine-trinity.install
deleted file mode 100644
index c5e46604f..000000000
--- a/ubuntu/_base/applications/amarok/debian/amarok-engine-xine-trinity.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/opt/trinity/share/services/amarok_xine-engine.desktop
-debian/tmp/opt/trinity/share/config.kcfg/xinecfg.kcfg
-debian/tmp/opt/trinity/lib/trinity/libamarok_xine-engine.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_xine-engine.la
diff --git a/ubuntu/_base/applications/amarok/debian/amarok-engine-yauap-trinity.install b/ubuntu/_base/applications/amarok/debian/amarok-engine-yauap-trinity.install
deleted file mode 100644
index ab71ca6f9..000000000
--- a/ubuntu/_base/applications/amarok/debian/amarok-engine-yauap-trinity.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/opt/trinity/share/services/amarok_yauap-engine_plugin.desktop
-debian/tmp/opt/trinity/lib/trinity/libamarok_yauap-engine_plugin.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_yauap-engine_plugin.so
diff --git a/ubuntu/_base/applications/amarok/debian/amarok-trinity.install b/ubuntu/_base/applications/amarok/debian/amarok-trinity.install
deleted file mode 100644
index f5aeb567f..000000000
--- a/ubuntu/_base/applications/amarok/debian/amarok-trinity.install
+++ /dev/null
@@ -1,48 +0,0 @@
-debian/tmp/opt/trinity/share/applications/kde/amarok.desktop
-debian/tmp/opt/trinity/share/services/amarokitpc.protocol
-debian/tmp/opt/trinity/share/services/amaroklastfm.protocol
-debian/tmp/opt/trinity/share/services/amarokpcast.protocol
-debian/tmp/opt/trinity/share/servicetypes/amarok_plugin.desktop
-debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop 
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_ifp-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_ifp-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
-
-#libkarma is not in MAIN yet
-#debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.la
-#debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.so
-
-debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.so
-debian/tmp/opt/trinity/lib/ruby_lib/*           /opt/trinity/lib/ruby_lib/
-debian/tmp/opt/trinity/lib/libamarok.so.0
-debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
-debian/tmp/opt/trinity/bin/amarok
-debian/tmp/opt/trinity/bin/amarokapp
-debian/tmp/opt/trinity/bin/amarok_libvisual
-debian/tmp/opt/trinity/bin/amarokcollectionscanner
-
-debian/icons/*                          /opt/trinity/share/pixmaps
-
-amarok/src/engine/xine/amarok_xine-mp3_install.desktop /opt/trinity/share/services
-debian/amarok_play_audiocd.desktop /opt/trinity/share/apps/konqueror/servicemenus
-debian/kubuntu-media-amarok /opt/trinity/bin
-debian/install-mp3 /opt/trinity/lib/amarok
diff --git a/ubuntu/_base/applications/amarok/debian/amarok-trinity.manpages b/ubuntu/_base/applications/amarok/debian/amarok-trinity.manpages
deleted file mode 100644
index 8094eebb9..000000000
--- a/ubuntu/_base/applications/amarok/debian/amarok-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/amarokapp-trinity.1
-debian/man/amarok-trinity.1
-debian/man/amarokcollectionscanner-trinity.1
-debian/man/amarok_libvisual-trinity.1
diff --git a/ubuntu/_base/applications/amarok/debian/amarok-trinity.menu b/ubuntu/_base/applications/amarok/debian/amarok-trinity.menu
deleted file mode 100644
index f78ef6060..000000000
--- a/ubuntu/_base/applications/amarok/debian/amarok-trinity.menu
+++ /dev/null
@@ -1,8 +0,0 @@
-?package(amarok):\
-	needs="X11"\
-	section="Applications/Sound"\
-	hints="KDE"\
-	title="Amarok"\
-	icon32x32="/usr/share/pixmaps/amarok.xpm"\
-	icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
-	command="/opt/trinity/bin/amarok"
diff --git a/ubuntu/_base/applications/amarok/debian/amarok_play_audiocd.desktop b/ubuntu/_base/applications/amarok/debian/amarok_play_audiocd.desktop
deleted file mode 100644
index 434630b60..000000000
--- a/ubuntu/_base/applications/amarok/debian/amarok_play_audiocd.desktop
+++ /dev/null
@@ -1,46 +0,0 @@
-[Desktop Entry]
-ServiceTypes=media/audiocd
-Actions=Play;
-Encoding=UTF-8
-X-KDE-Priority=TopLevel
-
-[Desktop Action Play]
-Name=Play Audio CD with amaroK
-Name[ar]=قراءة قرص مدمج صوتي بواسطة amaroK
-Name[bg]=Възпроизвеждане на аудио CD с amaroK
-Name[bn]=ক্যাফিন দিয়ে অডিও সিডি চালাও
-Name[br]=Seniñ ur bladenn klevet gant amaroK
-Name[ca]=Reprodueix Audio CD amb amaroK
-Name[cs]=Pehrát audio CD amaroK
-Name[da]=Spil lyd-cd med amaroK
-Name[de]=Audio-CD mit amaroK abspielen
-Name[el]=Αναπαραγωγή CD ήχου με το amaroK
-Name[es]=Reproducir CD de audio con amaroK
-Name[et]=Esita audio-CD amaroK'is
-Name[fi]=Soita musiikki-cd amaroKssa
-Name[fr]=Jouer un CD Audio avec amaroK
-Name[ga]=Seinn CD Fuaime le amaroK
-Name[gl]=Reproducir o CD de Áudio con amaroK
-Name[he]=נגן תקליטור שמע עם amaroK
-Name[is]=Spila tónlistardisk með amaroK
-Name[it]=Riproduci CD audio con amaroK
-Name[ja]=amaroKで音楽CDを再生
-Name[ka]=აუდიო CD-ის დაკვრა amaroK-ით
-Name[km]=ចាក់​ស៊ីឌី​អូឌីយ៉ូ​​ជាមួយ amaroK
-Name[nb]=Spill lyd-CD med amaroK
-Name[nl]=Audio-cd met amaroK afspelen
-Name[nn]=Spel lyd-CD med amaroK
-Name[pa]=ਕੈਫੀਨ ਨਾਲ ਆਡੀਓ CD ਚਲਾਓ
-Name[pl]=Odtwarzaj audio CD w amaroK
-Name[pt]=Tocar o CD de Áudio com o amaroK
-Name[pt_BR]=Reproduzir o CD de Áudio com o amaroK
-Name[sr]=Пустио аудио CD amaroK-ом
-Name[sr@Latn]=Pustio audio CD amaroK-om
-Name[sv]=Spela ljud-cd med amaroK
-Name[tr]=amaroK ile Ses CD'si Çal
-Name[uk]=Програти аудіо-КД з amaroK
-Name[xx]=xxPlay Audio CD with amaroKxx
-Name[zh_CN]=用 amaroK 播放音频 CD
-Name[zh_TW]=使用 amaroK 播放音樂 CD
-Icon=amarok
-Exec=bash kubuntu-media-amarok %u
diff --git a/ubuntu/_base/applications/amarok/debian/copyright b/ubuntu/_base/applications/amarok/debian/copyright
deleted file mode 100644
index 2775890ba..000000000
--- a/ubuntu/_base/applications/amarok/debian/copyright
+++ /dev/null
@@ -1,51 +0,0 @@
-Debianized by Peter Rockai <mornfall@mornfall.homeip.net>    2004-04-11
-New maintainer Adeodato Simó <dato@net.com.org.es>           2004-09-22
-New maintainer Modestas Vainius <modestas@vainius.eu>        2007-12-24
-
-It was downloaded from:
-
-    <ftp://ftp.kde.org/pub/kde/stable/amarok/>
-
-And the project homepage is:
-
-    <http://amarok.kde.org>
-
-Upstream Authors:
-
-    | Alexandre Oliveira	<aleprj@gmail.com>
-    | Christian Muehlhaeuser	<chris@chris.de>
-    | Frederik Holljen		<fh@ez.no>
-    | Gábor Lehel		<illissius@gmail.com>
-    | Ian Monroe		<ian@monroe.nu>
-    | Jeff Mitchell		<kde-dev@emailgoeshere.com>
-    | Mark Kretschmann		<markey@web.de>
-    | Martin Aumueller		<aumuell@reserv.at>
-    | Max Howell		<max.howell@methylblue.com>
-    | Mike Diehl		<madpenguin8@yahoo.com>
-    | Pierpaolo Di Panfilo	<pippo_dp@libero.it>
-    | Roman Becker		<roman@formmorf.de>
-    | Seb Ruiz			<me@sebruiz.net>
-    | Stanislav Karchebny	<berkus@madfire.net>
-
-Copyright:
-
-    | © 2002-2003, Mark Kretschmann
-    | © 2003-2006, The Amarok Development Squad
-
-License terms:
-
-    | 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; 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 program; if not, write to the Free Software Foundation,
-    | Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-  The full text of the GNU General Public License version 2 is available on
-  Debian systems in /usr/share/common-licenses/GPL-2.
diff --git a/ubuntu/_base/applications/amarok/debian/icons/amarok-16.xpm b/ubuntu/_base/applications/amarok/debian/icons/amarok-16.xpm
deleted file mode 100644
index 80a228f20..000000000
--- a/ubuntu/_base/applications/amarok/debian/icons/amarok-16.xpm
+++ /dev/null
@@ -1,210 +0,0 @@
-/* XPM */
-static char *amarok-16[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 188 2",
-"   c black",
-".  c #010203",
-"X  c #010304",
-"o  c #030405",
-"O  c #030406",
-"+  c #05070A",
-"@  c #03080C",
-"#  c #05090D",
-"$  c #04090F",
-"%  c #050A10",
-"&  c #070F17",
-"*  c #071019",
-"=  c #0A1521",
-"-  c #0B1825",
-";  c #0D1824",
-":  c #0D1926",
-">  c #0F1A26",
-",  c #0F1E2C",
-"<  c #0E1F30",
-"1  c #101D2A",
-"2  c #0F2133",
-"3  c #102030",
-"4  c #132436",
-"5  c #132639",
-"6  c #142638",
-"7  c #17293B",
-"8  c #14283C",
-"9  c #152A40",
-"0  c #193047",
-"q  c #193149",
-"w  c #19324B",
-"e  c #203A55",
-"r  c #223D59",
-"t  c #26415E",
-"y  c #234562",
-"u  c #22456C",
-"i  c #23486F",
-"p  c #26486E",
-"a  c #284360",
-"s  c #294663",
-"d  c #244A71",
-"f  c #264F7A",
-"g  c #294A70",
-"h  c #2A4B71",
-"j  c #2D4D73",
-"k  c #29537B",
-"l  c #2D5178",
-"z  c #304F74",
-"x  c #35506D",
-"c  c #325176",
-"v  c #325277",
-"b  c #335377",
-"n  c #355377",
-"m  c #365575",
-"M  c #37567A",
-"N  c #32597F",
-"B  c #33587E",
-"V  c #375A7F",
-"C  c #385472",
-"Z  c #395572",
-"A  c #3A5675",
-"S  c #38567A",
-"D  c #3B5876",
-"F  c #3A597A",
-"G  c #3B587A",
-"H  c #3B5A7B",
-"J  c #3B587C",
-"K  c #405C7F",
-"L  c #445E7F",
-"P  c #46607E",
-"I  c #2B5781",
-"U  c #385C82",
-"Y  c #376088",
-"T  c #37628A",
-"R  c #3A688F",
-"E  c #3E6A90",
-"W  c #3F6B92",
-"Q  c #415D80",
-"!  c #435E81",
-"~  c #445F80",
-"^  c #445F82",
-"/  c #466686",
-"(  c #476687",
-")  c #4A6486",
-"_  c #4E6989",
-"`  c #4F6E8F",
-"'  c #42769E",
-"]  c #46769D",
-"[  c #50698A",
-"{  c #506A89",
-"}  c #516A89",
-"|  c #506F8F",
-" . c #546D8C",
-".. c #556E8E",
-"X. c #5B7088",
-"o. c #5B718A",
-"O. c #587591",
-"+. c #5B7491",
-"@. c #5E7B9A",
-"#. c #487BA2",
-"$. c #6F7D8C",
-"%. c #607790",
-"&. c #637B97",
-"*. c #627E9B",
-"=. c #6B7D90",
-"-. c #4980A8",
-";. c #4A83AA",
-":. c #5491B8",
-">. c #5693B9",
-",. c #5E99BE",
-"<. c #658DAC",
-"1. c #6A87A0",
-"2. c #6A87A4",
-"3. c #6D89A7",
-"4. c #758BA2",
-"5. c #758FA9",
-"6. c #7E8FA1",
-"7. c #7F93A7",
-"8. c #7997AC",
-"9. c #63A5CA",
-"0. c #6CA7CA",
-"q. c #6CA8CB",
-"w. c #8B949E",
-"e. c #8093A7",
-"r. c #8594A4",
-"t. c #8395A8",
-"y. c #8D99A6",
-"u. c #8F9DAB",
-"i. c #93A0AD",
-"p. c #9AA0A8",
-"a. c #9EA7B1",
-"s. c #A5A6A7",
-"d. c #A3ACB7",
-"f. c #A9AFB7",
-"g. c #A5B2BF",
-"h. c #B0B1B2",
-"j. c #B2B2B2",
-"k. c gray70",
-"l. c #B1B3B6",
-"z. c #B4B5B6",
-"x. c #B6B6B6",
-"c. c #BBBBBB",
-"v. c #B8BBBE",
-"b. c #BCBCBC",
-"n. c #BDBEBF",
-"m. c gray75",
-"M. c #A8B8C9",
-"N. c #B9BDC2",
-"B. c #BABEC3",
-"V. c #93C1D9",
-"C. c #9BC7DD",
-"Z. c #BFC5CB",
-"A. c #B9C4D0",
-"S. c #C1C1C1",
-"D. c #C3C3C3",
-"F. c #C6C6C6",
-"G. c gray78",
-"H. c #C5C8CB",
-"J. c gray79",
-"K. c #CACACA",
-"L. c #CBCBCB",
-"P. c gray80",
-"I. c #CDCDCD",
-"U. c #CECECE",
-"Y. c gray81",
-"T. c #C1C8D0",
-"R. c #D0D0D0",
-"E. c gray82",
-"W. c #D1D1D2",
-"Q. c #D2D2D2",
-"!. c LightGray",
-"~. c gray83",
-"^. c #D5D5D5",
-"/. c #D7D7D7",
-"(. c #DADADA",
-"). c gray86",
-"_. c gainsboro",
-"`. c gray87",
-"'. c #CFD8E1",
-"]. c #D0D9E1",
-"[. c #E4E4E4",
-"{. c gray90",
-"}. c gray91",
-"|. c gray92",
-" X c #EAEDF1",
-".X c gray94",
-"XX c gray97",
-"oX c None",
-/* pixels */
-"oXoXoXoXX 6 a D Z r 1   oXoXoXoX",
-"oXoXoX2 | i.n.D.n.l.t.F * oXoXoX",
-"oXoXw e.G.).).~.Q.L.D.z.*.- oXoX",
-"oX< 7.K._.(.(.~.Q.P.f.y.c.@.% oX",
-"X ` b._.(./.~.~.Q.r. .L b.v.s   ",
-"4 u.L./.~.~.Q.H.+.!  .$.z.G.5.# ",
-"t k.Y.Q.Q.d._ +.c _ ~ s.B.P.g.3 ",
-"Z k.P.B.6.n A.&.L ) z F o.G.H.9 ",
-"x j.d._ h b _ J K ~ ! w.D.~.T.8 ",
-"e X.j S h p c M J c p.).{.{.M.: ",
-"> 4.D u u l N U J H R..X.X|.3.O ",
-"  C =.d I T E E T O.`.XXXX].w   ",
-"oX& f k E ] -.;.#.1.[.XX X/   oX",
-"oXoX= I ' >.q.9.,.8.{.]./ @   oX",
-"oXoXoX# y :.V.C.0.<.2.w X   oXoX",
-"oXoXoXoX  + , 7 4 ; O   oXoXoXoX"
-};
diff --git a/ubuntu/_base/applications/amarok/debian/icons/amarok.xpm b/ubuntu/_base/applications/amarok/debian/icons/amarok.xpm
deleted file mode 100644
index 6411e36d0..000000000
--- a/ubuntu/_base/applications/amarok/debian/icons/amarok.xpm
+++ /dev/null
@@ -1,220 +0,0 @@
-/* XPM */
-static char *amarok[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 182 2",
-"   c #000000",
-".  c #020508",
-"X  c #03090E",
-"o  c #0E0E0E",
-"O  c #050A10",
-"+  c #09131E",
-"@  c #101112",
-"#  c #14191F",
-"$  c #0A1622",
-"%  c #0B1926",
-"&  c #0D1C2C",
-"*  c #0E1F30",
-"=  c #161E26",
-"-  c #0F2032",
-";  c #18222D",
-":  c #102336",
-">  c #12273C",
-",  c #1A2632",
-"<  c #1C2B3B",
-"1  c #142C44",
-"2  c #162F48",
-"3  c #16304A",
-"4  c #18324E",
-"5  c #183450",
-"6  c #1B3A5A",
-"7  c #20344A",
-"8  c #223A52",
-"9  c #1E4064",
-"0  c #22456B",
-"q  c #23486E",
-"w  c #28496F",
-"e  c #244A72",
-"r  c #244D78",
-"t  c #2B4C72",
-"y  c #26517E",
-"u  c #2C5077",
-"i  c #2B537B",
-"p  c #325175",
-"a  c #355479",
-"s  c #33587E",
-"d  c #395575",
-"f  c #38567A",
-"g  c #3B597C",
-"h  c #405C7D",
-"j  c #49627D",
-"k  c #52677E",
-"l  c #275280",
-"z  c #285685",
-"x  c #295788",
-"c  c #2D5982",
-"v  c #2A598A",
-"b  c #2C5D91",
-"n  c #355C83",
-"m  c #395E83",
-"M  c #2E6094",
-"N  c #336189",
-"B  c #3A658C",
-"V  c #336395",
-"C  c #356892",
-"Z  c #386798",
-"A  c #3C6C93",
-"S  c #3C6A9A",
-"D  c #3D729A",
-"F  c #425D80",
-"G  c #456083",
-"H  c #41678D",
-"J  c #496485",
-"K  c #4C6688",
-"L  c #4F6889",
-"P  c #466E93",
-"I  c #426E9B",
-"U  c #417096",
-"Y  c #42739B",
-"T  c #47789F",
-"R  c #4B749C",
-"E  c #506782",
-"W  c #536A84",
-"Q  c #536C8B",
-"!  c #586C82",
-"~  c #5D7084",
-"^  c #5D748D",
-"/  c #51769D",
-"(  c #55799E",
-")  c #5A7190",
-"_  c #447AA1",
-"`  c #457CA8",
-"'  c #4F78A2",
-"]  c #5C7EA1",
-"[  c #627B96",
-"{  c #6A7F96",
-"}  c #4681AB",
-"|  c #4984AB",
-" . c #4E8BB2",
-".. c #5082A7",
-"X. c #5084AA",
-"o. c #5E80A4",
-"O. c #5B81A9",
-"+. c #548CB2",
-"@. c #5390B6",
-"#. c #5594BD",
-"$. c #5B94BC",
-"%. c #5E99BE",
-"&. c #6C8197",
-"*. c #69809B",
-"=. c #758699",
-"-. c #778A9D",
-";. c #7C8691",
-":. c #798A9D",
-">. c #6080A2",
-",. c #6A86A3",
-"<. c #6E8CAB",
-"1. c #608FB2",
-"2. c #7389A3",
-"3. c #7B91A6",
-"4. c #7B9AB9",
-"5. c #579AC1",
-"6. c #5B9EC5",
-"7. c #669EC2",
-"8. c #68A8CC",
-"9. c #6AACD0",
-"0. c #72ABCD",
-"q. c #78AFCE",
-"w. c #71B0D2",
-"e. c #7BB4D4",
-"r. c #858F9B",
-"t. c #87909A",
-"y. c #8D949B",
-"u. c #94989C",
-"i. c #9D9D9D",
-"p. c #8493A3",
-"a. c #8395A8",
-"s. c #8798A9",
-"d. c #859FB9",
-"f. c #9199A3",
-"g. c #8EA2B7",
-"h. c #8CA5BF",
-"j. c #96A2AB",
-"k. c #9BA4AD",
-"l. c #9DA9B5",
-"z. c #A3A3A3",
-"x. c #A6A9AC",
-"c. c #ACACAC",
-"v. c #A3ABB2",
-"b. c #A4AEB8",
-"n. c #AAAEB1",
-"m. c #ADB0B3",
-"M. c #ADB4BB",
-"N. c #B3B3B3",
-"B. c #B0B7BE",
-"V. c #B6B8B9",
-"C. c #BBBBBB",
-"Z. c #8FA7C1",
-"A. c #87B6D1",
-"S. c #85BBD7",
-"D. c #A2B1C1",
-"F. c #AFBBC7",
-"G. c #ADBAC8",
-"H. c #B2BCC7",
-"J. c #B0BCCA",
-"K. c #B8BDC3",
-"L. c #93C2DA",
-"P. c #9EC9DE",
-"I. c #BFC3C7",
-"U. c #B0C1D3",
-"Y. c #AFD1E1",
-"T. c #B4D6E4",
-"R. c #C3C3C4",
-"E. c #C1C4C8",
-"W. c #CCCCCC",
-"Q. c #C1CEDC",
-"!. c #CFD4D9",
-"~. c #D3D3D3",
-"^. c #D6DADE",
-"/. c #DBDBDB",
-"(. c #DAE0E6",
-"). c #E2E3E3",
-"_. c #E2E5E8",
-"`. c #ECECEC",
-"'. c #EAEEF1",
-"]. c #F4F4F4",
-"[. c #FBFBFB",
-"{. c None",
-/* pixels */
-"{.{.{.{.{.{.{.{.{.{.{.o # , 7 8 8 < ; @ o {.{.{.{.{.{.{.{.{.{.{.",
-"{.{.{.{.{.{.{.{.{.X 4 l M I / ( ( R Z v 9 *     {.{.{.{.{.{.{.{.",
-"{.{.{.{.{.{.{.X 6 M ( s.n.N.N.N.N.N.N.k.,.S r &   {.{.{.{.{.{.{.",
-"{.{.{.{.{.{.- v ( k.N.C.W.W.~.~.W.R.R.V.N.N.3.Z 6 .   {.{.{.{.{.",
-"{.{.{.{.  3 V a.N.C.~.)./././.~.~.~.W.W.R.V.N.n./ r X   {.{.{.{.",
-"{.{.{.{.2 Z j.N.W./././././.~.~.~.W.W.W.W.R.K.N.N.o.y .   {.{.{.",
-"{.{.{.& V j.N.W.).)././.~.~.~.~.~.W.W.W.W.R.n.R.C.V.] q     {.{.",
-"{.{.. v a.N.R.)././././.~./.~.~.W.~.W.W.R.E q n.R.C.V.I 1   {.{.",
-"{.{.6 ( N.C././././.~.~.~.~.~.~.W.~.~.b.j ^ p j R.C.C.v.v X   {.",
-"{.X b k.N.W././././.~./.~.~.~.~.~.W.:.e Q ) K k x.R.R.R.o.5   {.",
-"{.4 ' N.V././.~.~./.~.~.~.~.~.~.E.J p F ) ) p y.i.R.R.R.b.v   . ",
-"o r s.N.R./.~.~.~.~.~.~.~.W.I.B.h d s Q Q K ! z.c.W.W.R.R.I %   ",
-"@ M n.N.W.~.~.~.~.~.~.E.Q g g f p w L Q Q t u.z.W.W.W.W.W.<.4 . ",
-", S N.N.W.~.~.~.~.~.K.h G &.D.Q 0 F K L j j z.C.l.M.~.W.W.g.0 . ",
-"< / N.N.W.W.W.W.W.M.f h [ [.'.a g K G L p 0 d g w &.~.~.~.M.0 . ",
-"8 ( N.N.W.W.W.p.Q w p w (.F.f f F F G K g a g d j t.c.!.~.K.i . ",
-"7 ( N.N.R.R.{ 2.F 0 0 Q H.e g g F F F F G g g u.c.n.C././.H.r . ",
-", I N.m.f.^ h 0 0 0 0 d t a f g g F F F p ! c.N.W./.)././.D.q   ",
-"= V y.h f t d m p 0 0 q p p d a g g F p ! N.C.).).).).).).d.6   ",
-"o x :.t w t a d t 0 q t p a d s f f a 0 c.C.).`.`.`.).).).] , . ",
-"o 8 ,.r.q 0 q 0 0 q t u p s s g m f e g V./.`.`.`.`.`._.^.M X . ",
-"{.% Z m.;.q 0 0 q e i i s N h N m s r ^ C.`.].].].].`.`.Z.9   . ",
-"{.  r 2.N.! q q t n c m N B B B B c s =.R.].].].].].]._.S $   {.",
-"{.. $ Z =.q q u m c H B A U U U B B n p.~.].].[.[.[.].4.9     {.",
-"{.{.  6 z q r i c P U Y Y T _ _ D Y N j.~.].[.[.[.].U.v X   {.{.",
-"{.{.{.. e y r c A Y T ..| @. . .| ..D l./.`.].].[.Q.V %     {.{.",
-"{.{.{.  . e c N A D @.@.8.6.6.%.%.+.T n./.`.].].J.Z *     {.{.{.",
-"{.{.{.{.  . 9 M D X.@.6.q.w.w.8.8.%.| N./.`.(.4.v %     {.{.{.{.",
-"{.{.{.{.{.    > N } #.9.S.L.L.S.w.0.@.c.~.h.S 9 X     {.{.{.{.{.",
-"{.{.{.{.{.{.    X 2 C $.A.Y.T.P.q.#.` ' b 0 +       {.{.{.{.{.{.",
-"{.{.{.{.{.{.{.{.      # < 9 p w w 0 5 - .       {.{.{.{.{.{.{.{.",
-"{.{.{.{.{.{.{.{.{.{.  . .   . .   . . .   . {.{.{.{.{.{.{.{.{.{."
-};
diff --git a/ubuntu/_base/applications/amarok/debian/install-mp3 b/ubuntu/_base/applications/amarok/debian/install-mp3
deleted file mode 100644
index 7b06cbd2f..000000000
--- a/ubuntu/_base/applications/amarok/debian/install-mp3
+++ /dev/null
@@ -1,40 +0,0 @@
-check_mp3() {
-
-   INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install`
-
-   if [ -z "$INSTALLED" ]; then
-     if [ -x /opt/trinity/bin/kdialog ]; then
-       kdialog --msgbox "There was an error installing MP3 support. You need to install the package \"libxine1-ffmpeg\" manually." --icon amarok
-     elif [ -x /usr/bin/zenity ]; then
-       zenity --info --text "There was an error installing MP3 support. You need to install the package \"libxine1-ffmpeg\" manually."
-     else
-       Xdialog --msgbox "There was an error installing MP3 support.\nYou need to install the package \"libxine1-ffmpeg\" manually." 10 60
-     fi
-     exit 1
-   else
-     if [ -x /opt/trinity/bin/kdialog ]; then
-       kdialog --msgbox "MP3 support now installed, you will need to restart Amarok." --icon amarok
-     elif [ -x /usr/bin/zenity ]; then
-       zenity --info --text "MP3 support now installed, you will need to restart Amarok."
-     else
-       Xdialog --msgbox "MP3 support now installed, you will need to restart Amarok." 5 60
-     fi
-     exit 0
-   fi
-}
-
-INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install`
-
-#is available, not installed
-if [ -z "$INSTALLED" ]; then
-  if [ -x /opt/trinity/bin/kdesu ] && [ -x /usr/bin/install-package ]; then
-    /opt/trinity/bin/kdesu -d "install-package --icon amarok --install libxine1-ffmpeg"
-  elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then
-    gksudo "sh -c 'echo \"libxine1-ffmpeg i\"|synaptic --non-interactive --set-selections'"
-  else
-    xterm -e 'sudo apt-get install libxine1-ffmpeg'
-  fi
-  check_mp3
-fi
-
-exit 0
diff --git a/ubuntu/_base/applications/amarok/debian/kubuntu-media-amarok b/ubuntu/_base/applications/amarok/debian/kubuntu-media-amarok
deleted file mode 100644
index dacf7fc55..000000000
--- a/ubuntu/_base/applications/amarok/debian/kubuntu-media-amarok
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-DEVICE=$@
-
-if [ -n "$DEVICE" ];then
-	if [ ${DEVICE:0:7} = "audiocd" ]; then
-		amarok --cdplay ${DEVICE#*=}
-	elif [ ${DEVICE:0:1} = "/" ]; then
-		amarok --cdplay `dcop kded mediamanager fullList | grep -B1 $DEVICE | head -n1`
-	else
-		amarok --cdplay /dev/cdrom
-	fi
-else
-        amarok --cdplay /dev/cdrom
-fi
-
diff --git a/ubuntu/_base/applications/amarok/debian/man/amarok-trinity.1 b/ubuntu/_base/applications/amarok/debian/man/amarok-trinity.1
deleted file mode 100644
index dac3bb8aa..000000000
--- a/ubuntu/_base/applications/amarok/debian/man/amarok-trinity.1
+++ /dev/null
@@ -1,181 +0,0 @@
-.\" Generated by kdemangen.pl and edited by hand
-.TH AMAROK 1 "Mar 2004" "K Desktop Environment" "An audio player for KDE"
-.SH NAME
-amarok
-\- An audio player for KDE
-.SH SYNOPSIS
-amarok [Qt-options] [KDE-options] [URL(s)] 
-.SH DESCRIPTION
-amaroK is a multimedia player based on the soundserver-independent framework.
-There are many media players around these days, true. What's missing from most
-players is a user interface, that doesn't get in the way of the user.
-.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 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 
-.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 Arguments:
-URL(s)                    Files/URLs to Open
-.SS 
-.SS Options:
-.TP
-.B \-r,  \-\-previous  
-Skip backwards in playlist
-.TP
-.B \-p,  \-\-play  
-Start playing current playlist
-.TP
-.B \-s,  \-\-stop  
-Stop playback
-.TP
-.B  \-\-pause  
-Pause playback
-.TP
-.B \-f,  \-\-next  
-Skip forwards in playlist
-.SS 
-.SS Additional options:
-.TP
-.B \-e,  \-\-enqueue  
-Enqueue Files/URLs
-
-.SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
-.BR help:/amarok/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/amarok/'"
-from the command-line.
-.BR
-.SH AUTHORS
-.nf
-Christian Muehlhaeuser <chris@chris.de>
-.BR
-Mark Kretschmann <markey@web.de>
-.BR
-Max Howell <max.howell@methylblue.com>
-.BR
-Stanislav Karchebny <berk@upnet.ru>
-.BR
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
-.BR
-.SH OTHER
-This manual page was written by Alejandro Exojo <suy@badopi.org> for the Debian
-system (but may be used by others).
-.BR
diff --git a/ubuntu/_base/applications/amarok/debian/man/amarok_libvisual-trinity.1 b/ubuntu/_base/applications/amarok/debian/man/amarok_libvisual-trinity.1
deleted file mode 100644
index c932b9b0c..000000000
--- a/ubuntu/_base/applications/amarok/debian/man/amarok_libvisual-trinity.1
+++ /dev/null
@@ -1,14 +0,0 @@
-.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius
-.TH AMAROK_LIBVISUAL 1 "Feb 2008" "Amarok" "LibVisual support utility for Amarok"
-.SH NAME
-amarok_libvisual \- LibVisual support utility for Amarok
-.SH SYNOPSIS
-amarok_libvisual
-.SH DESCRIPTION
-This is LibVisual support helper utility for Amarok. It's used internally by Amarok 
-itself when needed and is not supposed to be invoked manually by user.
-.SS 
-.SH AUTHORS
-Amarok Developers
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/ubuntu/_base/applications/amarok/debian/man/amarokapp-trinity.1 b/ubuntu/_base/applications/amarok/debian/man/amarokapp-trinity.1
deleted file mode 100644
index 0850440dd..000000000
--- a/ubuntu/_base/applications/amarok/debian/man/amarokapp-trinity.1
+++ /dev/null
@@ -1,23 +0,0 @@
-.\" Generated by kdemangen.pl and edited by hand
-.TH AMAROK 1 "Feb 2008" "Amarok" "An audio player for KDE"
-.SH NAME
-amarokapp
-\- A direct executable for Amarok.
-.SH SYNOPSIS
-amarokapp [Qt-options] [KDE-options] [URL(s)] 
-.SH DESCRIPTION
-Amarok is a multimedia player based on the soundserver-independent framework.
-There are many media players around these days, true. What's missing from most
-players is a user interface, that doesn't get in the way of the user.
-.P
-This is direct Amarok executable. The recommend way to run Amarok is using
-\fBamarok(1)\fP, which is a wrapper script around \fBamarokapp\fP. However, if you're
-debugging Amarok with gdb, valgrind or similar program, you will probably want to
-run it against this binary directly.
-.P
-\fBamarokapp(1)\fP takes the same command line options and arguments as
-\fBamarok(1)\fP. See its manual page for more information how to run \fBamarokapp\fP.
-.SH SEE ALSO
-amarok(1)
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/ubuntu/_base/applications/amarok/debian/man/amarokcollectionscanner-trinity.1 b/ubuntu/_base/applications/amarok/debian/man/amarokcollectionscanner-trinity.1
deleted file mode 100644
index f4abfd1b2..000000000
--- a/ubuntu/_base/applications/amarok/debian/man/amarokcollectionscanner-trinity.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius
-.TH AMAROKCOLLECTIONSCANNER 1 "Feb 2008" "Amarok" "Collection Scanner for Amarok"
-.SH NAME
-amarokcollectionscanner \- Collection Scanner for Amarok
-.SH SYNOPSIS
-amarokcollectionscanner [Qt\-options] [KDE\-options] Folder(s) 
-.SH DESCRIPTION
-This Amarok helper utility scans folder(s) given on the command line or
-restarts previous scan if \fB\-\-restart\fP option was given and writes a
-specially structured XML file to standard output with extensive information
-(including tags) about audio files it was able to find. XML file schema used
-by this utility is Amarok specific.
-.P
-You may find his utility useful if you need to retreive and/or display extended
-information about collection of audio files.
-.SH OPTIONS
-.SS
-.SS Arguments:
-Folder(s)                 Folders to scan
-.SS 
-.SS Options:
-.TP
-.B \-r,  \-\-recursive  
-Scan folders recursively
-.TP
-.B \-i,  \-\-incremental  
-Incremental Scan (modified folders only)
-.TP
-.B \-p,  \-\-importplaylists  
-Import playlist
-.TP
-.B \-s,  \-\-restart  
-Restart the scanner at last position, after a crash []
-.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 
-.SH AUTHORS
-Amarok Developers
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/ubuntu/_base/applications/amarok/debian/watch b/ubuntu/_base/applications/amarok/debian/watch
deleted file mode 100644
index b0a7420bb..000000000
--- a/ubuntu/_base/applications/amarok/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-opts=pasv ftp://ftp.kde.org/pub/kde/stable/amarok/([0-9.]+)/src/amarok-([0-9.]+)\.tar\.bz2
diff --git a/debian/_base/applications/smb4k/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/smb4k/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/smb4k/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/kdbg/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/smb4k/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/development/kdbg/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kdbg/debian/changelog b/ubuntu/_base/applications/development/kdbg/debian/changelog
index 85cee798e..85cee798e 100644
--- a/ubuntu/_base/applications/kdbg/debian/changelog
+++ b/ubuntu/_base/applications/development/kdbg/debian/changelog
diff --git a/debian/_base/applications/wlassistant/debian/compat b/ubuntu/_base/applications/development/kdbg/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/wlassistant/debian/compat
+++ b/ubuntu/_base/applications/development/kdbg/debian/compat
diff --git a/ubuntu/_base/applications/kdbg/debian/control b/ubuntu/_base/applications/development/kdbg/debian/control
index 656937dc2..656937dc2 100644
--- a/ubuntu/_base/applications/kdbg/debian/control
+++ b/ubuntu/_base/applications/development/kdbg/debian/control
diff --git a/ubuntu/_base/applications/kdbg/debian/copyright b/ubuntu/_base/applications/development/kdbg/debian/copyright
index ebf1e447c..ebf1e447c 100644
--- a/ubuntu/_base/applications/kdbg/debian/copyright
+++ b/ubuntu/_base/applications/development/kdbg/debian/copyright
diff --git a/ubuntu/_base/applications/kdbg/debian/doc-base b/ubuntu/_base/applications/development/kdbg/debian/doc-base
index 330debeb4..330debeb4 100644
--- a/ubuntu/_base/applications/kdbg/debian/doc-base
+++ b/ubuntu/_base/applications/development/kdbg/debian/doc-base
diff --git a/ubuntu/_base/applications/kdbg/debian/docs b/ubuntu/_base/applications/development/kdbg/debian/docs
index 2e58c4d34..2e58c4d34 100644
--- a/ubuntu/_base/applications/kdbg/debian/docs
+++ b/ubuntu/_base/applications/development/kdbg/debian/docs
diff --git a/ubuntu/_base/applications/kdbg/debian/kdbg.1 b/ubuntu/_base/applications/development/kdbg/debian/kdbg.1
index 588ef94db..588ef94db 100644
--- a/ubuntu/_base/applications/kdbg/debian/kdbg.1
+++ b/ubuntu/_base/applications/development/kdbg/debian/kdbg.1
diff --git a/ubuntu/_base/applications/kdbg/debian/kdbg.xpm b/ubuntu/_base/applications/development/kdbg/debian/kdbg.xpm
index 8df7ac5f7..8df7ac5f7 100644
--- a/ubuntu/_base/applications/kdbg/debian/kdbg.xpm
+++ b/ubuntu/_base/applications/development/kdbg/debian/kdbg.xpm
diff --git a/ubuntu/_base/applications/kdbg/debian/menu b/ubuntu/_base/applications/development/kdbg/debian/menu
index d3a882bd0..d3a882bd0 100644
--- a/ubuntu/_base/applications/kdbg/debian/menu
+++ b/ubuntu/_base/applications/development/kdbg/debian/menu
diff --git a/ubuntu/_base/applications/kdbg/debian/rules b/ubuntu/_base/applications/development/kdbg/debian/rules
index 6120fab1d..6120fab1d 100755
--- a/ubuntu/_base/applications/kdbg/debian/rules
+++ b/ubuntu/_base/applications/development/kdbg/debian/rules
diff --git a/debian/_base/applications/soundkonverter/debian/source/format b/ubuntu/_base/applications/development/kdbg/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/soundkonverter/debian/source/format
+++ b/ubuntu/_base/applications/development/kdbg/debian/source/format
diff --git a/debian/_base/applications/soundkonverter/debian/source/options b/ubuntu/_base/applications/development/kdbg/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/soundkonverter/debian/source/options
+++ b/ubuntu/_base/applications/development/kdbg/debian/source/options
diff --git a/debian/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kdesvn/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/development/kdesvn/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kdesvn/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/kdesvn/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/ubuntu/_base/applications/kdesvn/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/development/kdesvn/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kdesvn/debian/changelog b/ubuntu/_base/applications/development/kdesvn/debian/changelog
index c3e74b6d9..c3e74b6d9 100644
--- a/ubuntu/_base/applications/kdesvn/debian/changelog
+++ b/ubuntu/_base/applications/development/kdesvn/debian/changelog
diff --git a/debian/_base/applications/yakuake/debian/compat b/ubuntu/_base/applications/development/kdesvn/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/_base/applications/yakuake/debian/compat
+++ b/ubuntu/_base/applications/development/kdesvn/debian/compat
diff --git a/ubuntu/_base/applications/kdesvn/debian/control b/ubuntu/_base/applications/development/kdesvn/debian/control
index 068b3912e..068b3912e 100644
--- a/ubuntu/_base/applications/kdesvn/debian/control
+++ b/ubuntu/_base/applications/development/kdesvn/debian/control
diff --git a/ubuntu/_base/applications/kdesvn/debian/copyright b/ubuntu/_base/applications/development/kdesvn/debian/copyright
index a3d664a33..a3d664a33 100644
--- a/ubuntu/_base/applications/kdesvn/debian/copyright
+++ b/ubuntu/_base/applications/development/kdesvn/debian/copyright
diff --git a/ubuntu/_base/applications/kdesvn/debian/docs b/ubuntu/_base/applications/development/kdesvn/debian/docs
index ca0272abf..ca0272abf 100644
--- a/ubuntu/_base/applications/kdesvn/debian/docs
+++ b/ubuntu/_base/applications/development/kdesvn/debian/docs
diff --git a/ubuntu/_base/applications/kdesvn/debian/icons/kdesvn.xpm b/ubuntu/_base/applications/development/kdesvn/debian/icons/kdesvn.xpm
index d5e2abf6a..d5e2abf6a 100644
--- a/ubuntu/_base/applications/kdesvn/debian/icons/kdesvn.xpm
+++ b/ubuntu/_base/applications/development/kdesvn/debian/icons/kdesvn.xpm
diff --git a/ubuntu/_base/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install b/ubuntu/_base/applications/development/kdesvn/debian/kdesvn-kio-plugins-trinity.install
index 44c022ef7..44c022ef7 100644
--- a/ubuntu/_base/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install
+++ b/ubuntu/_base/applications/development/kdesvn/debian/kdesvn-kio-plugins-trinity.install
diff --git a/ubuntu/_base/applications/kdesvn/debian/kdesvn-trinity.install b/ubuntu/_base/applications/development/kdesvn/debian/kdesvn-trinity.install
index 546d35034..546d35034 100644
--- a/ubuntu/_base/applications/kdesvn/debian/kdesvn-trinity.install
+++ b/ubuntu/_base/applications/development/kdesvn/debian/kdesvn-trinity.install
diff --git a/ubuntu/_base/applications/kdesvn/debian/kdesvn-trinity.manpages b/ubuntu/_base/applications/development/kdesvn/debian/kdesvn-trinity.manpages
index c834c876c..c834c876c 100644
--- a/ubuntu/_base/applications/kdesvn/debian/kdesvn-trinity.manpages
+++ b/ubuntu/_base/applications/development/kdesvn/debian/kdesvn-trinity.manpages
diff --git a/ubuntu/_base/applications/kdesvn/debian/kdesvn-trinity.menu b/ubuntu/_base/applications/development/kdesvn/debian/kdesvn-trinity.menu
index c85d2665d..c85d2665d 100644
--- a/ubuntu/_base/applications/kdesvn/debian/kdesvn-trinity.menu
+++ b/ubuntu/_base/applications/development/kdesvn/debian/kdesvn-trinity.menu
diff --git a/ubuntu/_base/applications/kdesvn/debian/libsvnqt-trinity-dev.install b/ubuntu/_base/applications/development/kdesvn/debian/libsvnqt-trinity-dev.install
index fb3c81018..fb3c81018 100644
--- a/ubuntu/_base/applications/kdesvn/debian/libsvnqt-trinity-dev.install
+++ b/ubuntu/_base/applications/development/kdesvn/debian/libsvnqt-trinity-dev.install
diff --git a/ubuntu/_base/applications/kdesvn/debian/libsvnqt4-trinity.install b/ubuntu/_base/applications/development/kdesvn/debian/libsvnqt4-trinity.install
index fcfe51754..fcfe51754 100644
--- a/ubuntu/_base/applications/kdesvn/debian/libsvnqt4-trinity.install
+++ b/ubuntu/_base/applications/development/kdesvn/debian/libsvnqt4-trinity.install
diff --git a/ubuntu/_base/applications/kdesvn/debian/man/kdesvn.1 b/ubuntu/_base/applications/development/kdesvn/debian/man/kdesvn.1
index 0e4816669..0e4816669 100644
--- a/ubuntu/_base/applications/kdesvn/debian/man/kdesvn.1
+++ b/ubuntu/_base/applications/development/kdesvn/debian/man/kdesvn.1
diff --git a/ubuntu/_base/applications/kdesvn/debian/man/kdesvnaskpass.1 b/ubuntu/_base/applications/development/kdesvn/debian/man/kdesvnaskpass.1
index 4cc8f03ad..4cc8f03ad 100644
--- a/ubuntu/_base/applications/kdesvn/debian/man/kdesvnaskpass.1
+++ b/ubuntu/_base/applications/development/kdesvn/debian/man/kdesvnaskpass.1
diff --git a/debian/_base/applications/kwin-style-crystal/debian/patches/series b/ubuntu/_base/applications/development/kdesvn/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/kwin-style-crystal/debian/patches/series
+++ b/ubuntu/_base/applications/development/kdesvn/debian/patches/series
diff --git a/ubuntu/_base/applications/kdesvn/debian/rules b/ubuntu/_base/applications/development/kdesvn/debian/rules
index 6cc910e98..6cc910e98 100755
--- a/ubuntu/_base/applications/kdesvn/debian/rules
+++ b/ubuntu/_base/applications/development/kdesvn/debian/rules
diff --git a/debian/_base/applications/tellico/debian/source/format b/ubuntu/_base/applications/development/kdesvn/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/tellico/debian/source/format
+++ b/ubuntu/_base/applications/development/kdesvn/debian/source/format
diff --git a/debian/_base/applications/tellico/debian/source/options b/ubuntu/_base/applications/development/kdesvn/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/tellico/debian/source/options
+++ b/ubuntu/_base/applications/development/kdesvn/debian/source/options
diff --git a/ubuntu/_base/applications/kdesvn/debian/watch b/ubuntu/_base/applications/development/kdesvn/debian/watch
index 190c9f8f7..190c9f8f7 100644
--- a/ubuntu/_base/applications/kdesvn/debian/watch
+++ b/ubuntu/_base/applications/development/kdesvn/debian/watch
diff --git a/debian/_base/applications/wlassistant/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/wlassistant/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/soundkonverter/debian/cdbs/versions.pl b/ubuntu/_base/applications/development/kdiff3/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/soundkonverter/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/development/kdiff3/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kdiff3/debian/changelog b/ubuntu/_base/applications/development/kdiff3/debian/changelog
index f0215eada..f0215eada 100644
--- a/ubuntu/_base/applications/kdiff3/debian/changelog
+++ b/ubuntu/_base/applications/development/kdiff3/debian/changelog
diff --git a/ubuntu/_base/applications/abakus/debian/compat b/ubuntu/_base/applications/development/kdiff3/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/abakus/debian/compat
+++ b/ubuntu/_base/applications/development/kdiff3/debian/compat
diff --git a/ubuntu/_base/applications/kdiff3/debian/control b/ubuntu/_base/applications/development/kdiff3/debian/control
index 6bb333671..6bb333671 100644
--- a/ubuntu/_base/applications/kdiff3/debian/control
+++ b/ubuntu/_base/applications/development/kdiff3/debian/control
diff --git a/ubuntu/_base/applications/kdiff3/debian/copyright b/ubuntu/_base/applications/development/kdiff3/debian/copyright
index 05b7204fd..05b7204fd 100644
--- a/ubuntu/_base/applications/kdiff3/debian/copyright
+++ b/ubuntu/_base/applications/development/kdiff3/debian/copyright
diff --git a/ubuntu/_base/applications/abakus/debian/docs b/ubuntu/_base/applications/development/kdiff3/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/_base/applications/abakus/debian/docs
+++ b/ubuntu/_base/applications/development/kdiff3/debian/docs
diff --git a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base b/ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.doc-base
index 014004a26..014004a26 100644
--- a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
+++ b/ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.doc-base
diff --git a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.install b/ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.install
index 6d9c9dd9a..6d9c9dd9a 100644
--- a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.install
+++ b/ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.install
diff --git a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.links b/ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.links
index e3fbe7781..e3fbe7781 100644
--- a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.links
+++ b/ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity-doc.links
diff --git a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.install b/ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity.install
index 00e22f353..00e22f353 100644
--- a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.install
+++ b/ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity.install
diff --git a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.sgml b/ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity.sgml
index 6eaa4064f..6eaa4064f 100644
--- a/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.sgml
+++ b/ubuntu/_base/applications/development/kdiff3/debian/kdiff3-trinity.sgml
diff --git a/ubuntu/_base/applications/kbarcode/debian/patches/.gitignore b/ubuntu/_base/applications/development/kdiff3/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kbarcode/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/development/kdiff3/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/kdiff3/debian/rules b/ubuntu/_base/applications/development/kdiff3/debian/rules
index 9181b1148..9181b1148 100755
--- a/ubuntu/_base/applications/kdiff3/debian/rules
+++ b/ubuntu/_base/applications/development/kdiff3/debian/rules
diff --git a/debian/_base/applications/wlassistant/debian/source/format b/ubuntu/_base/applications/development/kdiff3/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/wlassistant/debian/source/format
+++ b/ubuntu/_base/applications/development/kdiff3/debian/source/format
diff --git a/debian/_base/applications/wlassistant/debian/source/options b/ubuntu/_base/applications/development/kdiff3/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/wlassistant/debian/source/options
+++ b/ubuntu/_base/applications/development/kdiff3/debian/source/options
diff --git a/ubuntu/_base/applications/kdiff3/debian/watch b/ubuntu/_base/applications/development/kdiff3/debian/watch
index 1f8b23456..1f8b23456 100644
--- a/ubuntu/_base/applications/kdiff3/debian/watch
+++ b/ubuntu/_base/applications/development/kdiff3/debian/watch
diff --git a/ubuntu/_base/applications/kpicosim/debian/Makefile.am b/ubuntu/_base/applications/development/kpicosim/debian/Makefile.am
index 5de86e2c3..5de86e2c3 100644
--- a/ubuntu/_base/applications/kpicosim/debian/Makefile.am
+++ b/ubuntu/_base/applications/development/kpicosim/debian/Makefile.am
diff --git a/ubuntu/_base/applications/kpicosim/debian/changelog b/ubuntu/_base/applications/development/kpicosim/debian/changelog
index 5d239becc..5d239becc 100644
--- a/ubuntu/_base/applications/kpicosim/debian/changelog
+++ b/ubuntu/_base/applications/development/kpicosim/debian/changelog
diff --git a/ubuntu/_base/applications/adept/debian/compat b/ubuntu/_base/applications/development/kpicosim/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/adept/debian/compat
+++ b/ubuntu/_base/applications/development/kpicosim/debian/compat
diff --git a/ubuntu/_base/applications/kpicosim/debian/control b/ubuntu/_base/applications/development/kpicosim/debian/control
index f6d653ecd..f6d653ecd 100644
--- a/ubuntu/_base/applications/kpicosim/debian/control
+++ b/ubuntu/_base/applications/development/kpicosim/debian/control
diff --git a/ubuntu/_base/applications/kpicosim/debian/copyright b/ubuntu/_base/applications/development/kpicosim/debian/copyright
index 1e968a7a0..1e968a7a0 100644
--- a/ubuntu/_base/applications/kpicosim/debian/copyright
+++ b/ubuntu/_base/applications/development/kpicosim/debian/copyright
diff --git a/ubuntu/_base/applications/kpicosim/debian/dirs b/ubuntu/_base/applications/development/kpicosim/debian/dirs
index ca882bbb7..ca882bbb7 100644
--- a/ubuntu/_base/applications/kpicosim/debian/dirs
+++ b/ubuntu/_base/applications/development/kpicosim/debian/dirs
diff --git a/ubuntu/_base/applications/kbiff/debian/docs b/ubuntu/_base/applications/development/kpicosim/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/ubuntu/_base/applications/kbiff/debian/docs
+++ b/ubuntu/_base/applications/development/kpicosim/debian/docs
diff --git a/ubuntu/_base/applications/kpicosim/debian/kpicosim-trinity.links b/ubuntu/_base/applications/development/kpicosim/debian/kpicosim-trinity.links
index 78a8ee9df..78a8ee9df 100644
--- a/ubuntu/_base/applications/kpicosim/debian/kpicosim-trinity.links
+++ b/ubuntu/_base/applications/development/kpicosim/debian/kpicosim-trinity.links
diff --git a/ubuntu/_base/applications/kpicosim/debian/kpicosim-trinity.manpages b/ubuntu/_base/applications/development/kpicosim/debian/kpicosim-trinity.manpages
index 046bd32dd..046bd32dd 100644
--- a/ubuntu/_base/applications/kpicosim/debian/kpicosim-trinity.manpages
+++ b/ubuntu/_base/applications/development/kpicosim/debian/kpicosim-trinity.manpages
diff --git a/ubuntu/_base/applications/kpicosim/debian/kpicosim.1 b/ubuntu/_base/applications/development/kpicosim/debian/kpicosim.1
index 5557b20a8..5557b20a8 100644
--- a/ubuntu/_base/applications/kpicosim/debian/kpicosim.1
+++ b/ubuntu/_base/applications/development/kpicosim/debian/kpicosim.1
diff --git a/ubuntu/_base/applications/kpicosim/debian/menu b/ubuntu/_base/applications/development/kpicosim/debian/menu
index 12de54d49..12de54d49 100644
--- a/ubuntu/_base/applications/kpicosim/debian/menu
+++ b/ubuntu/_base/applications/development/kpicosim/debian/menu
diff --git a/ubuntu/_base/applications/kpicosim/debian/rules b/ubuntu/_base/applications/development/kpicosim/debian/rules
index 98b6ba69e..98b6ba69e 100755
--- a/ubuntu/_base/applications/kpicosim/debian/rules
+++ b/ubuntu/_base/applications/development/kpicosim/debian/rules
diff --git a/debian/_base/applications/yakuake/debian/source/format b/ubuntu/_base/applications/development/kpicosim/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/applications/yakuake/debian/source/format
+++ b/ubuntu/_base/applications/development/kpicosim/debian/source/format
diff --git a/debian/_base/applications/yakuake/debian/source/options b/ubuntu/_base/applications/development/kpicosim/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/applications/yakuake/debian/source/options
+++ b/ubuntu/_base/applications/development/kpicosim/debian/source/options
diff --git a/ubuntu/_base/applications/kpicosim/debian/watch b/ubuntu/_base/applications/development/kpicosim/debian/watch
index fc0a7c717..fc0a7c717 100644
--- a/ubuntu/_base/applications/kpicosim/debian/watch
+++ b/ubuntu/_base/applications/development/kpicosim/debian/watch
diff --git a/ubuntu/_base/applications/ktechlab/debian/changelog b/ubuntu/_base/applications/development/ktechlab/debian/changelog
index 283fadf39..283fadf39 100644
--- a/ubuntu/_base/applications/ktechlab/debian/changelog
+++ b/ubuntu/_base/applications/development/ktechlab/debian/changelog
diff --git a/ubuntu/_base/applications/amarok/debian/compat b/ubuntu/_base/applications/development/ktechlab/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/amarok/debian/compat
+++ b/ubuntu/_base/applications/development/ktechlab/debian/compat
diff --git a/ubuntu/_base/applications/ktechlab/debian/control b/ubuntu/_base/applications/development/ktechlab/debian/control
index 9cc731bec..9cc731bec 100644
--- a/ubuntu/_base/applications/ktechlab/debian/control
+++ b/ubuntu/_base/applications/development/ktechlab/debian/control
diff --git a/ubuntu/_base/applications/ktechlab/debian/copyright b/ubuntu/_base/applications/development/ktechlab/debian/copyright
index 5b1af8a2e..5b1af8a2e 100644
--- a/ubuntu/_base/applications/ktechlab/debian/copyright
+++ b/ubuntu/_base/applications/development/ktechlab/debian/copyright
diff --git a/ubuntu/_base/applications/ktechlab/debian/debiandirs b/ubuntu/_base/applications/development/ktechlab/debian/debiandirs
index 2b39b1c4e..2b39b1c4e 100644
--- a/ubuntu/_base/applications/ktechlab/debian/debiandirs
+++ b/ubuntu/_base/applications/development/ktechlab/debian/debiandirs
diff --git a/ubuntu/_base/applications/basket/debian/docs b/ubuntu/_base/applications/development/ktechlab/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/_base/applications/basket/debian/docs
+++ b/ubuntu/_base/applications/development/ktechlab/debian/docs
diff --git a/ubuntu/_base/applications/ktechlab/debian/ktechlab.1 b/ubuntu/_base/applications/development/ktechlab/debian/ktechlab.1
index 226deb2e6..226deb2e6 100644
--- a/ubuntu/_base/applications/ktechlab/debian/ktechlab.1
+++ b/ubuntu/_base/applications/development/ktechlab/debian/ktechlab.1
diff --git a/ubuntu/_base/applications/ktechlab/debian/manpages b/ubuntu/_base/applications/development/ktechlab/debian/manpages
index ae17eaa94..ae17eaa94 100644
--- a/ubuntu/_base/applications/ktechlab/debian/manpages
+++ b/ubuntu/_base/applications/development/ktechlab/debian/manpages
diff --git a/ubuntu/_base/applications/ktechlab/debian/menu b/ubuntu/_base/applications/development/ktechlab/debian/menu
index 8d468de83..8d468de83 100644
--- a/ubuntu/_base/applications/ktechlab/debian/menu
+++ b/ubuntu/_base/applications/development/ktechlab/debian/menu
diff --git a/ubuntu/_base/applications/ktechlab/debian/microbe.1 b/ubuntu/_base/applications/development/ktechlab/debian/microbe.1
index ad4ae5ec0..ad4ae5ec0 100644
--- a/ubuntu/_base/applications/ktechlab/debian/microbe.1
+++ b/ubuntu/_base/applications/development/ktechlab/debian/microbe.1
diff --git a/ubuntu/_base/applications/kchmviewer/debian/patches/.gitignore b/ubuntu/_base/applications/development/ktechlab/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kchmviewer/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/development/ktechlab/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/ktechlab/debian/rules b/ubuntu/_base/applications/development/ktechlab/debian/rules
index 6ee5ee935..6ee5ee935 100755
--- a/ubuntu/_base/applications/ktechlab/debian/rules
+++ b/ubuntu/_base/applications/development/ktechlab/debian/rules
diff --git a/ubuntu/_base/applications/abakus/debian/source/format b/ubuntu/_base/applications/development/ktechlab/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/abakus/debian/source/format
+++ b/ubuntu/_base/applications/development/ktechlab/debian/source/format
diff --git a/ubuntu/_base/applications/abakus/debian/source/options b/ubuntu/_base/applications/development/ktechlab/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/abakus/debian/source/options
+++ b/ubuntu/_base/applications/development/ktechlab/debian/source/options
diff --git a/ubuntu/_base/applications/piklab/debian/changelog b/ubuntu/_base/applications/development/piklab/debian/changelog
index b0f58e45c..b0f58e45c 100644
--- a/ubuntu/_base/applications/piklab/debian/changelog
+++ b/ubuntu/_base/applications/development/piklab/debian/changelog
diff --git a/ubuntu/_base/applications/basket/debian/compat b/ubuntu/_base/applications/development/piklab/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/basket/debian/compat
+++ b/ubuntu/_base/applications/development/piklab/debian/compat
diff --git a/ubuntu/_base/applications/piklab/debian/control b/ubuntu/_base/applications/development/piklab/debian/control
index 5d4aef796..5d4aef796 100644
--- a/ubuntu/_base/applications/piklab/debian/control
+++ b/ubuntu/_base/applications/development/piklab/debian/control
diff --git a/ubuntu/_base/applications/piklab/debian/copyright b/ubuntu/_base/applications/development/piklab/debian/copyright
index 5144c002c..5144c002c 100644
--- a/ubuntu/_base/applications/piklab/debian/copyright
+++ b/ubuntu/_base/applications/development/piklab/debian/copyright
diff --git a/ubuntu/_base/applications/kbarcode/debian/docs b/ubuntu/_base/applications/development/piklab/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/_base/applications/kbarcode/debian/docs
+++ b/ubuntu/_base/applications/development/piklab/debian/docs
diff --git a/ubuntu/_base/applications/piklab/debian/install b/ubuntu/_base/applications/development/piklab/debian/install
index 4b76727ec..4b76727ec 100644
--- a/ubuntu/_base/applications/piklab/debian/install
+++ b/ubuntu/_base/applications/development/piklab/debian/install
diff --git a/ubuntu/_base/applications/piklab/debian/menu b/ubuntu/_base/applications/development/piklab/debian/menu
index bf328cb78..bf328cb78 100644
--- a/ubuntu/_base/applications/piklab/debian/menu
+++ b/ubuntu/_base/applications/development/piklab/debian/menu
diff --git a/debian/_base/applications/piklab/debian/patches/series b/ubuntu/_base/applications/development/piklab/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/piklab/debian/patches/series
+++ b/ubuntu/_base/applications/development/piklab/debian/patches/series
diff --git a/ubuntu/_base/applications/piklab/debian/piklab.desktop b/ubuntu/_base/applications/development/piklab/debian/piklab.desktop
index 41e546d50..41e546d50 100644
--- a/ubuntu/_base/applications/piklab/debian/piklab.desktop
+++ b/ubuntu/_base/applications/development/piklab/debian/piklab.desktop
diff --git a/ubuntu/_base/applications/piklab/debian/piklab.sng b/ubuntu/_base/applications/development/piklab/debian/piklab.sng
index 4d2aa5902..4d2aa5902 100644
--- a/ubuntu/_base/applications/piklab/debian/piklab.sng
+++ b/ubuntu/_base/applications/development/piklab/debian/piklab.sng
diff --git a/ubuntu/_base/applications/piklab/debian/piklab.xpm b/ubuntu/_base/applications/development/piklab/debian/piklab.xpm
index 9f7cfe61f..9f7cfe61f 100644
--- a/ubuntu/_base/applications/piklab/debian/piklab.xpm
+++ b/ubuntu/_base/applications/development/piklab/debian/piklab.xpm
diff --git a/ubuntu/_base/applications/piklab/debian/piklab48.xpm b/ubuntu/_base/applications/development/piklab/debian/piklab48.xpm
index c7819f422..c7819f422 100644
--- a/ubuntu/_base/applications/piklab/debian/piklab48.xpm
+++ b/ubuntu/_base/applications/development/piklab/debian/piklab48.xpm
diff --git a/ubuntu/_base/applications/piklab/debian/rules b/ubuntu/_base/applications/development/piklab/debian/rules
index 4fd3da4c2..4fd3da4c2 100755
--- a/ubuntu/_base/applications/piklab/debian/rules
+++ b/ubuntu/_base/applications/development/piklab/debian/rules
diff --git a/ubuntu/_base/applications/adept/debian/source/format b/ubuntu/_base/applications/development/piklab/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/adept/debian/source/format
+++ b/ubuntu/_base/applications/development/piklab/debian/source/format
diff --git a/ubuntu/_base/applications/adept/debian/source/options b/ubuntu/_base/applications/development/piklab/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/adept/debian/source/options
+++ b/ubuntu/_base/applications/development/piklab/debian/source/options
diff --git a/ubuntu/_base/applications/filelight-l10n/debian/changelog b/ubuntu/_base/applications/filelight-l10n/debian/changelog
deleted file mode 100644
index 1c4c5eee8..000000000
--- a/ubuntu/_base/applications/filelight-l10n/debian/changelog
+++ /dev/null
@@ -1,37 +0,0 @@
-filelight-l10n-trinity (1.0-4) karmic; urgency=low
-
-  * Karmic rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
-
-filelight-l10n-trinity (1.0-3) intrepid; urgency=low
-
-  * Moved Trinity to /opt/trinity
-  * Integrated properly with KDE4.2+
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 06 March 2009 01:35:00 -0600
-
-filelight-l10n-trinity (1.0-2) intrepid; urgency=low
-
-  * Added -trinity suffix
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 09 Feb 2009 10:33:00 -0600
-
-filelight-l10n (1.0-2) unstable; urgency=low
-
-  * Depends on filelight. 
-  * Updated policy to 3.7.3.0. No changes needed.
-  * Added homepage as control field.
-  * Fix copyright file to sort out lintian warnings. 
-
- -- Raúl Sánchez Siles <rasasi78@gmail.com>  Sat, 19 Apr 2008 23:39:34 +0200
-
-filelight-l10n (1.0-1) unstable; urgency=low
-
-  * Initial release. (Closes: #447414).
-  * filelight: [INTL:de] German PO file corrections (Closes: #313714)
-  * filelight: No help: "Could not find service 'khelpcenter'"(Closes:
-  #263393).
-  * filelight: [INTL:sv] Swedish PO translation (Closes: #353796)
-
- -- Raúl Sánchez Siles <rasasi78@gmail.com>  Mon, 22 Oct 2007 00:53:30 +0200
diff --git a/ubuntu/_base/applications/filelight-l10n/debian/control b/ubuntu/_base/applications/filelight-l10n/debian/control
deleted file mode 100644
index a59186011..000000000
--- a/ubuntu/_base/applications/filelight-l10n/debian/control
+++ /dev/null
@@ -1,21 +0,0 @@
-Source: filelight-l10n-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Uploaders: Ral Snchez Siles <rasasi78@gmail.com>
-Build-Depends: kdelibs4-trinity-dev (>= 4:3.4.3), cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, automake, autoconf, libtool, libltdl-dev
-Standards-Version: 3.8.4
-Homepage: http://www.methylblue.com/filelight/
-
-Package: filelight-l10n-trinity
-Architecture: any
-Depends: ${shlibs:Depends} , filelight-trinity (>= ${source:Version})
-Replaces: filelight-l10n-kde3 (<< 4:3.5.13)
-Breaks: filelight-l10n-kde3 (<< 4:3.5.13)
-Description: Localization (l10n) for Filelight, disk space usage tool [Trinity]
- This package provides localization(l10n) files (translations and docs) for
- Filelight, Filelight allows you to understand your disk usage by graphically
- representing your filesystem as a set of concentric, segmented rings.
- .
- See the 'filelight' package description for more information.
-
diff --git a/ubuntu/_base/applications/filelight-l10n/debian/copyright b/ubuntu/_base/applications/filelight-l10n/debian/copyright
deleted file mode 100644
index f840087a2..000000000
--- a/ubuntu/_base/applications/filelight-l10n/debian/copyright
+++ /dev/null
@@ -1,38 +0,0 @@
-This package was debianized by Raúl Sánchez Siles<rasasi78@gmail.com>
-on Mon Oct 1 08:59:34 CEST 2007 based on the work by Christopher Martin
-<chrsmrtn@debian.org> with the help of Ana Guerrero<ana@ekaia.org> and
-others.
-
-The Debian packaging is Copyright 2007, Raul Sánchez Siles <rasasi78@gmail.com>
-and Christopher Martin <chrsmrtn@debian.org> is licensed under the GPLv2,
-which can be found at '/usr/share/common-licenses/GPL-2'.
-
-It was downloaded from: http://www.methylblue.com/filelight/
-
-Primary Developers:
-   Max Howell <mxcl@users.sf.net>
-
-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., 51 Franklin St, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-Copyright
-
-Filelight:
-
-    Copyright 2005-2006 Max Howell <max.howell@methylblue.com>
diff --git a/ubuntu/_base/applications/filelight-l10n/debian/rules b/ubuntu/_base/applications/filelight-l10n/debian/rules
deleted file mode 100755
index f23b6381f..000000000
--- a/ubuntu/_base/applications/filelight-l10n/debian/rules
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/debian-tde.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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/kde
diff --git a/ubuntu/_base/applications/knights/debian/changelog b/ubuntu/_base/applications/games/knights/debian/changelog
index 5dfb85e8c..5dfb85e8c 100644
--- a/ubuntu/_base/applications/knights/debian/changelog
+++ b/ubuntu/_base/applications/games/knights/debian/changelog
diff --git a/ubuntu/_base/applications/bibletime/debian/compat b/ubuntu/_base/applications/games/knights/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/bibletime/debian/compat
+++ b/ubuntu/_base/applications/games/knights/debian/compat
diff --git a/ubuntu/_base/applications/knights/debian/control b/ubuntu/_base/applications/games/knights/debian/control
index 23ddf0014..23ddf0014 100644
--- a/ubuntu/_base/applications/knights/debian/control
+++ b/ubuntu/_base/applications/games/knights/debian/control
diff --git a/ubuntu/_base/applications/knights/debian/copyright b/ubuntu/_base/applications/games/knights/debian/copyright
index c8554f7b5..c8554f7b5 100644
--- a/ubuntu/_base/applications/knights/debian/copyright
+++ b/ubuntu/_base/applications/games/knights/debian/copyright
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/debiandirs b/ubuntu/_base/applications/games/knights/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/ubuntu/_base/applications/gwenview-i18n/debian/debiandirs
+++ b/ubuntu/_base/applications/games/knights/debian/debiandirs
diff --git a/ubuntu/_base/applications/kde-guidance/debian/docs b/ubuntu/_base/applications/games/knights/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/docs
+++ b/ubuntu/_base/applications/games/knights/debian/docs
diff --git a/ubuntu/_base/applications/knights/debian/knights.1 b/ubuntu/_base/applications/games/knights/debian/knights.1
index d66f50342..d66f50342 100644
--- a/ubuntu/_base/applications/knights/debian/knights.1
+++ b/ubuntu/_base/applications/games/knights/debian/knights.1
diff --git a/ubuntu/_base/applications/knights/debian/knights.xpm b/ubuntu/_base/applications/games/knights/debian/knights.xpm
index afbf1959a..afbf1959a 100644
--- a/ubuntu/_base/applications/knights/debian/knights.xpm
+++ b/ubuntu/_base/applications/games/knights/debian/knights.xpm
diff --git a/ubuntu/_base/applications/knights/debian/menu b/ubuntu/_base/applications/games/knights/debian/menu
index f2f72ca74..f2f72ca74 100644
--- a/ubuntu/_base/applications/knights/debian/menu
+++ b/ubuntu/_base/applications/games/knights/debian/menu
diff --git a/ubuntu/_base/applications/kde-style-lipstik/debian/patches/.gitignore b/ubuntu/_base/applications/games/knights/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kde-style-lipstik/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/games/knights/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/knights/debian/rules b/ubuntu/_base/applications/games/knights/debian/rules
index bde510e8b..bde510e8b 100755
--- a/ubuntu/_base/applications/knights/debian/rules
+++ b/ubuntu/_base/applications/games/knights/debian/rules
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/source/format b/ubuntu/_base/applications/games/knights/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/amarok.cmake/debian/source/format
+++ b/ubuntu/_base/applications/games/knights/debian/source/format
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/source/options b/ubuntu/_base/applications/games/knights/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/amarok.cmake/debian/source/options
+++ b/ubuntu/_base/applications/games/knights/debian/source/options
diff --git a/ubuntu/_base/applications/knights/debian/watch b/ubuntu/_base/applications/games/knights/debian/watch
index e3fef441b..e3fef441b 100644
--- a/ubuntu/_base/applications/knights/debian/watch
+++ b/ubuntu/_base/applications/games/knights/debian/watch
diff --git a/ubuntu/_base/applications/digikam/debian/NEWS b/ubuntu/_base/applications/graphics/digikam/debian/NEWS
index a90a3b444..a90a3b444 100644
--- a/ubuntu/_base/applications/digikam/debian/NEWS
+++ b/ubuntu/_base/applications/graphics/digikam/debian/NEWS
diff --git a/ubuntu/_base/applications/digikam/debian/README.Debian b/ubuntu/_base/applications/graphics/digikam/debian/README.Debian
index 351a34b1f..351a34b1f 100644
--- a/ubuntu/_base/applications/digikam/debian/README.Debian
+++ b/ubuntu/_base/applications/graphics/digikam/debian/README.Debian
diff --git a/debian/_base/applications/yakuake/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/debian/_base/applications/yakuake/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/wlassistant/debian/cdbs/versions.pl b/ubuntu/_base/applications/graphics/digikam/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/wlassistant/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/graphics/digikam/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/digikam/debian/changelog b/ubuntu/_base/applications/graphics/digikam/debian/changelog
index 42c8bae54..42c8bae54 100644
--- a/ubuntu/_base/applications/digikam/debian/changelog
+++ b/ubuntu/_base/applications/graphics/digikam/debian/changelog
diff --git a/ubuntu/_base/applications/digikam/debian/clean b/ubuntu/_base/applications/graphics/digikam/debian/clean
index d0ada902a..d0ada902a 100644
--- a/ubuntu/_base/applications/digikam/debian/clean
+++ b/ubuntu/_base/applications/graphics/digikam/debian/clean
diff --git a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/compat b/ubuntu/_base/applications/graphics/digikam/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/compat
+++ b/ubuntu/_base/applications/graphics/digikam/debian/compat
diff --git a/ubuntu/_base/applications/digikam/debian/control b/ubuntu/_base/applications/graphics/digikam/debian/control
index f5f6fa639..f5f6fa639 100644
--- a/ubuntu/_base/applications/digikam/debian/control
+++ b/ubuntu/_base/applications/graphics/digikam/debian/control
diff --git a/ubuntu/_base/applications/digikam/debian/copyright b/ubuntu/_base/applications/graphics/digikam/debian/copyright
index c4c44e441..c4c44e441 100644
--- a/ubuntu/_base/applications/digikam/debian/copyright
+++ b/ubuntu/_base/applications/graphics/digikam/debian/copyright
diff --git a/ubuntu/_base/applications/digikam/debian/digikam-trinity.install b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install
index 87c7fe33f..87c7fe33f 100644
--- a/ubuntu/_base/applications/digikam/debian/digikam-trinity.install
+++ b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.install
diff --git a/ubuntu/_base/applications/digikam/debian/digikam-trinity.lintian-overrides b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.lintian-overrides
index 59b14fa47..59b14fa47 100644
--- a/ubuntu/_base/applications/digikam/debian/digikam-trinity.lintian-overrides
+++ b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.lintian-overrides
diff --git a/ubuntu/_base/applications/digikam/debian/digikam-trinity.manpages b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.manpages
index 4e21f2805..4e21f2805 100644
--- a/ubuntu/_base/applications/digikam/debian/digikam-trinity.manpages
+++ b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.manpages
diff --git a/ubuntu/_base/applications/digikam/debian/digikam-trinity.menu b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.menu
index 949e0fba8..949e0fba8 100644
--- a/ubuntu/_base/applications/digikam/debian/digikam-trinity.menu
+++ b/ubuntu/_base/applications/graphics/digikam/debian/digikam-trinity.menu
diff --git a/ubuntu/_base/applications/digikam/debian/digikam.manpage b/ubuntu/_base/applications/graphics/digikam/debian/digikam.manpage
index ed8c640c1..ed8c640c1 100644
--- a/ubuntu/_base/applications/digikam/debian/digikam.manpage
+++ b/ubuntu/_base/applications/graphics/digikam/debian/digikam.manpage
diff --git a/debian/_base/applications/rosegarden/debian/patches/series b/ubuntu/_base/applications/graphics/digikam/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/rosegarden/debian/patches/series
+++ b/ubuntu/_base/applications/graphics/digikam/debian/patches/series
diff --git a/ubuntu/_base/applications/digikam/debian/rules b/ubuntu/_base/applications/graphics/digikam/debian/rules
index f46ce7a86..f46ce7a86 100755
--- a/ubuntu/_base/applications/digikam/debian/rules
+++ b/ubuntu/_base/applications/graphics/digikam/debian/rules
diff --git a/ubuntu/_base/applications/digikam/debian/showfoto-trinity.install b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.install
index d9ff5c47a..d9ff5c47a 100644
--- a/ubuntu/_base/applications/digikam/debian/showfoto-trinity.install
+++ b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.install
diff --git a/ubuntu/_base/applications/digikam/debian/showfoto-trinity.manpage b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.manpage
index 2c5a6ad20..2c5a6ad20 100644
--- a/ubuntu/_base/applications/digikam/debian/showfoto-trinity.manpage
+++ b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.manpage
diff --git a/ubuntu/_base/applications/digikam/debian/showfoto-trinity.manpages b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.manpages
index e146c959f..e146c959f 100644
--- a/ubuntu/_base/applications/digikam/debian/showfoto-trinity.manpages
+++ b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.manpages
diff --git a/ubuntu/_base/applications/digikam/debian/showfoto-trinity.menu b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.menu
index 32ce26612..32ce26612 100644
--- a/ubuntu/_base/applications/digikam/debian/showfoto-trinity.menu
+++ b/ubuntu/_base/applications/graphics/digikam/debian/showfoto-trinity.menu
diff --git a/ubuntu/_base/applications/amarok/debian/source/format b/ubuntu/_base/applications/graphics/digikam/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/amarok/debian/source/format
+++ b/ubuntu/_base/applications/graphics/digikam/debian/source/format
diff --git a/ubuntu/_base/applications/amarok/debian/source/options b/ubuntu/_base/applications/graphics/digikam/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/amarok/debian/source/options
+++ b/ubuntu/_base/applications/graphics/digikam/debian/source/options
diff --git a/ubuntu/_base/applications/digikam/debian/watch b/ubuntu/_base/applications/graphics/digikam/debian/watch
index 16e6d05c4..16e6d05c4 100644
--- a/ubuntu/_base/applications/digikam/debian/watch
+++ b/ubuntu/_base/applications/graphics/digikam/debian/watch
diff --git a/ubuntu/_base/applications/digikam/debian/xpm.d/digikam-16.xpm b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/digikam-16.xpm
index 5820677d7..5820677d7 100644
--- a/ubuntu/_base/applications/digikam/debian/xpm.d/digikam-16.xpm
+++ b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/digikam-16.xpm
diff --git a/ubuntu/_base/applications/digikam/debian/xpm.d/digikam.xpm b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/digikam.xpm
index 88a2f7df2..88a2f7df2 100644
--- a/ubuntu/_base/applications/digikam/debian/xpm.d/digikam.xpm
+++ b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/digikam.xpm
diff --git a/ubuntu/_base/applications/digikam/debian/xpm.d/showfoto-16.xpm b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/showfoto-16.xpm
index 7425c5ba7..7425c5ba7 100644
--- a/ubuntu/_base/applications/digikam/debian/xpm.d/showfoto-16.xpm
+++ b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/showfoto-16.xpm
diff --git a/ubuntu/_base/applications/digikam/debian/xpm.d/showfoto.xpm b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/showfoto.xpm
index ef7ea08fa..ef7ea08fa 100644
--- a/ubuntu/_base/applications/digikam/debian/xpm.d/showfoto.xpm
+++ b/ubuntu/_base/applications/graphics/digikam/debian/xpm.d/showfoto.xpm
diff --git a/ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk
diff --git a/debian/_base/applications/yakuake/debian/cdbs/versions.pl b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/_base/applications/yakuake/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/changelog b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/changelog
index 035a06d71..035a06d71 100644
--- a/ubuntu/_base/applications/gwenview-i18n/debian/changelog
+++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/changelog
diff --git a/ubuntu/_base/applications/desktop-effects-kde/debian/compat b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/desktop-effects-kde/debian/compat
+++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/control b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/control
index c7bc196b8..c7bc196b8 100644
--- a/ubuntu/_base/applications/gwenview-i18n/debian/control
+++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/control
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/copyright b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/copyright
index b0709da94..b0709da94 100644
--- a/ubuntu/_base/applications/gwenview-i18n/debian/copyright
+++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/copyright
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/debiandirs b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/debiandirs
+++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/debiandirs
diff --git a/debian/_base/applications/wlassistant/debian/patches/series b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/wlassistant/debian/patches/series
+++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/patches/series
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/rules b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/rules
index b84d1292d..b84d1292d 100755
--- a/ubuntu/_base/applications/gwenview-i18n/debian/rules
+++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/rules
diff --git a/ubuntu/_base/applications/basket/debian/source/format b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/basket/debian/source/format
+++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/source/format
diff --git a/ubuntu/_base/applications/basket/debian/source/options b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/basket/debian/source/options
+++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/source/options
diff --git a/ubuntu/_base/applications/adept/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/adept/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/abakus/debian/cdbs/versions.pl b/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/abakus/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/gwenview/debian/changelog b/ubuntu/_base/applications/graphics/gwenview/debian/changelog
index 2c29a5ee5..2c29a5ee5 100644
--- a/ubuntu/_base/applications/gwenview/debian/changelog
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/changelog
diff --git a/ubuntu/_base/applications/digikam/debian/compat b/ubuntu/_base/applications/graphics/gwenview/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/digikam/debian/compat
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/compat
diff --git a/ubuntu/_base/applications/gwenview/debian/control b/ubuntu/_base/applications/graphics/gwenview/debian/control
index 67d6a0fae..67d6a0fae 100644
--- a/ubuntu/_base/applications/gwenview/debian/control
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/control
diff --git a/ubuntu/_base/applications/gwenview/debian/copyright b/ubuntu/_base/applications/graphics/gwenview/debian/copyright
index d87dc89ff..d87dc89ff 100644
--- a/ubuntu/_base/applications/gwenview/debian/copyright
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/copyright
diff --git a/ubuntu/_base/applications/gwenview/debian/gwenview.doc-base b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.doc-base
index 9efaff358..9efaff358 100644
--- a/ubuntu/_base/applications/gwenview/debian/gwenview.doc-base
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.doc-base
diff --git a/ubuntu/_base/applications/gwenview/debian/gwenview.lintian b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian
index e8c71a351..e8c71a351 100644
--- a/ubuntu/_base/applications/gwenview/debian/gwenview.lintian
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian
diff --git a/ubuntu/_base/applications/gwenview/debian/gwenview.xpm b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.xpm
index 076efa834..076efa834 100644
--- a/ubuntu/_base/applications/gwenview/debian/gwenview.xpm
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.xpm
diff --git a/ubuntu/_base/applications/gwenview/debian/menu b/ubuntu/_base/applications/graphics/gwenview/debian/menu
index c20d8c34c..c20d8c34c 100644
--- a/ubuntu/_base/applications/gwenview/debian/menu
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/menu
diff --git a/ubuntu/_base/applications/abakus/debian/patches/series b/ubuntu/_base/applications/graphics/gwenview/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/abakus/debian/patches/series
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/patches/series
diff --git a/ubuntu/_base/applications/gwenview/debian/rules b/ubuntu/_base/applications/graphics/gwenview/debian/rules
index 7c5315da0..7c5315da0 100755
--- a/ubuntu/_base/applications/gwenview/debian/rules
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/rules
diff --git a/ubuntu/_base/applications/bibletime/debian/source/format b/ubuntu/_base/applications/graphics/gwenview/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/bibletime/debian/source/format
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/source/format
diff --git a/ubuntu/_base/applications/bibletime/debian/source/options b/ubuntu/_base/applications/graphics/gwenview/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/bibletime/debian/source/options
+++ b/ubuntu/_base/applications/graphics/gwenview/debian/source/options
diff --git a/ubuntu/_base/applications/ksquirrel/debian/README.debian b/ubuntu/_base/applications/graphics/ksquirrel/debian/README.debian
index 7c478322f..7c478322f 100644
--- a/ubuntu/_base/applications/ksquirrel/debian/README.debian
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/README.debian
diff --git a/ubuntu/_base/applications/ksquirrel/debian/changelog b/ubuntu/_base/applications/graphics/ksquirrel/debian/changelog
index 8f786a231..8f786a231 100644
--- a/ubuntu/_base/applications/ksquirrel/debian/changelog
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/changelog
diff --git a/ubuntu/_base/applications/dolphin/debian/compat b/ubuntu/_base/applications/graphics/ksquirrel/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/dolphin/debian/compat
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/compat
diff --git a/ubuntu/_base/applications/ksquirrel/debian/control b/ubuntu/_base/applications/graphics/ksquirrel/debian/control
index f771c0a05..f771c0a05 100644
--- a/ubuntu/_base/applications/ksquirrel/debian/control
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/control
diff --git a/ubuntu/_base/applications/ksquirrel/debian/copyright b/ubuntu/_base/applications/graphics/ksquirrel/debian/copyright
index d09bb9228..d09bb9228 100644
--- a/ubuntu/_base/applications/ksquirrel/debian/copyright
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/copyright
diff --git a/ubuntu/_base/applications/kde-style-qtcurve/debian/docs b/ubuntu/_base/applications/graphics/ksquirrel/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/_base/applications/kde-style-qtcurve/debian/docs
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/docs
diff --git a/ubuntu/_base/applications/ksquirrel/debian/ksquirrel-libs-configurator.1 b/ubuntu/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1
index a6da62b4c..a6da62b4c 100644
--- a/ubuntu/_base/applications/ksquirrel/debian/ksquirrel-libs-configurator.1
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1
diff --git a/ubuntu/_base/applications/kdiff3/debian/patches/.gitignore b/ubuntu/_base/applications/graphics/ksquirrel/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kdiff3/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/ksquirrel/debian/rules b/ubuntu/_base/applications/graphics/ksquirrel/debian/rules
index a291256f6..a291256f6 100755
--- a/ubuntu/_base/applications/ksquirrel/debian/rules
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/rules
diff --git a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/source/format b/ubuntu/_base/applications/graphics/ksquirrel/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/source/format
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/source/format
diff --git a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/source/options b/ubuntu/_base/applications/graphics/ksquirrel/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/source/options
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/source/options
diff --git a/ubuntu/_base/applications/ksquirrel/debian/watch b/ubuntu/_base/applications/graphics/ksquirrel/debian/watch
index a276799ff..a276799ff 100644
--- a/ubuntu/_base/applications/ksquirrel/debian/watch
+++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/watch
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/kuickshow/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/amarok.cmake/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/adept/debian/cdbs/versions.pl b/ubuntu/_base/applications/graphics/kuickshow/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/adept/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kuickshow/debian/changelog b/ubuntu/_base/applications/graphics/kuickshow/debian/changelog
index c156cee8b..c156cee8b 100644
--- a/ubuntu/_base/applications/kuickshow/debian/changelog
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/changelog
diff --git a/ubuntu/_base/applications/filelight-l10n/debian/compat b/ubuntu/_base/applications/graphics/kuickshow/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/filelight-l10n/debian/compat
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/compat
diff --git a/ubuntu/_base/applications/kuickshow/debian/control b/ubuntu/_base/applications/graphics/kuickshow/debian/control
index c407ee57c..c407ee57c 100644
--- a/ubuntu/_base/applications/kuickshow/debian/control
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/control
diff --git a/ubuntu/_base/applications/kuickshow/debian/copyright b/ubuntu/_base/applications/graphics/kuickshow/debian/copyright
index 2373ec1a7..2373ec1a7 100644
--- a/ubuntu/_base/applications/kuickshow/debian/copyright
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/copyright
diff --git a/ubuntu/_base/applications/kuickshow/debian/icons/kuickshow-16.xpm b/ubuntu/_base/applications/graphics/kuickshow/debian/icons/kuickshow-16.xpm
index cf91f34d9..cf91f34d9 100644
--- a/ubuntu/_base/applications/kuickshow/debian/icons/kuickshow-16.xpm
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/icons/kuickshow-16.xpm
diff --git a/ubuntu/_base/applications/kuickshow/debian/icons/kuickshow.xpm b/ubuntu/_base/applications/graphics/kuickshow/debian/icons/kuickshow.xpm
index 5d2d6ca97..5d2d6ca97 100644
--- a/ubuntu/_base/applications/kuickshow/debian/icons/kuickshow.xpm
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/icons/kuickshow.xpm
diff --git a/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.install b/ubuntu/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.install
index dee09fb33..dee09fb33 100644
--- a/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.install
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.install
diff --git a/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.lintian b/ubuntu/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.lintian
index dd274dba5..dd274dba5 100644
--- a/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.lintian
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.lintian
diff --git a/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.manpages b/ubuntu/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.manpages
index 3eadda903..3eadda903 100644
--- a/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.manpages
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.manpages
diff --git a/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.menu b/ubuntu/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.menu
index 4d17d621c..4d17d621c 100644
--- a/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.menu
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/kuickshow-trinity.menu
diff --git a/ubuntu/_base/applications/kuickshow/debian/man/kuickshow.1 b/ubuntu/_base/applications/graphics/kuickshow/debian/man/kuickshow.1
index 2675eae4e..2675eae4e 100644
--- a/ubuntu/_base/applications/kuickshow/debian/man/kuickshow.1
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/man/kuickshow.1
diff --git a/ubuntu/_base/applications/adept/debian/patches/series b/ubuntu/_base/applications/graphics/kuickshow/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/adept/debian/patches/series
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/patches/series
diff --git a/ubuntu/_base/applications/kuickshow/debian/rules b/ubuntu/_base/applications/graphics/kuickshow/debian/rules
index e2fae601d..e2fae601d 100755
--- a/ubuntu/_base/applications/kuickshow/debian/rules
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/rules
diff --git a/ubuntu/_base/applications/desktop-effects-kde/debian/source/format b/ubuntu/_base/applications/graphics/kuickshow/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/desktop-effects-kde/debian/source/format
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/source/format
diff --git a/ubuntu/_base/applications/desktop-effects-kde/debian/source/options b/ubuntu/_base/applications/graphics/kuickshow/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/desktop-effects-kde/debian/source/options
+++ b/ubuntu/_base/applications/graphics/kuickshow/debian/source/options
diff --git a/ubuntu/_base/applications/potracegui/debian/changelog b/ubuntu/_base/applications/graphics/potracegui/debian/changelog
index 87afc2863..87afc2863 100644
--- a/ubuntu/_base/applications/potracegui/debian/changelog
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/changelog
diff --git a/ubuntu/_base/applications/filelight/debian/compat b/ubuntu/_base/applications/graphics/potracegui/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/filelight/debian/compat
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/compat
diff --git a/ubuntu/_base/applications/potracegui/debian/control b/ubuntu/_base/applications/graphics/potracegui/debian/control
index ad63842b1..ad63842b1 100644
--- a/ubuntu/_base/applications/potracegui/debian/control
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/control
diff --git a/ubuntu/_base/applications/potracegui/debian/copyright b/ubuntu/_base/applications/graphics/potracegui/debian/copyright
index f3437d1cc..f3437d1cc 100644
--- a/ubuntu/_base/applications/potracegui/debian/copyright
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/copyright
diff --git a/ubuntu/_base/applications/potracegui/debian/dirs b/ubuntu/_base/applications/graphics/potracegui/debian/dirs
index 34e17c1b8..34e17c1b8 100644
--- a/ubuntu/_base/applications/potracegui/debian/dirs
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/dirs
diff --git a/ubuntu/_base/applications/potracegui/debian/docs b/ubuntu/_base/applications/graphics/potracegui/debian/docs
index ba8894c15..ba8894c15 100644
--- a/ubuntu/_base/applications/potracegui/debian/docs
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/docs
diff --git a/ubuntu/_base/applications/potracegui/debian/potracegui-trinity.1 b/ubuntu/_base/applications/graphics/potracegui/debian/potracegui-trinity.1
index ef8dc8b59..ef8dc8b59 100644
--- a/ubuntu/_base/applications/potracegui/debian/potracegui-trinity.1
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/potracegui-trinity.1
diff --git a/ubuntu/_base/applications/potracegui/debian/potracegui-trinity.menu b/ubuntu/_base/applications/graphics/potracegui/debian/potracegui-trinity.menu
index ec42ba351..ec42ba351 100644
--- a/ubuntu/_base/applications/potracegui/debian/potracegui-trinity.menu
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/potracegui-trinity.menu
diff --git a/ubuntu/_base/applications/potracegui/debian/rules b/ubuntu/_base/applications/graphics/potracegui/debian/rules
index fdda3113f..fdda3113f 100755
--- a/ubuntu/_base/applications/potracegui/debian/rules
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/rules
diff --git a/ubuntu/_base/applications/digikam/debian/source/format b/ubuntu/_base/applications/graphics/potracegui/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/digikam/debian/source/format
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/source/format
diff --git a/ubuntu/_base/applications/digikam/debian/source/options b/ubuntu/_base/applications/graphics/potracegui/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/digikam/debian/source/options
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/source/options
diff --git a/ubuntu/_base/applications/potracegui/debian/watch b/ubuntu/_base/applications/graphics/potracegui/debian/watch
index ecb7330aa..ecb7330aa 100644
--- a/ubuntu/_base/applications/potracegui/debian/watch
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/watch
diff --git a/ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kbiff/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/amarok.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/internet/kbiff/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kbiff/debian/changelog b/ubuntu/_base/applications/internet/kbiff/debian/changelog
index bf7871f3b..bf7871f3b 100644
--- a/ubuntu/_base/applications/kbiff/debian/changelog
+++ b/ubuntu/_base/applications/internet/kbiff/debian/changelog
diff --git a/ubuntu/_base/applications/fusion-icon/debian/compat b/ubuntu/_base/applications/internet/kbiff/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/fusion-icon/debian/compat
+++ b/ubuntu/_base/applications/internet/kbiff/debian/compat
diff --git a/ubuntu/_base/applications/kbiff/debian/control b/ubuntu/_base/applications/internet/kbiff/debian/control
index 3ce16eb96..3ce16eb96 100644
--- a/ubuntu/_base/applications/kbiff/debian/control
+++ b/ubuntu/_base/applications/internet/kbiff/debian/control
diff --git a/ubuntu/_base/applications/kbiff/debian/copyright b/ubuntu/_base/applications/internet/kbiff/debian/copyright
index f2ff3daec..f2ff3daec 100644
--- a/ubuntu/_base/applications/kbiff/debian/copyright
+++ b/ubuntu/_base/applications/internet/kbiff/debian/copyright
diff --git a/ubuntu/_base/applications/basket/debian/dirs b/ubuntu/_base/applications/internet/kbiff/debian/dirs
index f583045fe..f583045fe 100644
--- a/ubuntu/_base/applications/basket/debian/dirs
+++ b/ubuntu/_base/applications/internet/kbiff/debian/dirs
diff --git a/ubuntu/_base/applications/kpicosim/debian/docs b/ubuntu/_base/applications/internet/kbiff/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/ubuntu/_base/applications/kpicosim/debian/docs
+++ b/ubuntu/_base/applications/internet/kbiff/debian/docs
diff --git a/ubuntu/_base/applications/kbiff/debian/menu b/ubuntu/_base/applications/internet/kbiff/debian/menu
index ab7f8c6e7..ab7f8c6e7 100644
--- a/ubuntu/_base/applications/kbiff/debian/menu
+++ b/ubuntu/_base/applications/internet/kbiff/debian/menu
diff --git a/ubuntu/_base/applications/kbiff/debian/rules b/ubuntu/_base/applications/internet/kbiff/debian/rules
index 2976e276e..2976e276e 100755
--- a/ubuntu/_base/applications/kbiff/debian/rules
+++ b/ubuntu/_base/applications/internet/kbiff/debian/rules
diff --git a/ubuntu/_base/applications/dolphin/debian/source/format b/ubuntu/_base/applications/internet/kbiff/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/dolphin/debian/source/format
+++ b/ubuntu/_base/applications/internet/kbiff/debian/source/format
diff --git a/ubuntu/_base/applications/dolphin/debian/source/options b/ubuntu/_base/applications/internet/kbiff/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/dolphin/debian/source/options
+++ b/ubuntu/_base/applications/internet/kbiff/debian/source/options
diff --git a/ubuntu/_base/applications/kbiff/debian/watch b/ubuntu/_base/applications/internet/kbiff/debian/watch
index eb0794476..eb0794476 100644
--- a/ubuntu/_base/applications/kbiff/debian/watch
+++ b/ubuntu/_base/applications/internet/kbiff/debian/watch
diff --git a/ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/amarok/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/konversation/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/amarok/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/internet/konversation/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/konversation/debian/changelog b/ubuntu/_base/applications/internet/konversation/debian/changelog
index bdb599f0f..bdb599f0f 100644
--- a/ubuntu/_base/applications/konversation/debian/changelog
+++ b/ubuntu/_base/applications/internet/konversation/debian/changelog
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/compat b/ubuntu/_base/applications/internet/konversation/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/compat
+++ b/ubuntu/_base/applications/internet/konversation/debian/compat
diff --git a/ubuntu/_base/applications/konversation/debian/control b/ubuntu/_base/applications/internet/konversation/debian/control
index 2104b84e6..2104b84e6 100644
--- a/ubuntu/_base/applications/konversation/debian/control
+++ b/ubuntu/_base/applications/internet/konversation/debian/control
diff --git a/ubuntu/_base/applications/konversation/debian/copyright b/ubuntu/_base/applications/internet/konversation/debian/copyright
index cb5c85c8e..cb5c85c8e 100644
--- a/ubuntu/_base/applications/konversation/debian/copyright
+++ b/ubuntu/_base/applications/internet/konversation/debian/copyright
diff --git a/ubuntu/_base/applications/konversation/debian/konversation-trinity.docs b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.docs
index e7f450c0c..e7f450c0c 100644
--- a/ubuntu/_base/applications/konversation/debian/konversation-trinity.docs
+++ b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.docs
diff --git a/ubuntu/_base/applications/konversation/debian/konversation-trinity.install b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.install
index ca10af6cf..ca10af6cf 100644
--- a/ubuntu/_base/applications/konversation/debian/konversation-trinity.install
+++ b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.install
diff --git a/ubuntu/_base/applications/konversation/debian/konversation-trinity.manpages b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.manpages
index 13cdaf4b2..13cdaf4b2 100644
--- a/ubuntu/_base/applications/konversation/debian/konversation-trinity.manpages
+++ b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.manpages
diff --git a/ubuntu/_base/applications/konversation/debian/konversation-trinity.menu b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.menu
index 0fbd13937..0fbd13937 100644
--- a/ubuntu/_base/applications/konversation/debian/konversation-trinity.menu
+++ b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.menu
diff --git a/ubuntu/_base/applications/konversation/debian/konversation16x16.xpm b/ubuntu/_base/applications/internet/konversation/debian/konversation16x16.xpm
index 4b4a9376c..4b4a9376c 100644
--- a/ubuntu/_base/applications/konversation/debian/konversation16x16.xpm
+++ b/ubuntu/_base/applications/internet/konversation/debian/konversation16x16.xpm
diff --git a/ubuntu/_base/applications/konversation/debian/konversation32x32.xpm b/ubuntu/_base/applications/internet/konversation/debian/konversation32x32.xpm
index 60c8f3b0c..60c8f3b0c 100644
--- a/ubuntu/_base/applications/konversation/debian/konversation32x32.xpm
+++ b/ubuntu/_base/applications/internet/konversation/debian/konversation32x32.xpm
diff --git a/ubuntu/_base/applications/konversation/debian/man/konversation.1.docbook b/ubuntu/_base/applications/internet/konversation/debian/man/konversation.1.docbook
index f48e27b95..f48e27b95 100644
--- a/ubuntu/_base/applications/konversation/debian/man/konversation.1.docbook
+++ b/ubuntu/_base/applications/internet/konversation/debian/man/konversation.1.docbook
diff --git a/ubuntu/_base/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook b/ubuntu/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook
index 1752d7b2c..1752d7b2c 100644
--- a/ubuntu/_base/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
+++ b/ubuntu/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook
diff --git a/ubuntu/_base/applications/kdmtheme/debian/patches/.gitignore b/ubuntu/_base/applications/internet/konversation/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kdmtheme/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/internet/konversation/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/konversation/debian/rules b/ubuntu/_base/applications/internet/konversation/debian/rules
index b0ed413fd..b0ed413fd 100755
--- a/ubuntu/_base/applications/konversation/debian/rules
+++ b/ubuntu/_base/applications/internet/konversation/debian/rules
diff --git a/ubuntu/_base/applications/filelight-l10n/debian/source/format b/ubuntu/_base/applications/internet/konversation/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/filelight-l10n/debian/source/format
+++ b/ubuntu/_base/applications/internet/konversation/debian/source/format
diff --git a/ubuntu/_base/applications/filelight-l10n/debian/source/options b/ubuntu/_base/applications/internet/konversation/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/filelight-l10n/debian/source/options
+++ b/ubuntu/_base/applications/internet/konversation/debian/source/options
diff --git a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/bibletime/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/bibletime/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kopete-otr/debian/changelog b/ubuntu/_base/applications/internet/kopete-otr/debian/changelog
index f424502b9..f424502b9 100644
--- a/ubuntu/_base/applications/kopete-otr/debian/changelog
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/changelog
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/compat b/ubuntu/_base/applications/internet/kopete-otr/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/gwenview-i18n/debian/compat
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/compat
diff --git a/ubuntu/_base/applications/kopete-otr/debian/control b/ubuntu/_base/applications/internet/kopete-otr/debian/control
index 4731c9d8b..4731c9d8b 100644
--- a/ubuntu/_base/applications/kopete-otr/debian/control
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/control
diff --git a/ubuntu/_base/applications/kopete-otr/debian/copyright b/ubuntu/_base/applications/internet/kopete-otr/debian/copyright
index 86dcae02e..86dcae02e 100644
--- a/ubuntu/_base/applications/kopete-otr/debian/copyright
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/copyright
diff --git a/ubuntu/_base/applications/kopete-otr/debian/rules b/ubuntu/_base/applications/internet/kopete-otr/debian/rules
index 7a6c3e8e4..7a6c3e8e4 100755
--- a/ubuntu/_base/applications/kopete-otr/debian/rules
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/rules
diff --git a/ubuntu/_base/applications/filelight/debian/source/format b/ubuntu/_base/applications/internet/kopete-otr/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/filelight/debian/source/format
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/source/format
diff --git a/ubuntu/_base/applications/filelight/debian/source/options b/ubuntu/_base/applications/internet/kopete-otr/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/filelight/debian/source/options
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/source/options
diff --git a/ubuntu/_base/applications/kopete-otr/debian/watch b/ubuntu/_base/applications/internet/kopete-otr/debian/watch
index 50ddb75fa..50ddb75fa 100644
--- a/ubuntu/_base/applications/kopete-otr/debian/watch
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/watch
diff --git a/ubuntu/_base/applications/kstreamripper/debian/README.Debian-source b/ubuntu/_base/applications/internet/kstreamripper/debian/README.Debian-source
index 57547ac25..57547ac25 100644
--- a/ubuntu/_base/applications/kstreamripper/debian/README.Debian-source
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/README.Debian-source
diff --git a/ubuntu/_base/applications/kstreamripper/debian/changelog b/ubuntu/_base/applications/internet/kstreamripper/debian/changelog
index 7e7fdb95b..7e7fdb95b 100644
--- a/ubuntu/_base/applications/kstreamripper/debian/changelog
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/changelog
diff --git a/ubuntu/_base/applications/gwenview/debian/compat b/ubuntu/_base/applications/internet/kstreamripper/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/gwenview/debian/compat
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/compat
diff --git a/ubuntu/_base/applications/kstreamripper/debian/control b/ubuntu/_base/applications/internet/kstreamripper/debian/control
index b5fafd432..b5fafd432 100644
--- a/ubuntu/_base/applications/kstreamripper/debian/control
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/control
diff --git a/ubuntu/_base/applications/kstreamripper/debian/copyright b/ubuntu/_base/applications/internet/kstreamripper/debian/copyright
index 61d405298..61d405298 100644
--- a/ubuntu/_base/applications/kstreamripper/debian/copyright
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/copyright
diff --git a/ubuntu/_base/applications/kstreamripper/debian/dirs b/ubuntu/_base/applications/internet/kstreamripper/debian/dirs
index a59ccc8af..a59ccc8af 100644
--- a/ubuntu/_base/applications/kstreamripper/debian/dirs
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/dirs
diff --git a/ubuntu/_base/applications/keep/debian/docs b/ubuntu/_base/applications/internet/kstreamripper/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/_base/applications/keep/debian/docs
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/docs
diff --git a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.install b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.install
index dc292dbda..dc292dbda 100644
--- a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.install
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.install
diff --git a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.postinst b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst
index f5542ab64..f5542ab64 100644
--- a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.postinst
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst
diff --git a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.postrm b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm
index 5209bcb38..5209bcb38 100644
--- a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.postrm
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm
diff --git a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper.1 b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.1
index b409a6be0..b409a6be0 100644
--- a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper.1
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.1
diff --git a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper.desktop b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.desktop
index a0c155fac..a0c155fac 100644
--- a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper.desktop
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.desktop
diff --git a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper.menu b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.menu
index 9ae6cbe73..9ae6cbe73 100644
--- a/ubuntu/_base/applications/kstreamripper/debian/kstreamripper.menu
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.menu
diff --git a/ubuntu/_base/applications/kstreamripper/debian/rules b/ubuntu/_base/applications/internet/kstreamripper/debian/rules
index cb9dc49ae..cb9dc49ae 100755
--- a/ubuntu/_base/applications/kstreamripper/debian/rules
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/rules
diff --git a/ubuntu/_base/applications/fusion-icon/debian/source/format b/ubuntu/_base/applications/internet/kstreamripper/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/fusion-icon/debian/source/format
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/source/format
diff --git a/ubuntu/_base/applications/fusion-icon/debian/source/options b/ubuntu/_base/applications/internet/kstreamripper/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/fusion-icon/debian/source/options
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/source/options
diff --git a/ubuntu/_base/applications/ktorrent/debian/README.Debian b/ubuntu/_base/applications/internet/ktorrent/debian/README.Debian
index 0d4e3f758..0d4e3f758 100644
--- a/ubuntu/_base/applications/ktorrent/debian/README.Debian
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/README.Debian
diff --git a/ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/ktorrent/debian/changelog b/ubuntu/_base/applications/internet/ktorrent/debian/changelog
index a82f9b70b..a82f9b70b 100644
--- a/ubuntu/_base/applications/ktorrent/debian/changelog
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/changelog
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/compat b/ubuntu/_base/applications/internet/ktorrent/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/k3b-i18n/debian/compat
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/compat
diff --git a/ubuntu/_base/applications/ktorrent/debian/control b/ubuntu/_base/applications/internet/ktorrent/debian/control
index e17085f05..e17085f05 100644
--- a/ubuntu/_base/applications/ktorrent/debian/control
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/control
diff --git a/ubuntu/_base/applications/ktorrent/debian/copyright b/ubuntu/_base/applications/internet/ktorrent/debian/copyright
index 9b8756613..9b8756613 100644
--- a/ubuntu/_base/applications/ktorrent/debian/copyright
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/copyright
diff --git a/ubuntu/_base/applications/ktorrent/debian/ktorrent.1.docbook b/ubuntu/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook
index f9b49424b..f9b49424b 100644
--- a/ubuntu/_base/applications/ktorrent/debian/ktorrent.1.docbook
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook
diff --git a/ubuntu/_base/applications/amarok.cmake/debian/patches/series b/ubuntu/_base/applications/internet/ktorrent/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/amarok.cmake/debian/patches/series
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/patches/series
diff --git a/ubuntu/_base/applications/ktorrent/debian/rules b/ubuntu/_base/applications/internet/ktorrent/debian/rules
index be25e3755..be25e3755 100755
--- a/ubuntu/_base/applications/ktorrent/debian/rules
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/rules
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/source/format b/ubuntu/_base/applications/internet/ktorrent/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/source/format
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/source/format
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/source/options b/ubuntu/_base/applications/internet/ktorrent/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/source/options
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/source/options
diff --git a/ubuntu/_base/applications/ktorrent/debian/watch b/ubuntu/_base/applications/internet/ktorrent/debian/watch
index 0262eb3c5..0262eb3c5 100644
--- a/ubuntu/_base/applications/ktorrent/debian/watch
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/watch
diff --git a/ubuntu/_base/applications/kvirc/debian/changelog b/ubuntu/_base/applications/internet/kvirc/debian/changelog
index 889d5878f..889d5878f 100644
--- a/ubuntu/_base/applications/kvirc/debian/changelog
+++ b/ubuntu/_base/applications/internet/kvirc/debian/changelog
diff --git a/ubuntu/_base/applications/k3b/debian/compat b/ubuntu/_base/applications/internet/kvirc/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/k3b/debian/compat
+++ b/ubuntu/_base/applications/internet/kvirc/debian/compat
diff --git a/ubuntu/_base/applications/kvirc/debian/control b/ubuntu/_base/applications/internet/kvirc/debian/control
index 8e7fb990a..8e7fb990a 100644
--- a/ubuntu/_base/applications/kvirc/debian/control
+++ b/ubuntu/_base/applications/internet/kvirc/debian/control
diff --git a/ubuntu/_base/applications/kvirc/debian/copyright b/ubuntu/_base/applications/internet/kvirc/debian/copyright
index 3f6f5b6e5..3f6f5b6e5 100644
--- a/ubuntu/_base/applications/kvirc/debian/copyright
+++ b/ubuntu/_base/applications/internet/kvirc/debian/copyright
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.install b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
index fd6afdc77..fd6afdc77 100644
--- a/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.install
+++ b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.links b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.links
index 831b763bf..831b763bf 100644
--- a/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.links
+++ b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.links
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.postinst b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.postinst
index ae66752f1..ae66752f1 100644
--- a/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.postinst
+++ b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.postinst
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.prerm b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.prerm
index 4efb6507f..4efb6507f 100644
--- a/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.prerm
+++ b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.prerm
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-trinity-dev.install b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.install
index b786fb7ec..b786fb7ec 100644
--- a/ubuntu/_base/applications/kvirc/debian/kvirc-trinity-dev.install
+++ b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.install
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-trinity-dev.links b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.links
index 23a8e59b0..23a8e59b0 100644
--- a/ubuntu/_base/applications/kvirc/debian/kvirc-trinity-dev.links
+++ b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity-dev.links
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-trinity.install b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity.install
index 994dd3e0e..994dd3e0e 100644
--- a/ubuntu/_base/applications/kvirc/debian/kvirc-trinity.install
+++ b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity.install
diff --git a/ubuntu/_base/applications/kvirc/debian/kvirc-trinity.menu b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity.menu
index b35945214..b35945214 100644
--- a/ubuntu/_base/applications/kvirc/debian/kvirc-trinity.menu
+++ b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-trinity.menu
diff --git a/ubuntu/_base/applications/kvirc/debian/overrides/kvirc b/ubuntu/_base/applications/internet/kvirc/debian/overrides/kvirc
index dc125fd2e..dc125fd2e 100644
--- a/ubuntu/_base/applications/kvirc/debian/overrides/kvirc
+++ b/ubuntu/_base/applications/internet/kvirc/debian/overrides/kvirc
diff --git a/ubuntu/_base/applications/amarok/debian/patches/series b/ubuntu/_base/applications/internet/kvirc/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/amarok/debian/patches/series
+++ b/ubuntu/_base/applications/internet/kvirc/debian/patches/series
diff --git a/ubuntu/_base/applications/kvirc/debian/rules b/ubuntu/_base/applications/internet/kvirc/debian/rules
index 3a8490e65..3a8490e65 100755
--- a/ubuntu/_base/applications/kvirc/debian/rules
+++ b/ubuntu/_base/applications/internet/kvirc/debian/rules
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/source/format b/ubuntu/_base/applications/internet/kvirc/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/gwenview-i18n/debian/source/format
+++ b/ubuntu/_base/applications/internet/kvirc/debian/source/format
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/source/options b/ubuntu/_base/applications/internet/kvirc/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/gwenview-i18n/debian/source/options
+++ b/ubuntu/_base/applications/internet/kvirc/debian/source/options
diff --git a/ubuntu/_base/applications/gwenview/debian/source/format b/ubuntu/_base/applications/internet/kvpnc/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/gwenview/debian/source/format
+++ b/ubuntu/_base/applications/internet/kvpnc/debian/source/format
diff --git a/ubuntu/_base/applications/gwenview/debian/source/options b/ubuntu/_base/applications/internet/kvpnc/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/gwenview/debian/source/options
+++ b/ubuntu/_base/applications/internet/kvpnc/debian/source/options
diff --git a/ubuntu/_base/applications/smb4k/debian/README.Debian b/ubuntu/_base/applications/internet/smb4k/debian/README.Debian
index 995d110e5..995d110e5 100644
--- a/ubuntu/_base/applications/smb4k/debian/README.Debian
+++ b/ubuntu/_base/applications/internet/smb4k/debian/README.Debian
diff --git a/ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/digikam/debian/cdbs/versions.pl b/ubuntu/_base/applications/internet/smb4k/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/digikam/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/internet/smb4k/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/smb4k/debian/changelog b/ubuntu/_base/applications/internet/smb4k/debian/changelog
index aa842f771..aa842f771 100644
--- a/ubuntu/_base/applications/smb4k/debian/changelog
+++ b/ubuntu/_base/applications/internet/smb4k/debian/changelog
diff --git a/ubuntu/_base/applications/k9copy/debian/compat b/ubuntu/_base/applications/internet/smb4k/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/k9copy/debian/compat
+++ b/ubuntu/_base/applications/internet/smb4k/debian/compat
diff --git a/ubuntu/_base/applications/smb4k/debian/control b/ubuntu/_base/applications/internet/smb4k/debian/control
index 6e0b8010e..6e0b8010e 100644
--- a/ubuntu/_base/applications/smb4k/debian/control
+++ b/ubuntu/_base/applications/internet/smb4k/debian/control
diff --git a/ubuntu/_base/applications/smb4k/debian/copyright b/ubuntu/_base/applications/internet/smb4k/debian/copyright
index d32c049ef..d32c049ef 100644
--- a/ubuntu/_base/applications/smb4k/debian/copyright
+++ b/ubuntu/_base/applications/internet/smb4k/debian/copyright
diff --git a/ubuntu/_base/applications/smb4k/debian/docs b/ubuntu/_base/applications/internet/smb4k/debian/docs
index e4acf0127..e4acf0127 100644
--- a/ubuntu/_base/applications/smb4k/debian/docs
+++ b/ubuntu/_base/applications/internet/smb4k/debian/docs
diff --git a/ubuntu/_base/applications/smb4k/debian/menu b/ubuntu/_base/applications/internet/smb4k/debian/menu
index 7f7c9cb2a..7f7c9cb2a 100644
--- a/ubuntu/_base/applications/smb4k/debian/menu
+++ b/ubuntu/_base/applications/internet/smb4k/debian/menu
diff --git a/ubuntu/_base/applications/smb4k/debian/rules b/ubuntu/_base/applications/internet/smb4k/debian/rules
index c8022b5a5..c8022b5a5 100755
--- a/ubuntu/_base/applications/smb4k/debian/rules
+++ b/ubuntu/_base/applications/internet/smb4k/debian/rules
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/source/format b/ubuntu/_base/applications/internet/smb4k/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/k3b-i18n/debian/source/format
+++ b/ubuntu/_base/applications/internet/smb4k/debian/source/format
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/source/options b/ubuntu/_base/applications/internet/smb4k/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/k3b-i18n/debian/source/options
+++ b/ubuntu/_base/applications/internet/smb4k/debian/source/options
diff --git a/ubuntu/_base/applications/smb4k/debian/watch b/ubuntu/_base/applications/internet/smb4k/debian/watch
index 70154d877..70154d877 100644
--- a/ubuntu/_base/applications/smb4k/debian/watch
+++ b/ubuntu/_base/applications/internet/smb4k/debian/watch
diff --git a/ubuntu/_base/applications/knetworkmanager.cmake/debian/README.source b/ubuntu/_base/applications/knetworkmanager.cmake/debian/README.source
deleted file mode 100644
index 96fb271ab..000000000
--- a/ubuntu/_base/applications/knetworkmanager.cmake/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/_base/applications/knetworkmanager.cmake/debian/changelog b/ubuntu/_base/applications/knetworkmanager.cmake/debian/changelog
deleted file mode 100644
index ed0d32a81..000000000
--- a/ubuntu/_base/applications/knetworkmanager.cmake/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/_base/applications/knetworkmanager.cmake/debian/control b/ubuntu/_base/applications/knetworkmanager.cmake/debian/control
deleted file mode 100644
index 0efa7ab0c..000000000
--- a/ubuntu/_base/applications/knetworkmanager.cmake/debian/control
+++ /dev/null
@@ -1,33 +0,0 @@
-Source: knetworkmanager-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs, debhelper (>= 7), quilt, cmake-trinity, ninja-build,
- 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-tqt-dev (>= 0.8.1),
- libiw-dev,
- libnl-dev (>= 1.1),
- network-manager-vpnc,
- network-manager-openvpn,
- network-manager-strongswan,
- network-manager-pptp
-Standards-Version: 3.8.3
-Homepage: http://opensuse.org/Projects/KNetworkManager
-
-Package: network-manager-tde
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
-Replaces: network-manager-tde (<< 4:3.5.13)
-Breaks: network-manager-tde (<< 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/_base/applications/knetworkmanager.cmake/debian/copyright b/ubuntu/_base/applications/knetworkmanager.cmake/debian/copyright
deleted file mode 100644
index 2490de254..000000000
--- a/ubuntu/_base/applications/knetworkmanager.cmake/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/_base/applications/knetworkmanager.cmake/debian/knetworkmanager.1 b/ubuntu/_base/applications/knetworkmanager.cmake/debian/knetworkmanager.1
deleted file mode 100644
index 3cd261c89..000000000
--- a/ubuntu/_base/applications/knetworkmanager.cmake/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/_base/applications/knetworkmanager.cmake/debian/manpages b/ubuntu/_base/applications/knetworkmanager.cmake/debian/manpages
deleted file mode 100644
index e2859341f..000000000
--- a/ubuntu/_base/applications/knetworkmanager.cmake/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/knetworkmanager.1
diff --git a/ubuntu/_base/applications/knetworkmanager.cmake/debian/menu b/ubuntu/_base/applications/knetworkmanager.cmake/debian/menu
deleted file mode 100644
index 9775e9c7c..000000000
--- a/ubuntu/_base/applications/knetworkmanager.cmake/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/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
deleted file mode 100644
index 9ae01a92b..000000000
--- a/ubuntu/_base/applications/knetworkmanager.cmake/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/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst b/ubuntu/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst
deleted file mode 100644
index fdd4e51ca..000000000
--- a/ubuntu/_base/applications/knetworkmanager.cmake/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/_base/applications/knetworkmanager.cmake/debian/rules b/ubuntu/_base/applications/knetworkmanager.cmake/debian/rules
deleted file mode 100755
index 7554d7394..000000000
--- a/ubuntu/_base/applications/knetworkmanager.cmake/debian/rules
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/make -f
-
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include debian/cdbs/debian-tde.mk
-
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
--DWITH_OPENVPN="ON" -DWITH_VPNC="ON" -DWITH_PPTP="ON"
-
-DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO
-
-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
diff --git a/ubuntu/_base/applications/knetworkmanager.cmake/debian/watch b/ubuntu/_base/applications/knetworkmanager.cmake/debian/watch
deleted file mode 100644
index ad7a7be91..000000000
--- a/ubuntu/_base/applications/knetworkmanager.cmake/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/_base/applications/knetworkmanager8/debian/README.source b/ubuntu/_base/applications/knetworkmanager8/debian/README.source
deleted file mode 100644
index 96fb271ab..000000000
--- a/ubuntu/_base/applications/knetworkmanager8/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/_base/applications/knetworkmanager8/debian/copyright b/ubuntu/_base/applications/knetworkmanager8/debian/copyright
deleted file mode 100644
index 2490de254..000000000
--- a/ubuntu/_base/applications/knetworkmanager8/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/_base/applications/knetworkmanager8/debian/knetworkmanager.1 b/ubuntu/_base/applications/knetworkmanager8/debian/knetworkmanager.1
deleted file mode 100644
index 3cd261c89..000000000
--- a/ubuntu/_base/applications/knetworkmanager8/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/_base/applications/knetworkmanager8/debian/manpages b/ubuntu/_base/applications/knetworkmanager8/debian/manpages
deleted file mode 100644
index e2859341f..000000000
--- a/ubuntu/_base/applications/knetworkmanager8/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/knetworkmanager.1
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/menu b/ubuntu/_base/applications/knetworkmanager8/debian/menu
deleted file mode 100644
index 9775e9c7c..000000000
--- a/ubuntu/_base/applications/knetworkmanager8/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/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
deleted file mode 100644
index 9ae01a92b..000000000
--- a/ubuntu/_base/applications/knetworkmanager8/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/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst b/ubuntu/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
deleted file mode 100644
index fdd4e51ca..000000000
--- a/ubuntu/_base/applications/knetworkmanager8/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/_base/applications/knetworkmanager8/debian/watch b/ubuntu/_base/applications/knetworkmanager8/debian/watch
deleted file mode 100644
index ad7a7be91..000000000
--- a/ubuntu/_base/applications/knetworkmanager8/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/_base/applications/kpowersave.cmake/debian/changelog b/ubuntu/_base/applications/kpowersave.cmake/debian/changelog
deleted file mode 100644
index c23417124..000000000
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/changelog
+++ /dev/null
@@ -1,372 +0,0 @@
-kpowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
-
-  * Karmic rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
-
-kpowersave-trinity (0.7.3-0ubuntu2) intrepid; urgency=low
-
-  * Moved Trinity to /opt/trinity
-  * Integrated properly with KDE4.2+
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
-
-kpowersave-trinity (0.7.3-0ubuntu1) intrepid; urgency=low
-
-  * Added -trinity suffix
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 14 Dec 2008 15:12:00 -0600
-
-kpowersave (0.7.3-2ubuntu1) intrepid; urgency=low
-
-  * Merge from debian unstable, remaining changes:
-    - debian/patches/kubuntu_02_messages_target.diff
-    - Modified maintainer field per specification
-
- -- Harald Sitter <apachelogger@ubuntu.com>  Fri, 25 Jan 2008 09:54:46 +0000
-
-kpowersave (0.7.3-2) unstable; urgency=low
-
-  * debian/control
-    - Bump Standards-Version to 3.7.3. No further changes required.
-    - Drop Recommends: pm-utils | powersaved | hibernate | acpi-support.
-      Let the hal package depend on the correct suspend framework.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 25 Jan 2008 06:02:09 +0100
-
-kpowersave (0.7.3-1ubuntu1) hardy; urgency=low
-
-  * Merge from debian unstable.
-  * Dropped debian/patches/kubuntu_01_kdepot.patch - in KDE CDBS class.
-  * Remaining Ubuntu changes:
-    - debian/patches/kubuntu_02_messages_target.diff
-
- -- Jonathan Patrick Davies <jpatrick@kubuntu.org>  Wed, 24 Oct 2007 20:41:44 +0200
-
-kpowersave (0.7.3-1) unstable; urgency=low
-
-  * New upstream release.
-    - Fixes a crash in HardwareInfo::checkCurrentCPUFreqPolicy ().
-      Closes: #422057
-  * debian/control
-    - Use the new "Homepage:" field to specify the upstream URL.
-    - Add a Build-Conflicts against autoconf2.13.
-  * debian/menu
-    - Update to the new menu spec.
-  * debian/patches/10-kpowersave-crash-on-getenv.patch
-    - Removed, fixed upstream.
-  * debian/patches/06-handle_failed_suspend.patch
-    - Removed, merged upstream.
-  * debian/patches/05-restore_window.patch
-    - Removed, merged upstream.
-  * debian/patches/04-default_config.patch
-    - Updated, wodim is now already in the application blacklist that is
-      provided by upstream.
-
- -- Michael Biebl <biebl@debian.org>  Thu, 04 Oct 2007 12:48:39 +0200
-
-kpowersave (0.7.2-3ubuntu1) gutsy; urgency=low
-
-  * Merge from debian unstable. 
-  * Remaining Ubuntu changes:
-    * debian/control: change Maintainer field
-    * debian/patches/kubuntu_01_kdepot.patch
-    * debian/patches/kubuntu_02_messages_target.diff
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 19 May 2007 13:22:26 +1000
-
-kpowersave (0.7.2-3) unstable; urgency=low
-
-  * debian/patches/10-kpowersave-crash-on-getenv.patch
-    - Fixes a crash when the environment variable DESKTOP_SESSION is not set.
-      Patch by Pierre Habouzit, thanks!  Closes: #422420
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Apr 2007 21:07:05 +0200
-
-kpowersave (0.7.2-2) unstable; urgency=low
-
-  * Upload to unstable.
-  * debian/patches/05-restore_window.patch
-    - Pull from svn. Properly restore minimized configuration dialog.
-      Closes: #413638
-  * debian/patches/06-handle_failed_suspend.patch
-    - Pull from svn. Check the return code of the Suspend() method and display
-      a message box if it failed. Closes: #413811
-
- -- Michael Biebl <biebl@debian.org>  Wed, 25 Apr 2007 20:40:41 +0200
-
-kpowersave (0.7.2-1ubuntu1) feisty; urgency=low
-
-  * Merge from debian experimental
-  * Dropped Ubuntu changes:
-    * debian/control: drop Conflics/Replaces/Provides klaptopdaemon - does not
-      conflict anymore
-    * debian/rules: remove dh_iconcache - done by cdbs
-  * Remaining Ubuntu changes:
-    * debian/control: change Maintainer field
-    * debian/patches/kubuntu_01_kdepot.patch
-    * debian/patches/kubuntu_02_messages_target.diff
-
- -- Luka Renko <lure@ubuntu.com>  Mon, 19 Mar 2007 22:30:13 +0100
-
-kpowersave (0.7.2-1) experimental; urgency=low
-
-  * New upstream release. Closes: #412647
-  * debian/patches/01-autoconf_2.6.patch,
-    debian/patches/02-close_dialog_on_destroy.patch
-    - Removed, merged upstream.
-  * debian/patches/04-default_config.patch
-    - Add wodim to application blacklist.
-    - Do not unmount external media on suspend.
-      kded/mediamanager in Debian is missing a patch which would allow that. 
-  * Beginning with this version, the dependency on powersaved as backend has
-    been dropped. All the heavy lifting is done via HAL now.
-    Update debian/control accordingly:
-    - Remove build dependency on libpowersave-dev.
-    - Remove dependency on powersaved, add a versioned dependency on 
-      hal (>= 0.5.8.1) instead (needed for cpu frequency scaling support).
-    - For proper suspend/resume support, hal should use one of the existing 
-      suspend frameworks. Add Recommends on these packages. 
-    - Update the package description.
-
- -- Michael Biebl <biebl@debian.org>  Mon,  5 Mar 2007 07:24:09 +0100
-
-kpowersave (0.7.2-0ubuntu1) feisty; urgency=low
-
-  * New upstream release: uses HAL directly (no powersave dependency)
-  * Changes:
-    * drop 01-autoconf_2.6.patch: included upstream
-    * drop 02-close_dialog_on_destroy.patch: included upstream
-    * drop 03-reset_blankonly_to_default.patch: fixed upstream
-    * update kubuntu_01_kdepot.patch to apply
-    * drop Build-Depends on libpowersave-dev: now uses HAL 
-    * drop Depends on powersaved: now uses HAL
-    * update Maintainer field
-  * UVF exception approved by MOTU https://launchpad.net/bugs/88793
-
- -- Luka Renko <lure@ubuntu.com>  Wed, 28 Feb 2007 22:35:46 +0100
-
-kpowersave (0.6.2-5ubuntu1) feisty; urgency=low
-
-  * Merge from debian unstable, remaining changes:
-    - Added dh_iconcache
-    - Add kubuntu_02_messages_target.diff fix messages 
-      target for .pot generation
-    - Added kubuntu_01_kdepot.diff for pot file extraction to rosetta
-    - Added a Conflicts/Replaces/Provides: klaptopdaemon to enforce 
-      its removal. 
-
- -- ville palo <vi64pa@gmail.com>  Sun, 21 Jan 2007 09:21:00 +0000
-
-kpowersave (0.6.2-5) unstable; urgency=low
-
-  * Prepend a sequence number to all patches.
-  * debian/patches/03-reset_blankonly_to_default.patch
-    - Added. Reset kscreensaver settings to correct default values on scheme 
-      changes and on application shutdown.
-      Patch by Modestas Vainius, thanks! Closes: #399473
-
- -- Michael Biebl <biebl@debian.org>  Sat, 20 Jan 2007 19:49:40 +0100
-
-kpowersave (0.6.2-4) unstable; urgency=low
-
-  * debian/patches/close_dialog_on_destroy.patch
-    - Added. Correctly close the information dialog when activated over dcop.
-      Closes: #398201
-
- -- Michael Biebl <biebl@debian.org>  Mon, 13 Nov 2006 06:05:56 +0100
-
-kpowersave (0.6.2-3) unstable; urgency=low
-
-  * Update maintainer email address to biebl@debian.org.
-
- -- Michael Biebl <biebl@debian.org>  Fri, 20 Oct 2006 00:04:12 +0200
-
-kpowersave (0.6.2-2ubuntu2) edgy; urgency=low
-
-  * Rebuild against dbus 0.90
-
- -- Sebastian Dröge <slomo@ubuntu.com>  Wed, 30 Aug 2006 22:04:58 +0200
-
-kpowersave (0.6.2-2ubuntu1) edgy; urgency=low
-
-  * Merge from debian unstable.
-
- -- Luka Renko <lure@ubuntu.com>  Sat, 12 Aug 2006 17:17:17 +0200
-
-kpowersave (0.6.2-2) unstable; urgency=medium
-
-  * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379824
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 25 Jul 2006 23:10:10 +0200
-
-kpowersave (0.6.2-1) unstable; urgency=low
-
-  * New upstream release.
-    - Display correct warning message if user lacks permissions to connect to
-      powersaved over dbus. Closes: #356609
-  * Requires powersave 0.12.8 or newer.
-
- -- Michael Biebl <biebl@teco.edu>  Sat, 24 Jun 2006 19:16:02 +0200
-
-kpowersave (0.6.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * Corrected typo in package description. Closes: #364191
-  * Removed kpowersave-fix-utf8_in_eventrc.diff, fixed upstream.
-  * Bumped Standards-Version to 3.7.2, no further changes required.
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 15 May 2006 02:28:48 +0200
-
-kpowersave (0.6.0-1ubuntu4) dapper; urgency=low
-
-  * Added dh_iconcache
-
- -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 13 May 2006 20:16:04 +1000
-
-kpowersave (0.6.0-1ubuntu3) dapper; urgency=low
-
-  * Add kubuntu_02_messages_target.diff fix messages 
-    target for .pot generation
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Apr 2006 15:03:01 +0000
-
-kpowersave (0.6.0-1ubuntu2) dapper; urgency=low
-
-  * Added kubuntu_01_kdepot.diff for pot file extraction to rosetta
-
- -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 13 Apr 2006 00:40:57 +0200
-
-kpowersave (0.6.0-1ubuntu1) dapper; urgency=low
-
-  * Added kpowersave-fix-utf8_in_eventrc.diff
-
- -- Luka Renko <lure.net@gmail.com>  Wed, 12 Apr 2006 19:39:57 +0200
-
-kpowersave (0.6.0-1) unstable; urgency=low
-
-  * New upstream release.
-  * Requires powersave 0.12.7 or newer.
-  * Added build dependency on libxtst-dev.
-  * Added kpowersave-fix-utf8_in_eventrc.diff. 
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 17 Apr 2006 18:21:14 +0200
-
-kpowersave (0.5.11-1ubuntu1) dapper; urgency=low
-
-  * New upstream release.
-
- -- Luka Renko <lure.net@gmail.com>  Sun, 26 Mar 2006 18:59:38 +0200
-
-kpowersave (0.5.11-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Michael Biebl <biebl@teco.edu>  Thu, 23 Mar 2006 09:45:35 +0100
-
-kpowersave (0.5.10-1ubuntu1) dapper; urgency=low
-
-  * Added a Conflicts/Replaces/Provides: klaptopdaemon to enforce its removal. 
-
- -- Michael Biebl <biebl@teco.edu>  Thu,  9 Mar 2006 23:05:33 +0100
-
-kpowersave (0.5.10-1) unstable; urgency=low
-
-  * New upstream release.
-  * Requires powersave 0.12.2 or newer.
-
- -- Michael Biebl <biebl@teco.edu>  Tue,  7 Mar 2006 23:45:01 +0100
-
-kpowersave (0.5.9-1) unstable; urgency=low
-
-  * New upstream release.
-  * Requires powersave 0.12.1 or newer.
-
- -- Michael Biebl <biebl@teco.edu>  Thu,  2 Mar 2006 18:43:24 +0100
-
-kpowersave (0.5.8-1) unstable; urgency=low
-
-  * New upstream release.
-  * Bumped debhelper compatibility to 5.
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 21 Feb 2006 10:51:35 +0100
-
-kpowersave (0.5.7-1) unstable; urgency=low
-
-  * New upstream release.
-    - kpowersave now shows correct instructions how to start the powersaved
-      daemon. Closes: #352218
-    - Layout problem in the information dialog has been fixed. Closes: #352684 
-  * Corrected formatting of the homepage url in the long description.
-  
- -- Michael Biebl <biebl@teco.edu>  Tue, 14 Feb 2006 23:27:37 +0100
-
-kpowersave (0.5.6-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Michael Biebl <biebl@teco.edu>  Tue,  7 Feb 2006 02:51:39 +0100
-
-kpowersave (0.5.5-1) unstable; urgency=low
-
-  * New upstream release.
-  * Removed build dependency on libcpufreq-dev as it is now correctly handled
-    by libpowersave-dev.
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 31 Jan 2006 01:32:36 +0100
-
-kpowersave (0.5.4-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 23 Jan 2006 23:14:39 +0100
-
-kpowersave (0.5.3-1) unstable; urgency=low
-
-  * New upstream release.
-  * Requires powersave 0.11.5 or newer.
-
- -- Michael Biebl <biebl@teco.edu>  Wed, 18 Jan 2006 05:10:26 +0100
-
-kpowersave (0.5.2-1ubuntu1) dapper; urgency=low
-
-  * Add kubuntu_01_desktop_autostart.patch to prevent kpowersave from starting
-    automatically in GNOME (Closes: Malone #32340).
-
- -- Raphaël Pinson <raphink@ubuntu.com>  Sat,  4 Mar 2006 17:22:09 +0100
-
-kpowersave (0.5.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * Removed patches absolute_build_path_fix.diff and sound_files_path.diff,
-    fixed upstream.
-  * Tightened dependencies on powersave, version 0.11.2 or newer is required.
-  * Use Debian libtool and regenerate the autotools files.
-    + Added build dependencies to automake1.9, autoconf and libtool.
-  * hal and dbus are now mandatory. Added the corresponding build
-    dependencies.
-  * Removed the build dependency on libqt3-compat-headers. Package has been
-    fixed upstream to compile cleanly without it. 
-
- -- Michael Biebl <biebl@teco.edu>  Mon, 16 Jan 2006 02:02:45 +0100
-
-kpowersave (0.5.0-1) unstable; urgency=low
-
-  * New upstream release.
-  * This release was not uploaded to unstable.
-
- -- Michael Biebl <biebl@teco.edu>  Tue, 10 Jan 2006 02:25:11 +0100
-
-kpowersave (0.4.5-2) unstable; urgency=low
-
-  * Depend on powersaved (<< 0.10). kpowersave-0.4.x does not work properly with
-    powersaved (>= 0.10). 
-
- -- Michael Biebl <biebl@teco.edu>  Sun,  8 Jan 2006 18:00:08 +0100
-
-kpowersave (0.4.5-1) unstable; urgency=low
-
-  * Initial release. Closes: #329922
-
- -- Michael Biebl <biebl@teco.edu>  Wed,  9 Nov 2005 00:53:24 +0100
-
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/compat b/ubuntu/_base/applications/kpowersave.cmake/debian/compat
deleted file mode 100644
index 7ed6ff82d..000000000
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/control b/ubuntu/_base/applications/kpowersave.cmake/debian/control
deleted file mode 100644
index a2a17da00..000000000
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/control
+++ /dev/null
@@ -1,42 +0,0 @@
-Source: kpowersave-trinity
-Section: kde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, cmake-trinity, ninja-build, kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev
-Standards-Version: 3.8.4
-Homepage: http://sourceforge.net/projects/powersave/
-
-Package: kpowersave-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1)
-Replaces: kpowersave-kde3 (<< 4:3.5.13)
-Breaks: kpowersave-kde3 (<< 4:3.5.13)
-Description: HAL based power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power 
- management settings and policies of your computer.
- It relies on HAL to do the heavy lifting.
- .
- Current feature list:
-  * support for ACPI, APM and PMU
-  * trigger suspend to disk/ram and standby
-  * switch cpu frequency policy (between: performance, dynamic and powersave)
-  * applet icon with information about AC state, battery fill and battery
-    (warning) states
-  * applet tooltip with information about battery fill and remaining battery 
-    time/percentage
-  * autosuspend (to suspend the machine if the user has been inactive for a 
-    defined time)
-  * a global configurable blacklist with programs which prevent autosuspend
-    (e.g. videoplayer and cd burning tools)
-  * trigger lock screen and select the lock method
-  * KNotify support
-  * online help
-  * localisations for many languages
- KPowersave supports schemes with following configurable specific 
- settings for:
-  * screensaver
-  * DPMS
-  * autosuspend
-  * scheme specific blacklist for autosuspend
-  * notification settings
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/copyright b/ubuntu/_base/applications/kpowersave.cmake/debian/copyright
deleted file mode 100644
index a1557e62e..000000000
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/copyright
+++ /dev/null
@@ -1,28 +0,0 @@
-This package was debianized by Michael Biebl <biebl@teco.edu> on
-Sun, 25 Sep 2005 01:12:21 +0200.
-
-It was downloaded from http://sourceforge.net/projects/powersave/
-
-Copyright Holders: 
-  Danny Kukawka <dkukawka@suse.de>
-  Thomas Renninger <trenn@suse.de>
-
-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/_base/applications/kpowersave.cmake/debian/install b/ubuntu/_base/applications/kpowersave.cmake/debian/install
deleted file mode 100644
index 4a1194bd1..000000000
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/kpowersave.xpm usr/share/pixmaps
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.linda b/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
deleted file mode 100644
index 4d9818595..000000000
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
+++ /dev/null
@@ -1,4 +0,0 @@
-Tag: lib-not-in-shlibs
-
-Tag: no-shlib-file
-Data: /usr/trinity/lib/libkdeinit_*.so
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
deleted file mode 100644
index b0c32f61e..000000000
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave-trinity: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave.1 b/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave.1
deleted file mode 100644
index 0ab1d6f90..000000000
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application"
-.SH NAME
-kpowersave
-\- A KDE KPart Application
-.SH SYNOPSIS
-kpowersave [Qt\-options] [KDE\-options] 
-.SH DESCRIPTION
-A KDE KPart Application
-.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
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
-.BR help:/kpowersave/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/kpowersave/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-Danny Kukawka <dkukawka@suse.de>
-.br
-Thomas Renninger <trenn@suse.de>
-.br
-
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave.xpm b/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave.xpm
deleted file mode 100644
index 99d178492..000000000
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave.xpm
+++ /dev/null
@@ -1,628 +0,0 @@
-/* XPM */
-static char * kpowersave_xpm[] = {
-"32 32 593 2",
-"  	c None",
-". 	c #6D2121",
-"+ 	c #783738",
-"@ 	c #743E40",
-"# 	c #5D2F30",
-"$ 	c #3E1618",
-"% 	c #8A0200",
-"& 	c #982306",
-"* 	c #A75C4B",
-"= 	c #D3B8BC",
-"- 	c #E9E0E1",
-"; 	c #E7E7ED",
-"> 	c #DDDFE7",
-", 	c #CCCBD7",
-"' 	c #B3ADBB",
-") 	c #827583",
-"! 	c #6A3227",
-"~ 	c #410B00",
-"{ 	c #080000",
-"] 	c #AE381A",
-"^ 	c #C79676",
-"/ 	c #D8C9B7",
-"( 	c #B3B7C2",
-"_ 	c #F2F8FF",
-": 	c #EBEDF4",
-"< 	c #D8D9E3",
-"[ 	c #CBCBD8",
-"} 	c #BEC0CF",
-"| 	c #B4B5C9",
-"1 	c #A0A4BD",
-"2 	c #9B90A1",
-"3 	c #B08583",
-"4 	c #8F493D",
-"5 	c #340B02",
-"6 	c #A71F09",
-"7 	c #D5BEA2",
-"8 	c #F1FFFF",
-"9 	c #EEF2F6",
-"0 	c #999AAD",
-"a 	c #C8C8D7",
-"b 	c #CFCFDB",
-"c 	c #C2C2D0",
-"d 	c #B6B6C6",
-"e 	c #A8A8BC",
-"f 	c #9B9BB1",
-"g 	c #8685A0",
-"h 	c #8D8EA6",
-"i 	c #AFB8CD",
-"j 	c #ABAFC6",
-"k 	c #9F534D",
-"l 	c #1C0000",
-"m 	c #B63F26",
-"n 	c #DAC1A4",
-"o 	c #DCD9DF",
-"p 	c #EEF3F6",
-"q 	c #B0B6C4",
-"r 	c #AEB0C4",
-"s 	c #BDBECF",
-"t 	c #B2B3C6",
-"u 	c #A6A7BB",
-"v 	c #9A9BB1",
-"w 	c #8C8EA5",
-"x 	c #797D94",
-"y 	c #98A0B4",
-"z 	c #B3BCD0",
-"A 	c #A99EAF",
-"B 	c #C46347",
-"C 	c #2B0C00",
-"D 	c #B63C1A",
-"E 	c #FED76A",
-"F 	c #E2BE8D",
-"G 	c #DCB4A6",
-"H 	c #D6BCBA",
-"I 	c #B3ABB9",
-"J 	c #A9A7B9",
-"K 	c #A4A5B7",
-"L 	c #9EA1B1",
-"M 	c #9798A9",
-"N 	c #9392A1",
-"O 	c #A2969F",
-"P 	c #C29994",
-"Q 	c #CD866F",
-"R 	c #DC6A3D",
-"S 	c #B42A0E",
-"T 	c #160101",
-"U 	c #B53817",
-"V 	c #FFDA34",
-"W 	c #FFF727",
-"X 	c #FCE43C",
-"Y 	c #F5B84C",
-"Z 	c #EDA45F",
-"` 	c #E79B6C",
-" .	c #E39872",
-"..	c #E2926F",
-"+.	c #E08764",
-"@.	c #E07853",
-"#.	c #DF623C",
-"$.	c #DA4925",
-"%.	c #C83415",
-"&.	c #B10E04",
-"*.	c #900000",
-"=.	c #180000",
-"-.	c #B53918",
-";.	c #FFD83B",
-">.	c #FFF30F",
-",.	c #FBED00",
-"'.	c #F2BD00",
-").	c #EB8F02",
-"!.	c #E4650D",
-"~.	c #DE3B14",
-"{.	c #D71E15",
-"].	c #CF180F",
-"^.	c #C60D07",
-"/.	c #BA0100",
-"(.	c #B10000",
-"_.	c #AA0000",
-":.	c #AB0000",
-"<.	c #980000",
-"[.	c #170000",
-"}.	c #FFF312",
-"|.	c #FBEC00",
-"1.	c #F2BA00",
-"2.	c #EA8B00",
-"3.	c #E45A00",
-"4.	c #DE2200",
-"5.	c #D40000",
-"6.	c #CC0000",
-"7.	c #C00000",
-"8.	c #A20103",
-"9.	c #8D0811",
-"0.	c #7F1825",
-"a.	c #6D293B",
-"b.	c #474158",
-"c.	c #60637E",
-"d.	c #7D7D99",
-"e.	c #9292AB",
-"f.	c #77779C",
-"g.	c #FDEE00",
-"h.	c #F9BF00",
-"i.	c #E68600",
-"j.	c #CC5100",
-"k.	c #AB260B",
-"l.	c #95161A",
-"m.	c #83232C",
-"n.	c #803D48",
-"o.	c #875E6B",
-"p.	c #8D7C8A",
-"q.	c #9698A7",
-"r.	c #A5ABB8",
-"s.	c #B7BCC6",
-"t.	c #CBC7CD",
-"u.	c #D0CBCF",
-"v.	c #C7C4CC",
-"w.	c #CAC9CF",
-"x.	c #9F9FB8",
-"y.	c #262641",
-"z.	c #B63915",
-"A.	c #FFD838",
-"B.	c #FFF413",
-"C.	c #F9EA00",
-"D.	c #99822F",
-"E.	c #8D7B67",
-"F.	c #958B89",
-"G.	c #A2A5A9",
-"H.	c #B4BABD",
-"I.	c #C6CDCE",
-"J.	c #D2DADA",
-"K.	c #D5DCE2",
-"L.	c #CDD5DF",
-"M.	c #BCC5D7",
-"N.	c #A0B5D8",
-"O.	c #83A5D9",
-"P.	c #6B98DB",
-"Q.	c #5A8FDE",
-"R.	c #3C80E3",
-"S.	c #5E8AD2",
-"T.	c #B4B0BE",
-"U.	c #3F3F61",
-"V.	c #AA372A",
-"W.	c #F9D742",
-"X.	c #FFFC02",
-"Y.	c #B1AB13",
-"Z.	c #6F7184",
-"`.	c #EDF1F8",
-" +	c #EAECEF",
-".+	c #CBD4E0",
-"++	c #B2C6E0",
-"@+	c #97B7E0",
-"#+	c #84ADE2",
-"$+	c #79A8E5",
-"%+	c #6DA2E9",
-"&+	c #5E9CED",
-"*+	c #5299F8",
-"=+	c #509AFD",
-"-+	c #529BFE",
-";+	c #509CFF",
-">+	c #4094FF",
-",+	c #3D7EE0",
-"'+	c #B4B3C0",
-")+	c #5D5C7F",
-"!+	c #9D363D",
-"~+	c #D1D0B4",
-"{+	c #FFF856",
-"]+	c #A29E28",
-"^+	c #72727F",
-"/+	c #E5E2E1",
-"(+	c #94B7DB",
-"_+	c #97C2EF",
-":+	c #A3CBF7",
-"<+	c #A6CEFC",
-"[+	c #AAD0FF",
-"}+	c #ABD1FF",
-"|+	c #A1CAFF",
-"1+	c #94C4FF",
-"2+	c #8ABDFF",
-"3+	c #7EB6FF",
-"4+	c #6DACFF",
-"5+	c #559EFF",
-"6+	c #4195FF",
-"7+	c #2877EB",
-"8+	c #9DA6C2",
-"9+	c #767292",
-"0+	c #0E0E1C",
-"a+	c #9F3636",
-"b+	c #C7CED6",
-"c+	c #EBEDF5",
-"d+	c #BEBCAD",
-"e+	c #606061",
-"f+	c #D3CECE",
-"g+	c #9ABEE5",
-"h+	c #D5EBFF",
-"i+	c #EEF4FF",
-"j+	c #D2E5FF",
-"k+	c #BFDAFF",
-"l+	c #ACD0FF",
-"m+	c #9BC7FF",
-"n+	c #8FBFFF",
-"o+	c #7FB6FF",
-"p+	c #4F9BFF",
-"q+	c #2B84FD",
-"r+	c #1875F6",
-"s+	c #0E6AF1",
-"t+	c #075DE3",
-"u+	c #8498C5",
-"v+	c #8E89A3",
-"w+	c #161629",
-"x+	c #C8CFCE",
-"y+	c #E8EAEB",
-"z+	c #D1D1D7",
-"A+	c #5C5C5D",
-"B+	c #BBB7B7",
-"C+	c #A6C0DF",
-"D+	c #AAD1FD",
-"E+	c #DEECFF",
-"F+	c #C4DDFF",
-"G+	c #B4D4FF",
-"H+	c #A4CAFF",
-"I+	c #9AC5FF",
-"J+	c #76B1FF",
-"K+	c #2C89FF",
-"L+	c #016BFE",
-"M+	c #0064F8",
-"N+	c #005FEE",
-"O+	c #005AE5",
-"P+	c #0050DD",
-"Q+	c #6588C7",
-"R+	c #A09AB0",
-"S+	c #2A2A44",
-"T+	c #C9CFCF",
-"U+	c #E5E7E7",
-"V+	c #E0E0E0",
-"W+	c #676767",
-"X+	c #A3A1A1",
-"Y+	c #B8C4D9",
-"Z+	c #93BFF0",
-"`+	c #D6E9FF",
-" @	c #BDD9FF",
-".@	c #ACCFFF",
-"+@	c #A3CAFF",
-"@@	c #7BB5FF",
-"#@	c #2386FF",
-"$@	c #0472FF",
-"%@	c #006AFC",
-"&@	c #0065F4",
-"*@	c #005FEA",
-"=@	c #005AE3",
-"-@	c #004FDB",
-";@	c #4B78C9",
-">@	c #A5A0B1",
-",@	c #454569",
-"'@	c #E4E6E6",
-")@	c #E7E7E7",
-"!@	c #7D7D7E",
-"~@	c #898788",
-"{@	c #C7CAD5",
-"]@	c #89B6EA",
-"^@	c #C7E1FF",
-"/@	c #B6D5FF",
-"(@	c #ABCEFF",
-"_@	c #86BBFF",
-":@	c #2F8EFF",
-"<@	c #117BFF",
-"[@	c #0570FF",
-"}@	c #0068F8",
-"|@	c #0063F0",
-"1@	c #005DE7",
-"2@	c #0059DF",
-"3@	c #004CD6",
-"4@	c #3369CD",
-"5@	c #A3A2B4",
-"6@	c #585880",
-"7@	c #909090",
-"8@	c #717072",
-"9@	c #C6C4CB",
-"0@	c #84AFE7",
-"a@	c #B5D7FF",
-"b@	c #B5D4FF",
-"c@	c #96C4FF",
-"d@	c #3A96FF",
-"e@	c #1C82FF",
-"f@	c #0D77FF",
-"g@	c #006BFD",
-"h@	c #0066F4",
-"i@	c #0061EC",
-"j@	c #005BE4",
-"k@	c #0055DB",
-"l@	c #004ED3",
-"m@	c #0D51CB",
-"n@	c #9298B7",
-"o@	c #6B6A90",
-"p@	c #0B0B17",
-"q@	c #E5E6E6",
-"r@	c #E6E6E6",
-"s@	c #9F9F9F",
-"t@	c #636265",
-"u@	c #BFBABC",
-"v@	c #80AAE1",
-"w@	c #9FC9FF",
-"x@	c #A8CEFF",
-"y@	c #4EA1FF",
-"z@	c #2489FF",
-"A@	c #187EFF",
-"B@	c #0069FA",
-"C@	c #005EE8",
-"D@	c #0058DF",
-"E@	c #0052D7",
-"F@	c #004DCE",
-"G@	c #0047C8",
-"H@	c #7B8CBA",
-"I@	c #7E7B9B",
-"J@	c #1D1D34",
-"K@	c #E5E5E5",
-"L@	c #AAAAAB",
-"M@	c #5E5E60",
-"N@	c #B3ADAC",
-"O@	c #90ADDA",
-"P@	c #78B4FC",
-"Q@	c #61ADFF",
-"R@	c #2D90FF",
-"S@	c #2185FF",
-"T@	c #0E78FF",
-"U@	c #016CFE",
-"V@	c #0066F5",
-"W@	c #005CE4",
-"X@	c #0055DC",
-"Y@	c #0050D3",
-"Z@	c #004ACB",
-"`@	c #003AC2",
-" #	c #617CC1",
-".#	c #8C89A2",
-"+#	c #2D2D4C",
-"@#	c #E4E4E4",
-"##	c #B5B5B5",
-"$#	c #606062",
-"%#	c #9D9A9B",
-"&#	c #ABB6CF",
-"*#	c #3D94F7",
-"=#	c #3C9CFF",
-"-#	c #2C8DFF",
-";#	c #1A80FF",
-">#	c #0772FF",
-",#	c #0068FB",
-"'#	c #0062F2",
-")#	c #005BEA",
-"!#	c #0053E2",
-"~#	c #004FD9",
-"{#	c #024BCF",
-"]#	c #094DC7",
-"^#	c #1950C0",
-"/#	c #6681C0",
-"(#	c #8987A0",
-"_#	c #41416E",
-":#	c #E3E3E3",
-"<#	c #BCBCBC",
-"[#	c #69696B",
-"}#	c #858488",
-"|#	c #BDBAC5",
-"1#	c #3E8DEF",
-"2#	c #3094FF",
-"3#	c #1C84FF",
-"4#	c #0473FF",
-"5#	c #0069FD",
-"6#	c #0364F2",
-"7#	c #1464E5",
-"8#	c #296AD7",
-"9#	c #4A7ACB",
-"0#	c #6281BF",
-"a#	c #7B8CB9",
-"b#	c #9098B4",
-"c#	c #ABAAB7",
-"d#	c #B4B2B9",
-"e#	c #B8B7BD",
-"f#	c #AAAAB9",
-"g#	c #8080A3",
-"h#	c #5B5B8F",
-"i#	c #A03838",
-"j#	c #E2E2E2",
-"k#	c #727274",
-"l#	c #727276",
-"m#	c #BDB6BB",
-"n#	c #508DE5",
-"o#	c #1579F9",
-"p#	c #347FE8",
-"q#	c #5287D9",
-"r#	c #6B8DCB",
-"s#	c #8699C1",
-"t#	c #9BA4BC",
-"u#	c #BAB8C0",
-"v#	c #CCC6C4",
-"w#	c #D1CCC9",
-"x#	c #D3D0CE",
-"y#	c #D3D0D6",
-"z#	c #D1D2E3",
-"A#	c #D4D6EE",
-"B#	c #DADBF6",
-"C#	c #DCDEE9",
-"D#	c #D4D4D4",
-"E#	c #BFBFC4",
-"F#	c #A6A6B9",
-"G#	c #8686AD",
-"H#	c #56568C",
-"I#	c #3E3E79",
-"J#	c #A13434",
-"K#	c #CAD4D4",
-"L#	c #7C7C7D",
-"M#	c #67676A",
-"N#	c #ACABB4",
-"O#	c #AAB1CA",
-"P#	c #AAB1C9",
-"Q#	c #C5C2C7",
-"R#	c #D3CCCA",
-"S#	c #D7D1D0",
-"T#	c #DAD7D8",
-"U#	c #DEDCE0",
-"V#	c #D8D9EA",
-"W#	c #CCCFF1",
-"X#	c #C5C8F6",
-"Y#	c #C5C9FA",
-"Z#	c #CACDFF",
-"`#	c #D0D3FF",
-" $	c #D7DAFF",
-".$	c #E1E3FF",
-"+$	c #EAECFF",
-"@$	c #EDEEFD",
-"#$	c #E2E3E7",
-"$$	c #CBCBC7",
-"%$	c #C8C8C4",
-"&$	c #BDBDC0",
-"*$	c #9E9EAF",
-"=$	c #6A6A9D",
-"-$	c #840808",
-";$	c #C18B8B",
-">$	c #EBF3F3",
-",$	c #E8F0F0",
-"'$	c #BDC2C2",
-")$	c #878A8A",
-"!$	c #616367",
-"~$	c #B1B1B4",
-"{$	c #D0CECC",
-"]$	c #DEDBD8",
-"^$	c #E4E4E2",
-"/$	c #E6E6E5",
-"($	c #E7E8EA",
-"_$	c #D2D4F9",
-":$	c #B9BEFD",
-"<$	c #B0B5FF",
-"[$	c #B4B9FF",
-"}$	c #BFC3FF",
-"|$	c #C9CEFF",
-"1$	c #D5D8FF",
-"2$	c #DDDFFF",
-"3$	c #E4E7FC",
-"4$	c #E3E4EF",
-"5$	c #DADBDF",
-"6$	c #D1D1D2",
-"7$	c #C5C5C5",
-"8$	c #B1B1B1",
-"9$	c #959595",
-"0$	c #717170",
-"a$	c #606056",
-"b$	c #676782",
-"c$	c #17172F",
-"d$	c #5C0303",
-"e$	c #9E4545",
-"f$	c #C08787",
-"g$	c #B59F9F",
-"h$	c #8F8787",
-"i$	c #5D5C5F",
-"j$	c #777A7E",
-"k$	c #9DA0A4",
-"l$	c #B1B2B2",
-"m$	c #BCBBBB",
-"n$	c #C5C5C3",
-"o$	c #D3D3D3",
-"p$	c #E1E1E1",
-"q$	c #DDDDEA",
-"r$	c #D4D6F5",
-"s$	c #CED1FD",
-"t$	c #D4D6FD",
-"u$	c #DDDEF5",
-"v$	c #DBDCE7",
-"w$	c #D8D8DB",
-"x$	c #D0CFCF",
-"y$	c #C0C1BF",
-"z$	c #ACACAB",
-"A$	c #959594",
-"B$	c #82827F",
-"C$	c #737370",
-"D$	c #64646D",
-"E$	c #595973",
-"F$	c #565680",
-"G$	c #48487B",
-"H$	c #0D0D1B",
-"I$	c #2C0000",
-"J$	c #4B0E0E",
-"K$	c #541717",
-"L$	c #521516",
-"M$	c #430E10",
-"N$	c #442329",
-"O$	c #59535C",
-"P$	c #777882",
-"Q$	c #97979B",
-"R$	c #A7A7A8",
-"S$	c #AFAFAE",
-"T$	c #BABAB6",
-"U$	c #CBCAC6",
-"V$	c #D7D8D8",
-"W$	c #D9D9DB",
-"X$	c #D2D1CF",
-"Y$	c #C4C3C1",
-"Z$	c #B0AFAD",
-"`$	c #9B9B99",
-" %	c #8B8B88",
-".%	c #7E7E7D",
-"+%	c #74747B",
-"@%	c #66667E",
-"#%	c #5A5A82",
-"$%	c #44446F",
-"%%	c #29294B",
-"&%	c #131329",
-"*%	c #06060E",
-"=%	c #131319",
-"-%	c #2C2C37",
-";%	c #545463",
-">%	c #757584",
-",%	c #8D8D94",
-"'%	c #989897",
-")%	c #A1A19E",
-"!%	c #A9A9A7",
-"~%	c #A2A29F",
-"{%	c #91918E",
-"]%	c #848484",
-"^%	c #7A7A85",
-"/%	c #696983",
-"(%	c #535376",
-"_%	c #363659",
-":%	c #1F1F3C",
-"<%	c #0D0D1A",
-"[%	c #12121C",
-"}%	c #333345",
-"|%	c #5A5A6F",
-"1%	c #737385",
-"2%	c #88888E",
-"3%	c #7E7E89",
-"4%	c #686882",
-"5%	c #50506E",
-"6%	c #30304C",
-"7%	c #16162A",
-"8%	c #080811",
-"9%	c #1A1A29",
-"0%	c #2E2E44",
-"a%	c #26263C",
-"b%	c #11111F",
-"                                                                ",
-"            . + @ # $                                           ",
-"    % & * = - ; > , ' ) ! ~ {                                   ",
-"  ] ^ / ( _ : < [ } | 1 2 3 4 5                                 ",
-"6 7 8 9 0 a b c d e f g h i j k l                               ",
-"m n o p q r s t u v w x y z A B C                               ",
-"D E F G H I J K L M N O P Q R S T                               ",
-"U V W X Y Z `  ...+.@.#.$.%.&.*.=.                              ",
-"-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.                              ",
-"-.;.}.|.1.2.3.4.5.6.7.(.8.9.0.a.b.c.d.e.f.                      ",
-"-.;.}.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.                    ",
-"z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.                    ",
-"V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+                    ",
-"!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+                  ",
-"a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+                  ",
-"a+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+                  ",
-"a+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@                  ",
-"a+T+'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@                  ",
-"a+T+'@)@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@                ",
-"a+T+q@r@s@t@u@v@w@x@y@z@A@[@B@|@C@D@E@F@G@H@I@J@                ",
-"a+T+q@K@L@M@N@O@P@Q@R@S@T@U@V@i@W@X@Y@Z@`@ #.#+#                ",
-"a+T+q@@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_#                ",
-"a+T+q@:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#            ",
-"i#T+q@j#<#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#I#    ",
-"J#K#U+j#<#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$  ",
-"-$;$>$,$'$)$!$~${$]$^$/$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$9$0$a$b$c$",
-"  d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$",
-"      I$J$K$L$M$N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%  ",
-"                    =%-%;%>%,%'%)%!%~%{%]%^%/%(%_%:%<%          ",
-"                          [%}%|%1%2%3%4%5%6%7%8%                ",
-"                                9%0%a%b%                        ",
-"                                                                "};
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/manpages b/ubuntu/_base/applications/kpowersave.cmake/debian/manpages
deleted file mode 100644
index c8fa7b85f..000000000
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kpowersave.1
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/menu b/ubuntu/_base/applications/kpowersave.cmake/debian/menu
deleted file mode 100644
index 6ae0f9833..000000000
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/menu
+++ /dev/null
@@ -1,7 +0,0 @@
-?package(kpowersave):\
-  needs="X11"\
-  section="Applications/System/Monitoring"\
-  title="KPowersave"\
-  longtitle="Battery monitor and general power management"\
-  icon="/usr/share/pixmaps/kpowersave.xpm"\
-  command="/opt/trinity/bin/kpowersave"
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/postrm b/ubuntu/_base/applications/kpowersave.cmake/debian/postrm
deleted file mode 100644
index 4e8eda799..000000000
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/postrm
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kpowersave-trinity
-
-if [ -z "$package_name" ]; then
-    print >&2 "Internal Error. Please report a bug."
-    exit 1;
-fi
-
-case "$1" in
-  remove)
-    dpkg-divert --package $package_name --rename --remove /etc/acpi/powerbtn.sh
-    ;;
-  purge)
-    ;;
-  upgrade)
-    ;;
-  *) echo "$0: didn't understand being called with \`$1'" 1>&2
-     exit 0;;
-esac
-
-exit 0
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/preinst b/ubuntu/_base/applications/kpowersave.cmake/debian/preinst
deleted file mode 100644
index b007ccf90..000000000
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/preinst
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kpowersave-trinity
-
-if [ -z "$package_name" ]; then
-    print >&2 "Internal Error. Please report a bug."
-    exit 1;
-fi
-
-case "$1" in
-  install)
-    dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
-    ;;
-  upgrade)
-    dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
-    ;;
-  abort-upgrade)
-    ;;
-  *) echo "$0: didn't understand being called with \`$1'" 1>&2
-     exit 0;;
-esac
-
-exit 0
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/rules b/ubuntu/_base/applications/kpowersave.cmake/debian/rules
deleted file mode 100755
index 9be4bb2cb..000000000
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/rules
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/make -f
-  
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include debian/cdbs/debian-tde.mk
-
-DEB_INSTALL_DOCS_ALL := AUTHORS NEWS
-
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
-
-install/kpowersave-trinity::
-	install -p -D -m644 debian/$(cdbs_curpkg).lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
-	install -p -D -m644 debian/$(cdbs_curpkg).linda debian/$(cdbs_curpkg)/usr/share/linda/overrides/$(cdbs_curpkg)
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/watch b/ubuntu/_base/applications/kpowersave.cmake/debian/watch
deleted file mode 100644
index 832285e63..000000000
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
diff --git a/ubuntu/_base/applications/kpowersave/debian/copyright b/ubuntu/_base/applications/kpowersave/debian/copyright
deleted file mode 100644
index a1557e62e..000000000
--- a/ubuntu/_base/applications/kpowersave/debian/copyright
+++ /dev/null
@@ -1,28 +0,0 @@
-This package was debianized by Michael Biebl <biebl@teco.edu> on
-Sun, 25 Sep 2005 01:12:21 +0200.
-
-It was downloaded from http://sourceforge.net/projects/powersave/
-
-Copyright Holders: 
-  Danny Kukawka <dkukawka@suse.de>
-  Thomas Renninger <trenn@suse.de>
-
-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/_base/applications/kpowersave/debian/kpowersave-trinity.lintian b/ubuntu/_base/applications/kpowersave/debian/kpowersave-trinity.lintian
deleted file mode 100644
index b0c32f61e..000000000
--- a/ubuntu/_base/applications/kpowersave/debian/kpowersave-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave-trinity: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-
diff --git a/ubuntu/_base/applications/kpowersave/debian/kpowersave.1 b/ubuntu/_base/applications/kpowersave/debian/kpowersave.1
deleted file mode 100644
index 0ab1d6f90..000000000
--- a/ubuntu/_base/applications/kpowersave/debian/kpowersave.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application"
-.SH NAME
-kpowersave
-\- A KDE KPart Application
-.SH SYNOPSIS
-kpowersave [Qt\-options] [KDE\-options] 
-.SH DESCRIPTION
-A KDE KPart Application
-.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
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
-.BR help:/kpowersave/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/kpowersave/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-Danny Kukawka <dkukawka@suse.de>
-.br
-Thomas Renninger <trenn@suse.de>
-.br
-
diff --git a/ubuntu/_base/applications/kpowersave/debian/kpowersave.xpm b/ubuntu/_base/applications/kpowersave/debian/kpowersave.xpm
deleted file mode 100644
index 99d178492..000000000
--- a/ubuntu/_base/applications/kpowersave/debian/kpowersave.xpm
+++ /dev/null
@@ -1,628 +0,0 @@
-/* XPM */
-static char * kpowersave_xpm[] = {
-"32 32 593 2",
-"  	c None",
-". 	c #6D2121",
-"+ 	c #783738",
-"@ 	c #743E40",
-"# 	c #5D2F30",
-"$ 	c #3E1618",
-"% 	c #8A0200",
-"& 	c #982306",
-"* 	c #A75C4B",
-"= 	c #D3B8BC",
-"- 	c #E9E0E1",
-"; 	c #E7E7ED",
-"> 	c #DDDFE7",
-", 	c #CCCBD7",
-"' 	c #B3ADBB",
-") 	c #827583",
-"! 	c #6A3227",
-"~ 	c #410B00",
-"{ 	c #080000",
-"] 	c #AE381A",
-"^ 	c #C79676",
-"/ 	c #D8C9B7",
-"( 	c #B3B7C2",
-"_ 	c #F2F8FF",
-": 	c #EBEDF4",
-"< 	c #D8D9E3",
-"[ 	c #CBCBD8",
-"} 	c #BEC0CF",
-"| 	c #B4B5C9",
-"1 	c #A0A4BD",
-"2 	c #9B90A1",
-"3 	c #B08583",
-"4 	c #8F493D",
-"5 	c #340B02",
-"6 	c #A71F09",
-"7 	c #D5BEA2",
-"8 	c #F1FFFF",
-"9 	c #EEF2F6",
-"0 	c #999AAD",
-"a 	c #C8C8D7",
-"b 	c #CFCFDB",
-"c 	c #C2C2D0",
-"d 	c #B6B6C6",
-"e 	c #A8A8BC",
-"f 	c #9B9BB1",
-"g 	c #8685A0",
-"h 	c #8D8EA6",
-"i 	c #AFB8CD",
-"j 	c #ABAFC6",
-"k 	c #9F534D",
-"l 	c #1C0000",
-"m 	c #B63F26",
-"n 	c #DAC1A4",
-"o 	c #DCD9DF",
-"p 	c #EEF3F6",
-"q 	c #B0B6C4",
-"r 	c #AEB0C4",
-"s 	c #BDBECF",
-"t 	c #B2B3C6",
-"u 	c #A6A7BB",
-"v 	c #9A9BB1",
-"w 	c #8C8EA5",
-"x 	c #797D94",
-"y 	c #98A0B4",
-"z 	c #B3BCD0",
-"A 	c #A99EAF",
-"B 	c #C46347",
-"C 	c #2B0C00",
-"D 	c #B63C1A",
-"E 	c #FED76A",
-"F 	c #E2BE8D",
-"G 	c #DCB4A6",
-"H 	c #D6BCBA",
-"I 	c #B3ABB9",
-"J 	c #A9A7B9",
-"K 	c #A4A5B7",
-"L 	c #9EA1B1",
-"M 	c #9798A9",
-"N 	c #9392A1",
-"O 	c #A2969F",
-"P 	c #C29994",
-"Q 	c #CD866F",
-"R 	c #DC6A3D",
-"S 	c #B42A0E",
-"T 	c #160101",
-"U 	c #B53817",
-"V 	c #FFDA34",
-"W 	c #FFF727",
-"X 	c #FCE43C",
-"Y 	c #F5B84C",
-"Z 	c #EDA45F",
-"` 	c #E79B6C",
-" .	c #E39872",
-"..	c #E2926F",
-"+.	c #E08764",
-"@.	c #E07853",
-"#.	c #DF623C",
-"$.	c #DA4925",
-"%.	c #C83415",
-"&.	c #B10E04",
-"*.	c #900000",
-"=.	c #180000",
-"-.	c #B53918",
-";.	c #FFD83B",
-">.	c #FFF30F",
-",.	c #FBED00",
-"'.	c #F2BD00",
-").	c #EB8F02",
-"!.	c #E4650D",
-"~.	c #DE3B14",
-"{.	c #D71E15",
-"].	c #CF180F",
-"^.	c #C60D07",
-"/.	c #BA0100",
-"(.	c #B10000",
-"_.	c #AA0000",
-":.	c #AB0000",
-"<.	c #980000",
-"[.	c #170000",
-"}.	c #FFF312",
-"|.	c #FBEC00",
-"1.	c #F2BA00",
-"2.	c #EA8B00",
-"3.	c #E45A00",
-"4.	c #DE2200",
-"5.	c #D40000",
-"6.	c #CC0000",
-"7.	c #C00000",
-"8.	c #A20103",
-"9.	c #8D0811",
-"0.	c #7F1825",
-"a.	c #6D293B",
-"b.	c #474158",
-"c.	c #60637E",
-"d.	c #7D7D99",
-"e.	c #9292AB",
-"f.	c #77779C",
-"g.	c #FDEE00",
-"h.	c #F9BF00",
-"i.	c #E68600",
-"j.	c #CC5100",
-"k.	c #AB260B",
-"l.	c #95161A",
-"m.	c #83232C",
-"n.	c #803D48",
-"o.	c #875E6B",
-"p.	c #8D7C8A",
-"q.	c #9698A7",
-"r.	c #A5ABB8",
-"s.	c #B7BCC6",
-"t.	c #CBC7CD",
-"u.	c #D0CBCF",
-"v.	c #C7C4CC",
-"w.	c #CAC9CF",
-"x.	c #9F9FB8",
-"y.	c #262641",
-"z.	c #B63915",
-"A.	c #FFD838",
-"B.	c #FFF413",
-"C.	c #F9EA00",
-"D.	c #99822F",
-"E.	c #8D7B67",
-"F.	c #958B89",
-"G.	c #A2A5A9",
-"H.	c #B4BABD",
-"I.	c #C6CDCE",
-"J.	c #D2DADA",
-"K.	c #D5DCE2",
-"L.	c #CDD5DF",
-"M.	c #BCC5D7",
-"N.	c #A0B5D8",
-"O.	c #83A5D9",
-"P.	c #6B98DB",
-"Q.	c #5A8FDE",
-"R.	c #3C80E3",
-"S.	c #5E8AD2",
-"T.	c #B4B0BE",
-"U.	c #3F3F61",
-"V.	c #AA372A",
-"W.	c #F9D742",
-"X.	c #FFFC02",
-"Y.	c #B1AB13",
-"Z.	c #6F7184",
-"`.	c #EDF1F8",
-" +	c #EAECEF",
-".+	c #CBD4E0",
-"++	c #B2C6E0",
-"@+	c #97B7E0",
-"#+	c #84ADE2",
-"$+	c #79A8E5",
-"%+	c #6DA2E9",
-"&+	c #5E9CED",
-"*+	c #5299F8",
-"=+	c #509AFD",
-"-+	c #529BFE",
-";+	c #509CFF",
-">+	c #4094FF",
-",+	c #3D7EE0",
-"'+	c #B4B3C0",
-")+	c #5D5C7F",
-"!+	c #9D363D",
-"~+	c #D1D0B4",
-"{+	c #FFF856",
-"]+	c #A29E28",
-"^+	c #72727F",
-"/+	c #E5E2E1",
-"(+	c #94B7DB",
-"_+	c #97C2EF",
-":+	c #A3CBF7",
-"<+	c #A6CEFC",
-"[+	c #AAD0FF",
-"}+	c #ABD1FF",
-"|+	c #A1CAFF",
-"1+	c #94C4FF",
-"2+	c #8ABDFF",
-"3+	c #7EB6FF",
-"4+	c #6DACFF",
-"5+	c #559EFF",
-"6+	c #4195FF",
-"7+	c #2877EB",
-"8+	c #9DA6C2",
-"9+	c #767292",
-"0+	c #0E0E1C",
-"a+	c #9F3636",
-"b+	c #C7CED6",
-"c+	c #EBEDF5",
-"d+	c #BEBCAD",
-"e+	c #606061",
-"f+	c #D3CECE",
-"g+	c #9ABEE5",
-"h+	c #D5EBFF",
-"i+	c #EEF4FF",
-"j+	c #D2E5FF",
-"k+	c #BFDAFF",
-"l+	c #ACD0FF",
-"m+	c #9BC7FF",
-"n+	c #8FBFFF",
-"o+	c #7FB6FF",
-"p+	c #4F9BFF",
-"q+	c #2B84FD",
-"r+	c #1875F6",
-"s+	c #0E6AF1",
-"t+	c #075DE3",
-"u+	c #8498C5",
-"v+	c #8E89A3",
-"w+	c #161629",
-"x+	c #C8CFCE",
-"y+	c #E8EAEB",
-"z+	c #D1D1D7",
-"A+	c #5C5C5D",
-"B+	c #BBB7B7",
-"C+	c #A6C0DF",
-"D+	c #AAD1FD",
-"E+	c #DEECFF",
-"F+	c #C4DDFF",
-"G+	c #B4D4FF",
-"H+	c #A4CAFF",
-"I+	c #9AC5FF",
-"J+	c #76B1FF",
-"K+	c #2C89FF",
-"L+	c #016BFE",
-"M+	c #0064F8",
-"N+	c #005FEE",
-"O+	c #005AE5",
-"P+	c #0050DD",
-"Q+	c #6588C7",
-"R+	c #A09AB0",
-"S+	c #2A2A44",
-"T+	c #C9CFCF",
-"U+	c #E5E7E7",
-"V+	c #E0E0E0",
-"W+	c #676767",
-"X+	c #A3A1A1",
-"Y+	c #B8C4D9",
-"Z+	c #93BFF0",
-"`+	c #D6E9FF",
-" @	c #BDD9FF",
-".@	c #ACCFFF",
-"+@	c #A3CAFF",
-"@@	c #7BB5FF",
-"#@	c #2386FF",
-"$@	c #0472FF",
-"%@	c #006AFC",
-"&@	c #0065F4",
-"*@	c #005FEA",
-"=@	c #005AE3",
-"-@	c #004FDB",
-";@	c #4B78C9",
-">@	c #A5A0B1",
-",@	c #454569",
-"'@	c #E4E6E6",
-")@	c #E7E7E7",
-"!@	c #7D7D7E",
-"~@	c #898788",
-"{@	c #C7CAD5",
-"]@	c #89B6EA",
-"^@	c #C7E1FF",
-"/@	c #B6D5FF",
-"(@	c #ABCEFF",
-"_@	c #86BBFF",
-":@	c #2F8EFF",
-"<@	c #117BFF",
-"[@	c #0570FF",
-"}@	c #0068F8",
-"|@	c #0063F0",
-"1@	c #005DE7",
-"2@	c #0059DF",
-"3@	c #004CD6",
-"4@	c #3369CD",
-"5@	c #A3A2B4",
-"6@	c #585880",
-"7@	c #909090",
-"8@	c #717072",
-"9@	c #C6C4CB",
-"0@	c #84AFE7",
-"a@	c #B5D7FF",
-"b@	c #B5D4FF",
-"c@	c #96C4FF",
-"d@	c #3A96FF",
-"e@	c #1C82FF",
-"f@	c #0D77FF",
-"g@	c #006BFD",
-"h@	c #0066F4",
-"i@	c #0061EC",
-"j@	c #005BE4",
-"k@	c #0055DB",
-"l@	c #004ED3",
-"m@	c #0D51CB",
-"n@	c #9298B7",
-"o@	c #6B6A90",
-"p@	c #0B0B17",
-"q@	c #E5E6E6",
-"r@	c #E6E6E6",
-"s@	c #9F9F9F",
-"t@	c #636265",
-"u@	c #BFBABC",
-"v@	c #80AAE1",
-"w@	c #9FC9FF",
-"x@	c #A8CEFF",
-"y@	c #4EA1FF",
-"z@	c #2489FF",
-"A@	c #187EFF",
-"B@	c #0069FA",
-"C@	c #005EE8",
-"D@	c #0058DF",
-"E@	c #0052D7",
-"F@	c #004DCE",
-"G@	c #0047C8",
-"H@	c #7B8CBA",
-"I@	c #7E7B9B",
-"J@	c #1D1D34",
-"K@	c #E5E5E5",
-"L@	c #AAAAAB",
-"M@	c #5E5E60",
-"N@	c #B3ADAC",
-"O@	c #90ADDA",
-"P@	c #78B4FC",
-"Q@	c #61ADFF",
-"R@	c #2D90FF",
-"S@	c #2185FF",
-"T@	c #0E78FF",
-"U@	c #016CFE",
-"V@	c #0066F5",
-"W@	c #005CE4",
-"X@	c #0055DC",
-"Y@	c #0050D3",
-"Z@	c #004ACB",
-"`@	c #003AC2",
-" #	c #617CC1",
-".#	c #8C89A2",
-"+#	c #2D2D4C",
-"@#	c #E4E4E4",
-"##	c #B5B5B5",
-"$#	c #606062",
-"%#	c #9D9A9B",
-"&#	c #ABB6CF",
-"*#	c #3D94F7",
-"=#	c #3C9CFF",
-"-#	c #2C8DFF",
-";#	c #1A80FF",
-">#	c #0772FF",
-",#	c #0068FB",
-"'#	c #0062F2",
-")#	c #005BEA",
-"!#	c #0053E2",
-"~#	c #004FD9",
-"{#	c #024BCF",
-"]#	c #094DC7",
-"^#	c #1950C0",
-"/#	c #6681C0",
-"(#	c #8987A0",
-"_#	c #41416E",
-":#	c #E3E3E3",
-"<#	c #BCBCBC",
-"[#	c #69696B",
-"}#	c #858488",
-"|#	c #BDBAC5",
-"1#	c #3E8DEF",
-"2#	c #3094FF",
-"3#	c #1C84FF",
-"4#	c #0473FF",
-"5#	c #0069FD",
-"6#	c #0364F2",
-"7#	c #1464E5",
-"8#	c #296AD7",
-"9#	c #4A7ACB",
-"0#	c #6281BF",
-"a#	c #7B8CB9",
-"b#	c #9098B4",
-"c#	c #ABAAB7",
-"d#	c #B4B2B9",
-"e#	c #B8B7BD",
-"f#	c #AAAAB9",
-"g#	c #8080A3",
-"h#	c #5B5B8F",
-"i#	c #A03838",
-"j#	c #E2E2E2",
-"k#	c #727274",
-"l#	c #727276",
-"m#	c #BDB6BB",
-"n#	c #508DE5",
-"o#	c #1579F9",
-"p#	c #347FE8",
-"q#	c #5287D9",
-"r#	c #6B8DCB",
-"s#	c #8699C1",
-"t#	c #9BA4BC",
-"u#	c #BAB8C0",
-"v#	c #CCC6C4",
-"w#	c #D1CCC9",
-"x#	c #D3D0CE",
-"y#	c #D3D0D6",
-"z#	c #D1D2E3",
-"A#	c #D4D6EE",
-"B#	c #DADBF6",
-"C#	c #DCDEE9",
-"D#	c #D4D4D4",
-"E#	c #BFBFC4",
-"F#	c #A6A6B9",
-"G#	c #8686AD",
-"H#	c #56568C",
-"I#	c #3E3E79",
-"J#	c #A13434",
-"K#	c #CAD4D4",
-"L#	c #7C7C7D",
-"M#	c #67676A",
-"N#	c #ACABB4",
-"O#	c #AAB1CA",
-"P#	c #AAB1C9",
-"Q#	c #C5C2C7",
-"R#	c #D3CCCA",
-"S#	c #D7D1D0",
-"T#	c #DAD7D8",
-"U#	c #DEDCE0",
-"V#	c #D8D9EA",
-"W#	c #CCCFF1",
-"X#	c #C5C8F6",
-"Y#	c #C5C9FA",
-"Z#	c #CACDFF",
-"`#	c #D0D3FF",
-" $	c #D7DAFF",
-".$	c #E1E3FF",
-"+$	c #EAECFF",
-"@$	c #EDEEFD",
-"#$	c #E2E3E7",
-"$$	c #CBCBC7",
-"%$	c #C8C8C4",
-"&$	c #BDBDC0",
-"*$	c #9E9EAF",
-"=$	c #6A6A9D",
-"-$	c #840808",
-";$	c #C18B8B",
-">$	c #EBF3F3",
-",$	c #E8F0F0",
-"'$	c #BDC2C2",
-")$	c #878A8A",
-"!$	c #616367",
-"~$	c #B1B1B4",
-"{$	c #D0CECC",
-"]$	c #DEDBD8",
-"^$	c #E4E4E2",
-"/$	c #E6E6E5",
-"($	c #E7E8EA",
-"_$	c #D2D4F9",
-":$	c #B9BEFD",
-"<$	c #B0B5FF",
-"[$	c #B4B9FF",
-"}$	c #BFC3FF",
-"|$	c #C9CEFF",
-"1$	c #D5D8FF",
-"2$	c #DDDFFF",
-"3$	c #E4E7FC",
-"4$	c #E3E4EF",
-"5$	c #DADBDF",
-"6$	c #D1D1D2",
-"7$	c #C5C5C5",
-"8$	c #B1B1B1",
-"9$	c #959595",
-"0$	c #717170",
-"a$	c #606056",
-"b$	c #676782",
-"c$	c #17172F",
-"d$	c #5C0303",
-"e$	c #9E4545",
-"f$	c #C08787",
-"g$	c #B59F9F",
-"h$	c #8F8787",
-"i$	c #5D5C5F",
-"j$	c #777A7E",
-"k$	c #9DA0A4",
-"l$	c #B1B2B2",
-"m$	c #BCBBBB",
-"n$	c #C5C5C3",
-"o$	c #D3D3D3",
-"p$	c #E1E1E1",
-"q$	c #DDDDEA",
-"r$	c #D4D6F5",
-"s$	c #CED1FD",
-"t$	c #D4D6FD",
-"u$	c #DDDEF5",
-"v$	c #DBDCE7",
-"w$	c #D8D8DB",
-"x$	c #D0CFCF",
-"y$	c #C0C1BF",
-"z$	c #ACACAB",
-"A$	c #959594",
-"B$	c #82827F",
-"C$	c #737370",
-"D$	c #64646D",
-"E$	c #595973",
-"F$	c #565680",
-"G$	c #48487B",
-"H$	c #0D0D1B",
-"I$	c #2C0000",
-"J$	c #4B0E0E",
-"K$	c #541717",
-"L$	c #521516",
-"M$	c #430E10",
-"N$	c #442329",
-"O$	c #59535C",
-"P$	c #777882",
-"Q$	c #97979B",
-"R$	c #A7A7A8",
-"S$	c #AFAFAE",
-"T$	c #BABAB6",
-"U$	c #CBCAC6",
-"V$	c #D7D8D8",
-"W$	c #D9D9DB",
-"X$	c #D2D1CF",
-"Y$	c #C4C3C1",
-"Z$	c #B0AFAD",
-"`$	c #9B9B99",
-" %	c #8B8B88",
-".%	c #7E7E7D",
-"+%	c #74747B",
-"@%	c #66667E",
-"#%	c #5A5A82",
-"$%	c #44446F",
-"%%	c #29294B",
-"&%	c #131329",
-"*%	c #06060E",
-"=%	c #131319",
-"-%	c #2C2C37",
-";%	c #545463",
-">%	c #757584",
-",%	c #8D8D94",
-"'%	c #989897",
-")%	c #A1A19E",
-"!%	c #A9A9A7",
-"~%	c #A2A29F",
-"{%	c #91918E",
-"]%	c #848484",
-"^%	c #7A7A85",
-"/%	c #696983",
-"(%	c #535376",
-"_%	c #363659",
-":%	c #1F1F3C",
-"<%	c #0D0D1A",
-"[%	c #12121C",
-"}%	c #333345",
-"|%	c #5A5A6F",
-"1%	c #737385",
-"2%	c #88888E",
-"3%	c #7E7E89",
-"4%	c #686882",
-"5%	c #50506E",
-"6%	c #30304C",
-"7%	c #16162A",
-"8%	c #080811",
-"9%	c #1A1A29",
-"0%	c #2E2E44",
-"a%	c #26263C",
-"b%	c #11111F",
-"                                                                ",
-"            . + @ # $                                           ",
-"    % & * = - ; > , ' ) ! ~ {                                   ",
-"  ] ^ / ( _ : < [ } | 1 2 3 4 5                                 ",
-"6 7 8 9 0 a b c d e f g h i j k l                               ",
-"m n o p q r s t u v w x y z A B C                               ",
-"D E F G H I J K L M N O P Q R S T                               ",
-"U V W X Y Z `  ...+.@.#.$.%.&.*.=.                              ",
-"-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.                              ",
-"-.;.}.|.1.2.3.4.5.6.7.(.8.9.0.a.b.c.d.e.f.                      ",
-"-.;.}.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.                    ",
-"z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.                    ",
-"V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+                    ",
-"!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+                  ",
-"a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+                  ",
-"a+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+                  ",
-"a+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@                  ",
-"a+T+'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@                  ",
-"a+T+'@)@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@                ",
-"a+T+q@r@s@t@u@v@w@x@y@z@A@[@B@|@C@D@E@F@G@H@I@J@                ",
-"a+T+q@K@L@M@N@O@P@Q@R@S@T@U@V@i@W@X@Y@Z@`@ #.#+#                ",
-"a+T+q@@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_#                ",
-"a+T+q@:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#            ",
-"i#T+q@j#<#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#I#    ",
-"J#K#U+j#<#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$  ",
-"-$;$>$,$'$)$!$~${$]$^$/$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$9$0$a$b$c$",
-"  d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$",
-"      I$J$K$L$M$N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%  ",
-"                    =%-%;%>%,%'%)%!%~%{%]%^%/%(%_%:%<%          ",
-"                          [%}%|%1%2%3%4%5%6%7%8%                ",
-"                                9%0%a%b%                        ",
-"                                                                "};
diff --git a/ubuntu/_base/applications/kpowersave/debian/manpages b/ubuntu/_base/applications/kpowersave/debian/manpages
deleted file mode 100644
index c8fa7b85f..000000000
--- a/ubuntu/_base/applications/kpowersave/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kpowersave.1
diff --git a/ubuntu/_base/applications/kpowersave/debian/postrm b/ubuntu/_base/applications/kpowersave/debian/postrm
deleted file mode 100644
index 4e8eda799..000000000
--- a/ubuntu/_base/applications/kpowersave/debian/postrm
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kpowersave-trinity
-
-if [ -z "$package_name" ]; then
-    print >&2 "Internal Error. Please report a bug."
-    exit 1;
-fi
-
-case "$1" in
-  remove)
-    dpkg-divert --package $package_name --rename --remove /etc/acpi/powerbtn.sh
-    ;;
-  purge)
-    ;;
-  upgrade)
-    ;;
-  *) echo "$0: didn't understand being called with \`$1'" 1>&2
-     exit 0;;
-esac
-
-exit 0
diff --git a/ubuntu/_base/applications/kpowersave/debian/watch b/ubuntu/_base/applications/kpowersave/debian/watch
deleted file mode 100644
index 832285e63..000000000
--- a/ubuntu/_base/applications/kpowersave/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
diff --git a/ubuntu/_base/applications/ksystemlog/debian/patches/series b/ubuntu/_base/applications/ksystemlog/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
--- a/ubuntu/_base/applications/ksystemlog/debian/patches/series
+++ /dev/null
diff --git a/ubuntu/_base/applications/ktorrent/debian/cdbs/versions.pl b/ubuntu/_base/applications/ktorrent/debian/cdbs/versions.pl
deleted file mode 100644
index 75c9add4b..000000000
--- a/ubuntu/_base/applications/ktorrent/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/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($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/_base/applications/ktorrent/debian/patches/series b/ubuntu/_base/applications/ktorrent/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
--- a/ubuntu/_base/applications/ktorrent/debian/patches/series
+++ /dev/null
diff --git a/ubuntu/_base/applications/kuickshow/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kuickshow/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/kuickshow/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE 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.
-
-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
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# 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:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-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
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-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)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-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
-
-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
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-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 )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(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
-	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/tde/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/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/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/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	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
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/kuickshow/debian/cdbs/versions.pl b/ubuntu/_base/applications/kuickshow/debian/cdbs/versions.pl
deleted file mode 100644
index 75c9add4b..000000000
--- a/ubuntu/_base/applications/kuickshow/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/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($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/_base/applications/kuickshow/debian/patches/series b/ubuntu/_base/applications/kuickshow/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
--- a/ubuntu/_base/applications/kuickshow/debian/patches/series
+++ /dev/null
diff --git a/ubuntu/_base/applications/kvirc/debian/patches/series b/ubuntu/_base/applications/kvirc/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
--- a/ubuntu/_base/applications/kvirc/debian/patches/series
+++ /dev/null
diff --git a/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE 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.
-
-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
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# 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:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-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
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-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)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-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
-
-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
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-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 )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(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
-	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/tde/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/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/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/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	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
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/kvkbd/debian/cdbs/versions.pl b/ubuntu/_base/applications/kvkbd/debian/cdbs/versions.pl
deleted file mode 100644
index 75c9add4b..000000000
--- a/ubuntu/_base/applications/kvkbd/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/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($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/_base/applications/kwin-style-crystal/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kwin-style-crystal/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/kwin-style-crystal/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE 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.
-
-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
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# 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:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-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
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-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)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-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
-
-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
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-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 )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(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
-	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/tde/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/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/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/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	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
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/kwin-style-crystal/debian/cdbs/versions.pl b/ubuntu/_base/applications/kwin-style-crystal/debian/cdbs/versions.pl
deleted file mode 100644
index 75c9add4b..000000000
--- a/ubuntu/_base/applications/kwin-style-crystal/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/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($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/_base/applications/kwin-style-crystal/debian/patches/series b/ubuntu/_base/applications/kwin-style-crystal/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
--- a/ubuntu/_base/applications/kwin-style-crystal/debian/patches/series
+++ /dev/null
diff --git a/ubuntu/_base/applications/bibletime/debian/bibletime.xpm b/ubuntu/_base/applications/misc/bibletime/debian/bibletime.xpm
index e782dea59..e782dea59 100644
--- a/ubuntu/_base/applications/bibletime/debian/bibletime.xpm
+++ b/ubuntu/_base/applications/misc/bibletime/debian/bibletime.xpm
diff --git a/ubuntu/_base/applications/filelight-l10n/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/filelight-l10n/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/dolphin/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/bibletime/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/dolphin/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/misc/bibletime/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/bibletime/debian/changelog b/ubuntu/_base/applications/misc/bibletime/debian/changelog
index 0592f7738..0592f7738 100644
--- a/ubuntu/_base/applications/bibletime/debian/changelog
+++ b/ubuntu/_base/applications/misc/bibletime/debian/changelog
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/compat b/ubuntu/_base/applications/misc/bibletime/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kaffeine-mozilla/debian/compat
+++ b/ubuntu/_base/applications/misc/bibletime/debian/compat
diff --git a/ubuntu/_base/applications/bibletime/debian/control b/ubuntu/_base/applications/misc/bibletime/debian/control
index 9bbfd7ad9..9bbfd7ad9 100644
--- a/ubuntu/_base/applications/bibletime/debian/control
+++ b/ubuntu/_base/applications/misc/bibletime/debian/control
diff --git a/ubuntu/_base/applications/bibletime/debian/copyright b/ubuntu/_base/applications/misc/bibletime/debian/copyright
index c256c741a..c256c741a 100644
--- a/ubuntu/_base/applications/bibletime/debian/copyright
+++ b/ubuntu/_base/applications/misc/bibletime/debian/copyright
diff --git a/ubuntu/_base/applications/bibletime/debian/de/bibletime.1 b/ubuntu/_base/applications/misc/bibletime/debian/de/bibletime.1
index 6b662b132..6b662b132 100644
--- a/ubuntu/_base/applications/bibletime/debian/de/bibletime.1
+++ b/ubuntu/_base/applications/misc/bibletime/debian/de/bibletime.1
diff --git a/ubuntu/_base/applications/bibletime/debian/dirs b/ubuntu/_base/applications/misc/bibletime/debian/dirs
index b870fa9c8..b870fa9c8 100644
--- a/ubuntu/_base/applications/bibletime/debian/dirs
+++ b/ubuntu/_base/applications/misc/bibletime/debian/dirs
diff --git a/ubuntu/_base/applications/bibletime/debian/en/bibletime.1 b/ubuntu/_base/applications/misc/bibletime/debian/en/bibletime.1
index b71192301..b71192301 100644
--- a/ubuntu/_base/applications/bibletime/debian/en/bibletime.1
+++ b/ubuntu/_base/applications/misc/bibletime/debian/en/bibletime.1
diff --git a/ubuntu/_base/applications/bibletime/debian/install b/ubuntu/_base/applications/misc/bibletime/debian/install
index dc727ccec..dc727ccec 100644
--- a/ubuntu/_base/applications/bibletime/debian/install
+++ b/ubuntu/_base/applications/misc/bibletime/debian/install
diff --git a/ubuntu/_base/applications/bibletime/debian/menu b/ubuntu/_base/applications/misc/bibletime/debian/menu
index 7ba4e395f..7ba4e395f 100644
--- a/ubuntu/_base/applications/bibletime/debian/menu
+++ b/ubuntu/_base/applications/misc/bibletime/debian/menu
diff --git a/ubuntu/_base/applications/basket/debian/patches/series b/ubuntu/_base/applications/misc/bibletime/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/basket/debian/patches/series
+++ b/ubuntu/_base/applications/misc/bibletime/debian/patches/series
diff --git a/ubuntu/_base/applications/bibletime/debian/rules b/ubuntu/_base/applications/misc/bibletime/debian/rules
index f81b7f592..f81b7f592 100755
--- a/ubuntu/_base/applications/bibletime/debian/rules
+++ b/ubuntu/_base/applications/misc/bibletime/debian/rules
diff --git a/ubuntu/_base/applications/k3b/debian/source/format b/ubuntu/_base/applications/misc/bibletime/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/k3b/debian/source/format
+++ b/ubuntu/_base/applications/misc/bibletime/debian/source/format
diff --git a/ubuntu/_base/applications/k3b/debian/source/options b/ubuntu/_base/applications/misc/bibletime/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/k3b/debian/source/options
+++ b/ubuntu/_base/applications/misc/bibletime/debian/source/options
diff --git a/ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/filelight-l10n/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/filelight-l10n/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/changelog b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/changelog
index d234636a4..d234636a4 100644
--- a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/changelog
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/changelog
diff --git a/ubuntu/_base/applications/kaffeine/debian/compat b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kaffeine/debian/compat
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/compat
diff --git a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/control b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/control
index f3c4d6682..f3c4d6682 100644
--- a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/control
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/control
diff --git a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/copyright b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/copyright
index 68f70d9c0..68f70d9c0 100644
--- a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/copyright
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/copyright
diff --git a/ubuntu/_base/applications/bibletime/debian/patches/series b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/bibletime/debian/patches/series
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/patches/series
diff --git a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/rules b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/rules
index 5076c1b32..5076c1b32 100755
--- a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/rules
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/rules
diff --git a/ubuntu/_base/applications/k9copy/debian/source/format b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/k9copy/debian/source/format
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/source/format
diff --git a/ubuntu/_base/applications/k9copy/debian/source/options b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/k9copy/debian/source/options
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-kconfig/debian/source/options
diff --git a/ubuntu/_base/applications/desktop-effects-kde/debian/changelog b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/changelog
index 4f20cbb6a..4f20cbb6a 100644
--- a/ubuntu/_base/applications/desktop-effects-kde/debian/changelog
+++ b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/changelog
diff --git a/ubuntu/_base/applications/katapult/debian/compat b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/katapult/debian/compat
+++ b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/compat
diff --git a/ubuntu/_base/applications/desktop-effects-kde/debian/control b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/control
index e5fb4e480..e5fb4e480 100644
--- a/ubuntu/_base/applications/desktop-effects-kde/debian/control
+++ b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/control
diff --git a/ubuntu/_base/applications/desktop-effects-kde/debian/copyright b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/copyright
index b2569f52f..b2569f52f 100644
--- a/ubuntu/_base/applications/desktop-effects-kde/debian/copyright
+++ b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/copyright
diff --git a/ubuntu/_base/applications/desktop-effects-kde/debian/desktop-effects-kde-trinity.install b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/desktop-effects-kde-trinity.install
index e6d16e467..e6d16e467 100644
--- a/ubuntu/_base/applications/desktop-effects-kde/debian/desktop-effects-kde-trinity.install
+++ b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/desktop-effects-kde-trinity.install
diff --git a/ubuntu/_base/applications/desktop-effects-kde/debian/rules b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/rules
index 25fa64a44..25fa64a44 100755
--- a/ubuntu/_base/applications/desktop-effects-kde/debian/rules
+++ b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/rules
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/source/format b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kaffeine-mozilla/debian/source/format
+++ b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/source/format
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/source/options b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kaffeine-mozilla/debian/source/options
+++ b/ubuntu/_base/applications/misc/desktop-effects-kde/debian/source/options
diff --git a/ubuntu/_base/applications/fusion-icon/debian/changelog b/ubuntu/_base/applications/misc/fusion-icon/debian/changelog
index 87f2b117a..87f2b117a 100644
--- a/ubuntu/_base/applications/fusion-icon/debian/changelog
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/changelog
diff --git a/ubuntu/_base/applications/kbarcode/debian/compat b/ubuntu/_base/applications/misc/fusion-icon/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kbarcode/debian/compat
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/compat
diff --git a/ubuntu/_base/applications/fusion-icon/debian/control b/ubuntu/_base/applications/misc/fusion-icon/debian/control
index 87d875fc9..87d875fc9 100644
--- a/ubuntu/_base/applications/fusion-icon/debian/control
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/control
diff --git a/ubuntu/_base/applications/fusion-icon/debian/copyright b/ubuntu/_base/applications/misc/fusion-icon/debian/copyright
index ae1ce34fa..ae1ce34fa 100644
--- a/ubuntu/_base/applications/fusion-icon/debian/copyright
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/copyright
diff --git a/ubuntu/_base/applications/fusion-icon/debian/fusion-icon.1 b/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.1
index 1b15860e1..1b15860e1 100644
--- a/ubuntu/_base/applications/fusion-icon/debian/fusion-icon.1
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.1
diff --git a/ubuntu/_base/applications/fusion-icon/debian/fusion-icon.xpm b/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm
index fe0843739..fe0843739 100644
--- a/ubuntu/_base/applications/fusion-icon/debian/fusion-icon.xpm
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm
diff --git a/ubuntu/_base/applications/fusion-icon/debian/install b/ubuntu/_base/applications/misc/fusion-icon/debian/install
index 7d4e26567..7d4e26567 100644
--- a/ubuntu/_base/applications/fusion-icon/debian/install
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/install
diff --git a/ubuntu/_base/applications/fusion-icon/debian/links b/ubuntu/_base/applications/misc/fusion-icon/debian/links
index 51627e83a..51627e83a 100644
--- a/ubuntu/_base/applications/fusion-icon/debian/links
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/links
diff --git a/ubuntu/_base/applications/fusion-icon/debian/manpages b/ubuntu/_base/applications/misc/fusion-icon/debian/manpages
index 3ba122a39..3ba122a39 100644
--- a/ubuntu/_base/applications/fusion-icon/debian/manpages
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/manpages
diff --git a/ubuntu/_base/applications/fusion-icon/debian/menu b/ubuntu/_base/applications/misc/fusion-icon/debian/menu
index e85a21dbf..e85a21dbf 100644
--- a/ubuntu/_base/applications/fusion-icon/debian/menu
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/menu
diff --git a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/patches/series b/ubuntu/_base/applications/misc/fusion-icon/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/patches/series
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/patches/series
diff --git a/ubuntu/_base/applications/fusion-icon/debian/pycompat b/ubuntu/_base/applications/misc/fusion-icon/debian/pycompat
index 0cfbf0888..0cfbf0888 100644
--- a/ubuntu/_base/applications/fusion-icon/debian/pycompat
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/pycompat
diff --git a/ubuntu/_base/applications/fusion-icon/debian/python-distutils-custom.mk b/ubuntu/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk
index fbc70a624..fbc70a624 100644
--- a/ubuntu/_base/applications/fusion-icon/debian/python-distutils-custom.mk
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk
diff --git a/ubuntu/_base/applications/fusion-icon/debian/rules b/ubuntu/_base/applications/misc/fusion-icon/debian/rules
index 88040a563..88040a563 100755
--- a/ubuntu/_base/applications/fusion-icon/debian/rules
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/rules
diff --git a/ubuntu/_base/applications/kaffeine/debian/source/format b/ubuntu/_base/applications/misc/fusion-icon/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kaffeine/debian/source/format
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/source/format
diff --git a/ubuntu/_base/applications/kaffeine/debian/source/options b/ubuntu/_base/applications/misc/fusion-icon/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kaffeine/debian/source/options
+++ b/ubuntu/_base/applications/misc/fusion-icon/debian/source/options
diff --git a/debian/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/multimedia/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
index ca324be99..ca324be99 100644
--- a/debian/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/_base/applications/amarok/debian/README.Debian b/ubuntu/_base/applications/multimedia/amarok/debian/README.Debian
index 7dc17fb17..7dc17fb17 100644
--- a/debian/_base/applications/amarok/debian/README.Debian
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/README.Debian
diff --git a/debian/_base/applications/amarok/debian/amarok-common-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-common-trinity.install
index 3b473baa0..3b473baa0 100644
--- a/debian/_base/applications/amarok/debian/amarok-common-trinity.install
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-common-trinity.install
diff --git a/debian/_base/applications/amarok/debian/amarok-engine-xine-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-engine-xine-trinity.install
index c5e46604f..c5e46604f 100644
--- a/debian/_base/applications/amarok/debian/amarok-engine-xine-trinity.install
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-engine-xine-trinity.install
diff --git a/debian/_base/applications/amarok/debian/amarok-engine-yauap-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-engine-yauap-trinity.install
index ab71ca6f9..ab71ca6f9 100644
--- a/debian/_base/applications/amarok/debian/amarok-engine-yauap-trinity.install
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-engine-yauap-trinity.install
diff --git a/debian/_base/applications/amarok/debian/amarok-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
index f5aeb567f..f5aeb567f 100644
--- a/debian/_base/applications/amarok/debian/amarok-trinity.install
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
diff --git a/debian/_base/applications/amarok/debian/amarok-trinity.manpages b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
index 8094eebb9..8094eebb9 100644
--- a/debian/_base/applications/amarok/debian/amarok-trinity.manpages
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
diff --git a/debian/_base/applications/amarok/debian/amarok-trinity.menu b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.menu
index f78ef6060..f78ef6060 100644
--- a/debian/_base/applications/amarok/debian/amarok-trinity.menu
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.menu
diff --git a/debian/_base/applications/amarok/debian/amarok_play_audiocd.desktop b/ubuntu/_base/applications/multimedia/amarok/debian/amarok_play_audiocd.desktop
index 434630b60..434630b60 100644
--- a/debian/_base/applications/amarok/debian/amarok_play_audiocd.desktop
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/amarok_play_audiocd.desktop
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/filelight/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/filelight/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/amarok/debian/changelog b/ubuntu/_base/applications/multimedia/amarok/debian/changelog
index 9551fe7f3..9551fe7f3 100644
--- a/ubuntu/_base/applications/amarok/debian/changelog
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/changelog
diff --git a/ubuntu/_base/applications/kbfx/debian/compat b/ubuntu/_base/applications/multimedia/amarok/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kbfx/debian/compat
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/compat
diff --git a/ubuntu/_base/applications/amarok/debian/control b/ubuntu/_base/applications/multimedia/amarok/debian/control
index 5ecbf5c3f..5ecbf5c3f 100644
--- a/ubuntu/_base/applications/amarok/debian/control
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/control
diff --git a/debian/_base/applications/amarok/debian/copyright b/ubuntu/_base/applications/multimedia/amarok/debian/copyright
index 2775890ba..2775890ba 100644
--- a/debian/_base/applications/amarok/debian/copyright
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/copyright
diff --git a/debian/_base/applications/amarok/debian/icons/amarok-16.xpm b/ubuntu/_base/applications/multimedia/amarok/debian/icons/amarok-16.xpm
index 80a228f20..80a228f20 100644
--- a/debian/_base/applications/amarok/debian/icons/amarok-16.xpm
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/icons/amarok-16.xpm
diff --git a/debian/_base/applications/amarok/debian/icons/amarok.xpm b/ubuntu/_base/applications/multimedia/amarok/debian/icons/amarok.xpm
index 6411e36d0..6411e36d0 100644
--- a/debian/_base/applications/amarok/debian/icons/amarok.xpm
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/icons/amarok.xpm
diff --git a/debian/_base/applications/amarok/debian/install-mp3 b/ubuntu/_base/applications/multimedia/amarok/debian/install-mp3
index 7b06cbd2f..7b06cbd2f 100644
--- a/debian/_base/applications/amarok/debian/install-mp3
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/install-mp3
diff --git a/debian/_base/applications/amarok/debian/kubuntu-media-amarok b/ubuntu/_base/applications/multimedia/amarok/debian/kubuntu-media-amarok
index dacf7fc55..dacf7fc55 100644
--- a/debian/_base/applications/amarok/debian/kubuntu-media-amarok
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/kubuntu-media-amarok
diff --git a/debian/_base/applications/amarok/debian/man/amarok-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
index dac3bb8aa..dac3bb8aa 100644
--- a/debian/_base/applications/amarok/debian/man/amarok-trinity.1
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
diff --git a/debian/_base/applications/amarok/debian/man/amarok_libvisual-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
index c932b9b0c..c932b9b0c 100644
--- a/debian/_base/applications/amarok/debian/man/amarok_libvisual-trinity.1
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
diff --git a/debian/_base/applications/amarok/debian/man/amarokapp-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
index 0850440dd..0850440dd 100644
--- a/debian/_base/applications/amarok/debian/man/amarokapp-trinity.1
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
diff --git a/debian/_base/applications/amarok/debian/man/amarokcollectionscanner-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
index f4abfd1b2..f4abfd1b2 100644
--- a/debian/_base/applications/amarok/debian/man/amarokcollectionscanner-trinity.1
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
diff --git a/ubuntu/_base/applications/digikam/debian/patches/series b/ubuntu/_base/applications/multimedia/amarok/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/digikam/debian/patches/series
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/patches/series
diff --git a/ubuntu/_base/applications/amarok/debian/rules b/ubuntu/_base/applications/multimedia/amarok/debian/rules
index cbe19f288..cbe19f288 100755
--- a/ubuntu/_base/applications/amarok/debian/rules
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/rules
diff --git a/ubuntu/_base/applications/katapult/debian/source/format b/ubuntu/_base/applications/multimedia/amarok/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/katapult/debian/source/format
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/source/format
diff --git a/ubuntu/_base/applications/katapult/debian/source/options b/ubuntu/_base/applications/multimedia/amarok/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/katapult/debian/source/options
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/source/options
diff --git a/debian/_base/applications/amarok/debian/watch b/ubuntu/_base/applications/multimedia/amarok/debian/watch
index b0a7420bb..b0a7420bb 100644
--- a/debian/_base/applications/amarok/debian/watch
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/watch
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/changelog b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/changelog
index 3d2a61f28..3d2a61f28 100644
--- a/ubuntu/_base/applications/k3b-i18n/debian/changelog
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/changelog
diff --git a/ubuntu/_base/applications/kbibtex/debian/compat b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kbibtex/debian/compat
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/control b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/control
index 8c2643680..8c2643680 100644
--- a/ubuntu/_base/applications/k3b-i18n/debian/control
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/control
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/copyright b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/copyright
index c4a57636b..c4a57636b 100644
--- a/ubuntu/_base/applications/k3b-i18n/debian/copyright
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/copyright
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/rules b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules
index c1a9a4afc..c1a9a4afc 100755
--- a/ubuntu/_base/applications/k3b-i18n/debian/rules
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules
diff --git a/ubuntu/_base/applications/kbarcode/debian/source/format b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kbarcode/debian/source/format
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/source/format
diff --git a/ubuntu/_base/applications/kbarcode/debian/source/options b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kbarcode/debian/source/options
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/source/options
diff --git a/ubuntu/_base/applications/k3b-i18n/debian/watch b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/watch
index cdaaf355a..cdaaf355a 100644
--- a/ubuntu/_base/applications/k3b-i18n/debian/watch
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/watch
diff --git a/ubuntu/_base/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 0cf0bd0a6..0cf0bd0a6 100644
--- a/ubuntu/_base/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/_base/applications/k3b/debian/README.Debian b/ubuntu/_base/applications/multimedia/k3b/debian/README.Debian
index f87a80e77..f87a80e77 100644
--- a/ubuntu/_base/applications/k3b/debian/README.Debian
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/README.Debian
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/k3b/debian/changelog b/ubuntu/_base/applications/multimedia/k3b/debian/changelog
index c1b283bb1..c1b283bb1 100644
--- a/ubuntu/_base/applications/k3b/debian/changelog
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/changelog
diff --git a/ubuntu/_base/applications/kbiff/debian/compat b/ubuntu/_base/applications/multimedia/k3b/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kbiff/debian/compat
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/compat
diff --git a/ubuntu/_base/applications/k3b/debian/control b/ubuntu/_base/applications/multimedia/k3b/debian/control
index c60cc6831..c60cc6831 100644
--- a/ubuntu/_base/applications/k3b/debian/control
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/control
diff --git a/ubuntu/_base/applications/k3b/debian/copyright b/ubuntu/_base/applications/multimedia/k3b/debian/copyright
index b5022ab93..b5022ab93 100644
--- a/ubuntu/_base/applications/k3b/debian/copyright
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/copyright
diff --git a/ubuntu/_base/applications/k3b/debian/docs b/ubuntu/_base/applications/multimedia/k3b/debian/docs
index 623fe2da9..623fe2da9 100644
--- a/ubuntu/_base/applications/k3b/debian/docs
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/docs
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-data-trinity.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data-trinity.install
index af584fe32..af584fe32 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b-data-trinity.install
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data-trinity.install
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-data.files b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.files
index 3b3a0add7..3b3a0add7 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b-data.files
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.files
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-data.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.install
index b7175c514..b7175c514 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b-data.install
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.install
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-rip-audiocd.desktop b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-rip-audiocd.desktop
index 2d7d24def..2d7d24def 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b-rip-audiocd.desktop
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-rip-audiocd.desktop
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-rip-videodvd.desktop b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-rip-videodvd.desktop
index 627ed3a24..627ed3a24 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b-rip-videodvd.desktop
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-rip-videodvd.desktop
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-trinity.1 b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.1
index abbd41f07..abbd41f07 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b-trinity.1
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.1
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-trinity.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install
index 8e0b27b98..8e0b27b98 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b-trinity.install
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-trinity.manpages b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages
index 328f16efe..328f16efe 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b-trinity.manpages
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-trinity.menu b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.menu
index f07382ed8..f07382ed8 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b-trinity.menu
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.menu
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-trinity.postinst b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.postinst
index 3807d55e6..3807d55e6 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b-trinity.postinst
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.postinst
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-write-bin-image.desktop b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-write-bin-image.desktop
index f1223957d..f1223957d 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b-write-bin-image.desktop
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-write-bin-image.desktop
diff --git a/ubuntu/_base/applications/k3b/debian/k3b-write-iso-image.desktop b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-write-iso-image.desktop
index bc8b04a50..bc8b04a50 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b-write-iso-image.desktop
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-write-iso-image.desktop
diff --git a/ubuntu/_base/applications/k3b/debian/k3b.files b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.files
index d6388a5b6..d6388a5b6 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b.files
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.files
diff --git a/ubuntu/_base/applications/k3b/debian/k3b.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.install
index 72cf96bb3..72cf96bb3 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b.install
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.install
diff --git a/ubuntu/_base/applications/k3b/debian/k3b.manpages b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.manpages
index 60dde70bc..60dde70bc 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b.manpages
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.manpages
diff --git a/ubuntu/_base/applications/k3b/debian/k3b.menu b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.menu
index c6f95c029..c6f95c029 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b.menu
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.menu
diff --git a/ubuntu/_base/applications/k3b/debian/k3b.postinst b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.postinst
index 3807d55e6..3807d55e6 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b.postinst
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.postinst
diff --git a/ubuntu/_base/applications/k3b/debian/k3b.xpm b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.xpm
index a7748bac4..a7748bac4 100644
--- a/ubuntu/_base/applications/k3b/debian/k3b.xpm
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.xpm
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b-dev.files b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.files
index d45003d06..d45003d06 100644
--- a/ubuntu/_base/applications/k3b/debian/libk3b-dev.files
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.files
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b-dev.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.install
index 6257a06d1..6257a06d1 100644
--- a/ubuntu/_base/applications/k3b/debian/libk3b-dev.install
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.install
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b-trinity-dev.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-trinity-dev.install
index 575f91fdb..575f91fdb 100644
--- a/ubuntu/_base/applications/k3b/debian/libk3b-trinity-dev.install
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-trinity-dev.install
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b3-extracodecs-trinity.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs-trinity.install
index d806398ef..d806398ef 100644
--- a/ubuntu/_base/applications/k3b/debian/libk3b3-extracodecs-trinity.install
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs-trinity.install
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b3-extracodecs.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install
index 0e57a97dc..0e57a97dc 100644
--- a/ubuntu/_base/applications/k3b/debian/libk3b3-extracodecs.install
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b3-trinity.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-trinity.install
index e18a34c1c..e18a34c1c 100644
--- a/ubuntu/_base/applications/k3b/debian/libk3b3-trinity.install
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-trinity.install
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b3.files b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.files
index d77e53e7c..d77e53e7c 100644
--- a/ubuntu/_base/applications/k3b/debian/libk3b3.files
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.files
diff --git a/ubuntu/_base/applications/k3b/debian/libk3b3.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.install
index f5c557815..f5c557815 100644
--- a/ubuntu/_base/applications/k3b/debian/libk3b3.install
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.install
diff --git a/ubuntu/_base/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff b/ubuntu/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
index dc44bfdb8..dc44bfdb8 100644
--- a/ubuntu/_base/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
diff --git a/ubuntu/_base/applications/k3b/debian/patches/series b/ubuntu/_base/applications/multimedia/k3b/debian/patches/series
index bff63cb8c..bff63cb8c 100644
--- a/ubuntu/_base/applications/k3b/debian/patches/series
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/patches/series
diff --git a/ubuntu/_base/applications/k3b/debian/rules b/ubuntu/_base/applications/multimedia/k3b/debian/rules
index e40095080..e40095080 100755
--- a/ubuntu/_base/applications/k3b/debian/rules
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/rules
diff --git a/ubuntu/_base/applications/kbfx/debian/source/format b/ubuntu/_base/applications/multimedia/k3b/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kbfx/debian/source/format
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/source/format
diff --git a/ubuntu/_base/applications/kbfx/debian/source/options b/ubuntu/_base/applications/multimedia/k3b/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kbfx/debian/source/options
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/source/options
diff --git a/ubuntu/_base/applications/k3b/debian/watch b/ubuntu/_base/applications/multimedia/k3b/debian/watch
index 7e3c554ae..7e3c554ae 100644
--- a/ubuntu/_base/applications/k3b/debian/watch
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/watch
diff --git a/ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/k9copy/debian/changelog b/ubuntu/_base/applications/multimedia/k9copy/debian/changelog
index 5220703ba..5220703ba 100644
--- a/ubuntu/_base/applications/k9copy/debian/changelog
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/changelog
diff --git a/ubuntu/_base/applications/kbookreader/debian/compat b/ubuntu/_base/applications/multimedia/k9copy/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kbookreader/debian/compat
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/compat
diff --git a/ubuntu/_base/applications/k9copy/debian/control b/ubuntu/_base/applications/multimedia/k9copy/debian/control
index e1c8092d3..e1c8092d3 100644
--- a/ubuntu/_base/applications/k9copy/debian/control
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/control
diff --git a/ubuntu/_base/applications/k9copy/debian/copyright b/ubuntu/_base/applications/multimedia/k9copy/debian/copyright
index c08901dd0..c08901dd0 100644
--- a/ubuntu/_base/applications/k9copy/debian/copyright
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/copyright
diff --git a/ubuntu/_base/applications/k9copy/debian/k9copy.1.docbook b/ubuntu/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook
index d3fd4d792..d3fd4d792 100644
--- a/ubuntu/_base/applications/k9copy/debian/k9copy.1.docbook
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook
diff --git a/ubuntu/_base/applications/dolphin/debian/patches/series b/ubuntu/_base/applications/multimedia/k9copy/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/dolphin/debian/patches/series
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/patches/series
diff --git a/ubuntu/_base/applications/k9copy/debian/rules b/ubuntu/_base/applications/multimedia/k9copy/debian/rules
index e0b9d3f6f..e0b9d3f6f 100755
--- a/ubuntu/_base/applications/k9copy/debian/rules
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/rules
diff --git a/ubuntu/_base/applications/kbibtex/debian/source/format b/ubuntu/_base/applications/multimedia/k9copy/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kbibtex/debian/source/format
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/source/format
diff --git a/ubuntu/_base/applications/kbibtex/debian/source/options b/ubuntu/_base/applications/multimedia/k9copy/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kbibtex/debian/source/options
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/source/options
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/changelog b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/changelog
index 7e3c2a0fd..7e3c2a0fd 100644
--- a/ubuntu/_base/applications/kaffeine-mozilla/debian/changelog
+++ b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/changelog
diff --git a/ubuntu/_base/applications/kchmviewer/debian/compat b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kchmviewer/debian/compat
+++ b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/control b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control
index 4f623cb44..4f623cb44 100644
--- a/ubuntu/_base/applications/kaffeine-mozilla/debian/control
+++ b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/copyright b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/copyright
index d7092f934..d7092f934 100644
--- a/ubuntu/_base/applications/kaffeine-mozilla/debian/copyright
+++ b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/copyright
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/docs b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/_base/applications/kaffeine-mozilla/debian/docs
+++ b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/docs
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/kaffeine-mozilla.install
index 30f14a91f..30f14a91f 100644
--- a/ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install
+++ b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/kaffeine-mozilla.install
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/kaffeine-mozilla.links
index 372fe38d5..372fe38d5 100644
--- a/ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links
+++ b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/kaffeine-mozilla.links
diff --git a/ubuntu/_base/applications/kaffeine-mozilla/debian/rules b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/rules
index 08c10c248..08c10c248 100755
--- a/ubuntu/_base/applications/kaffeine-mozilla/debian/rules
+++ b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/rules
diff --git a/ubuntu/_base/applications/kbiff/debian/source/format b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kbiff/debian/source/format
+++ b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/format
diff --git a/ubuntu/_base/applications/kbiff/debian/source/options b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kbiff/debian/source/options
+++ b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/source/options
diff --git a/ubuntu/_base/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/multimedia/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 1d06672c7..1d06672c7 100644
--- a/ubuntu/_base/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/_base/applications/kaffeine/debian/README.Debian b/ubuntu/_base/applications/multimedia/kaffeine/debian/README.Debian
index 74cac614e..74cac614e 100644
--- a/ubuntu/_base/applications/kaffeine/debian/README.Debian
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/README.Debian
diff --git a/ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/gwenview/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/gwenview/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kaffeine/debian/changelog b/ubuntu/_base/applications/multimedia/kaffeine/debian/changelog
index 63b3d1a72..63b3d1a72 100644
--- a/ubuntu/_base/applications/kaffeine/debian/changelog
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/changelog
diff --git a/ubuntu/_base/applications/kcpuload/debian/compat b/ubuntu/_base/applications/multimedia/kaffeine/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kcpuload/debian/compat
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/compat
diff --git a/ubuntu/_base/applications/kaffeine/debian/control b/ubuntu/_base/applications/multimedia/kaffeine/debian/control
index ffdc18ddd..ffdc18ddd 100644
--- a/ubuntu/_base/applications/kaffeine/debian/control
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/control
diff --git a/ubuntu/_base/applications/kaffeine/debian/copyright b/ubuntu/_base/applications/multimedia/kaffeine/debian/copyright
index 8b7ddae56..8b7ddae56 100644
--- a/ubuntu/_base/applications/kaffeine/debian/copyright
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/copyright
diff --git a/ubuntu/_base/applications/kaffeine/debian/docs b/ubuntu/_base/applications/multimedia/kaffeine/debian/docs
index 194085499..194085499 100644
--- a/ubuntu/_base/applications/kaffeine/debian/docs
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/docs
diff --git a/ubuntu/_base/applications/kaffeine/debian/install-codecs b/ubuntu/_base/applications/multimedia/kaffeine/debian/install-codecs
index 271285c4e..271285c4e 100644
--- a/ubuntu/_base/applications/kaffeine/debian/install-codecs
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/install-codecs
diff --git a/ubuntu/_base/applications/kaffeine/debian/install-css.sh b/ubuntu/_base/applications/multimedia/kaffeine/debian/install-css.sh
index f374562ff..f374562ff 100644
--- a/ubuntu/_base/applications/kaffeine/debian/install-css.sh
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/install-css.sh
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-gstreamer-trinity.install
index cddfdc50f..cddfdc50f 100644
--- a/ubuntu/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-gstreamer-trinity.install
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine-iso.desktop b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-iso.desktop
index c1d407f15..c1d407f15 100644
--- a/ubuntu/_base/applications/kaffeine/debian/kaffeine-iso.desktop
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-iso.desktop
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.install b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.install
index 825837cba..825837cba 100644
--- a/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.install
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.install
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.lintian-overrides
index 2e7541445..2e7541445 100644
--- a/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine-trinity.lintian-overrides
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine.1 b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine.1
index ca6de5bc7..ca6de5bc7 100644
--- a/ubuntu/_base/applications/kaffeine/debian/kaffeine.1
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine.1
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine.xpm b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine.xpm
index 255d651d9..255d651d9 100644
--- a/ubuntu/_base/applications/kaffeine/debian/kaffeine.xpm
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine.xpm
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine_codecinstall.desktop b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine_codecinstall.desktop
index 25ec5689c..25ec5689c 100644
--- a/ubuntu/_base/applications/kaffeine/debian/kaffeine_codecinstall.desktop
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine_codecinstall.desktop
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
index 7b4adb8d9..7b4adb8d9 100644
--- a/ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
diff --git a/ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
index a022ecda3..a022ecda3 100644
--- a/ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
diff --git a/ubuntu/_base/applications/kaffeine/debian/menu b/ubuntu/_base/applications/multimedia/kaffeine/debian/menu
index 4314c464a..4314c464a 100644
--- a/ubuntu/_base/applications/kaffeine/debian/menu
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/menu
diff --git a/ubuntu/_base/applications/filelight-l10n/debian/patches/series b/ubuntu/_base/applications/multimedia/kaffeine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/filelight-l10n/debian/patches/series
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/patches/series
diff --git a/ubuntu/_base/applications/kaffeine/debian/rules b/ubuntu/_base/applications/multimedia/kaffeine/debian/rules
index 56947e0e5..56947e0e5 100755
--- a/ubuntu/_base/applications/kaffeine/debian/rules
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/rules
diff --git a/ubuntu/_base/applications/kbookreader/debian/source/format b/ubuntu/_base/applications/multimedia/kaffeine/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kbookreader/debian/source/format
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/source/format
diff --git a/ubuntu/_base/applications/kbookreader/debian/source/options b/ubuntu/_base/applications/multimedia/kaffeine/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kbookreader/debian/source/options
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/source/options
diff --git a/ubuntu/_base/applications/kaffeine/debian/watch b/ubuntu/_base/applications/multimedia/kaffeine/debian/watch
index 3f054ccd4..3f054ccd4 100644
--- a/ubuntu/_base/applications/kaffeine/debian/watch
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/watch
diff --git a/ubuntu/_base/applications/kbarcode/debian/README.Debian b/ubuntu/_base/applications/multimedia/kmplayer/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/_base/applications/kbarcode/debian/README.Debian
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/README.Debian
diff --git a/ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/k3b/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/k3b/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kmplayer/debian/changelog b/ubuntu/_base/applications/multimedia/kmplayer/debian/changelog
index 6084762a7..6084762a7 100644
--- a/ubuntu/_base/applications/kmplayer/debian/changelog
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/changelog
diff --git a/ubuntu/_base/applications/kdbg/debian/compat b/ubuntu/_base/applications/multimedia/kmplayer/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kdbg/debian/compat
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/compat
diff --git a/ubuntu/_base/applications/kmplayer/debian/control b/ubuntu/_base/applications/multimedia/kmplayer/debian/control
index 81325a35f..81325a35f 100644
--- a/ubuntu/_base/applications/kmplayer/debian/control
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/control
diff --git a/ubuntu/_base/applications/kmplayer/debian/copyright b/ubuntu/_base/applications/multimedia/kmplayer/debian/copyright
index 749b0db05..749b0db05 100644
--- a/ubuntu/_base/applications/kmplayer/debian/copyright
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/copyright
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-base-trinity.install b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-base-trinity.install
index 7e7f44aec..7e7f44aec 100644
--- a/ubuntu/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-base-trinity.install
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-konq-plugins-trinity.install
index 4590b56f4..4590b56f4 100644
--- a/ubuntu/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-konq-plugins-trinity.install
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity-doc.install
index 9b26532f3..9b26532f3 100644
--- a/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity-doc.install
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity.install
index 3c2a5f5ff..3c2a5f5ff 100644
--- a/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer-trinity.install
diff --git a/ubuntu/_base/applications/kmplayer/debian/kmplayer.1.docbook b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer.1.docbook
index eda152760..eda152760 100644
--- a/ubuntu/_base/applications/kmplayer/debian/kmplayer.1.docbook
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/kmplayer.1.docbook
diff --git a/ubuntu/_base/applications/kmplayer/debian/menu b/ubuntu/_base/applications/multimedia/kmplayer/debian/menu
index 444b60fb5..444b60fb5 100644
--- a/ubuntu/_base/applications/kmplayer/debian/menu
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/menu
diff --git a/ubuntu/_base/applications/filelight/debian/patches/series b/ubuntu/_base/applications/multimedia/kmplayer/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/filelight/debian/patches/series
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/patches/series
diff --git a/ubuntu/_base/applications/kmplayer/debian/rules b/ubuntu/_base/applications/multimedia/kmplayer/debian/rules
index 3b37fa87e..3b37fa87e 100755
--- a/ubuntu/_base/applications/kmplayer/debian/rules
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/rules
diff --git a/ubuntu/_base/applications/kchmviewer/debian/source/format b/ubuntu/_base/applications/multimedia/kmplayer/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kchmviewer/debian/source/format
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/source/format
diff --git a/ubuntu/_base/applications/kchmviewer/debian/source/options b/ubuntu/_base/applications/multimedia/kmplayer/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kchmviewer/debian/source/options
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/source/options
diff --git a/ubuntu/_base/applications/kmplayer/debian/watch b/ubuntu/_base/applications/multimedia/kmplayer/debian/watch
index d809e2ca1..d809e2ca1 100644
--- a/ubuntu/_base/applications/kmplayer/debian/watch
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/watch
diff --git a/ubuntu/_base/applications/kradio/debian/changelog b/ubuntu/_base/applications/multimedia/kradio/debian/changelog
index ad7c7832c..ad7c7832c 100644
--- a/ubuntu/_base/applications/kradio/debian/changelog
+++ b/ubuntu/_base/applications/multimedia/kradio/debian/changelog
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/compat b/ubuntu/_base/applications/multimedia/kradio/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kdbusnotification/debian/compat
+++ b/ubuntu/_base/applications/multimedia/kradio/debian/compat
diff --git a/ubuntu/_base/applications/kradio/debian/control b/ubuntu/_base/applications/multimedia/kradio/debian/control
index fae9088c4..fae9088c4 100644
--- a/ubuntu/_base/applications/kradio/debian/control
+++ b/ubuntu/_base/applications/multimedia/kradio/debian/control
diff --git a/ubuntu/_base/applications/kradio/debian/convert-presets.1 b/ubuntu/_base/applications/multimedia/kradio/debian/convert-presets.1
index 1f605127f..1f605127f 100644
--- a/ubuntu/_base/applications/kradio/debian/convert-presets.1
+++ b/ubuntu/_base/applications/multimedia/kradio/debian/convert-presets.1
diff --git a/ubuntu/_base/applications/kradio/debian/copyright b/ubuntu/_base/applications/multimedia/kradio/debian/copyright
index 932ce3d04..932ce3d04 100644
--- a/ubuntu/_base/applications/kradio/debian/copyright
+++ b/ubuntu/_base/applications/multimedia/kradio/debian/copyright
diff --git a/ubuntu/_base/applications/kradio/debian/docs b/ubuntu/_base/applications/multimedia/kradio/debian/docs
index bc4a4e465..bc4a4e465 100644
--- a/ubuntu/_base/applications/kradio/debian/docs
+++ b/ubuntu/_base/applications/multimedia/kradio/debian/docs
diff --git a/ubuntu/_base/applications/kradio/debian/kradio.1 b/ubuntu/_base/applications/multimedia/kradio/debian/kradio.1
index 3b715d05d..3b715d05d 100644
--- a/ubuntu/_base/applications/kradio/debian/kradio.1
+++ b/ubuntu/_base/applications/multimedia/kradio/debian/kradio.1
diff --git a/ubuntu/_base/applications/kradio/debian/manpages b/ubuntu/_base/applications/multimedia/kradio/debian/manpages
index f37e7cfcf..f37e7cfcf 100644
--- a/ubuntu/_base/applications/kradio/debian/manpages
+++ b/ubuntu/_base/applications/multimedia/kradio/debian/manpages
diff --git a/ubuntu/_base/applications/kradio/debian/menu b/ubuntu/_base/applications/multimedia/kradio/debian/menu
index 9c29dc73c..9c29dc73c 100644
--- a/ubuntu/_base/applications/kradio/debian/menu
+++ b/ubuntu/_base/applications/multimedia/kradio/debian/menu
diff --git a/ubuntu/_base/applications/kradio/debian/rules b/ubuntu/_base/applications/multimedia/kradio/debian/rules
index f3c1f73d7..f3c1f73d7 100755
--- a/ubuntu/_base/applications/kradio/debian/rules
+++ b/ubuntu/_base/applications/multimedia/kradio/debian/rules
diff --git a/ubuntu/_base/applications/kcpuload/debian/source/format b/ubuntu/_base/applications/multimedia/kradio/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kcpuload/debian/source/format
+++ b/ubuntu/_base/applications/multimedia/kradio/debian/source/format
diff --git a/ubuntu/_base/applications/kcpuload/debian/source/options b/ubuntu/_base/applications/multimedia/kradio/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kcpuload/debian/source/options
+++ b/ubuntu/_base/applications/multimedia/kradio/debian/source/options
diff --git a/ubuntu/_base/applications/kradio/debian/watch b/ubuntu/_base/applications/multimedia/kradio/debian/watch
index 49f735f61..49f735f61 100644
--- a/ubuntu/_base/applications/kradio/debian/watch
+++ b/ubuntu/_base/applications/multimedia/kradio/debian/watch
diff --git a/ubuntu/_base/applications/rosegarden/debian/README.Debian b/ubuntu/_base/applications/multimedia/rosegarden/debian/README.Debian
index 0719da93f..0719da93f 100644
--- a/ubuntu/_base/applications/rosegarden/debian/README.Debian
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/README.Debian
diff --git a/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/rosegarden/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/ubuntu/_base/applications/rosegarden/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/rosegarden/debian/changelog b/ubuntu/_base/applications/multimedia/rosegarden/debian/changelog
index c91341594..c91341594 100644
--- a/ubuntu/_base/applications/rosegarden/debian/changelog
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/changelog
diff --git a/ubuntu/_base/applications/kde-guidance/debian/compat b/ubuntu/_base/applications/multimedia/rosegarden/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/compat
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/compat
diff --git a/ubuntu/_base/applications/rosegarden/debian/control b/ubuntu/_base/applications/multimedia/rosegarden/debian/control
index d2d76841d..d2d76841d 100644
--- a/ubuntu/_base/applications/rosegarden/debian/control
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/control
diff --git a/ubuntu/_base/applications/rosegarden/debian/copyright b/ubuntu/_base/applications/multimedia/rosegarden/debian/copyright
index df2a7e77d..df2a7e77d 100644
--- a/ubuntu/_base/applications/rosegarden/debian/copyright
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/copyright
diff --git a/ubuntu/_base/applications/rosegarden/debian/lintianoverrides b/ubuntu/_base/applications/multimedia/rosegarden/debian/lintianoverrides
index 135ea69e9..135ea69e9 100644
--- a/ubuntu/_base/applications/rosegarden/debian/lintianoverrides
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/lintianoverrides
diff --git a/ubuntu/_base/applications/fusion-icon/debian/patches/series b/ubuntu/_base/applications/multimedia/rosegarden/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/fusion-icon/debian/patches/series
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/patches/series
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-audiofile-importer.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1
index b420ba197..b420ba197 100644
--- a/ubuntu/_base/applications/rosegarden/debian/rosegarden-audiofile-importer.1
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-data-trinity.install b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-data-trinity.install
index 59a4a5943..59a4a5943 100644
--- a/ubuntu/_base/applications/rosegarden/debian/rosegarden-data-trinity.install
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-data-trinity.install
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-lilypondview.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1
index e2aa9f951..e2aa9f951 100644
--- a/ubuntu/_base/applications/rosegarden/debian/rosegarden-lilypondview.1
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-project-package.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1
index 0da30c2a5..0da30c2a5 100644
--- a/ubuntu/_base/applications/rosegarden/debian/rosegarden-project-package.1
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.dirs b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.dirs
index 1dffbd19c..1dffbd19c 100644
--- a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.dirs
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.dirs
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.docs b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.docs
index 23da6d676..23da6d676 100644
--- a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.docs
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.docs
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.examples b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.examples
index 1e660fdcf..1e660fdcf 100644
--- a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.examples
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.examples
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.install b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
index 50a0bcdaa..50a0bcdaa 100644
--- a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.install
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.links b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.links
index f3d6d1228..f3d6d1228 100644
--- a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.links
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.links
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.menu b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.menu
index ca56a8f26..ca56a8f26 100644
--- a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.menu
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.menu
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
index 3b3894dec..3b3894dec 100644
--- a/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
diff --git a/ubuntu/_base/applications/rosegarden/debian/rosegarden.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden.1
index 91916b271..91916b271 100644
--- a/ubuntu/_base/applications/rosegarden/debian/rosegarden.1
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden.1
diff --git a/ubuntu/_base/applications/rosegarden/debian/rules b/ubuntu/_base/applications/multimedia/rosegarden/debian/rules
index 4a0ea2f93..4a0ea2f93 100755
--- a/ubuntu/_base/applications/rosegarden/debian/rules
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rules
diff --git a/ubuntu/_base/applications/rosegarden/debian/semantic.cache b/ubuntu/_base/applications/multimedia/rosegarden/debian/semantic.cache
index e7b76d07a..e7b76d07a 100644
--- a/ubuntu/_base/applications/rosegarden/debian/semantic.cache
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/semantic.cache
diff --git a/ubuntu/_base/applications/kdbg/debian/source/format b/ubuntu/_base/applications/multimedia/rosegarden/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kdbg/debian/source/format
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/source/format
diff --git a/ubuntu/_base/applications/kdbg/debian/source/options b/ubuntu/_base/applications/multimedia/rosegarden/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kdbg/debian/source/options
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/source/options
diff --git a/ubuntu/_base/applications/rosegarden/debian/watch b/ubuntu/_base/applications/multimedia/rosegarden/debian/watch
index f0021dfd7..f0021dfd7 100644
--- a/ubuntu/_base/applications/rosegarden/debian/watch
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/watch
diff --git a/ubuntu/_base/applications/rosegarden/debian/x-rosegarden.desktop b/ubuntu/_base/applications/multimedia/rosegarden/debian/x-rosegarden.desktop
index b6b766909..b6b766909 100644
--- a/ubuntu/_base/applications/rosegarden/debian/x-rosegarden.desktop
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/x-rosegarden.desktop
diff --git a/ubuntu/_base/applications/soundkonverter/debian/README.Debian b/ubuntu/_base/applications/multimedia/soundkonverter/debian/README.Debian
index 079784d5b..079784d5b 100644
--- a/ubuntu/_base/applications/soundkonverter/debian/README.Debian
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/README.Debian
diff --git a/ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/k9copy/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/k9copy/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/soundkonverter/debian/changelog b/ubuntu/_base/applications/multimedia/soundkonverter/debian/changelog
index 585438bcf..585438bcf 100644
--- a/ubuntu/_base/applications/soundkonverter/debian/changelog
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/changelog
diff --git a/ubuntu/_base/applications/kde-style-lipstik/debian/compat b/ubuntu/_base/applications/multimedia/soundkonverter/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kde-style-lipstik/debian/compat
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/compat
diff --git a/ubuntu/_base/applications/soundkonverter/debian/control b/ubuntu/_base/applications/multimedia/soundkonverter/debian/control
index 528d4f0bb..528d4f0bb 100644
--- a/ubuntu/_base/applications/soundkonverter/debian/control
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/control
diff --git a/ubuntu/_base/applications/soundkonverter/debian/copyright b/ubuntu/_base/applications/multimedia/soundkonverter/debian/copyright
index 05bf08795..05bf08795 100644
--- a/ubuntu/_base/applications/soundkonverter/debian/copyright
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/copyright
diff --git a/ubuntu/_base/applications/kdiff3/debian/docs b/ubuntu/_base/applications/multimedia/soundkonverter/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/_base/applications/kdiff3/debian/docs
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/docs
diff --git a/ubuntu/_base/applications/kile/debian/patches/.gitignore b/ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kile/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/soundkonverter/debian/rules b/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules
index 2294f77ba..2294f77ba 100755
--- a/ubuntu/_base/applications/soundkonverter/debian/rules
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules
diff --git a/ubuntu/_base/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install b/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-amarok-trinity.install
index 38b81a194..38b81a194 100644
--- a/ubuntu/_base/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-amarok-trinity.install
diff --git a/ubuntu/_base/applications/soundkonverter/debian/soundkonverter-trinity.install b/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
index 0f6801b72..0f6801b72 100644
--- a/ubuntu/_base/applications/soundkonverter/debian/soundkonverter-trinity.install
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install
diff --git a/ubuntu/_base/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides b/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
index 6a12cd7d8..6a12cd7d8 100644
--- a/ubuntu/_base/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/source/format b/ubuntu/_base/applications/multimedia/soundkonverter/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kdbusnotification/debian/source/format
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/source/format
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/source/options b/ubuntu/_base/applications/multimedia/soundkonverter/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kdbusnotification/debian/source/options
+++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/source/options
diff --git a/ubuntu/_base/applications/basket/debian/basket-kontact-integration-trinity.install b/ubuntu/_base/applications/office/basket/debian/basket-kontact-integration-trinity.install
index 846f111d3..846f111d3 100644
--- a/ubuntu/_base/applications/basket/debian/basket-kontact-integration-trinity.install
+++ b/ubuntu/_base/applications/office/basket/debian/basket-kontact-integration-trinity.install
diff --git a/ubuntu/_base/applications/basket/debian/basket-trinity.install b/ubuntu/_base/applications/office/basket/debian/basket-trinity.install
index a24d7e924..a24d7e924 100644
--- a/ubuntu/_base/applications/basket/debian/basket-trinity.install
+++ b/ubuntu/_base/applications/office/basket/debian/basket-trinity.install
diff --git a/ubuntu/_base/applications/basket/debian/basket.1 b/ubuntu/_base/applications/office/basket/debian/basket.1
index 46f5a3754..46f5a3754 100644
--- a/ubuntu/_base/applications/basket/debian/basket.1
+++ b/ubuntu/_base/applications/office/basket/debian/basket.1
diff --git a/ubuntu/_base/applications/basket/debian/changelog b/ubuntu/_base/applications/office/basket/debian/changelog
index e39578cba..e39578cba 100644
--- a/ubuntu/_base/applications/basket/debian/changelog
+++ b/ubuntu/_base/applications/office/basket/debian/changelog
diff --git a/ubuntu/_base/applications/kde-style-qtcurve/debian/compat b/ubuntu/_base/applications/office/basket/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kde-style-qtcurve/debian/compat
+++ b/ubuntu/_base/applications/office/basket/debian/compat
diff --git a/ubuntu/_base/applications/basket/debian/control b/ubuntu/_base/applications/office/basket/debian/control
index 36252962d..36252962d 100644
--- a/ubuntu/_base/applications/basket/debian/control
+++ b/ubuntu/_base/applications/office/basket/debian/control
diff --git a/ubuntu/_base/applications/basket/debian/copyright b/ubuntu/_base/applications/office/basket/debian/copyright
index 32425ad0a..32425ad0a 100644
--- a/ubuntu/_base/applications/basket/debian/copyright
+++ b/ubuntu/_base/applications/office/basket/debian/copyright
diff --git a/ubuntu/_base/applications/kbiff/debian/dirs b/ubuntu/_base/applications/office/basket/debian/dirs
index f583045fe..f583045fe 100644
--- a/ubuntu/_base/applications/kbiff/debian/dirs
+++ b/ubuntu/_base/applications/office/basket/debian/dirs
diff --git a/ubuntu/_base/applications/kile/debian/docs b/ubuntu/_base/applications/office/basket/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/_base/applications/kile/debian/docs
+++ b/ubuntu/_base/applications/office/basket/debian/docs
diff --git a/ubuntu/_base/applications/basket/debian/menu b/ubuntu/_base/applications/office/basket/debian/menu
index a7e14117e..a7e14117e 100644
--- a/ubuntu/_base/applications/basket/debian/menu
+++ b/ubuntu/_base/applications/office/basket/debian/menu
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/patches/series b/ubuntu/_base/applications/office/basket/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/patches/series
+++ b/ubuntu/_base/applications/office/basket/debian/patches/series
diff --git a/ubuntu/_base/applications/basket/debian/rules b/ubuntu/_base/applications/office/basket/debian/rules
index 200c5baf7..200c5baf7 100755
--- a/ubuntu/_base/applications/basket/debian/rules
+++ b/ubuntu/_base/applications/office/basket/debian/rules
diff --git a/ubuntu/_base/applications/kde-guidance/debian/source/format b/ubuntu/_base/applications/office/basket/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/source/format
+++ b/ubuntu/_base/applications/office/basket/debian/source/format
diff --git a/ubuntu/_base/applications/kde-guidance/debian/source/options b/ubuntu/_base/applications/office/basket/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/source/options
+++ b/ubuntu/_base/applications/office/basket/debian/source/options
diff --git a/ubuntu/_base/applications/basket/debian/watch b/ubuntu/_base/applications/office/basket/debian/watch
index a620b0d5a..a620b0d5a 100644
--- a/ubuntu/_base/applications/basket/debian/watch
+++ b/ubuntu/_base/applications/office/basket/debian/watch
diff --git a/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kaffeine/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/kbibtex/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kaffeine/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/office/kbibtex/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kbibtex/debian/changelog b/ubuntu/_base/applications/office/kbibtex/debian/changelog
index c06f2a183..c06f2a183 100644
--- a/ubuntu/_base/applications/kbibtex/debian/changelog
+++ b/ubuntu/_base/applications/office/kbibtex/debian/changelog
diff --git a/ubuntu/_base/applications/kde-systemsettings/debian/compat b/ubuntu/_base/applications/office/kbibtex/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kde-systemsettings/debian/compat
+++ b/ubuntu/_base/applications/office/kbibtex/debian/compat
diff --git a/ubuntu/_base/applications/kbibtex/debian/control b/ubuntu/_base/applications/office/kbibtex/debian/control
index a85448cb6..a85448cb6 100644
--- a/ubuntu/_base/applications/kbibtex/debian/control
+++ b/ubuntu/_base/applications/office/kbibtex/debian/control
diff --git a/ubuntu/_base/applications/kbibtex/debian/copyright b/ubuntu/_base/applications/office/kbibtex/debian/copyright
index a3860eab7..a3860eab7 100644
--- a/ubuntu/_base/applications/kbibtex/debian/copyright
+++ b/ubuntu/_base/applications/office/kbibtex/debian/copyright
diff --git a/ubuntu/_base/applications/kbibtex/debian/docs b/ubuntu/_base/applications/office/kbibtex/debian/docs
index 166765aba..166765aba 100644
--- a/ubuntu/_base/applications/kbibtex/debian/docs
+++ b/ubuntu/_base/applications/office/kbibtex/debian/docs
diff --git a/ubuntu/_base/applications/kbibtex/debian/menu b/ubuntu/_base/applications/office/kbibtex/debian/menu
index 63d91bc0c..63d91bc0c 100644
--- a/ubuntu/_base/applications/kbibtex/debian/menu
+++ b/ubuntu/_base/applications/office/kbibtex/debian/menu
diff --git a/ubuntu/_base/applications/kbibtex/debian/rules b/ubuntu/_base/applications/office/kbibtex/debian/rules
index 3b0bb5ca9..3b0bb5ca9 100755
--- a/ubuntu/_base/applications/kbibtex/debian/rules
+++ b/ubuntu/_base/applications/office/kbibtex/debian/rules
diff --git a/ubuntu/_base/applications/kde-style-lipstik/debian/source/format b/ubuntu/_base/applications/office/kbibtex/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kde-style-lipstik/debian/source/format
+++ b/ubuntu/_base/applications/office/kbibtex/debian/source/format
diff --git a/ubuntu/_base/applications/kde-style-lipstik/debian/source/options b/ubuntu/_base/applications/office/kbibtex/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kde-style-lipstik/debian/source/options
+++ b/ubuntu/_base/applications/office/kbibtex/debian/source/options
diff --git a/ubuntu/_base/applications/kbibtex/debian/watch b/ubuntu/_base/applications/office/kbibtex/debian/watch
index a0b02fa2d..a0b02fa2d 100644
--- a/ubuntu/_base/applications/kbibtex/debian/watch
+++ b/ubuntu/_base/applications/office/kbibtex/debian/watch
diff --git a/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/katapult/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/kbookreader/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/katapult/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/office/kbookreader/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kbookreader/debian/changelog b/ubuntu/_base/applications/office/kbookreader/debian/changelog
index 2d836d558..2d836d558 100644
--- a/ubuntu/_base/applications/kbookreader/debian/changelog
+++ b/ubuntu/_base/applications/office/kbookreader/debian/changelog
diff --git a/ubuntu/_base/applications/kdesudo/debian/compat b/ubuntu/_base/applications/office/kbookreader/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kdesudo/debian/compat
+++ b/ubuntu/_base/applications/office/kbookreader/debian/compat
diff --git a/ubuntu/_base/applications/kbookreader/debian/control b/ubuntu/_base/applications/office/kbookreader/debian/control
index 5abe85a00..5abe85a00 100644
--- a/ubuntu/_base/applications/kbookreader/debian/control
+++ b/ubuntu/_base/applications/office/kbookreader/debian/control
diff --git a/ubuntu/_base/applications/kbookreader/debian/copyright b/ubuntu/_base/applications/office/kbookreader/debian/copyright
index 8d31bf1da..8d31bf1da 100644
--- a/ubuntu/_base/applications/kbookreader/debian/copyright
+++ b/ubuntu/_base/applications/office/kbookreader/debian/copyright
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/patches/series b/ubuntu/_base/applications/office/kbookreader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/gwenview-i18n/debian/patches/series
+++ b/ubuntu/_base/applications/office/kbookreader/debian/patches/series
diff --git a/ubuntu/_base/applications/kbookreader/debian/rules b/ubuntu/_base/applications/office/kbookreader/debian/rules
index ea135866a..ea135866a 100755
--- a/ubuntu/_base/applications/kbookreader/debian/rules
+++ b/ubuntu/_base/applications/office/kbookreader/debian/rules
diff --git a/ubuntu/_base/applications/kde-style-qtcurve/debian/source/format b/ubuntu/_base/applications/office/kbookreader/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kde-style-qtcurve/debian/source/format
+++ b/ubuntu/_base/applications/office/kbookreader/debian/source/format
diff --git a/ubuntu/_base/applications/kde-style-qtcurve/debian/source/options b/ubuntu/_base/applications/office/kbookreader/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kde-style-qtcurve/debian/source/options
+++ b/ubuntu/_base/applications/office/kbookreader/debian/source/options
diff --git a/ubuntu/_base/applications/kile/debian/README.Debian b/ubuntu/_base/applications/office/kile/debian/README.Debian
index 8e55c77bc..8e55c77bc 100644
--- a/ubuntu/_base/applications/kile/debian/README.Debian
+++ b/ubuntu/_base/applications/office/kile/debian/README.Debian
diff --git a/ubuntu/_base/applications/kile/debian/TODO.Debian b/ubuntu/_base/applications/office/kile/debian/TODO.Debian
index bbfc0d8dd..bbfc0d8dd 100644
--- a/ubuntu/_base/applications/kile/debian/TODO.Debian
+++ b/ubuntu/_base/applications/office/kile/debian/TODO.Debian
diff --git a/ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kile/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/office/kile/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kbarcode/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/kile/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kbarcode/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/office/kile/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kile/debian/changelog b/ubuntu/_base/applications/office/kile/debian/changelog
index 5fc398065..5fc398065 100644
--- a/ubuntu/_base/applications/kile/debian/changelog
+++ b/ubuntu/_base/applications/office/kile/debian/changelog
diff --git a/ubuntu/_base/applications/kdesvn/debian/compat b/ubuntu/_base/applications/office/kile/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kdesvn/debian/compat
+++ b/ubuntu/_base/applications/office/kile/debian/compat
diff --git a/ubuntu/_base/applications/kile/debian/control b/ubuntu/_base/applications/office/kile/debian/control
index 605268a27..605268a27 100644
--- a/ubuntu/_base/applications/kile/debian/control
+++ b/ubuntu/_base/applications/office/kile/debian/control
diff --git a/ubuntu/_base/applications/kile/debian/copyright b/ubuntu/_base/applications/office/kile/debian/copyright
index 513a8f2ca..513a8f2ca 100644
--- a/ubuntu/_base/applications/kile/debian/copyright
+++ b/ubuntu/_base/applications/office/kile/debian/copyright
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/docs b/ubuntu/_base/applications/office/kile/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/docs
+++ b/ubuntu/_base/applications/office/kile/debian/docs
diff --git a/ubuntu/_base/applications/kile/debian/kile-trinity.install b/ubuntu/_base/applications/office/kile/debian/kile-trinity.install
index 3d82db5d5..3d82db5d5 100644
--- a/ubuntu/_base/applications/kile/debian/kile-trinity.install
+++ b/ubuntu/_base/applications/office/kile/debian/kile-trinity.install
diff --git a/ubuntu/_base/applications/kile/debian/kile-trinity.links b/ubuntu/_base/applications/office/kile/debian/kile-trinity.links
index ebafda14f..ebafda14f 100644
--- a/ubuntu/_base/applications/kile/debian/kile-trinity.links
+++ b/ubuntu/_base/applications/office/kile/debian/kile-trinity.links
diff --git a/ubuntu/_base/applications/kile/debian/kile.1 b/ubuntu/_base/applications/office/kile/debian/kile.1
index bbcde5836..bbcde5836 100644
--- a/ubuntu/_base/applications/kile/debian/kile.1
+++ b/ubuntu/_base/applications/office/kile/debian/kile.1
diff --git a/ubuntu/_base/applications/kile/debian/kile.xpm b/ubuntu/_base/applications/office/kile/debian/kile.xpm
index 408d2710b..408d2710b 100644
--- a/ubuntu/_base/applications/kile/debian/kile.xpm
+++ b/ubuntu/_base/applications/office/kile/debian/kile.xpm
diff --git a/ubuntu/_base/applications/kile/debian/menu b/ubuntu/_base/applications/office/kile/debian/menu
index 8ddf08ad7..8ddf08ad7 100644
--- a/ubuntu/_base/applications/kile/debian/menu
+++ b/ubuntu/_base/applications/office/kile/debian/menu
diff --git a/ubuntu/_base/applications/knights/debian/patches/.gitignore b/ubuntu/_base/applications/office/kile/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/knights/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/office/kile/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/kile/debian/rules b/ubuntu/_base/applications/office/kile/debian/rules
index 581aec434..581aec434 100755
--- a/ubuntu/_base/applications/kile/debian/rules
+++ b/ubuntu/_base/applications/office/kile/debian/rules
diff --git a/ubuntu/_base/applications/kde-systemsettings/debian/source/format b/ubuntu/_base/applications/office/kile/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kde-systemsettings/debian/source/format
+++ b/ubuntu/_base/applications/office/kile/debian/source/format
diff --git a/ubuntu/_base/applications/kde-systemsettings/debian/source/options b/ubuntu/_base/applications/office/kile/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kde-systemsettings/debian/source/options
+++ b/ubuntu/_base/applications/office/kile/debian/source/options
diff --git a/ubuntu/_base/applications/kile/debian/watch b/ubuntu/_base/applications/office/kile/debian/watch
index e372a7062..e372a7062 100644
--- a/ubuntu/_base/applications/kile/debian/watch
+++ b/ubuntu/_base/applications/office/kile/debian/watch
diff --git a/ubuntu/_base/applications/kmymoney/debian/NEWS b/ubuntu/_base/applications/office/kmymoney/debian/NEWS
index a10bb6f91..a10bb6f91 100644
--- a/ubuntu/_base/applications/kmymoney/debian/NEWS
+++ b/ubuntu/_base/applications/office/kmymoney/debian/NEWS
diff --git a/ubuntu/_base/applications/kmymoney/debian/README.source b/ubuntu/_base/applications/office/kmymoney/debian/README.source
index 2a0f24655..2a0f24655 100644
--- a/ubuntu/_base/applications/kmymoney/debian/README.source
+++ b/ubuntu/_base/applications/office/kmymoney/debian/README.source
diff --git a/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kbibtex/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/kmymoney/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kbibtex/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/office/kmymoney/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kmymoney/debian/changelog b/ubuntu/_base/applications/office/kmymoney/debian/changelog
index ff799841f..ff799841f 100644
--- a/ubuntu/_base/applications/kmymoney/debian/changelog
+++ b/ubuntu/_base/applications/office/kmymoney/debian/changelog
diff --git a/ubuntu/_base/applications/kdiff3/debian/compat b/ubuntu/_base/applications/office/kmymoney/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kdiff3/debian/compat
+++ b/ubuntu/_base/applications/office/kmymoney/debian/compat
diff --git a/ubuntu/_base/applications/kmymoney/debian/control b/ubuntu/_base/applications/office/kmymoney/debian/control
index 5d9752bb1..5d9752bb1 100644
--- a/ubuntu/_base/applications/kmymoney/debian/control
+++ b/ubuntu/_base/applications/office/kmymoney/debian/control
diff --git a/ubuntu/_base/applications/kmymoney/debian/copyright b/ubuntu/_base/applications/office/kmymoney/debian/copyright
index 6ba1a0edf..6ba1a0edf 100644
--- a/ubuntu/_base/applications/kmymoney/debian/copyright
+++ b/ubuntu/_base/applications/office/kmymoney/debian/copyright
diff --git a/ubuntu/_base/applications/kmymoney/debian/kmymoney2-common-trinity.install b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-common-trinity.install
index f8c7e9a01..f8c7e9a01 100644
--- a/ubuntu/_base/applications/kmymoney/debian/kmymoney2-common-trinity.install
+++ b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-common-trinity.install
diff --git a/ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity-dev.install b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
index 4c3b73990..4c3b73990 100644
--- a/ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity-dev.install
+++ b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
diff --git a/ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity.docs b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs
index cbc02b603..cbc02b603 100644
--- a/ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity.docs
+++ b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs
diff --git a/ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity.install b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.install
index 89ecca2de..89ecca2de 100644
--- a/ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity.install
+++ b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.install
diff --git a/ubuntu/_base/applications/kmymoney/debian/kmymoney2.xpm b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2.xpm
index 8bf0321d5..8bf0321d5 100644
--- a/ubuntu/_base/applications/kmymoney/debian/kmymoney2.xpm
+++ b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2.xpm
diff --git a/ubuntu/_base/applications/kmymoney/debian/menu b/ubuntu/_base/applications/office/kmymoney/debian/menu
index 3a6b25af8..3a6b25af8 100644
--- a/ubuntu/_base/applications/kmymoney/debian/menu
+++ b/ubuntu/_base/applications/office/kmymoney/debian/menu
diff --git a/ubuntu/_base/applications/gwenview/debian/patches/series b/ubuntu/_base/applications/office/kmymoney/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/gwenview/debian/patches/series
+++ b/ubuntu/_base/applications/office/kmymoney/debian/patches/series
diff --git a/ubuntu/_base/applications/kmymoney/debian/rules b/ubuntu/_base/applications/office/kmymoney/debian/rules
index 2788384f7..2788384f7 100755
--- a/ubuntu/_base/applications/kmymoney/debian/rules
+++ b/ubuntu/_base/applications/office/kmymoney/debian/rules
diff --git a/ubuntu/_base/applications/kdesudo/debian/source/format b/ubuntu/_base/applications/office/kmymoney/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kdesudo/debian/source/format
+++ b/ubuntu/_base/applications/office/kmymoney/debian/source/format
diff --git a/ubuntu/_base/applications/kdesudo/debian/source/options b/ubuntu/_base/applications/office/kmymoney/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kdesudo/debian/source/options
+++ b/ubuntu/_base/applications/office/kmymoney/debian/source/options
diff --git a/ubuntu/_base/applications/kmymoney/debian/watch b/ubuntu/_base/applications/office/kmymoney/debian/watch
index b80efc65c..b80efc65c 100644
--- a/ubuntu/_base/applications/kmymoney/debian/watch
+++ b/ubuntu/_base/applications/office/kmymoney/debian/watch
diff --git a/ubuntu/_base/applications/knowit/debian/changelog b/ubuntu/_base/applications/office/knowit/debian/changelog
index b5d67442f..b5d67442f 100644
--- a/ubuntu/_base/applications/knowit/debian/changelog
+++ b/ubuntu/_base/applications/office/knowit/debian/changelog
diff --git a/ubuntu/_base/applications/kdirstat/debian/compat b/ubuntu/_base/applications/office/knowit/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kdirstat/debian/compat
+++ b/ubuntu/_base/applications/office/knowit/debian/compat
diff --git a/ubuntu/_base/applications/knowit/debian/control b/ubuntu/_base/applications/office/knowit/debian/control
index 98e1f9552..98e1f9552 100644
--- a/ubuntu/_base/applications/knowit/debian/control
+++ b/ubuntu/_base/applications/office/knowit/debian/control
diff --git a/ubuntu/_base/applications/knowit/debian/copyright b/ubuntu/_base/applications/office/knowit/debian/copyright
index 008edff30..008edff30 100644
--- a/ubuntu/_base/applications/knowit/debian/copyright
+++ b/ubuntu/_base/applications/office/knowit/debian/copyright
diff --git a/ubuntu/_base/applications/knowit/debian/docs b/ubuntu/_base/applications/office/knowit/debian/docs
index 5502ed8f4..5502ed8f4 100644
--- a/ubuntu/_base/applications/knowit/debian/docs
+++ b/ubuntu/_base/applications/office/knowit/debian/docs
diff --git a/ubuntu/_base/applications/knowit/debian/knowit.1 b/ubuntu/_base/applications/office/knowit/debian/knowit.1
index a19da8be1..a19da8be1 100644
--- a/ubuntu/_base/applications/knowit/debian/knowit.1
+++ b/ubuntu/_base/applications/office/knowit/debian/knowit.1
diff --git a/ubuntu/_base/applications/knowit/debian/rules b/ubuntu/_base/applications/office/knowit/debian/rules
index 77f1d05a4..77f1d05a4 100755
--- a/ubuntu/_base/applications/knowit/debian/rules
+++ b/ubuntu/_base/applications/office/knowit/debian/rules
diff --git a/ubuntu/_base/applications/kdesvn/debian/source/format b/ubuntu/_base/applications/office/knowit/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kdesvn/debian/source/format
+++ b/ubuntu/_base/applications/office/knowit/debian/source/format
diff --git a/ubuntu/_base/applications/kdesvn/debian/source/options b/ubuntu/_base/applications/office/knowit/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kdesvn/debian/source/options
+++ b/ubuntu/_base/applications/office/knowit/debian/source/options
diff --git a/ubuntu/_base/applications/knowit/debian/watch b/ubuntu/_base/applications/office/knowit/debian/watch
index 0c83833f0..0c83833f0 100644
--- a/ubuntu/_base/applications/knowit/debian/watch
+++ b/ubuntu/_base/applications/office/knowit/debian/watch
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/changelog b/ubuntu/_base/applications/office/koffice-i18n/debian/changelog
index 26f667147..26f667147 100644
--- a/ubuntu/_base/applications/koffice-i18n/debian/changelog
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/changelog
diff --git a/ubuntu/_base/applications/kdmtheme/debian/compat b/ubuntu/_base/applications/office/koffice-i18n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kdmtheme/debian/compat
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/compat
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/control b/ubuntu/_base/applications/office/koffice-i18n/debian/control
index f0d1f9757..f0d1f9757 100644
--- a/ubuntu/_base/applications/koffice-i18n/debian/control
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/control
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/copyright b/ubuntu/_base/applications/office/koffice-i18n/debian/copyright
index 2ab72642a..2ab72642a 100644
--- a/ubuntu/_base/applications/koffice-i18n/debian/copyright
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/copyright
diff --git a/ubuntu/_base/applications/knights/debian/debiandirs b/ubuntu/_base/applications/office/koffice-i18n/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/ubuntu/_base/applications/knights/debian/debiandirs
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/debiandirs
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/rules b/ubuntu/_base/applications/office/koffice-i18n/debian/rules
index 478c97b9d..478c97b9d 100755
--- a/ubuntu/_base/applications/koffice-i18n/debian/rules
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/rules
diff --git a/ubuntu/_base/applications/kdiff3/debian/source/format b/ubuntu/_base/applications/office/koffice-i18n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kdiff3/debian/source/format
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/source/format
diff --git a/ubuntu/_base/applications/kdiff3/debian/source/options b/ubuntu/_base/applications/office/koffice-i18n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kdiff3/debian/source/options
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/source/options
diff --git a/ubuntu/_base/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/office/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
index ec579c644..ec579c644 100644
--- a/ubuntu/_base/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/applications/office/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/_base/applications/koffice/debian/README.MimeType b/ubuntu/_base/applications/office/koffice/debian/README.MimeType
index 7d9888658..7d9888658 100644
--- a/ubuntu/_base/applications/koffice/debian/README.MimeType
+++ b/ubuntu/_base/applications/office/koffice/debian/README.MimeType
diff --git a/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kbiff/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/koffice/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kbiff/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/office/koffice/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/koffice/debian/chalk-data-trinity.install b/ubuntu/_base/applications/office/koffice/debian/chalk-data-trinity.install
index a37b11ace..a37b11ace 100644
--- a/ubuntu/_base/applications/koffice/debian/chalk-data-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/chalk-data-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/chalk-data-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/chalk-data-trinity.lintian
index 909a9062a..909a9062a 100644
--- a/ubuntu/_base/applications/koffice/debian/chalk-data-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/chalk-data-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/chalk-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/chalk-trinity.docs
index 99cd93d41..99cd93d41 100644
--- a/ubuntu/_base/applications/koffice/debian/chalk-trinity.docs
+++ b/ubuntu/_base/applications/office/koffice/debian/chalk-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/chalk-trinity.install b/ubuntu/_base/applications/office/koffice/debian/chalk-trinity.install
index a36c77eb8..a36c77eb8 100644
--- a/ubuntu/_base/applications/koffice/debian/chalk-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/chalk-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/chalk-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/chalk-trinity.lintian
index ef467a3e1..ef467a3e1 100644
--- a/ubuntu/_base/applications/koffice/debian/chalk-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/chalk-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/chalk-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/chalk-trinity.menu
index 2354092d2..2354092d2 100644
--- a/ubuntu/_base/applications/koffice/debian/chalk-trinity.menu
+++ b/ubuntu/_base/applications/office/koffice/debian/chalk-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/chalk-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/chalk-trinity.mime
index 86a95ce5b..86a95ce5b 100644
--- a/ubuntu/_base/applications/koffice/debian/chalk-trinity.mime
+++ b/ubuntu/_base/applications/office/koffice/debian/chalk-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/chalk.xpm b/ubuntu/_base/applications/office/koffice/debian/chalk.xpm
index 0edc4f49a..0edc4f49a 100644
--- a/ubuntu/_base/applications/koffice/debian/chalk.xpm
+++ b/ubuntu/_base/applications/office/koffice/debian/chalk.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/changelog b/ubuntu/_base/applications/office/koffice/debian/changelog
index 8ce61b75e..8ce61b75e 100644
--- a/ubuntu/_base/applications/koffice/debian/changelog
+++ b/ubuntu/_base/applications/office/koffice/debian/changelog
diff --git a/ubuntu/_base/applications/kdpkg/debian/compat b/ubuntu/_base/applications/office/koffice/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kdpkg/debian/compat
+++ b/ubuntu/_base/applications/office/koffice/debian/compat
diff --git a/ubuntu/_base/applications/koffice/debian/control b/ubuntu/_base/applications/office/koffice/debian/control
index 37d242ddf..37d242ddf 100644
--- a/ubuntu/_base/applications/koffice/debian/control
+++ b/ubuntu/_base/applications/office/koffice/debian/control
diff --git a/ubuntu/_base/applications/koffice/debian/copyright b/ubuntu/_base/applications/office/koffice/debian/copyright
index 900ced776..900ced776 100644
--- a/ubuntu/_base/applications/koffice/debian/copyright
+++ b/ubuntu/_base/applications/office/koffice/debian/copyright
diff --git a/ubuntu/_base/applications/koffice/debian/fogra27l.icm.uu b/ubuntu/_base/applications/office/koffice/debian/fogra27l.icm.uu
index 39417fc89..39417fc89 100644
--- a/ubuntu/_base/applications/koffice/debian/fogra27l.icm.uu
+++ b/ubuntu/_base/applications/office/koffice/debian/fogra27l.icm.uu
diff --git a/ubuntu/_base/applications/koffice/debian/karbon-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.docs
index 975685c5b..975685c5b 100644
--- a/ubuntu/_base/applications/koffice/debian/karbon-trinity.docs
+++ b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/karbon-trinity.install b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install
index 669e5d49d..669e5d49d 100644
--- a/ubuntu/_base/applications/koffice/debian/karbon-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/karbon-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.lintian
index f399de402..f399de402 100644
--- a/ubuntu/_base/applications/koffice/debian/karbon-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/karbon-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages
index 8a212a2b2..8a212a2b2 100644
--- a/ubuntu/_base/applications/koffice/debian/karbon-trinity.manpages
+++ b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/karbon-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.menu
index 0329fc505..0329fc505 100644
--- a/ubuntu/_base/applications/koffice/debian/karbon-trinity.menu
+++ b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/karbon-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.mime
index 30e0e75b0..30e0e75b0 100644
--- a/ubuntu/_base/applications/koffice/debian/karbon-trinity.mime
+++ b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/karbon.1 b/ubuntu/_base/applications/office/koffice/debian/karbon.1
index fa077706a..fa077706a 100644
--- a/ubuntu/_base/applications/koffice/debian/karbon.1
+++ b/ubuntu/_base/applications/office/koffice/debian/karbon.1
diff --git a/ubuntu/_base/applications/koffice/debian/karbon.xpm b/ubuntu/_base/applications/office/koffice/debian/karbon.xpm
index 92f24765d..92f24765d 100644
--- a/ubuntu/_base/applications/koffice/debian/karbon.xpm
+++ b/ubuntu/_base/applications/office/koffice/debian/karbon.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kchart-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.README.Debian
index ab998f150..ab998f150 100644
--- a/ubuntu/_base/applications/koffice/debian/kchart-trinity.README.Debian
+++ b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/kchart-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.docs
index d79e8fa24..d79e8fa24 100644
--- a/ubuntu/_base/applications/koffice/debian/kchart-trinity.docs
+++ b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kchart-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install
index cc59b8a8f..cc59b8a8f 100644
--- a/ubuntu/_base/applications/koffice/debian/kchart-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kchart-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.lintian
index f81d8d6f7..f81d8d6f7 100644
--- a/ubuntu/_base/applications/koffice/debian/kchart-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kchart-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages
index 38c864763..38c864763 100644
--- a/ubuntu/_base/applications/koffice/debian/kchart-trinity.manpages
+++ b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kchart-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.menu
index 405e19fec..405e19fec 100644
--- a/ubuntu/_base/applications/koffice/debian/kchart-trinity.menu
+++ b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kchart-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.mime
index 7b0f739ff..7b0f739ff 100644
--- a/ubuntu/_base/applications/koffice/debian/kchart-trinity.mime
+++ b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/kchart.1 b/ubuntu/_base/applications/office/koffice/debian/kchart.1
index 0b2c8a4c3..0b2c8a4c3 100644
--- a/ubuntu/_base/applications/koffice/debian/kchart.1
+++ b/ubuntu/_base/applications/office/koffice/debian/kchart.1
diff --git a/ubuntu/_base/applications/koffice/debian/kchart.xpm b/ubuntu/_base/applications/office/koffice/debian/kchart.xpm
index 4b1c6e11d..4b1c6e11d 100644
--- a/ubuntu/_base/applications/koffice/debian/kchart.xpm
+++ b/ubuntu/_base/applications/office/koffice/debian/kchart.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kexi-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kexi-trinity.docs
index 2633ffdfd..2633ffdfd 100644
--- a/ubuntu/_base/applications/koffice/debian/kexi-trinity.docs
+++ b/ubuntu/_base/applications/office/koffice/debian/kexi-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kexi-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kexi-trinity.install
index fb80fb2bc..fb80fb2bc 100644
--- a/ubuntu/_base/applications/koffice/debian/kexi-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kexi-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kexi-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kexi-trinity.lintian
index 07d1301aa..07d1301aa 100644
--- a/ubuntu/_base/applications/koffice/debian/kexi-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kexi-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kformula-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.README.Debian
index bfd5bb7e5..bfd5bb7e5 100644
--- a/ubuntu/_base/applications/koffice/debian/kformula-trinity.README.Debian
+++ b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/kformula-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.docs
index a5ddd1f27..a5ddd1f27 100644
--- a/ubuntu/_base/applications/koffice/debian/kformula-trinity.docs
+++ b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kformula-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install
index 0ec37116a..0ec37116a 100644
--- a/ubuntu/_base/applications/koffice/debian/kformula-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kformula-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian
index ec8c2f644..ec8c2f644 100644
--- a/ubuntu/_base/applications/koffice/debian/kformula-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kformula-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages
index 35c78eaa9..35c78eaa9 100644
--- a/ubuntu/_base/applications/koffice/debian/kformula-trinity.manpages
+++ b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kformula-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.menu
index 37f699400..37f699400 100644
--- a/ubuntu/_base/applications/koffice/debian/kformula-trinity.menu
+++ b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kformula-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.mime
index 5687b0f24..5687b0f24 100644
--- a/ubuntu/_base/applications/koffice/debian/kformula-trinity.mime
+++ b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/kformula.1 b/ubuntu/_base/applications/office/koffice/debian/kformula.1
index 801df0727..801df0727 100644
--- a/ubuntu/_base/applications/koffice/debian/kformula.1
+++ b/ubuntu/_base/applications/office/koffice/debian/kformula.1
diff --git a/ubuntu/_base/applications/koffice/debian/kformula.xpm b/ubuntu/_base/applications/office/koffice/debian/kformula.xpm
index b42f4e220..b42f4e220 100644
--- a/ubuntu/_base/applications/koffice/debian/kformula.xpm
+++ b/ubuntu/_base/applications/office/koffice/debian/kformula.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.README.Debian
index 0b97a4e69..0b97a4e69 100644
--- a/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.README.Debian
+++ b/ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.docs
index db5dbf658..db5dbf658 100644
--- a/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.docs
+++ b/ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.install
index 02f3c0322..02f3c0322 100644
--- a/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.lintian
index 4eb29a57e..4eb29a57e 100644
--- a/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kivio-data-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.docs
index 0ec5716cd..0ec5716cd 100644
--- a/ubuntu/_base/applications/koffice/debian/kivio-trinity.docs
+++ b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install
index 510c85320..510c85320 100644
--- a/ubuntu/_base/applications/koffice/debian/kivio-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.lintian
index 00d1d2875..00d1d2875 100644
--- a/ubuntu/_base/applications/koffice/debian/kivio-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages
index 1f348c0ca..1f348c0ca 100644
--- a/ubuntu/_base/applications/koffice/debian/kivio-trinity.manpages
+++ b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.menu
index db45a4245..db45a4245 100644
--- a/ubuntu/_base/applications/koffice/debian/kivio-trinity.menu
+++ b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kivio-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.mime
index 637162677..637162677 100644
--- a/ubuntu/_base/applications/koffice/debian/kivio-trinity.mime
+++ b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/kivio.1 b/ubuntu/_base/applications/office/koffice/debian/kivio.1
index 0ae1aa215..0ae1aa215 100644
--- a/ubuntu/_base/applications/koffice/debian/kivio.1
+++ b/ubuntu/_base/applications/office/koffice/debian/kivio.1
diff --git a/ubuntu/_base/applications/koffice/debian/kivio.xpm b/ubuntu/_base/applications/office/koffice/debian/kivio.xpm
index 0d9c9b122..0d9c9b122 100644
--- a/ubuntu/_base/applications/koffice/debian/kivio.xpm
+++ b/ubuntu/_base/applications/office/koffice/debian/kivio.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/koconverter.1 b/ubuntu/_base/applications/office/koffice/debian/koconverter.1
index 95eab71a2..95eab71a2 100644
--- a/ubuntu/_base/applications/koffice/debian/koconverter.1
+++ b/ubuntu/_base/applications/office/koffice/debian/koconverter.1
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.README.Debian
index eb49daa16..eb49daa16 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.README.Debian
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.docs
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.install b/ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.install
index 2f17354e2..2f17354e2 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.links b/ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.links
index f85e205f2..f85e205f2 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.links
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-data-trinity.links
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-dev-trinity.install b/ubuntu/_base/applications/office/koffice/debian/koffice-dev-trinity.install
index c65cbd3d3..c65cbd3d3 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-dev-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-dev-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.README.Debian
index 1feeb83d9..1feeb83d9 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.README.Debian
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.docs
index 53238b144..53238b144 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.docs
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.install b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install
index 8d1ecc1d3..8d1ecc1d3 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.links b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.links
index b0df87ed7..b0df87ed7 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.links
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.links
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.lintian
index 1137a9b12..1137a9b12 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
index 52c63b5d7..52c63b5d7 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.manpages
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
index bedc6cae9..bedc6cae9 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
index 65271eda0..65271eda0 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
index 0b6a7dbaa..0b6a7dbaa 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
index f6b06085b..f6b06085b 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
index 561d95388..561d95388 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
index 1e5b4ef84..1e5b4ef84 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
index 4d4e5727b..4d4e5727b 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kword
index 09953babd..09953babd 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.kword
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
index 9e168a19f..9e168a19f 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc.install b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc.install
index a3aaf470b..a3aaf470b 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc.install
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity-doc.install
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity.README.Debian
index 7d5f525a3..7d5f525a3 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-trinity.README.Debian
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/koffice-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity.docs
index 53238b144..53238b144 100644
--- a/ubuntu/_base/applications/koffice/debian/koffice-trinity.docs
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/koscript.1 b/ubuntu/_base/applications/office/koffice/debian/koscript.1
index 9517c3f74..9517c3f74 100644
--- a/ubuntu/_base/applications/koffice/debian/koscript.1
+++ b/ubuntu/_base/applications/office/koffice/debian/koscript.1
diff --git a/ubuntu/_base/applications/koffice/debian/koshell-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.docs
index 6ade957d9..6ade957d9 100644
--- a/ubuntu/_base/applications/koffice/debian/koshell-trinity.docs
+++ b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/koshell-trinity.install b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install
index a6670c1ae..a6670c1ae 100644
--- a/ubuntu/_base/applications/koffice/debian/koshell-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/koshell-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian
index 073ee53ab..073ee53ab 100644
--- a/ubuntu/_base/applications/koffice/debian/koshell-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/koshell-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages
index fc332a5cc..fc332a5cc 100644
--- a/ubuntu/_base/applications/koffice/debian/koshell-trinity.manpages
+++ b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/koshell-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.menu
index ec838c038..ec838c038 100644
--- a/ubuntu/_base/applications/koffice/debian/koshell-trinity.menu
+++ b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/koshell.1 b/ubuntu/_base/applications/office/koffice/debian/koshell.1
index 2213dc554..2213dc554 100644
--- a/ubuntu/_base/applications/koffice/debian/koshell.1
+++ b/ubuntu/_base/applications/office/koffice/debian/koshell.1
diff --git a/ubuntu/_base/applications/koffice/debian/koshell.xpm b/ubuntu/_base/applications/office/koffice/debian/koshell.xpm
index 25dc6e976..25dc6e976 100644
--- a/ubuntu/_base/applications/koffice/debian/koshell.xpm
+++ b/ubuntu/_base/applications/office/koffice/debian/koshell.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kplato-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.install
index c4b1bc359..c4b1bc359 100644
--- a/ubuntu/_base/applications/koffice/debian/kplato-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kplato-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian
index 5237efd72..5237efd72 100644
--- a/ubuntu/_base/applications/koffice/debian/kplato-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kprconverter.pl.1 b/ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1
index bd6bdfd66..bd6bdfd66 100644
--- a/ubuntu/_base/applications/koffice/debian/kprconverter.pl.1
+++ b/ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-data-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kpresenter-data-trinity.install
index 3322113fc..3322113fc 100644
--- a/ubuntu/_base/applications/koffice/debian/kpresenter-data-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kpresenter-data-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-data-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kpresenter-data-trinity.lintian
index 0756d2647..0756d2647 100644
--- a/ubuntu/_base/applications/koffice/debian/kpresenter-data-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kpresenter-data-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.README.Debian
index d1142abfb..d1142abfb 100644
--- a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.README.Debian
+++ b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.docs
index b1fdb5570..b1fdb5570 100644
--- a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.docs
+++ b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install
index fc90edce6..fc90edce6 100644
--- a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.lintian
index 2445c57ce..2445c57ce 100644
--- a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
index 3357e6954..3357e6954 100644
--- a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.manpages
+++ b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.menu
index 52bff66e1..52bff66e1 100644
--- a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.menu
+++ b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.mime
index 9ddd38545..9ddd38545 100644
--- a/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.mime
+++ b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter.1 b/ubuntu/_base/applications/office/koffice/debian/kpresenter.1
index 7eb96d7f2..7eb96d7f2 100644
--- a/ubuntu/_base/applications/koffice/debian/kpresenter.1
+++ b/ubuntu/_base/applications/office/koffice/debian/kpresenter.1
diff --git a/ubuntu/_base/applications/koffice/debian/kpresenter.xpm b/ubuntu/_base/applications/office/koffice/debian/kpresenter.xpm
index c1465a6f3..c1465a6f3 100644
--- a/ubuntu/_base/applications/koffice/debian/kpresenter.xpm
+++ b/ubuntu/_base/applications/office/koffice/debian/kpresenter.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.README.Debian
index 697074b1e..697074b1e 100644
--- a/ubuntu/_base/applications/koffice/debian/kspread-trinity.README.Debian
+++ b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.docs
index 96e2fe386..96e2fe386 100644
--- a/ubuntu/_base/applications/koffice/debian/kspread-trinity.docs
+++ b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.examples b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.examples
index ad588b752..ad588b752 100644
--- a/ubuntu/_base/applications/koffice/debian/kspread-trinity.examples
+++ b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.examples
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install
index eee4ef24f..eee4ef24f 100644
--- a/ubuntu/_base/applications/koffice/debian/kspread-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.lintian
index 370d6a7f9..370d6a7f9 100644
--- a/ubuntu/_base/applications/koffice/debian/kspread-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages
index 833228aec..833228aec 100644
--- a/ubuntu/_base/applications/koffice/debian/kspread-trinity.manpages
+++ b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.menu
index 8a6987024..8a6987024 100644
--- a/ubuntu/_base/applications/koffice/debian/kspread-trinity.menu
+++ b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kspread-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.mime
index 14b369e46..14b369e46 100644
--- a/ubuntu/_base/applications/koffice/debian/kspread-trinity.mime
+++ b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/kspread.1 b/ubuntu/_base/applications/office/koffice/debian/kspread.1
index 3ae324559..3ae324559 100644
--- a/ubuntu/_base/applications/koffice/debian/kspread.1
+++ b/ubuntu/_base/applications/office/koffice/debian/kspread.1
diff --git a/ubuntu/_base/applications/koffice/debian/kspread.xpm b/ubuntu/_base/applications/office/koffice/debian/kspread.xpm
index ddc117b6b..ddc117b6b 100644
--- a/ubuntu/_base/applications/koffice/debian/kspread.xpm
+++ b/ubuntu/_base/applications/office/koffice/debian/kspread.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install
index c5190eb05..c5190eb05 100644
--- a/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
index ba2ff8197..ba2ff8197 100644
--- a/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
index 4fb6feb79..4fb6feb79 100644
--- a/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.manpages
+++ b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.menu
index e2e0f4256..e2e0f4256 100644
--- a/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.menu
+++ b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kthesaurus.1 b/ubuntu/_base/applications/office/koffice/debian/kthesaurus.1
index f5fba2153..f5fba2153 100644
--- a/ubuntu/_base/applications/koffice/debian/kthesaurus.1
+++ b/ubuntu/_base/applications/office/koffice/debian/kthesaurus.1
diff --git a/ubuntu/_base/applications/koffice/debian/kthesaurus.xpm b/ubuntu/_base/applications/office/koffice/debian/kthesaurus.xpm
index fec4f069b..fec4f069b 100644
--- a/ubuntu/_base/applications/koffice/debian/kthesaurus.xpm
+++ b/ubuntu/_base/applications/office/koffice/debian/kthesaurus.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kudesigner.1 b/ubuntu/_base/applications/office/koffice/debian/kudesigner.1
index b293d0016..b293d0016 100644
--- a/ubuntu/_base/applications/koffice/debian/kudesigner.1
+++ b/ubuntu/_base/applications/office/koffice/debian/kudesigner.1
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.README.Debian
index fd3e6b053..fd3e6b053 100644
--- a/ubuntu/_base/applications/koffice/debian/kugar-trinity.README.Debian
+++ b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.docs
index 9943eb16c..9943eb16c 100644
--- a/ubuntu/_base/applications/koffice/debian/kugar-trinity.docs
+++ b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.examples b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.examples
index a96de7575..a96de7575 100644
--- a/ubuntu/_base/applications/koffice/debian/kugar-trinity.examples
+++ b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.examples
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.examples.README b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.examples.README
index 9b7cb6fe6..9b7cb6fe6 100644
--- a/ubuntu/_base/applications/koffice/debian/kugar-trinity.examples.README
+++ b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.examples.README
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install
index 99a9264f1..99a9264f1 100644
--- a/ubuntu/_base/applications/koffice/debian/kugar-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.links b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.links
index 9a06b3e2f..9a06b3e2f 100644
--- a/ubuntu/_base/applications/koffice/debian/kugar-trinity.links
+++ b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.links
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.lintian
index a0cd38a78..a0cd38a78 100644
--- a/ubuntu/_base/applications/koffice/debian/kugar-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages
index 2a72a7d1b..2a72a7d1b 100644
--- a/ubuntu/_base/applications/koffice/debian/kugar-trinity.manpages
+++ b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.menu
index c378a94a1..c378a94a1 100644
--- a/ubuntu/_base/applications/koffice/debian/kugar-trinity.menu
+++ b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kugar-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.mime
index f731d744f..f731d744f 100644
--- a/ubuntu/_base/applications/koffice/debian/kugar-trinity.mime
+++ b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/kugar.1 b/ubuntu/_base/applications/office/koffice/debian/kugar.1
index c3903a3d1..c3903a3d1 100644
--- a/ubuntu/_base/applications/koffice/debian/kugar.1
+++ b/ubuntu/_base/applications/office/koffice/debian/kugar.1
diff --git a/ubuntu/_base/applications/koffice/debian/kugar.xpm b/ubuntu/_base/applications/office/koffice/debian/kugar.xpm
index ee5a5a9f6..ee5a5a9f6 100644
--- a/ubuntu/_base/applications/koffice/debian/kugar.xpm
+++ b/ubuntu/_base/applications/office/koffice/debian/kugar.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/kword-data-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kword-data-trinity.install
index 32f9e2f9c..32f9e2f9c 100644
--- a/ubuntu/_base/applications/koffice/debian/kword-data-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kword-data-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kword-data-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kword-data-trinity.lintian
index 34a1f7f57..34a1f7f57 100644
--- a/ubuntu/_base/applications/koffice/debian/kword-data-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kword-data-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.README.Debian b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.README.Debian
index 14ad609c3..14ad609c3 100644
--- a/ubuntu/_base/applications/koffice/debian/kword-trinity.README.Debian
+++ b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.README.Debian
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.docs b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.docs
index 8c00bbf2b..8c00bbf2b 100644
--- a/ubuntu/_base/applications/koffice/debian/kword-trinity.docs
+++ b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.docs
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.examples b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.examples
index 81458fe9f..81458fe9f 100644
--- a/ubuntu/_base/applications/koffice/debian/kword-trinity.examples
+++ b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.examples
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install
index d003812cd..d003812cd 100644
--- a/ubuntu/_base/applications/koffice/debian/kword-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.lintian
index a187698f4..a187698f4 100644
--- a/ubuntu/_base/applications/koffice/debian/kword-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.lintian
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages
index a9bf36729..a9bf36729 100644
--- a/ubuntu/_base/applications/koffice/debian/kword-trinity.manpages
+++ b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.menu b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.menu
index 2dfdc2579..2dfdc2579 100644
--- a/ubuntu/_base/applications/koffice/debian/kword-trinity.menu
+++ b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.menu
diff --git a/ubuntu/_base/applications/koffice/debian/kword-trinity.mime b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.mime
index 026ac0d2b..026ac0d2b 100644
--- a/ubuntu/_base/applications/koffice/debian/kword-trinity.mime
+++ b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.mime
diff --git a/ubuntu/_base/applications/koffice/debian/kword.1 b/ubuntu/_base/applications/office/koffice/debian/kword.1
index c191e2978..c191e2978 100644
--- a/ubuntu/_base/applications/koffice/debian/kword.1
+++ b/ubuntu/_base/applications/office/koffice/debian/kword.1
diff --git a/ubuntu/_base/applications/koffice/debian/kword.xpm b/ubuntu/_base/applications/office/koffice/debian/kword.xpm
index 38d4f830c..38d4f830c 100644
--- a/ubuntu/_base/applications/koffice/debian/kword.xpm
+++ b/ubuntu/_base/applications/office/koffice/debian/kword.xpm
diff --git a/ubuntu/_base/applications/koffice/debian/not-installed.list b/ubuntu/_base/applications/office/koffice/debian/not-installed.list
index de62d185f..de62d185f 100644
--- a/ubuntu/_base/applications/koffice/debian/not-installed.list
+++ b/ubuntu/_base/applications/office/koffice/debian/not-installed.list
diff --git a/ubuntu/_base/applications/k9copy/debian/patches/series b/ubuntu/_base/applications/office/koffice/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/k9copy/debian/patches/series
+++ b/ubuntu/_base/applications/office/koffice/debian/patches/series
diff --git a/ubuntu/_base/applications/koffice/debian/rules b/ubuntu/_base/applications/office/koffice/debian/rules
index fd6a0d37c..fd6a0d37c 100755
--- a/ubuntu/_base/applications/koffice/debian/rules
+++ b/ubuntu/_base/applications/office/koffice/debian/rules
diff --git a/ubuntu/_base/applications/kdirstat/debian/source/format b/ubuntu/_base/applications/office/koffice/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kdirstat/debian/source/format
+++ b/ubuntu/_base/applications/office/koffice/debian/source/format
diff --git a/ubuntu/_base/applications/kdirstat/debian/source/options b/ubuntu/_base/applications/office/koffice/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kdirstat/debian/source/options
+++ b/ubuntu/_base/applications/office/koffice/debian/source/options
diff --git a/ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kbookreader/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/kpilot/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kbookreader/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/office/kpilot/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kpilot/debian/changelog b/ubuntu/_base/applications/office/kpilot/debian/changelog
index 033be0529..033be0529 100644
--- a/ubuntu/_base/applications/kpilot/debian/changelog
+++ b/ubuntu/_base/applications/office/kpilot/debian/changelog
diff --git a/ubuntu/_base/applications/keep/debian/compat b/ubuntu/_base/applications/office/kpilot/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/keep/debian/compat
+++ b/ubuntu/_base/applications/office/kpilot/debian/compat
diff --git a/ubuntu/_base/applications/kpilot/debian/control b/ubuntu/_base/applications/office/kpilot/debian/control
index e4fcd9ea5..e4fcd9ea5 100644
--- a/ubuntu/_base/applications/kpilot/debian/control
+++ b/ubuntu/_base/applications/office/kpilot/debian/control
diff --git a/ubuntu/_base/applications/kpilot/debian/copyright b/ubuntu/_base/applications/office/kpilot/debian/copyright
index 86dcae02e..86dcae02e 100644
--- a/ubuntu/_base/applications/kpilot/debian/copyright
+++ b/ubuntu/_base/applications/office/kpilot/debian/copyright
diff --git a/ubuntu/_base/applications/kpilot/debian/rules b/ubuntu/_base/applications/office/kpilot/debian/rules
index 7a6c3e8e4..7a6c3e8e4 100755
--- a/ubuntu/_base/applications/kpilot/debian/rules
+++ b/ubuntu/_base/applications/office/kpilot/debian/rules
diff --git a/ubuntu/_base/applications/kdmtheme/debian/source/format b/ubuntu/_base/applications/office/kpilot/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kdmtheme/debian/source/format
+++ b/ubuntu/_base/applications/office/kpilot/debian/source/format
diff --git a/ubuntu/_base/applications/kdmtheme/debian/source/options b/ubuntu/_base/applications/office/kpilot/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kdmtheme/debian/source/options
+++ b/ubuntu/_base/applications/office/kpilot/debian/source/options
diff --git a/ubuntu/_base/applications/tellico/debian/changelog b/ubuntu/_base/applications/office/tellico/debian/changelog
index e8f8697e8..e8f8697e8 100644
--- a/ubuntu/_base/applications/tellico/debian/changelog
+++ b/ubuntu/_base/applications/office/tellico/debian/changelog
diff --git a/ubuntu/_base/applications/kerry/debian/compat b/ubuntu/_base/applications/office/tellico/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kerry/debian/compat
+++ b/ubuntu/_base/applications/office/tellico/debian/compat
diff --git a/ubuntu/_base/applications/tellico/debian/control b/ubuntu/_base/applications/office/tellico/debian/control
index 4c3306ba5..4c3306ba5 100644
--- a/ubuntu/_base/applications/tellico/debian/control
+++ b/ubuntu/_base/applications/office/tellico/debian/control
diff --git a/ubuntu/_base/applications/tellico/debian/copyright b/ubuntu/_base/applications/office/tellico/debian/copyright
index 69496b35c..69496b35c 100644
--- a/ubuntu/_base/applications/tellico/debian/copyright
+++ b/ubuntu/_base/applications/office/tellico/debian/copyright
diff --git a/ubuntu/_base/applications/tellico/debian/menu b/ubuntu/_base/applications/office/tellico/debian/menu
index 430884153..430884153 100644
--- a/ubuntu/_base/applications/tellico/debian/menu
+++ b/ubuntu/_base/applications/office/tellico/debian/menu
diff --git a/ubuntu/_base/applications/tellico/debian/rules b/ubuntu/_base/applications/office/tellico/debian/rules
index 4dfb7936d..4dfb7936d 100755
--- a/ubuntu/_base/applications/tellico/debian/rules
+++ b/ubuntu/_base/applications/office/tellico/debian/rules
diff --git a/ubuntu/_base/applications/kdpkg/debian/source/format b/ubuntu/_base/applications/office/tellico/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kdpkg/debian/source/format
+++ b/ubuntu/_base/applications/office/tellico/debian/source/format
diff --git a/ubuntu/_base/applications/kdpkg/debian/source/options b/ubuntu/_base/applications/office/tellico/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kdpkg/debian/source/options
+++ b/ubuntu/_base/applications/office/tellico/debian/source/options
diff --git a/ubuntu/_base/applications/tellico/debian/tellico-data-trinity.install b/ubuntu/_base/applications/office/tellico/debian/tellico-data-trinity.install
index 152ef011b..152ef011b 100644
--- a/ubuntu/_base/applications/tellico/debian/tellico-data-trinity.install
+++ b/ubuntu/_base/applications/office/tellico/debian/tellico-data-trinity.install
diff --git a/ubuntu/_base/applications/tellico/debian/tellico-scripts-trinity.install b/ubuntu/_base/applications/office/tellico/debian/tellico-scripts-trinity.install
index 71c51d5eb..71c51d5eb 100644
--- a/ubuntu/_base/applications/tellico/debian/tellico-scripts-trinity.install
+++ b/ubuntu/_base/applications/office/tellico/debian/tellico-scripts-trinity.install
diff --git a/ubuntu/_base/applications/tellico/debian/tellico-trinity.install b/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install
index a45d88c99..a45d88c99 100644
--- a/ubuntu/_base/applications/tellico/debian/tellico-trinity.install
+++ b/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install
diff --git a/ubuntu/_base/applications/tellico/debian/tellico.1x b/ubuntu/_base/applications/office/tellico/debian/tellico.1x
index e102af2c5..e102af2c5 100644
--- a/ubuntu/_base/applications/tellico/debian/tellico.1x
+++ b/ubuntu/_base/applications/office/tellico/debian/tellico.1x
diff --git a/ubuntu/_base/applications/tellico/debian/tellico.xpm b/ubuntu/_base/applications/office/tellico/debian/tellico.xpm
index 589d66eeb..589d66eeb 100644
--- a/ubuntu/_base/applications/tellico/debian/tellico.xpm
+++ b/ubuntu/_base/applications/office/tellico/debian/tellico.xpm
diff --git a/ubuntu/_base/applications/tellico/debian/watch b/ubuntu/_base/applications/office/tellico/debian/watch
index 8e67307f5..8e67307f5 100644
--- a/ubuntu/_base/applications/tellico/debian/watch
+++ b/ubuntu/_base/applications/office/tellico/debian/watch
diff --git a/ubuntu/_base/applications/piklab/debian/patches/series b/ubuntu/_base/applications/piklab/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
--- a/ubuntu/_base/applications/piklab/debian/patches/series
+++ /dev/null
diff --git a/ubuntu/_base/applications/piklab/debian/source/format b/ubuntu/_base/applications/piklab/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/_base/applications/piklab/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ubuntu/_base/applications/piklab/debian/source/options b/ubuntu/_base/applications/piklab/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/applications/piklab/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/ubuntu/_base/applications/potracegui/debian/source/format b/ubuntu/_base/applications/potracegui/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/_base/applications/potracegui/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ubuntu/_base/applications/potracegui/debian/source/options b/ubuntu/_base/applications/potracegui/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/applications/potracegui/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE 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.
-
-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
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# 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:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-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
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-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)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-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
-
-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
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-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 )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(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
-	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/tde/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/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/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/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	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
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/rosegarden/debian/patches/series b/ubuntu/_base/applications/rosegarden/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
--- a/ubuntu/_base/applications/rosegarden/debian/patches/series
+++ /dev/null
diff --git a/ubuntu/_base/applications/rosegarden/debian/source/format b/ubuntu/_base/applications/rosegarden/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/_base/applications/rosegarden/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ubuntu/_base/applications/rosegarden/debian/source/options b/ubuntu/_base/applications/rosegarden/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/applications/rosegarden/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/ubuntu/_base/applications/kbfx/debian/README.Debian b/ubuntu/_base/applications/settings/kde-guidance/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/_base/applications/kbfx/debian/README.Debian
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/README.Debian
diff --git a/ubuntu/_base/applications/kde-guidance/debian/changelog b/ubuntu/_base/applications/settings/kde-guidance/debian/changelog
index fbd50fb8f..fbd50fb8f 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/changelog
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/changelog
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/compat b/ubuntu/_base/applications/settings/kde-guidance/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kgtk-qt3/debian/compat
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/compat
diff --git a/ubuntu/_base/applications/kde-guidance/debian/control b/ubuntu/_base/applications/settings/kde-guidance/debian/control
index 836aad023..836aad023 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/control
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/control
diff --git a/ubuntu/_base/applications/kde-guidance/debian/copyright b/ubuntu/_base/applications/settings/kde-guidance/debian/copyright
index 38c1d30e8..38c1d30e8 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/copyright
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/copyright
diff --git a/ubuntu/_base/applications/kde-guidance/debian/dirs b/ubuntu/_base/applications/settings/kde-guidance/debian/dirs
index 3dd0bc793..3dd0bc793 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/dirs
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/dirs
diff --git a/ubuntu/_base/applications/kde-guidance/debian/displayconfig-trinity.1 b/ubuntu/_base/applications/settings/kde-guidance/debian/displayconfig-trinity.1
index 3670902b8..3670902b8 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/displayconfig-trinity.1
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/displayconfig-trinity.1
diff --git a/ubuntu/_base/applications/knights/debian/docs b/ubuntu/_base/applications/settings/kde-guidance/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/_base/applications/knights/debian/docs
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/docs
diff --git a/ubuntu/_base/applications/kde-guidance/debian/guidance-backends-trinity.install b/ubuntu/_base/applications/settings/kde-guidance/debian/guidance-backends-trinity.install
index de6cbc63e..de6cbc63e 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/guidance-backends-trinity.install
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/guidance-backends-trinity.install
diff --git a/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install b/ubuntu/_base/applications/settings/kde-guidance/debian/kde-guidance-powermanager-trinity.install
index 8c707520e..8c707520e 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/kde-guidance-powermanager-trinity.install
diff --git a/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.init b/ubuntu/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.init
index 30a3854d1..30a3854d1 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.init
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.init
diff --git a/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.install b/ubuntu/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.install
index ddf96826a..ddf96826a 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.install
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.install
diff --git a/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides b/ubuntu/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.lintian-overrides
index 6131946c2..6131946c2 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.lintian-overrides
diff --git a/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.postinst b/ubuntu/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.postinst
index de2804fc4..de2804fc4 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.postinst
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/kde-guidance-trinity.postinst
diff --git a/ubuntu/_base/applications/kde-guidance/debian/mountconfig-trinity.1 b/ubuntu/_base/applications/settings/kde-guidance/debian/mountconfig-trinity.1
index 7f1fb728c..7f1fb728c 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/mountconfig-trinity.1
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/mountconfig-trinity.1
diff --git a/ubuntu/_base/applications/kaffeine/debian/patches/series b/ubuntu/_base/applications/settings/kde-guidance/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kaffeine/debian/patches/series
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/patches/series
diff --git a/ubuntu/_base/applications/kde-guidance/debian/pycompat b/ubuntu/_base/applications/settings/kde-guidance/debian/pycompat
index 0cfbf0888..0cfbf0888 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/pycompat
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/pycompat
diff --git a/ubuntu/_base/applications/kde-guidance/debian/python-distutils-jaunty.mk b/ubuntu/_base/applications/settings/kde-guidance/debian/python-distutils-jaunty.mk
index 1a1ec9a8e..1a1ec9a8e 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/python-distutils-jaunty.mk
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/python-distutils-jaunty.mk
diff --git a/ubuntu/_base/applications/kde-guidance/debian/pyversions b/ubuntu/_base/applications/settings/kde-guidance/debian/pyversions
index b3dc41ebc..b3dc41ebc 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/pyversions
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/pyversions
diff --git a/ubuntu/_base/applications/kde-guidance/debian/rules b/ubuntu/_base/applications/settings/kde-guidance/debian/rules
index 48e5e31d7..48e5e31d7 100755
--- a/ubuntu/_base/applications/kde-guidance/debian/rules
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/rules
diff --git a/ubuntu/_base/applications/kde-guidance/debian/serviceconfig-trinity.1 b/ubuntu/_base/applications/settings/kde-guidance/debian/serviceconfig-trinity.1
index 776a01998..776a01998 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/serviceconfig-trinity.1
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/serviceconfig-trinity.1
diff --git a/ubuntu/_base/applications/keep/debian/source/format b/ubuntu/_base/applications/settings/kde-guidance/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/keep/debian/source/format
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/source/format
diff --git a/ubuntu/_base/applications/keep/debian/source/options b/ubuntu/_base/applications/settings/kde-guidance/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/keep/debian/source/options
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/source/options
diff --git a/ubuntu/_base/applications/kde-guidance/debian/userconfig-trinity.1 b/ubuntu/_base/applications/settings/kde-guidance/debian/userconfig-trinity.1
index 3b950add1..3b950add1 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/userconfig-trinity.1
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/userconfig-trinity.1
diff --git a/ubuntu/_base/applications/kde-guidance/debian/watch b/ubuntu/_base/applications/settings/kde-guidance/debian/watch
index 19912c171..19912c171 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/watch
+++ b/ubuntu/_base/applications/settings/kde-guidance/debian/watch
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kde-systemsettings/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/settings/kde-systemsettings/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kcpuload/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kde-systemsettings/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kcpuload/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/settings/kde-systemsettings/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kde-systemsettings/debian/changelog b/ubuntu/_base/applications/settings/kde-systemsettings/debian/changelog
index 932e17449..932e17449 100644
--- a/ubuntu/_base/applications/kde-systemsettings/debian/changelog
+++ b/ubuntu/_base/applications/settings/kde-systemsettings/debian/changelog
diff --git a/ubuntu/_base/applications/kile/debian/compat b/ubuntu/_base/applications/settings/kde-systemsettings/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kile/debian/compat
+++ b/ubuntu/_base/applications/settings/kde-systemsettings/debian/compat
diff --git a/ubuntu/_base/applications/kde-systemsettings/debian/control b/ubuntu/_base/applications/settings/kde-systemsettings/debian/control
index a781f7401..a781f7401 100644
--- a/ubuntu/_base/applications/kde-systemsettings/debian/control
+++ b/ubuntu/_base/applications/settings/kde-systemsettings/debian/control
diff --git a/ubuntu/_base/applications/kde-systemsettings/debian/copyright b/ubuntu/_base/applications/settings/kde-systemsettings/debian/copyright
index 04a4bdce1..04a4bdce1 100644
--- a/ubuntu/_base/applications/kde-systemsettings/debian/copyright
+++ b/ubuntu/_base/applications/settings/kde-systemsettings/debian/copyright
diff --git a/ubuntu/_base/applications/kde-systemsettings/debian/docs b/ubuntu/_base/applications/settings/kde-systemsettings/debian/docs
index 0eb1e7d11..0eb1e7d11 100644
--- a/ubuntu/_base/applications/kde-systemsettings/debian/docs
+++ b/ubuntu/_base/applications/settings/kde-systemsettings/debian/docs
diff --git a/ubuntu/_base/applications/kde-systemsettings/debian/kde-settings-laptops.directory b/ubuntu/_base/applications/settings/kde-systemsettings/debian/kde-settings-laptops.directory
index 687a493c4..687a493c4 100644
--- a/ubuntu/_base/applications/kde-systemsettings/debian/kde-settings-laptops.directory
+++ b/ubuntu/_base/applications/settings/kde-systemsettings/debian/kde-settings-laptops.directory
diff --git a/ubuntu/_base/applications/kde-systemsettings/debian/kde-systemsettings-trinity.preinst b/ubuntu/_base/applications/settings/kde-systemsettings/debian/kde-systemsettings-trinity.preinst
index f7b840ea2..f7b840ea2 100644
--- a/ubuntu/_base/applications/kde-systemsettings/debian/kde-systemsettings-trinity.preinst
+++ b/ubuntu/_base/applications/settings/kde-systemsettings/debian/kde-systemsettings-trinity.preinst
diff --git a/ubuntu/_base/applications/katapult/debian/patches/series b/ubuntu/_base/applications/settings/kde-systemsettings/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/katapult/debian/patches/series
+++ b/ubuntu/_base/applications/settings/kde-systemsettings/debian/patches/series
diff --git a/ubuntu/_base/applications/kde-systemsettings/debian/rules b/ubuntu/_base/applications/settings/kde-systemsettings/debian/rules
index 5c5acf0de..5c5acf0de 100755
--- a/ubuntu/_base/applications/kde-systemsettings/debian/rules
+++ b/ubuntu/_base/applications/settings/kde-systemsettings/debian/rules
diff --git a/ubuntu/_base/applications/kerry/debian/source/format b/ubuntu/_base/applications/settings/kde-systemsettings/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kerry/debian/source/format
+++ b/ubuntu/_base/applications/settings/kde-systemsettings/debian/source/format
diff --git a/ubuntu/_base/applications/kerry/debian/source/options b/ubuntu/_base/applications/settings/kde-systemsettings/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kerry/debian/source/options
+++ b/ubuntu/_base/applications/settings/kde-systemsettings/debian/source/options
diff --git a/ubuntu/_base/applications/kde-systemsettings/debian/systemsettings.1.docbook b/ubuntu/_base/applications/settings/kde-systemsettings/debian/systemsettings.1.docbook
index 2b260e626..2b260e626 100644
--- a/ubuntu/_base/applications/kde-systemsettings/debian/systemsettings.1.docbook
+++ b/ubuntu/_base/applications/settings/kde-systemsettings/debian/systemsettings.1.docbook
diff --git a/ubuntu/_base/applications/kde-style-qtcurve/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kdesudo/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kde-style-qtcurve/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/settings/kdesudo/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kdbg/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kdesudo/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kdbg/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/settings/kdesudo/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kdesudo/debian/changelog b/ubuntu/_base/applications/settings/kdesudo/debian/changelog
index d245ff2e7..d245ff2e7 100644
--- a/ubuntu/_base/applications/kdesudo/debian/changelog
+++ b/ubuntu/_base/applications/settings/kdesudo/debian/changelog
diff --git a/ubuntu/_base/applications/kima/debian/compat b/ubuntu/_base/applications/settings/kdesudo/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kima/debian/compat
+++ b/ubuntu/_base/applications/settings/kdesudo/debian/compat
diff --git a/ubuntu/_base/applications/kdesudo/debian/control b/ubuntu/_base/applications/settings/kdesudo/debian/control
index 2af9662b6..2af9662b6 100644
--- a/ubuntu/_base/applications/kdesudo/debian/control
+++ b/ubuntu/_base/applications/settings/kdesudo/debian/control
diff --git a/ubuntu/_base/applications/kdesudo/debian/copyright b/ubuntu/_base/applications/settings/kdesudo/debian/copyright
index 9cd32407b..9cd32407b 100644
--- a/ubuntu/_base/applications/kdesudo/debian/copyright
+++ b/ubuntu/_base/applications/settings/kdesudo/debian/copyright
diff --git a/ubuntu/_base/applications/kdesudo/debian/kdesudo-trinity.1.docbook b/ubuntu/_base/applications/settings/kdesudo/debian/kdesudo-trinity.1.docbook
index 0e1ba2b60..0e1ba2b60 100644
--- a/ubuntu/_base/applications/kdesudo/debian/kdesudo-trinity.1.docbook
+++ b/ubuntu/_base/applications/settings/kdesudo/debian/kdesudo-trinity.1.docbook
diff --git a/ubuntu/_base/applications/kdesudo/debian/links b/ubuntu/_base/applications/settings/kdesudo/debian/links
index c30adf9c1..c30adf9c1 100644
--- a/ubuntu/_base/applications/kdesudo/debian/links
+++ b/ubuntu/_base/applications/settings/kdesudo/debian/links
diff --git a/ubuntu/_base/applications/kbfx/debian/patches/series b/ubuntu/_base/applications/settings/kdesudo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kbfx/debian/patches/series
+++ b/ubuntu/_base/applications/settings/kdesudo/debian/patches/series
diff --git a/ubuntu/_base/applications/kdesudo/debian/postinst b/ubuntu/_base/applications/settings/kdesudo/debian/postinst
index 7ec0ace2f..7ec0ace2f 100644
--- a/ubuntu/_base/applications/kdesudo/debian/postinst
+++ b/ubuntu/_base/applications/settings/kdesudo/debian/postinst
diff --git a/ubuntu/_base/applications/kdesudo/debian/postrm b/ubuntu/_base/applications/settings/kdesudo/debian/postrm
index 526a8c60a..526a8c60a 100644
--- a/ubuntu/_base/applications/kdesudo/debian/postrm
+++ b/ubuntu/_base/applications/settings/kdesudo/debian/postrm
diff --git a/ubuntu/_base/applications/kdesudo/debian/preinst b/ubuntu/_base/applications/settings/kdesudo/debian/preinst
index 4ce843004..4ce843004 100644
--- a/ubuntu/_base/applications/kdesudo/debian/preinst
+++ b/ubuntu/_base/applications/settings/kdesudo/debian/preinst
diff --git a/ubuntu/_base/applications/kdesudo/debian/rules b/ubuntu/_base/applications/settings/kdesudo/debian/rules
index ddcdb7807..ddcdb7807 100755
--- a/ubuntu/_base/applications/kdesudo/debian/rules
+++ b/ubuntu/_base/applications/settings/kdesudo/debian/rules
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/source/format b/ubuntu/_base/applications/settings/kdesudo/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kgtk-qt3/debian/source/format
+++ b/ubuntu/_base/applications/settings/kdesudo/debian/source/format
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/source/options b/ubuntu/_base/applications/settings/kdesudo/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kgtk-qt3/debian/source/options
+++ b/ubuntu/_base/applications/settings/kdesudo/debian/source/options
diff --git a/ubuntu/_base/applications/kdpkg/debian/changelog b/ubuntu/_base/applications/settings/kdpkg/debian/changelog
index 2c3e7dd4d..2c3e7dd4d 100644
--- a/ubuntu/_base/applications/kdpkg/debian/changelog
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/changelog
diff --git a/ubuntu/_base/applications/kio-apt/debian/compat b/ubuntu/_base/applications/settings/kdpkg/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kio-apt/debian/compat
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/compat
diff --git a/ubuntu/_base/applications/kdpkg/debian/control b/ubuntu/_base/applications/settings/kdpkg/debian/control
index 2d228856c..2d228856c 100644
--- a/ubuntu/_base/applications/kdpkg/debian/control
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/control
diff --git a/ubuntu/_base/applications/kdpkg/debian/copyright b/ubuntu/_base/applications/settings/kdpkg/debian/copyright
index 6ca73edad..6ca73edad 100644
--- a/ubuntu/_base/applications/kdpkg/debian/copyright
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/copyright
diff --git a/ubuntu/_base/applications/kdpkg/debian/kdpkg-install.1 b/ubuntu/_base/applications/settings/kdpkg/debian/kdpkg-install.1
index 0325170a5..0325170a5 100644
--- a/ubuntu/_base/applications/kdpkg/debian/kdpkg-install.1
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/kdpkg-install.1
diff --git a/ubuntu/_base/applications/kdpkg/debian/kdpkg.1 b/ubuntu/_base/applications/settings/kdpkg/debian/kdpkg.1
index 0325170a5..0325170a5 100644
--- a/ubuntu/_base/applications/kdpkg/debian/kdpkg.1
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/kdpkg.1
diff --git a/ubuntu/_base/applications/kdpkg/debian/manpages b/ubuntu/_base/applications/settings/kdpkg/debian/manpages
index 7835ccb72..7835ccb72 100644
--- a/ubuntu/_base/applications/kdpkg/debian/manpages
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/manpages
diff --git a/ubuntu/_base/applications/kbookreader/debian/patches/series b/ubuntu/_base/applications/settings/kdpkg/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kbookreader/debian/patches/series
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/patches/series
diff --git a/ubuntu/_base/applications/kdpkg/debian/rules b/ubuntu/_base/applications/settings/kdpkg/debian/rules
index 8293bfe64..8293bfe64 100755
--- a/ubuntu/_base/applications/kdpkg/debian/rules
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/rules
diff --git a/ubuntu/_base/applications/kile/debian/source/format b/ubuntu/_base/applications/settings/kdpkg/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kile/debian/source/format
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/source/format
diff --git a/ubuntu/_base/applications/kile/debian/source/options b/ubuntu/_base/applications/settings/kdpkg/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kile/debian/source/options
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/source/options
diff --git a/ubuntu/_base/applications/kima/debian/changelog b/ubuntu/_base/applications/settings/kima/debian/changelog
index 9cc006cef..9cc006cef 100644
--- a/ubuntu/_base/applications/kima/debian/changelog
+++ b/ubuntu/_base/applications/settings/kima/debian/changelog
diff --git a/ubuntu/_base/applications/kio-locate/debian/compat b/ubuntu/_base/applications/settings/kima/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kio-locate/debian/compat
+++ b/ubuntu/_base/applications/settings/kima/debian/compat
diff --git a/ubuntu/_base/applications/kima/debian/control b/ubuntu/_base/applications/settings/kima/debian/control
index 7ddaad218..7ddaad218 100644
--- a/ubuntu/_base/applications/kima/debian/control
+++ b/ubuntu/_base/applications/settings/kima/debian/control
diff --git a/ubuntu/_base/applications/kima/debian/copyright b/ubuntu/_base/applications/settings/kima/debian/copyright
index 8facbcf30..8facbcf30 100644
--- a/ubuntu/_base/applications/kima/debian/copyright
+++ b/ubuntu/_base/applications/settings/kima/debian/copyright
diff --git a/ubuntu/_base/applications/kima/debian/rules b/ubuntu/_base/applications/settings/kima/debian/rules
index 27a3fe333..27a3fe333 100755
--- a/ubuntu/_base/applications/kima/debian/rules
+++ b/ubuntu/_base/applications/settings/kima/debian/rules
diff --git a/ubuntu/_base/applications/kima/debian/source/format b/ubuntu/_base/applications/settings/kima/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kima/debian/source/format
+++ b/ubuntu/_base/applications/settings/kima/debian/source/format
diff --git a/ubuntu/_base/applications/kima/debian/source/options b/ubuntu/_base/applications/settings/kima/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kima/debian/source/options
+++ b/ubuntu/_base/applications/settings/kima/debian/source/options
diff --git a/ubuntu/_base/applications/kde-systemsettings/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kde-systemsettings/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kdbusnotification/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kiosktool/debian/changelog b/ubuntu/_base/applications/settings/kiosktool/debian/changelog
index a81e4659e..a81e4659e 100644
--- a/ubuntu/_base/applications/kiosktool/debian/changelog
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/changelog
diff --git a/ubuntu/_base/applications/kio-umountwrapper/debian/compat b/ubuntu/_base/applications/settings/kiosktool/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kio-umountwrapper/debian/compat
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/compat
diff --git a/ubuntu/_base/applications/kiosktool/debian/control b/ubuntu/_base/applications/settings/kiosktool/debian/control
index 1005343c6..1005343c6 100644
--- a/ubuntu/_base/applications/kiosktool/debian/control
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/control
diff --git a/ubuntu/_base/applications/kiosktool/debian/copyright b/ubuntu/_base/applications/settings/kiosktool/debian/copyright
index a88b1d8d2..a88b1d8d2 100644
--- a/ubuntu/_base/applications/kiosktool/debian/copyright
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/copyright
diff --git a/ubuntu/_base/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 b/ubuntu/_base/applications/settings/kiosktool/debian/kiosktool-kdedirs-trinity.1
index 62faad5d3..62faad5d3 100644
--- a/ubuntu/_base/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/kiosktool-kdedirs-trinity.1
diff --git a/ubuntu/_base/applications/kiosktool/debian/kiosktool-trinity.1 b/ubuntu/_base/applications/settings/kiosktool/debian/kiosktool-trinity.1
index 08ba2ec80..08ba2ec80 100644
--- a/ubuntu/_base/applications/kiosktool/debian/kiosktool-trinity.1
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/kiosktool-trinity.1
diff --git a/ubuntu/_base/applications/kiosktool/debian/kiosktool-trinity.manpages b/ubuntu/_base/applications/settings/kiosktool/debian/kiosktool-trinity.manpages
index 2d009e1db..2d009e1db 100644
--- a/ubuntu/_base/applications/kiosktool/debian/kiosktool-trinity.manpages
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/kiosktool-trinity.manpages
diff --git a/ubuntu/_base/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff b/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_02_kmenu.diff
index 77f7d912f..77f7d912f 100644
--- a/ubuntu/_base/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_02_kmenu.diff
diff --git a/ubuntu/_base/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
index d850db3da..d850db3da 100644
--- a/ubuntu/_base/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
diff --git a/ubuntu/_base/applications/kiosktool/debian/patches/series b/ubuntu/_base/applications/settings/kiosktool/debian/patches/series
index f33e94505..f33e94505 100644
--- a/ubuntu/_base/applications/kiosktool/debian/patches/series
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/patches/series
diff --git a/ubuntu/_base/applications/kiosktool/debian/rules b/ubuntu/_base/applications/settings/kiosktool/debian/rules
index 6bf27ed9c..6bf27ed9c 100755
--- a/ubuntu/_base/applications/kiosktool/debian/rules
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/rules
diff --git a/ubuntu/_base/applications/kio-apt/debian/source/format b/ubuntu/_base/applications/settings/kiosktool/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kio-apt/debian/source/format
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/source/format
diff --git a/ubuntu/_base/applications/kio-apt/debian/source/options b/ubuntu/_base/applications/settings/kiosktool/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kio-apt/debian/source/options
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/source/options
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/changelog b/ubuntu/_base/applications/settings/kmyfirewall/debian/changelog
index cfe55d3e4..cfe55d3e4 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/changelog
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/changelog
diff --git a/ubuntu/_base/applications/kiosktool/debian/compat b/ubuntu/_base/applications/settings/kmyfirewall/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kiosktool/debian/compat
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/compat
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/control b/ubuntu/_base/applications/settings/kmyfirewall/debian/control
index 0ed896170..0ed896170 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/control
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/control
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/copyright b/ubuntu/_base/applications/settings/kmyfirewall/debian/copyright
index 8429d407e..8429d407e 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/copyright
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/copyright
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/debiandirs b/ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/ubuntu/_base/applications/koffice-i18n/debian/debiandirs
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/dirs b/ubuntu/_base/applications/settings/kmyfirewall/debian/dirs
index f0312285e..f0312285e 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/dirs
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/dirs
diff --git a/ubuntu/_base/applications/krename/debian/docs b/ubuntu/_base/applications/settings/kmyfirewall/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/_base/applications/krename/debian/docs
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/docs
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/install b/ubuntu/_base/applications/settings/kmyfirewall/debian/install
index 3a28b6931..3a28b6931 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/install
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/install
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/kmfinstallerplugin.desktop b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop
index 77922f4b4..77922f4b4 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/kmfinstallerplugin.desktop
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.1 b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1
index 31560bd7b..31560bd7b 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.1
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.desktop b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop
index 379235132..379235132 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.desktop
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.xpm b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm
index 3d58b81ff..3d58b81ff 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.xpm
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/manpages b/ubuntu/_base/applications/settings/kmyfirewall/debian/manpages
index fab755280..fab755280 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/manpages
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/manpages
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/menu b/ubuntu/_base/applications/settings/kmyfirewall/debian/menu
index 3d1feab6e..3d1feab6e 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/menu
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/menu
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/rules b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules
index d03f14f42..d03f14f42 100755
--- a/ubuntu/_base/applications/kmyfirewall/debian/rules
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules
diff --git a/ubuntu/_base/applications/kio-locate/debian/source/format b/ubuntu/_base/applications/settings/kmyfirewall/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kio-locate/debian/source/format
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/source/format
diff --git a/ubuntu/_base/applications/kio-locate/debian/source/options b/ubuntu/_base/applications/settings/kmyfirewall/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kio-locate/debian/source/options
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/source/options
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/watch b/ubuntu/_base/applications/settings/kmyfirewall/debian/watch
index 42dfe005b..42dfe005b 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/watch
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/watch
diff --git a/debian/_base/applications/knetworkmanager8/debian/README.source b/ubuntu/_base/applications/settings/knetworkmanager8/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/debian/_base/applications/knetworkmanager8/debian/README.source
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/README.source
diff --git a/ubuntu/_base/applications/kdesudo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kdesudo/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kde-style-qtcurve/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kde-style-qtcurve/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/changelog b/ubuntu/_base/applications/settings/knetworkmanager8/debian/changelog
index c65f5ff4a..c65f5ff4a 100644
--- a/ubuntu/_base/applications/knetworkmanager8/debian/changelog
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/changelog
diff --git a/ubuntu/_base/applications/kmplayer/debian/compat b/ubuntu/_base/applications/settings/knetworkmanager8/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kmplayer/debian/compat
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/compat
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/control b/ubuntu/_base/applications/settings/knetworkmanager8/debian/control
index eb044b0d2..eb044b0d2 100644
--- a/ubuntu/_base/applications/knetworkmanager8/debian/control
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/control
diff --git a/debian/_base/applications/knetworkmanager8/debian/copyright b/ubuntu/_base/applications/settings/knetworkmanager8/debian/copyright
index 2490de254..2490de254 100644
--- a/debian/_base/applications/knetworkmanager8/debian/copyright
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/copyright
diff --git a/debian/_base/applications/knetworkmanager8/debian/knetworkmanager.1 b/ubuntu/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1
index 3cd261c89..3cd261c89 100644
--- a/debian/_base/applications/knetworkmanager8/debian/knetworkmanager.1
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1
diff --git a/debian/_base/applications/knetworkmanager8/debian/manpages b/ubuntu/_base/applications/settings/knetworkmanager8/debian/manpages
index e2859341f..e2859341f 100644
--- a/debian/_base/applications/knetworkmanager8/debian/manpages
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/manpages
diff --git a/debian/_base/applications/knetworkmanager8/debian/menu b/ubuntu/_base/applications/settings/knetworkmanager8/debian/menu
index 9775e9c7c..9775e9c7c 100644
--- a/debian/_base/applications/knetworkmanager8/debian/menu
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/menu
diff --git a/debian/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..9ae01a92b 100644
--- a/debian/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
diff --git a/debian/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst b/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst
index fdd4e51ca..fdd4e51ca 100644
--- a/debian/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst
diff --git a/ubuntu/_base/applications/kde-guidance/debian/patches/series b/ubuntu/_base/applications/settings/knetworkmanager8/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/patches/series
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/patches/series
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/rules b/ubuntu/_base/applications/settings/knetworkmanager8/debian/rules
index 84104d2a8..84104d2a8 100755
--- a/ubuntu/_base/applications/knetworkmanager8/debian/rules
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/rules
diff --git a/ubuntu/_base/applications/kio-umountwrapper/debian/source/format b/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kio-umountwrapper/debian/source/format
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/format
diff --git a/ubuntu/_base/applications/kio-umountwrapper/debian/source/options b/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kio-umountwrapper/debian/source/options
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/options
diff --git a/debian/_base/applications/knetworkmanager8/debian/watch b/ubuntu/_base/applications/settings/knetworkmanager8/debian/watch
index ad7a7be91..ad7a7be91 100644
--- a/debian/_base/applications/knetworkmanager8/debian/watch
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/watch
diff --git a/ubuntu/_base/applications/kde-guidance/debian/README.Debian b/ubuntu/_base/applications/settings/wlassistant/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/_base/applications/kde-guidance/debian/README.Debian
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/README.Debian
diff --git a/ubuntu/_base/applications/kdesvn/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kdesvn/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kde-systemsettings/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kde-systemsettings/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/wlassistant/debian/changelog b/ubuntu/_base/applications/settings/wlassistant/debian/changelog
index 69859afc3..69859afc3 100644
--- a/ubuntu/_base/applications/wlassistant/debian/changelog
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/changelog
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/compat b/ubuntu/_base/applications/settings/wlassistant/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/compat
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/compat
diff --git a/ubuntu/_base/applications/wlassistant/debian/control b/ubuntu/_base/applications/settings/wlassistant/debian/control
index 61b9d7287..61b9d7287 100644
--- a/ubuntu/_base/applications/wlassistant/debian/control
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/control
diff --git a/ubuntu/_base/applications/wlassistant/debian/copyright b/ubuntu/_base/applications/settings/wlassistant/debian/copyright
index 5179772ff..5179772ff 100644
--- a/ubuntu/_base/applications/wlassistant/debian/copyright
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/copyright
diff --git a/ubuntu/_base/applications/kde-style-qtcurve/debian/patches/series b/ubuntu/_base/applications/settings/wlassistant/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kde-style-qtcurve/debian/patches/series
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/patches/series
diff --git a/ubuntu/_base/applications/wlassistant/debian/rules b/ubuntu/_base/applications/settings/wlassistant/debian/rules
index 6256246f6..6256246f6 100755
--- a/ubuntu/_base/applications/wlassistant/debian/rules
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/rules
diff --git a/ubuntu/_base/applications/kiosktool/debian/source/format b/ubuntu/_base/applications/settings/wlassistant/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kiosktool/debian/source/format
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/source/format
diff --git a/ubuntu/_base/applications/kiosktool/debian/source/options b/ubuntu/_base/applications/settings/wlassistant/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kiosktool/debian/source/options
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/source/options
diff --git a/ubuntu/_base/applications/wlassistant/debian/watch b/ubuntu/_base/applications/settings/wlassistant/debian/watch
index 42304de6e..42304de6e 100644
--- a/ubuntu/_base/applications/wlassistant/debian/watch
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/watch
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-16.xpm b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-16.xpm
index fcaa89b00..fcaa89b00 100644
--- a/ubuntu/_base/applications/wlassistant/debian/wlassistant-16.xpm
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-16.xpm
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.dirs b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.dirs
index 57855aec4..57855aec4 100644
--- a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.dirs
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.dirs
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.docs b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
index 8fa4b0c87..8fa4b0c87 100644
--- a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.docs
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.install b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.install
index 7465386d3..7465386d3 100644
--- a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.install
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.install
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.manpage b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.manpage
index fb021a15b..fb021a15b 100644
--- a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.manpage
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.manpage
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.menu b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.menu
index dc43a7b0f..dc43a7b0f 100644
--- a/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.menu
diff --git a/ubuntu/_base/applications/wlassistant/debian/wlassistant.xpm b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant.xpm
index d1f52cbe8..d1f52cbe8 100644
--- a/ubuntu/_base/applications/wlassistant/debian/wlassistant.xpm
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant.xpm
diff --git a/ubuntu/_base/applications/smartcardauth/debian/source/format b/ubuntu/_base/applications/smartcardauth/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/_base/applications/smartcardauth/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ubuntu/_base/applications/smartcardauth/debian/source/options b/ubuntu/_base/applications/smartcardauth/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/applications/smartcardauth/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE 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.
-
-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
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# 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:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-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
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-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)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-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
-
-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
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-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 )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(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
-	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/tde/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/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/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/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	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
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/smb4k/debian/cdbs/versions.pl b/ubuntu/_base/applications/smb4k/debian/cdbs/versions.pl
deleted file mode 100644
index 75c9add4b..000000000
--- a/ubuntu/_base/applications/smb4k/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/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($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/_base/applications/smb4k/debian/source/format b/ubuntu/_base/applications/smb4k/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/_base/applications/smb4k/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ubuntu/_base/applications/smb4k/debian/source/options b/ubuntu/_base/applications/smb4k/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/applications/smb4k/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE 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.
-
-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
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# 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:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-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
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-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)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-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
-
-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
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-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 )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(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
-	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/tde/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/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/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/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	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
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/soundkonverter/debian/cdbs/versions.pl b/ubuntu/_base/applications/soundkonverter/debian/cdbs/versions.pl
deleted file mode 100644
index 75c9add4b..000000000
--- a/ubuntu/_base/applications/soundkonverter/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/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($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/_base/applications/soundkonverter/debian/compat b/ubuntu/_base/applications/soundkonverter/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/ubuntu/_base/applications/soundkonverter/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/ubuntu/_base/applications/soundkonverter/debian/source/format b/ubuntu/_base/applications/soundkonverter/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/_base/applications/soundkonverter/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ubuntu/_base/applications/soundkonverter/debian/source/options b/ubuntu/_base/applications/soundkonverter/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/applications/soundkonverter/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/ubuntu/_base/applications/adept/debian/adept-batch-trinity.install b/ubuntu/_base/applications/system/adept/debian/adept-batch-trinity.install
index 7f2ac31a4..7f2ac31a4 100644
--- a/ubuntu/_base/applications/adept/debian/adept-batch-trinity.install
+++ b/ubuntu/_base/applications/system/adept/debian/adept-batch-trinity.install
diff --git a/ubuntu/_base/applications/adept/debian/adept-common-trinity.install b/ubuntu/_base/applications/system/adept/debian/adept-common-trinity.install
index 535c10c7d..535c10c7d 100644
--- a/ubuntu/_base/applications/adept/debian/adept-common-trinity.install
+++ b/ubuntu/_base/applications/system/adept/debian/adept-common-trinity.install
diff --git a/ubuntu/_base/applications/adept/debian/adept-installer-trinity.install b/ubuntu/_base/applications/system/adept/debian/adept-installer-trinity.install
index a3de6d18c..a3de6d18c 100644
--- a/ubuntu/_base/applications/adept/debian/adept-installer-trinity.install
+++ b/ubuntu/_base/applications/system/adept/debian/adept-installer-trinity.install
diff --git a/ubuntu/_base/applications/adept/debian/adept-manager-trinity.install b/ubuntu/_base/applications/system/adept/debian/adept-manager-trinity.install
index 35fc0712b..35fc0712b 100644
--- a/ubuntu/_base/applications/adept/debian/adept-manager-trinity.install
+++ b/ubuntu/_base/applications/system/adept/debian/adept-manager-trinity.install
diff --git a/ubuntu/_base/applications/adept/debian/adept-notifier-trinity.install b/ubuntu/_base/applications/system/adept/debian/adept-notifier-trinity.install
index b1e97afac..b1e97afac 100644
--- a/ubuntu/_base/applications/adept/debian/adept-notifier-trinity.install
+++ b/ubuntu/_base/applications/system/adept/debian/adept-notifier-trinity.install
diff --git a/ubuntu/_base/applications/adept/debian/adept-updater-trinity.install b/ubuntu/_base/applications/system/adept/debian/adept-updater-trinity.install
index 0be740892..0be740892 100644
--- a/ubuntu/_base/applications/adept/debian/adept-updater-trinity.install
+++ b/ubuntu/_base/applications/system/adept/debian/adept-updater-trinity.install
diff --git a/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/adept/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/system/adept/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kdesudo/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/adept/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kdesudo/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/system/adept/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/adept/debian/changelog b/ubuntu/_base/applications/system/adept/debian/changelog
index 58496db32..58496db32 100644
--- a/ubuntu/_base/applications/adept/debian/changelog
+++ b/ubuntu/_base/applications/system/adept/debian/changelog
diff --git a/ubuntu/_base/applications/kmymoney/debian/compat b/ubuntu/_base/applications/system/adept/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kmymoney/debian/compat
+++ b/ubuntu/_base/applications/system/adept/debian/compat
diff --git a/ubuntu/_base/applications/adept/debian/control b/ubuntu/_base/applications/system/adept/debian/control
index 45dd0cac0..45dd0cac0 100644
--- a/ubuntu/_base/applications/adept/debian/control
+++ b/ubuntu/_base/applications/system/adept/debian/control
diff --git a/ubuntu/_base/applications/adept/debian/copyright b/ubuntu/_base/applications/system/adept/debian/copyright
index 6f8ad6648..6f8ad6648 100644
--- a/ubuntu/_base/applications/adept/debian/copyright
+++ b/ubuntu/_base/applications/system/adept/debian/copyright
diff --git a/ubuntu/_base/applications/adept/debian/dirs b/ubuntu/_base/applications/system/adept/debian/dirs
index 73752c9ae..73752c9ae 100644
--- a/ubuntu/_base/applications/adept/debian/dirs
+++ b/ubuntu/_base/applications/system/adept/debian/dirs
diff --git a/ubuntu/_base/applications/adept/debian/docs b/ubuntu/_base/applications/system/adept/debian/docs
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/adept/debian/docs
+++ b/ubuntu/_base/applications/system/adept/debian/docs
diff --git a/ubuntu/_base/applications/kde-systemsettings/debian/patches/series b/ubuntu/_base/applications/system/adept/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kde-systemsettings/debian/patches/series
+++ b/ubuntu/_base/applications/system/adept/debian/patches/series
diff --git a/ubuntu/_base/applications/adept/debian/rules b/ubuntu/_base/applications/system/adept/debian/rules
index 83626c5cb..83626c5cb 100755
--- a/ubuntu/_base/applications/adept/debian/rules
+++ b/ubuntu/_base/applications/system/adept/debian/rules
diff --git a/ubuntu/_base/applications/kmatplot/debian/source/format b/ubuntu/_base/applications/system/adept/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kmatplot/debian/source/format
+++ b/ubuntu/_base/applications/system/adept/debian/source/format
diff --git a/ubuntu/_base/applications/kmatplot/debian/source/options b/ubuntu/_base/applications/system/adept/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kmatplot/debian/source/options
+++ b/ubuntu/_base/applications/system/adept/debian/source/options
diff --git a/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kdiff3/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/dolphin/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kdiff3/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/system/dolphin/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/dolphin/debian/changelog b/ubuntu/_base/applications/system/dolphin/debian/changelog
index 5a0a63c7d..5a0a63c7d 100644
--- a/ubuntu/_base/applications/dolphin/debian/changelog
+++ b/ubuntu/_base/applications/system/dolphin/debian/changelog
diff --git a/ubuntu/_base/applications/knemo/debian/compat b/ubuntu/_base/applications/system/dolphin/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/knemo/debian/compat
+++ b/ubuntu/_base/applications/system/dolphin/debian/compat
diff --git a/ubuntu/_base/applications/dolphin/debian/control b/ubuntu/_base/applications/system/dolphin/debian/control
index 68f78df86..68f78df86 100644
--- a/ubuntu/_base/applications/dolphin/debian/control
+++ b/ubuntu/_base/applications/system/dolphin/debian/control
diff --git a/ubuntu/_base/applications/dolphin/debian/copyright b/ubuntu/_base/applications/system/dolphin/debian/copyright
index 970a6b5a2..970a6b5a2 100644
--- a/ubuntu/_base/applications/dolphin/debian/copyright
+++ b/ubuntu/_base/applications/system/dolphin/debian/copyright
diff --git a/ubuntu/_base/applications/dolphin/debian/dolphin.1 b/ubuntu/_base/applications/system/dolphin/debian/dolphin.1
index 2a1a972f0..2a1a972f0 100644
--- a/ubuntu/_base/applications/dolphin/debian/dolphin.1
+++ b/ubuntu/_base/applications/system/dolphin/debian/dolphin.1
diff --git a/ubuntu/_base/applications/dolphin/debian/manpages b/ubuntu/_base/applications/system/dolphin/debian/manpages
index 8b02277f2..8b02277f2 100644
--- a/ubuntu/_base/applications/dolphin/debian/manpages
+++ b/ubuntu/_base/applications/system/dolphin/debian/manpages
diff --git a/ubuntu/_base/applications/kdesudo/debian/patches/series b/ubuntu/_base/applications/system/dolphin/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kdesudo/debian/patches/series
+++ b/ubuntu/_base/applications/system/dolphin/debian/patches/series
diff --git a/ubuntu/_base/applications/dolphin/debian/rules b/ubuntu/_base/applications/system/dolphin/debian/rules
index ffb1212cf..ffb1212cf 100755
--- a/ubuntu/_base/applications/dolphin/debian/rules
+++ b/ubuntu/_base/applications/system/dolphin/debian/rules
diff --git a/ubuntu/_base/applications/kmplayer/debian/source/format b/ubuntu/_base/applications/system/dolphin/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kmplayer/debian/source/format
+++ b/ubuntu/_base/applications/system/dolphin/debian/source/format
diff --git a/ubuntu/_base/applications/kmplayer/debian/source/options b/ubuntu/_base/applications/system/dolphin/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kmplayer/debian/source/options
+++ b/ubuntu/_base/applications/system/dolphin/debian/source/options
diff --git a/ubuntu/_base/applications/kdmtheme/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/katapult/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kdmtheme/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/system/katapult/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kdirstat/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/katapult/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kdirstat/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/system/katapult/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/katapult/debian/changelog b/ubuntu/_base/applications/system/katapult/debian/changelog
index 4452b8a56..4452b8a56 100644
--- a/ubuntu/_base/applications/katapult/debian/changelog
+++ b/ubuntu/_base/applications/system/katapult/debian/changelog
diff --git a/ubuntu/_base/applications/knetload/debian/compat b/ubuntu/_base/applications/system/katapult/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/knetload/debian/compat
+++ b/ubuntu/_base/applications/system/katapult/debian/compat
diff --git a/ubuntu/_base/applications/katapult/debian/control b/ubuntu/_base/applications/system/katapult/debian/control
index 8d1218816..8d1218816 100644
--- a/ubuntu/_base/applications/katapult/debian/control
+++ b/ubuntu/_base/applications/system/katapult/debian/control
diff --git a/ubuntu/_base/applications/katapult/debian/copyright b/ubuntu/_base/applications/system/katapult/debian/copyright
index fa75bbec3..fa75bbec3 100644
--- a/ubuntu/_base/applications/katapult/debian/copyright
+++ b/ubuntu/_base/applications/system/katapult/debian/copyright
diff --git a/ubuntu/_base/applications/katapult/debian/docs b/ubuntu/_base/applications/system/katapult/debian/docs
index 022850854..022850854 100644
--- a/ubuntu/_base/applications/katapult/debian/docs
+++ b/ubuntu/_base/applications/system/katapult/debian/docs
diff --git a/ubuntu/_base/applications/katapult/debian/katapult.1.docbook b/ubuntu/_base/applications/system/katapult/debian/katapult.1.docbook
index 718ff8707..718ff8707 100644
--- a/ubuntu/_base/applications/katapult/debian/katapult.1.docbook
+++ b/ubuntu/_base/applications/system/katapult/debian/katapult.1.docbook
diff --git a/ubuntu/_base/applications/katapult/debian/lintian b/ubuntu/_base/applications/system/katapult/debian/lintian
index af70e7550..af70e7550 100644
--- a/ubuntu/_base/applications/katapult/debian/lintian
+++ b/ubuntu/_base/applications/system/katapult/debian/lintian
diff --git a/ubuntu/_base/applications/katapult/debian/menu b/ubuntu/_base/applications/system/katapult/debian/menu
index a76f261ac..a76f261ac 100644
--- a/ubuntu/_base/applications/katapult/debian/menu
+++ b/ubuntu/_base/applications/system/katapult/debian/menu
diff --git a/ubuntu/_base/applications/kdesvn/debian/patches/series b/ubuntu/_base/applications/system/katapult/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kdesvn/debian/patches/series
+++ b/ubuntu/_base/applications/system/katapult/debian/patches/series
diff --git a/ubuntu/_base/applications/katapult/debian/rules b/ubuntu/_base/applications/system/katapult/debian/rules
index 3b1abb30a..3b1abb30a 100755
--- a/ubuntu/_base/applications/katapult/debian/rules
+++ b/ubuntu/_base/applications/system/katapult/debian/rules
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/source/format b/ubuntu/_base/applications/system/katapult/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/source/format
+++ b/ubuntu/_base/applications/system/katapult/debian/source/format
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/source/options b/ubuntu/_base/applications/system/katapult/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/source/options
+++ b/ubuntu/_base/applications/system/katapult/debian/source/options
diff --git a/ubuntu/_base/applications/kmplayer/debian/README.Debian b/ubuntu/_base/applications/system/kbfx/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/_base/applications/kmplayer/debian/README.Debian
+++ b/ubuntu/_base/applications/system/kbfx/debian/README.Debian
diff --git a/ubuntu/_base/applications/kbfx/debian/changelog b/ubuntu/_base/applications/system/kbfx/debian/changelog
index cbb743bf9..cbb743bf9 100644
--- a/ubuntu/_base/applications/kbfx/debian/changelog
+++ b/ubuntu/_base/applications/system/kbfx/debian/changelog
diff --git a/ubuntu/_base/applications/kbfx/debian/cmake.mk b/ubuntu/_base/applications/system/kbfx/debian/cmake.mk
index 4c7e2e24c..4c7e2e24c 100644
--- a/ubuntu/_base/applications/kbfx/debian/cmake.mk
+++ b/ubuntu/_base/applications/system/kbfx/debian/cmake.mk
diff --git a/ubuntu/_base/applications/knetstats/debian/compat b/ubuntu/_base/applications/system/kbfx/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/knetstats/debian/compat
+++ b/ubuntu/_base/applications/system/kbfx/debian/compat
diff --git a/ubuntu/_base/applications/kbfx/debian/control b/ubuntu/_base/applications/system/kbfx/debian/control
index f5c0da227..f5c0da227 100644
--- a/ubuntu/_base/applications/kbfx/debian/control
+++ b/ubuntu/_base/applications/system/kbfx/debian/control
diff --git a/ubuntu/_base/applications/kbfx/debian/copyright b/ubuntu/_base/applications/system/kbfx/debian/copyright
index 11d23df1b..11d23df1b 100644
--- a/ubuntu/_base/applications/kbfx/debian/copyright
+++ b/ubuntu/_base/applications/system/kbfx/debian/copyright
diff --git a/ubuntu/_base/applications/kbfx/debian/docs b/ubuntu/_base/applications/system/kbfx/debian/docs
index 4182e08ae..4182e08ae 100644
--- a/ubuntu/_base/applications/kbfx/debian/docs
+++ b/ubuntu/_base/applications/system/kbfx/debian/docs
diff --git a/ubuntu/_base/applications/kbfx/debian/kbfx.lintian-overrides b/ubuntu/_base/applications/system/kbfx/debian/kbfx.lintian-overrides
index a2ecfe7dc..a2ecfe7dc 100644
--- a/ubuntu/_base/applications/kbfx/debian/kbfx.lintian-overrides
+++ b/ubuntu/_base/applications/system/kbfx/debian/kbfx.lintian-overrides
diff --git a/ubuntu/_base/applications/kdirstat/debian/patches/series b/ubuntu/_base/applications/system/kbfx/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kdirstat/debian/patches/series
+++ b/ubuntu/_base/applications/system/kbfx/debian/patches/series
diff --git a/ubuntu/_base/applications/kbfx/debian/postinst b/ubuntu/_base/applications/system/kbfx/debian/postinst
index e95a6906b..e95a6906b 100644
--- a/ubuntu/_base/applications/kbfx/debian/postinst
+++ b/ubuntu/_base/applications/system/kbfx/debian/postinst
diff --git a/ubuntu/_base/applications/kbfx/debian/rules b/ubuntu/_base/applications/system/kbfx/debian/rules
index e839edd42..e839edd42 100755
--- a/ubuntu/_base/applications/kbfx/debian/rules
+++ b/ubuntu/_base/applications/system/kbfx/debian/rules
diff --git a/ubuntu/_base/applications/kmymoney/debian/source/format b/ubuntu/_base/applications/system/kbfx/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kmymoney/debian/source/format
+++ b/ubuntu/_base/applications/system/kbfx/debian/source/format
diff --git a/ubuntu/_base/applications/kmymoney/debian/source/options b/ubuntu/_base/applications/system/kbfx/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kmymoney/debian/source/options
+++ b/ubuntu/_base/applications/system/kbfx/debian/source/options
diff --git a/ubuntu/_base/applications/kbfx/debian/watch b/ubuntu/_base/applications/system/kbfx/debian/watch
index cfc9a7d7d..cfc9a7d7d 100644
--- a/ubuntu/_base/applications/kbfx/debian/watch
+++ b/ubuntu/_base/applications/system/kbfx/debian/watch
diff --git a/ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kdmtheme/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kdmtheme/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/changelog b/ubuntu/_base/applications/system/kdbusnotification/debian/changelog
index 3845c888d..3845c888d 100644
--- a/ubuntu/_base/applications/kdbusnotification/debian/changelog
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/changelog
diff --git a/ubuntu/_base/applications/knetworkmanager.cmake/debian/compat b/ubuntu/_base/applications/system/kdbusnotification/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/knetworkmanager.cmake/debian/compat
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/compat
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/control b/ubuntu/_base/applications/system/kdbusnotification/debian/control
index 343c566a3..343c566a3 100644
--- a/ubuntu/_base/applications/kdbusnotification/debian/control
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/control
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/copyright b/ubuntu/_base/applications/system/kdbusnotification/debian/copyright
index 760904ce9..760904ce9 100644
--- a/ubuntu/_base/applications/kdbusnotification/debian/copyright
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/copyright
diff --git a/ubuntu/_base/applications/kcpuload/debian/links b/ubuntu/_base/applications/system/kdbusnotification/debian/links
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kcpuload/debian/links
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/links
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/rules b/ubuntu/_base/applications/system/kdbusnotification/debian/rules
index 2750f623d..2750f623d 100755
--- a/ubuntu/_base/applications/kdbusnotification/debian/rules
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/rules
diff --git a/ubuntu/_base/applications/knemo/debian/source/format b/ubuntu/_base/applications/system/kdbusnotification/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/knemo/debian/source/format
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/source/format
diff --git a/ubuntu/_base/applications/knemo/debian/source/options b/ubuntu/_base/applications/system/kdbusnotification/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/knemo/debian/source/options
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/source/options
diff --git a/ubuntu/_base/applications/knemo/debian/README.Debian b/ubuntu/_base/applications/system/knemo/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/_base/applications/knemo/debian/README.Debian
+++ b/ubuntu/_base/applications/system/knemo/debian/README.Debian
diff --git a/ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/knemo/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/system/knemo/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/keep/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/knemo/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/keep/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/system/knemo/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/knemo/debian/changelog b/ubuntu/_base/applications/system/knemo/debian/changelog
index fe6f4765f..fe6f4765f 100644
--- a/ubuntu/_base/applications/knemo/debian/changelog
+++ b/ubuntu/_base/applications/system/knemo/debian/changelog
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/compat b/ubuntu/_base/applications/system/knemo/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/knetworkmanager8/debian/compat
+++ b/ubuntu/_base/applications/system/knemo/debian/compat
diff --git a/ubuntu/_base/applications/knemo/debian/control b/ubuntu/_base/applications/system/knemo/debian/control
index 26f39cdc0..26f39cdc0 100644
--- a/ubuntu/_base/applications/knemo/debian/control
+++ b/ubuntu/_base/applications/system/knemo/debian/control
diff --git a/ubuntu/_base/applications/knemo/debian/copyright b/ubuntu/_base/applications/system/knemo/debian/copyright
index 56f8c81f8..56f8c81f8 100644
--- a/ubuntu/_base/applications/knemo/debian/copyright
+++ b/ubuntu/_base/applications/system/knemo/debian/copyright
diff --git a/ubuntu/_base/applications/knemo/debian/dirs b/ubuntu/_base/applications/system/knemo/debian/dirs
index 57855aec4..57855aec4 100644
--- a/ubuntu/_base/applications/knemo/debian/dirs
+++ b/ubuntu/_base/applications/system/knemo/debian/dirs
diff --git a/ubuntu/_base/applications/kdpkg/debian/patches/series b/ubuntu/_base/applications/system/knemo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kdpkg/debian/patches/series
+++ b/ubuntu/_base/applications/system/knemo/debian/patches/series
diff --git a/ubuntu/_base/applications/knemo/debian/rules b/ubuntu/_base/applications/system/knemo/debian/rules
index b8737a4a9..b8737a4a9 100755
--- a/ubuntu/_base/applications/knemo/debian/rules
+++ b/ubuntu/_base/applications/system/knemo/debian/rules
diff --git a/ubuntu/_base/applications/knetload/debian/source/format b/ubuntu/_base/applications/system/knemo/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/knetload/debian/source/format
+++ b/ubuntu/_base/applications/system/knemo/debian/source/format
diff --git a/ubuntu/_base/applications/knetload/debian/source/options b/ubuntu/_base/applications/system/knemo/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/knetload/debian/source/options
+++ b/ubuntu/_base/applications/system/knemo/debian/source/options
diff --git a/ubuntu/_base/applications/knetload/debian/changelog b/ubuntu/_base/applications/system/knetload/debian/changelog
index f5456314d..f5456314d 100644
--- a/ubuntu/_base/applications/knetload/debian/changelog
+++ b/ubuntu/_base/applications/system/knetload/debian/changelog
diff --git a/ubuntu/_base/applications/knights/debian/compat b/ubuntu/_base/applications/system/knetload/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/knights/debian/compat
+++ b/ubuntu/_base/applications/system/knetload/debian/compat
diff --git a/ubuntu/_base/applications/knetload/debian/control b/ubuntu/_base/applications/system/knetload/debian/control
index 3a8741921..3a8741921 100644
--- a/ubuntu/_base/applications/knetload/debian/control
+++ b/ubuntu/_base/applications/system/knetload/debian/control
diff --git a/ubuntu/_base/applications/knetload/debian/copyright b/ubuntu/_base/applications/system/knetload/debian/copyright
index 7093501e6..7093501e6 100644
--- a/ubuntu/_base/applications/knetload/debian/copyright
+++ b/ubuntu/_base/applications/system/knetload/debian/copyright
diff --git a/ubuntu/_base/applications/kde-style-lipstik/debian/dirs b/ubuntu/_base/applications/system/knetload/debian/dirs
index 43e7f554c..43e7f554c 100644
--- a/ubuntu/_base/applications/kde-style-lipstik/debian/dirs
+++ b/ubuntu/_base/applications/system/knetload/debian/dirs
diff --git a/ubuntu/_base/applications/knetload/debian/docs b/ubuntu/_base/applications/system/knetload/debian/docs
index ca0272abf..ca0272abf 100644
--- a/ubuntu/_base/applications/knetload/debian/docs
+++ b/ubuntu/_base/applications/system/knetload/debian/docs
diff --git a/ubuntu/_base/applications/knetload/debian/knetload-trinity.install b/ubuntu/_base/applications/system/knetload/debian/knetload-trinity.install
index cdb14888d..cdb14888d 100644
--- a/ubuntu/_base/applications/knetload/debian/knetload-trinity.install
+++ b/ubuntu/_base/applications/system/knetload/debian/knetload-trinity.install
diff --git a/ubuntu/_base/applications/knetload/debian/knetload-trinity.manpages b/ubuntu/_base/applications/system/knetload/debian/knetload-trinity.manpages
index b0a6ac166..b0a6ac166 100644
--- a/ubuntu/_base/applications/knetload/debian/knetload-trinity.manpages
+++ b/ubuntu/_base/applications/system/knetload/debian/knetload-trinity.manpages
diff --git a/ubuntu/_base/applications/knetload/debian/knetload.1 b/ubuntu/_base/applications/system/knetload/debian/knetload.1
index 30b6c4e4d..30b6c4e4d 100644
--- a/ubuntu/_base/applications/knetload/debian/knetload.1
+++ b/ubuntu/_base/applications/system/knetload/debian/knetload.1
diff --git a/ubuntu/_base/applications/knetload/debian/knetload.xpm b/ubuntu/_base/applications/system/knetload/debian/knetload.xpm
index 3cc7ef17f..3cc7ef17f 100644
--- a/ubuntu/_base/applications/knetload/debian/knetload.xpm
+++ b/ubuntu/_base/applications/system/knetload/debian/knetload.xpm
diff --git a/ubuntu/_base/applications/knetload/debian/menu b/ubuntu/_base/applications/system/knetload/debian/menu
index a39b37e3c..a39b37e3c 100644
--- a/ubuntu/_base/applications/knetload/debian/menu
+++ b/ubuntu/_base/applications/system/knetload/debian/menu
diff --git a/ubuntu/_base/applications/knetload/debian/rules b/ubuntu/_base/applications/system/knetload/debian/rules
index 0a65d48d8..0a65d48d8 100755
--- a/ubuntu/_base/applications/knetload/debian/rules
+++ b/ubuntu/_base/applications/system/knetload/debian/rules
diff --git a/ubuntu/_base/applications/knetstats/debian/source/format b/ubuntu/_base/applications/system/knetload/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/knetstats/debian/source/format
+++ b/ubuntu/_base/applications/system/knetload/debian/source/format
diff --git a/ubuntu/_base/applications/knetstats/debian/source/options b/ubuntu/_base/applications/system/knetload/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/knetstats/debian/source/options
+++ b/ubuntu/_base/applications/system/knetload/debian/source/options
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kerry/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/knetstats/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kerry/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/system/knetstats/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/knetstats/debian/changelog b/ubuntu/_base/applications/system/knetstats/debian/changelog
index d1015cb26..d1015cb26 100644
--- a/ubuntu/_base/applications/knetstats/debian/changelog
+++ b/ubuntu/_base/applications/system/knetstats/debian/changelog
diff --git a/ubuntu/_base/applications/knowit/debian/compat b/ubuntu/_base/applications/system/knetstats/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/knowit/debian/compat
+++ b/ubuntu/_base/applications/system/knetstats/debian/compat
diff --git a/ubuntu/_base/applications/knetstats/debian/control b/ubuntu/_base/applications/system/knetstats/debian/control
index 8cf7ca6c3..8cf7ca6c3 100644
--- a/ubuntu/_base/applications/knetstats/debian/control
+++ b/ubuntu/_base/applications/system/knetstats/debian/control
diff --git a/ubuntu/_base/applications/knetstats/debian/copyright b/ubuntu/_base/applications/system/knetstats/debian/copyright
index bf7dbe0ed..bf7dbe0ed 100644
--- a/ubuntu/_base/applications/knetstats/debian/copyright
+++ b/ubuntu/_base/applications/system/knetstats/debian/copyright
diff --git a/ubuntu/_base/applications/knetstats/debian/knetstats.1.docbook b/ubuntu/_base/applications/system/knetstats/debian/knetstats.1.docbook
index 28b721f53..28b721f53 100644
--- a/ubuntu/_base/applications/knetstats/debian/knetstats.1.docbook
+++ b/ubuntu/_base/applications/system/knetstats/debian/knetstats.1.docbook
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/patches/series b/ubuntu/_base/applications/system/knetstats/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kgtk-qt3/debian/patches/series
+++ b/ubuntu/_base/applications/system/knetstats/debian/patches/series
diff --git a/ubuntu/_base/applications/knetstats/debian/rules b/ubuntu/_base/applications/system/knetstats/debian/rules
index 5a77222d6..5a77222d6 100755
--- a/ubuntu/_base/applications/knetstats/debian/rules
+++ b/ubuntu/_base/applications/system/knetstats/debian/rules
diff --git a/ubuntu/_base/applications/knetworkmanager.cmake/debian/source/format b/ubuntu/_base/applications/system/knetstats/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/knetworkmanager.cmake/debian/source/format
+++ b/ubuntu/_base/applications/system/knetstats/debian/source/format
diff --git a/ubuntu/_base/applications/knetworkmanager.cmake/debian/source/options b/ubuntu/_base/applications/system/knetstats/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/knetworkmanager.cmake/debian/source/options
+++ b/ubuntu/_base/applications/system/knetstats/debian/source/options
diff --git a/ubuntu/_base/applications/knetstats/debian/watch b/ubuntu/_base/applications/system/knetstats/debian/watch
index 8d12f40b0..8d12f40b0 100644
--- a/ubuntu/_base/applications/knetstats/debian/watch
+++ b/ubuntu/_base/applications/system/knetstats/debian/watch
diff --git a/ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kpowersave/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/system/kpowersave/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kpowersave/debian/changelog b/ubuntu/_base/applications/system/kpowersave/debian/changelog
index d9b8099ef..d9b8099ef 100644
--- a/ubuntu/_base/applications/kpowersave/debian/changelog
+++ b/ubuntu/_base/applications/system/kpowersave/debian/changelog
diff --git a/ubuntu/_base/applications/knutclient/debian/compat b/ubuntu/_base/applications/system/kpowersave/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/knutclient/debian/compat
+++ b/ubuntu/_base/applications/system/kpowersave/debian/compat
diff --git a/ubuntu/_base/applications/kpowersave/debian/control b/ubuntu/_base/applications/system/kpowersave/debian/control
index de64d2033..de64d2033 100644
--- a/ubuntu/_base/applications/kpowersave/debian/control
+++ b/ubuntu/_base/applications/system/kpowersave/debian/control
diff --git a/debian/_base/applications/kpowersave/debian/copyright b/ubuntu/_base/applications/system/kpowersave/debian/copyright
index a1557e62e..a1557e62e 100644
--- a/debian/_base/applications/kpowersave/debian/copyright
+++ b/ubuntu/_base/applications/system/kpowersave/debian/copyright
diff --git a/ubuntu/_base/applications/kpowersave/debian/install b/ubuntu/_base/applications/system/kpowersave/debian/install
index 7b00dd534..7b00dd534 100644
--- a/ubuntu/_base/applications/kpowersave/debian/install
+++ b/ubuntu/_base/applications/system/kpowersave/debian/install
diff --git a/ubuntu/_base/applications/kpowersave/debian/kpowersave-trinity.linda b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda
index 652f468f2..652f468f2 100644
--- a/ubuntu/_base/applications/kpowersave/debian/kpowersave-trinity.linda
+++ b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda
diff --git a/debian/_base/applications/kpowersave/debian/kpowersave-trinity.lintian b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian
index b0c32f61e..b0c32f61e 100644
--- a/debian/_base/applications/kpowersave/debian/kpowersave-trinity.lintian
+++ b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian
diff --git a/debian/_base/applications/kpowersave/debian/kpowersave.1 b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave.1
index 0ab1d6f90..0ab1d6f90 100644
--- a/debian/_base/applications/kpowersave/debian/kpowersave.1
+++ b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave.1
diff --git a/debian/_base/applications/kpowersave/debian/kpowersave.xpm b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave.xpm
index 99d178492..99d178492 100644
--- a/debian/_base/applications/kpowersave/debian/kpowersave.xpm
+++ b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave.xpm
diff --git a/debian/_base/applications/kpowersave/debian/manpages b/ubuntu/_base/applications/system/kpowersave/debian/manpages
index c8fa7b85f..c8fa7b85f 100644
--- a/debian/_base/applications/kpowersave/debian/manpages
+++ b/ubuntu/_base/applications/system/kpowersave/debian/manpages
diff --git a/ubuntu/_base/applications/kpowersave/debian/menu b/ubuntu/_base/applications/system/kpowersave/debian/menu
index 0dbd62cc4..0dbd62cc4 100644
--- a/ubuntu/_base/applications/kpowersave/debian/menu
+++ b/ubuntu/_base/applications/system/kpowersave/debian/menu
diff --git a/ubuntu/_base/applications/kio-apt/debian/patches/series b/ubuntu/_base/applications/system/kpowersave/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kio-apt/debian/patches/series
+++ b/ubuntu/_base/applications/system/kpowersave/debian/patches/series
diff --git a/debian/_base/applications/kpowersave/debian/postrm b/ubuntu/_base/applications/system/kpowersave/debian/postrm
index 4e8eda799..4e8eda799 100644
--- a/debian/_base/applications/kpowersave/debian/postrm
+++ b/ubuntu/_base/applications/system/kpowersave/debian/postrm
diff --git a/ubuntu/_base/applications/kpowersave/debian/preinst b/ubuntu/_base/applications/system/kpowersave/debian/preinst
index d0eb1227c..d0eb1227c 100644
--- a/ubuntu/_base/applications/kpowersave/debian/preinst
+++ b/ubuntu/_base/applications/system/kpowersave/debian/preinst
diff --git a/ubuntu/_base/applications/kpowersave/debian/rules b/ubuntu/_base/applications/system/kpowersave/debian/rules
index 368c2a532..368c2a532 100755
--- a/ubuntu/_base/applications/kpowersave/debian/rules
+++ b/ubuntu/_base/applications/system/kpowersave/debian/rules
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/source/format b/ubuntu/_base/applications/system/kpowersave/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/knetworkmanager8/debian/source/format
+++ b/ubuntu/_base/applications/system/kpowersave/debian/source/format
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/source/options b/ubuntu/_base/applications/system/kpowersave/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/knetworkmanager8/debian/source/options
+++ b/ubuntu/_base/applications/system/kpowersave/debian/source/options
diff --git a/debian/_base/applications/kpowersave/debian/watch b/ubuntu/_base/applications/system/kpowersave/debian/watch
index 832285e63..832285e63 100644
--- a/debian/_base/applications/kpowersave/debian/watch
+++ b/ubuntu/_base/applications/system/kpowersave/debian/watch
diff --git a/ubuntu/_base/applications/krusader/debian/README.Debian b/ubuntu/_base/applications/system/krusader/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/_base/applications/krusader/debian/README.Debian
+++ b/ubuntu/_base/applications/system/krusader/debian/README.Debian
diff --git a/ubuntu/_base/applications/kio-apt/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/krusader/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kio-apt/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/system/krusader/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kile/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/krusader/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kile/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/system/krusader/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/krusader/debian/changelog b/ubuntu/_base/applications/system/krusader/debian/changelog
index 33154f756..33154f756 100644
--- a/ubuntu/_base/applications/krusader/debian/changelog
+++ b/ubuntu/_base/applications/system/krusader/debian/changelog
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/compat b/ubuntu/_base/applications/system/krusader/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/koffice-i18n/debian/compat
+++ b/ubuntu/_base/applications/system/krusader/debian/compat
diff --git a/ubuntu/_base/applications/krusader/debian/control b/ubuntu/_base/applications/system/krusader/debian/control
index 4d00a07a5..4d00a07a5 100644
--- a/ubuntu/_base/applications/krusader/debian/control
+++ b/ubuntu/_base/applications/system/krusader/debian/control
diff --git a/ubuntu/_base/applications/krusader/debian/copyright b/ubuntu/_base/applications/system/krusader/debian/copyright
index 127bd8f63..127bd8f63 100644
--- a/ubuntu/_base/applications/krusader/debian/copyright
+++ b/ubuntu/_base/applications/system/krusader/debian/copyright
diff --git a/ubuntu/_base/applications/krusader/debian/docs b/ubuntu/_base/applications/system/krusader/debian/docs
index 623fe2da9..623fe2da9 100644
--- a/ubuntu/_base/applications/krusader/debian/docs
+++ b/ubuntu/_base/applications/system/krusader/debian/docs
diff --git a/ubuntu/_base/applications/krusader/debian/krusader.lintian-overrides b/ubuntu/_base/applications/system/krusader/debian/krusader.lintian-overrides
index ab5986658..ab5986658 100644
--- a/ubuntu/_base/applications/krusader/debian/krusader.lintian-overrides
+++ b/ubuntu/_base/applications/system/krusader/debian/krusader.lintian-overrides
diff --git a/ubuntu/_base/applications/krusader/debian/menu b/ubuntu/_base/applications/system/krusader/debian/menu
index 92d07892f..92d07892f 100644
--- a/ubuntu/_base/applications/krusader/debian/menu
+++ b/ubuntu/_base/applications/system/krusader/debian/menu
diff --git a/ubuntu/_base/applications/kio-locate/debian/patches/series b/ubuntu/_base/applications/system/krusader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kio-locate/debian/patches/series
+++ b/ubuntu/_base/applications/system/krusader/debian/patches/series
diff --git a/ubuntu/_base/applications/krusader/debian/rules b/ubuntu/_base/applications/system/krusader/debian/rules
index c4d62cbf5..c4d62cbf5 100755
--- a/ubuntu/_base/applications/krusader/debian/rules
+++ b/ubuntu/_base/applications/system/krusader/debian/rules
diff --git a/ubuntu/_base/applications/krusader/debian/source.lintian-overrides b/ubuntu/_base/applications/system/krusader/debian/source.lintian-overrides
index 01d57f16c..01d57f16c 100644
--- a/ubuntu/_base/applications/krusader/debian/source.lintian-overrides
+++ b/ubuntu/_base/applications/system/krusader/debian/source.lintian-overrides
diff --git a/ubuntu/_base/applications/knights/debian/source/format b/ubuntu/_base/applications/system/krusader/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/knights/debian/source/format
+++ b/ubuntu/_base/applications/system/krusader/debian/source/format
diff --git a/ubuntu/_base/applications/knights/debian/source/options b/ubuntu/_base/applications/system/krusader/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/knights/debian/source/options
+++ b/ubuntu/_base/applications/system/krusader/debian/source/options
diff --git a/ubuntu/_base/applications/krusader/debian/watch b/ubuntu/_base/applications/system/krusader/debian/watch
index d19bef39d..d19bef39d 100644
--- a/ubuntu/_base/applications/krusader/debian/watch
+++ b/ubuntu/_base/applications/system/krusader/debian/watch
diff --git a/ubuntu/_base/applications/kio-locate/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kio-locate/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kio-apt/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kio-apt/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/ksystemlog/debian/changelog b/ubuntu/_base/applications/system/ksystemlog/debian/changelog
index d067e585b..d067e585b 100644
--- a/ubuntu/_base/applications/ksystemlog/debian/changelog
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/changelog
diff --git a/ubuntu/_base/applications/koffice/debian/compat b/ubuntu/_base/applications/system/ksystemlog/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/koffice/debian/compat
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/compat
diff --git a/ubuntu/_base/applications/ksystemlog/debian/control b/ubuntu/_base/applications/system/ksystemlog/debian/control
index 7f166ced2..7f166ced2 100644
--- a/ubuntu/_base/applications/ksystemlog/debian/control
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/control
diff --git a/ubuntu/_base/applications/ksystemlog/debian/copyright b/ubuntu/_base/applications/system/ksystemlog/debian/copyright
index 0aac949f5..0aac949f5 100644
--- a/ubuntu/_base/applications/ksystemlog/debian/copyright
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/copyright
diff --git a/ubuntu/_base/applications/ksystemlog/debian/docs b/ubuntu/_base/applications/system/ksystemlog/debian/docs
index 5502ed8f4..5502ed8f4 100644
--- a/ubuntu/_base/applications/ksystemlog/debian/docs
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/docs
diff --git a/ubuntu/_base/applications/ksystemlog/debian/ksystemlog.xml b/ubuntu/_base/applications/system/ksystemlog/debian/ksystemlog.xml
index f412afcd4..f412afcd4 100644
--- a/ubuntu/_base/applications/ksystemlog/debian/ksystemlog.xml
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/ksystemlog.xml
diff --git a/ubuntu/_base/applications/ksystemlog/debian/menu b/ubuntu/_base/applications/system/ksystemlog/debian/menu
index 57aa688f9..57aa688f9 100644
--- a/ubuntu/_base/applications/ksystemlog/debian/menu
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/menu
diff --git a/ubuntu/_base/applications/kio-umountwrapper/debian/patches/series b/ubuntu/_base/applications/system/ksystemlog/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kio-umountwrapper/debian/patches/series
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/patches/series
diff --git a/ubuntu/_base/applications/ksystemlog/debian/rules b/ubuntu/_base/applications/system/ksystemlog/debian/rules
index 32df64dbd..32df64dbd 100755
--- a/ubuntu/_base/applications/ksystemlog/debian/rules
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/rules
diff --git a/ubuntu/_base/applications/knowit/debian/source/format b/ubuntu/_base/applications/system/ksystemlog/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/knowit/debian/source/format
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/source/format
diff --git a/ubuntu/_base/applications/knowit/debian/source/options b/ubuntu/_base/applications/system/ksystemlog/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/knowit/debian/source/options
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/source/options
diff --git a/ubuntu/_base/applications/ksystemlog/debian/watch b/ubuntu/_base/applications/system/ksystemlog/debian/watch
index b15cf467b..b15cf467b 100644
--- a/ubuntu/_base/applications/ksystemlog/debian/watch
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/watch
diff --git a/ubuntu/_base/applications/kio-umountwrapper/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kio-umountwrapper/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kio-locate/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/kvkbd/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kio-locate/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/system/kvkbd/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kvkbd/debian/changelog b/ubuntu/_base/applications/system/kvkbd/debian/changelog
index 9d94af90e..9d94af90e 100644
--- a/ubuntu/_base/applications/kvkbd/debian/changelog
+++ b/ubuntu/_base/applications/system/kvkbd/debian/changelog
diff --git a/ubuntu/_base/applications/konversation/debian/compat b/ubuntu/_base/applications/system/kvkbd/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/konversation/debian/compat
+++ b/ubuntu/_base/applications/system/kvkbd/debian/compat
diff --git a/ubuntu/_base/applications/kvkbd/debian/control b/ubuntu/_base/applications/system/kvkbd/debian/control
index ce13cbccb..ce13cbccb 100644
--- a/ubuntu/_base/applications/kvkbd/debian/control
+++ b/ubuntu/_base/applications/system/kvkbd/debian/control
diff --git a/ubuntu/_base/applications/kvkbd/debian/copyright b/ubuntu/_base/applications/system/kvkbd/debian/copyright
index 6b22ad784..6b22ad784 100644
--- a/ubuntu/_base/applications/kvkbd/debian/copyright
+++ b/ubuntu/_base/applications/system/kvkbd/debian/copyright
diff --git a/ubuntu/_base/applications/konversation/debian/patches/.gitignore b/ubuntu/_base/applications/system/kvkbd/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/konversation/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/system/kvkbd/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/kvkbd/debian/rules b/ubuntu/_base/applications/system/kvkbd/debian/rules
index 7a6c3e8e4..7a6c3e8e4 100755
--- a/ubuntu/_base/applications/kvkbd/debian/rules
+++ b/ubuntu/_base/applications/system/kvkbd/debian/rules
diff --git a/ubuntu/_base/applications/knutclient/debian/source/format b/ubuntu/_base/applications/system/kvkbd/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/knutclient/debian/source/format
+++ b/ubuntu/_base/applications/system/kvkbd/debian/source/format
diff --git a/ubuntu/_base/applications/knutclient/debian/source/options b/ubuntu/_base/applications/system/kvkbd/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/knutclient/debian/source/options
+++ b/ubuntu/_base/applications/system/kvkbd/debian/source/options
diff --git a/ubuntu/_base/applications/smartcardauth/debian/changelog b/ubuntu/_base/applications/system/smartcardauth/debian/changelog
index 4d5f37dad..4d5f37dad 100755
--- a/ubuntu/_base/applications/smartcardauth/debian/changelog
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/changelog
diff --git a/ubuntu/_base/applications/kopete-otr/debian/compat b/ubuntu/_base/applications/system/smartcardauth/debian/compat
index 7f8f011eb..7f8f011eb 100644..100755
--- a/ubuntu/_base/applications/kopete-otr/debian/compat
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/compat
diff --git a/ubuntu/_base/applications/smartcardauth/debian/control b/ubuntu/_base/applications/system/smartcardauth/debian/control
index c18647ee8..c18647ee8 100644
--- a/ubuntu/_base/applications/smartcardauth/debian/control
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/control
diff --git a/ubuntu/_base/applications/smartcardauth/debian/dirs b/ubuntu/_base/applications/system/smartcardauth/debian/dirs
index 73752c9ae..73752c9ae 100755
--- a/ubuntu/_base/applications/smartcardauth/debian/dirs
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/dirs
diff --git a/ubuntu/_base/applications/smartcardauth/debian/rules b/ubuntu/_base/applications/system/smartcardauth/debian/rules
index fe74e584a..fe74e584a 100755
--- a/ubuntu/_base/applications/smartcardauth/debian/rules
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/rules
diff --git a/ubuntu/_base/applications/smartcardauth/debian/smartcardauth.postinst b/ubuntu/_base/applications/system/smartcardauth/debian/smartcardauth.postinst
index 842e0017d..842e0017d 100755
--- a/ubuntu/_base/applications/smartcardauth/debian/smartcardauth.postinst
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/smartcardauth.postinst
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/source/format b/ubuntu/_base/applications/system/smartcardauth/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/koffice-i18n/debian/source/format
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/source/format
diff --git a/ubuntu/_base/applications/koffice-i18n/debian/source/options b/ubuntu/_base/applications/system/smartcardauth/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/koffice-i18n/debian/source/options
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/source/options
diff --git a/ubuntu/_base/applications/yakuake/debian/README b/ubuntu/_base/applications/system/yakuake/debian/README
index 85f0e1b9f..85f0e1b9f 100644
--- a/ubuntu/_base/applications/yakuake/debian/README
+++ b/ubuntu/_base/applications/system/yakuake/debian/README
diff --git a/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kio-umountwrapper/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/yakuake/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kio-umountwrapper/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/system/yakuake/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/yakuake/debian/changelog b/ubuntu/_base/applications/system/yakuake/debian/changelog
index fcb60a3f9..fcb60a3f9 100644
--- a/ubuntu/_base/applications/yakuake/debian/changelog
+++ b/ubuntu/_base/applications/system/yakuake/debian/changelog
diff --git a/ubuntu/_base/applications/kpicosim/debian/compat b/ubuntu/_base/applications/system/yakuake/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kpicosim/debian/compat
+++ b/ubuntu/_base/applications/system/yakuake/debian/compat
diff --git a/ubuntu/_base/applications/yakuake/debian/control b/ubuntu/_base/applications/system/yakuake/debian/control
index ffb14a61e..ffb14a61e 100644
--- a/ubuntu/_base/applications/yakuake/debian/control
+++ b/ubuntu/_base/applications/system/yakuake/debian/control
diff --git a/ubuntu/_base/applications/yakuake/debian/copyright b/ubuntu/_base/applications/system/yakuake/debian/copyright
index df27b9653..df27b9653 100644
--- a/ubuntu/_base/applications/yakuake/debian/copyright
+++ b/ubuntu/_base/applications/system/yakuake/debian/copyright
diff --git a/ubuntu/_base/applications/yakuake/debian/icons/yakuake-16.xpm b/ubuntu/_base/applications/system/yakuake/debian/icons/yakuake-16.xpm
index a16b98fef..a16b98fef 100644
--- a/ubuntu/_base/applications/yakuake/debian/icons/yakuake-16.xpm
+++ b/ubuntu/_base/applications/system/yakuake/debian/icons/yakuake-16.xpm
diff --git a/ubuntu/_base/applications/yakuake/debian/icons/yakuake.xpm b/ubuntu/_base/applications/system/yakuake/debian/icons/yakuake.xpm
index 6745c7c0e..6745c7c0e 100644
--- a/ubuntu/_base/applications/yakuake/debian/icons/yakuake.xpm
+++ b/ubuntu/_base/applications/system/yakuake/debian/icons/yakuake.xpm
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/patches/.gitignore b/ubuntu/_base/applications/system/yakuake/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/system/yakuake/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/yakuake/debian/rules b/ubuntu/_base/applications/system/yakuake/debian/rules
index 2bbfee612..2bbfee612 100755
--- a/ubuntu/_base/applications/yakuake/debian/rules
+++ b/ubuntu/_base/applications/system/yakuake/debian/rules
diff --git a/ubuntu/_base/applications/koffice/debian/source/format b/ubuntu/_base/applications/system/yakuake/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/koffice/debian/source/format
+++ b/ubuntu/_base/applications/system/yakuake/debian/source/format
diff --git a/ubuntu/_base/applications/koffice/debian/source/options b/ubuntu/_base/applications/system/yakuake/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/koffice/debian/source/options
+++ b/ubuntu/_base/applications/system/yakuake/debian/source/options
diff --git a/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.1 b/ubuntu/_base/applications/system/yakuake/debian/yakuake-trinity.1
index 7b404d01e..7b404d01e 100644
--- a/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.1
+++ b/ubuntu/_base/applications/system/yakuake/debian/yakuake-trinity.1
diff --git a/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.install b/ubuntu/_base/applications/system/yakuake/debian/yakuake-trinity.install
index e5e863463..e5e863463 100644
--- a/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.install
+++ b/ubuntu/_base/applications/system/yakuake/debian/yakuake-trinity.install
diff --git a/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.manpages b/ubuntu/_base/applications/system/yakuake/debian/yakuake-trinity.manpages
index f9a1365b5..f9a1365b5 100644
--- a/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.manpages
+++ b/ubuntu/_base/applications/system/yakuake/debian/yakuake-trinity.manpages
diff --git a/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.menu b/ubuntu/_base/applications/system/yakuake/debian/yakuake-trinity.menu
index 80d76482b..80d76482b 100644
--- a/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.menu
+++ b/ubuntu/_base/applications/system/yakuake/debian/yakuake-trinity.menu
diff --git a/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/kio-apt/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio/kio-apt/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kiosktool/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/kio-apt/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kiosktool/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tdeio/kio-apt/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kio-apt/debian/changelog b/ubuntu/_base/applications/tdeio/kio-apt/debian/changelog
index 1b3d932c4..1b3d932c4 100644
--- a/ubuntu/_base/applications/kio-apt/debian/changelog
+++ b/ubuntu/_base/applications/tdeio/kio-apt/debian/changelog
diff --git a/ubuntu/_base/applications/kpilot/debian/compat b/ubuntu/_base/applications/tdeio/kio-apt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kpilot/debian/compat
+++ b/ubuntu/_base/applications/tdeio/kio-apt/debian/compat
diff --git a/ubuntu/_base/applications/kio-apt/debian/control b/ubuntu/_base/applications/tdeio/kio-apt/debian/control
index 553b55468..553b55468 100644
--- a/ubuntu/_base/applications/kio-apt/debian/control
+++ b/ubuntu/_base/applications/tdeio/kio-apt/debian/control
diff --git a/ubuntu/_base/applications/kio-apt/debian/copyright b/ubuntu/_base/applications/tdeio/kio-apt/debian/copyright
index b461d84ed..b461d84ed 100644
--- a/ubuntu/_base/applications/kio-apt/debian/copyright
+++ b/ubuntu/_base/applications/tdeio/kio-apt/debian/copyright
diff --git a/ubuntu/_base/applications/kio-apt/debian/docs b/ubuntu/_base/applications/tdeio/kio-apt/debian/docs
index 62deb0497..62deb0497 100644
--- a/ubuntu/_base/applications/kio-apt/debian/docs
+++ b/ubuntu/_base/applications/tdeio/kio-apt/debian/docs
diff --git a/ubuntu/_base/applications/kio-apt/debian/fixrpath b/ubuntu/_base/applications/tdeio/kio-apt/debian/fixrpath
index 0ca44359e..0ca44359e 100755
--- a/ubuntu/_base/applications/kio-apt/debian/fixrpath
+++ b/ubuntu/_base/applications/tdeio/kio-apt/debian/fixrpath
diff --git a/ubuntu/_base/applications/kio-apt/debian/kdedeb_logo.png.uu b/ubuntu/_base/applications/tdeio/kio-apt/debian/kdedeb_logo.png.uu
index 85ac9ca79..85ac9ca79 100644
--- a/ubuntu/_base/applications/kio-apt/debian/kdedeb_logo.png.uu
+++ b/ubuntu/_base/applications/tdeio/kio-apt/debian/kdedeb_logo.png.uu
diff --git a/ubuntu/_base/applications/kmplayer/debian/patches/series b/ubuntu/_base/applications/tdeio/kio-apt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kmplayer/debian/patches/series
+++ b/ubuntu/_base/applications/tdeio/kio-apt/debian/patches/series
diff --git a/ubuntu/_base/applications/kio-apt/debian/rules b/ubuntu/_base/applications/tdeio/kio-apt/debian/rules
index e519cb2fe..e519cb2fe 100755
--- a/ubuntu/_base/applications/kio-apt/debian/rules
+++ b/ubuntu/_base/applications/tdeio/kio-apt/debian/rules
diff --git a/ubuntu/_base/applications/konversation/debian/source/format b/ubuntu/_base/applications/tdeio/kio-apt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/konversation/debian/source/format
+++ b/ubuntu/_base/applications/tdeio/kio-apt/debian/source/format
diff --git a/ubuntu/_base/applications/konversation/debian/source/options b/ubuntu/_base/applications/tdeio/kio-apt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/konversation/debian/source/options
+++ b/ubuntu/_base/applications/tdeio/kio-apt/debian/source/options
diff --git a/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/kio-locate/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio/kio-locate/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kmplayer/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/kio-locate/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kmplayer/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tdeio/kio-locate/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kio-locate/debian/changelog b/ubuntu/_base/applications/tdeio/kio-locate/debian/changelog
index 6fe22089e..6fe22089e 100644
--- a/ubuntu/_base/applications/kio-locate/debian/changelog
+++ b/ubuntu/_base/applications/tdeio/kio-locate/debian/changelog
diff --git a/ubuntu/_base/applications/kpowersave/debian/compat b/ubuntu/_base/applications/tdeio/kio-locate/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kpowersave/debian/compat
+++ b/ubuntu/_base/applications/tdeio/kio-locate/debian/compat
diff --git a/ubuntu/_base/applications/kio-locate/debian/control b/ubuntu/_base/applications/tdeio/kio-locate/debian/control
index c7aec055b..c7aec055b 100644
--- a/ubuntu/_base/applications/kio-locate/debian/control
+++ b/ubuntu/_base/applications/tdeio/kio-locate/debian/control
diff --git a/ubuntu/_base/applications/kio-locate/debian/copyright b/ubuntu/_base/applications/tdeio/kio-locate/debian/copyright
index 17e1fdc15..17e1fdc15 100644
--- a/ubuntu/_base/applications/kio-locate/debian/copyright
+++ b/ubuntu/_base/applications/tdeio/kio-locate/debian/copyright
diff --git a/ubuntu/_base/applications/kmymoney/debian/patches/series b/ubuntu/_base/applications/tdeio/kio-locate/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kmymoney/debian/patches/series
+++ b/ubuntu/_base/applications/tdeio/kio-locate/debian/patches/series
diff --git a/ubuntu/_base/applications/kio-locate/debian/rules b/ubuntu/_base/applications/tdeio/kio-locate/debian/rules
index b13f963a0..b13f963a0 100755
--- a/ubuntu/_base/applications/kio-locate/debian/rules
+++ b/ubuntu/_base/applications/tdeio/kio-locate/debian/rules
diff --git a/ubuntu/_base/applications/kopete-otr/debian/source/format b/ubuntu/_base/applications/tdeio/kio-locate/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kopete-otr/debian/source/format
+++ b/ubuntu/_base/applications/tdeio/kio-locate/debian/source/format
diff --git a/ubuntu/_base/applications/kopete-otr/debian/source/options b/ubuntu/_base/applications/tdeio/kio-locate/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kopete-otr/debian/source/options
+++ b/ubuntu/_base/applications/tdeio/kio-locate/debian/source/options
diff --git a/ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kmymoney/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kmymoney/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kio-umountwrapper/debian/changelog b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/changelog
index 44969da09..44969da09 100644
--- a/ubuntu/_base/applications/kio-umountwrapper/debian/changelog
+++ b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/changelog
diff --git a/ubuntu/_base/applications/kradio/debian/compat b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kradio/debian/compat
+++ b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/compat
diff --git a/ubuntu/_base/applications/kio-umountwrapper/debian/control b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/control
index 36e03611f..36e03611f 100644
--- a/ubuntu/_base/applications/kio-umountwrapper/debian/control
+++ b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/control
diff --git a/ubuntu/_base/applications/kio-umountwrapper/debian/copyright b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/copyright
index 08e471ac6..08e471ac6 100644
--- a/ubuntu/_base/applications/kio-umountwrapper/debian/copyright
+++ b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/copyright
diff --git a/ubuntu/_base/applications/kio-umountwrapper/debian/media_safelyremove.desktop b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/media_safelyremove.desktop
index 970caf8a5..970caf8a5 100644
--- a/ubuntu/_base/applications/kio-umountwrapper/debian/media_safelyremove.desktop
+++ b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/media_safelyremove.desktop
diff --git a/ubuntu/_base/applications/knemo/debian/patches/series b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/knemo/debian/patches/series
+++ b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/patches/series
diff --git a/ubuntu/_base/applications/kio-umountwrapper/debian/postrm b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/postrm
index 2baeddc3e..2baeddc3e 100644
--- a/ubuntu/_base/applications/kio-umountwrapper/debian/postrm
+++ b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/postrm
diff --git a/ubuntu/_base/applications/kio-umountwrapper/debian/preinst b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/preinst
index 78e02c765..78e02c765 100644
--- a/ubuntu/_base/applications/kio-umountwrapper/debian/preinst
+++ b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/preinst
diff --git a/ubuntu/_base/applications/kio-umountwrapper/debian/rules b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/rules
index aef1a4538..aef1a4538 100755
--- a/ubuntu/_base/applications/kio-umountwrapper/debian/rules
+++ b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/rules
diff --git a/ubuntu/_base/applications/kpicosim/debian/source/format b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kpicosim/debian/source/format
+++ b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/source/format
diff --git a/ubuntu/_base/applications/kpicosim/debian/source/options b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kpicosim/debian/source/options
+++ b/ubuntu/_base/applications/tdeio/kio-umountwrapper/debian/source/options
diff --git a/ubuntu/_base/applications/tellico/debian/compat b/ubuntu/_base/applications/tellico/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/ubuntu/_base/applications/tellico/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/ubuntu/_base/applications/tellico/debian/source/format b/ubuntu/_base/applications/tellico/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/_base/applications/tellico/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ubuntu/_base/applications/tellico/debian/source/options b/ubuntu/_base/applications/tellico/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/applications/tellico/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
index a34c9c81c..a34c9c81c 100644
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4 b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
index 874f83934..874f83934 100644
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
diff --git a/ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/knemo/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/knemo/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/changelog b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/changelog
index cf3d30a9a..cf3d30a9a 100644
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/changelog
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/changelog
diff --git a/ubuntu/_base/applications/krename/debian/compat b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/krename/debian/compat
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/control b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control
index af162453e..af162453e 100644
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/control
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/copyright b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/copyright
index aa4e449ee..aa4e449ee 100644
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/copyright
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/copyright
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
index 5502ed8f4..5502ed8f4 100644
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
index b477f5ce2..b477f5ce2 100644
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
diff --git a/ubuntu/_base/applications/knetstats/debian/patches/series b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/knetstats/debian/patches/series
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/patches/series
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/rules b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules
index d193b164f..d193b164f 100755
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/rules
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules
diff --git a/ubuntu/_base/applications/kpilot/debian/source/format b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kpilot/debian/source/format
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/source/format
diff --git a/ubuntu/_base/applications/kpilot/debian/source/options b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kpilot/debian/source/options
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/source/options
diff --git a/ubuntu/_base/applications/kde-style-lipstik/debian/changelog b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/changelog
index 8df3a0424..8df3a0424 100644
--- a/ubuntu/_base/applications/kde-style-lipstik/debian/changelog
+++ b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/changelog
diff --git a/ubuntu/_base/applications/krusader/debian/compat b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/krusader/debian/compat
+++ b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/compat
diff --git a/ubuntu/_base/applications/kde-style-lipstik/debian/control b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/control
index 3ea18fee8..3ea18fee8 100644
--- a/ubuntu/_base/applications/kde-style-lipstik/debian/control
+++ b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/control
diff --git a/ubuntu/_base/applications/kde-style-lipstik/debian/copyright b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/copyright
index 446318fca..446318fca 100644
--- a/ubuntu/_base/applications/kde-style-lipstik/debian/copyright
+++ b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/copyright
diff --git a/ubuntu/_base/applications/knetload/debian/dirs b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/dirs
index 43e7f554c..43e7f554c 100644
--- a/ubuntu/_base/applications/knetload/debian/dirs
+++ b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/dirs
diff --git a/ubuntu/_base/applications/kde-style-lipstik/debian/docs b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/docs
index 0948b8ef4..0948b8ef4 100644
--- a/ubuntu/_base/applications/kde-style-lipstik/debian/docs
+++ b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/docs
diff --git a/ubuntu/_base/applications/ksquirrel/debian/patches/.gitignore b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/ksquirrel/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/kde-style-lipstik/debian/rules b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/rules
index 620265e8e..620265e8e 100755
--- a/ubuntu/_base/applications/kde-style-lipstik/debian/rules
+++ b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/rules
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/source/format b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/source/format
+++ b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/source/format
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/source/options b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/source/options
+++ b/ubuntu/_base/applications/themes/kde-style-lipstik/debian/source/options
diff --git a/ubuntu/_base/applications/knetworkmanager.cmake/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/knetworkmanager.cmake/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/knetstats/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/knetstats/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kde-style-qtcurve/debian/changelog b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/changelog
index b89b8bc90..b89b8bc90 100644
--- a/ubuntu/_base/applications/kde-style-qtcurve/debian/changelog
+++ b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/changelog
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/compat b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/compat
+++ b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/compat
diff --git a/ubuntu/_base/applications/kde-style-qtcurve/debian/control b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/control
index 9d6d2b6c7..9d6d2b6c7 100644
--- a/ubuntu/_base/applications/kde-style-qtcurve/debian/control
+++ b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/control
diff --git a/ubuntu/_base/applications/kde-style-qtcurve/debian/copyright b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/copyright
index 055d8a659..055d8a659 100644
--- a/ubuntu/_base/applications/kde-style-qtcurve/debian/copyright
+++ b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/copyright
diff --git a/ubuntu/_base/applications/ksquirrel/debian/docs b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/_base/applications/ksquirrel/debian/docs
+++ b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/docs
diff --git a/ubuntu/_base/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
index 003761370..003761370 100644
--- a/ubuntu/_base/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
+++ b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
diff --git a/ubuntu/_base/applications/knetworkmanager.cmake/debian/patches/series b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/knetworkmanager.cmake/debian/patches/series
+++ b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/patches/series
diff --git a/ubuntu/_base/applications/kde-style-qtcurve/debian/rules b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/rules
index f9774bf4b..f9774bf4b 100755
--- a/ubuntu/_base/applications/kde-style-qtcurve/debian/rules
+++ b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/rules
diff --git a/ubuntu/_base/applications/kde-style-qtcurve/debian/scan-version b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/scan-version
index 640ea27c7..640ea27c7 100644
--- a/ubuntu/_base/applications/kde-style-qtcurve/debian/scan-version
+++ b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/scan-version
diff --git a/ubuntu/_base/applications/kpowersave/debian/source/format b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kpowersave/debian/source/format
+++ b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/source/format
diff --git a/ubuntu/_base/applications/kpowersave/debian/source/options b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kpowersave/debian/source/options
+++ b/ubuntu/_base/applications/themes/kde-style-qtcurve/debian/source/options
diff --git a/ubuntu/_base/applications/kdmtheme/debian/README.Debian b/ubuntu/_base/applications/themes/kdmtheme/debian/README.Debian
index 1291b6a32..1291b6a32 100644
--- a/ubuntu/_base/applications/kdmtheme/debian/README.Debian
+++ b/ubuntu/_base/applications/themes/kdmtheme/debian/README.Debian
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/kdmtheme/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/themes/kdmtheme/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/knetworkmanager.cmake/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/kdmtheme/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/themes/kdmtheme/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kdmtheme/debian/changelog b/ubuntu/_base/applications/themes/kdmtheme/debian/changelog
index e14e2952b..e14e2952b 100644
--- a/ubuntu/_base/applications/kdmtheme/debian/changelog
+++ b/ubuntu/_base/applications/themes/kdmtheme/debian/changelog
diff --git a/ubuntu/_base/applications/ksquirrel/debian/compat b/ubuntu/_base/applications/themes/kdmtheme/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/ksquirrel/debian/compat
+++ b/ubuntu/_base/applications/themes/kdmtheme/debian/compat
diff --git a/ubuntu/_base/applications/kdmtheme/debian/control b/ubuntu/_base/applications/themes/kdmtheme/debian/control
index c87bd3a51..c87bd3a51 100644
--- a/ubuntu/_base/applications/kdmtheme/debian/control
+++ b/ubuntu/_base/applications/themes/kdmtheme/debian/control
diff --git a/ubuntu/_base/applications/kdmtheme/debian/copyright b/ubuntu/_base/applications/themes/kdmtheme/debian/copyright
index 23265e2b6..23265e2b6 100644
--- a/ubuntu/_base/applications/kdmtheme/debian/copyright
+++ b/ubuntu/_base/applications/themes/kdmtheme/debian/copyright
diff --git a/ubuntu/_base/applications/kdmtheme/debian/docs b/ubuntu/_base/applications/themes/kdmtheme/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/_base/applications/kdmtheme/debian/docs
+++ b/ubuntu/_base/applications/themes/kdmtheme/debian/docs
diff --git a/ubuntu/_base/applications/kdmtheme/debian/kdmtheme.lintian-overrides b/ubuntu/_base/applications/themes/kdmtheme/debian/kdmtheme.lintian-overrides
index d033183c7..d033183c7 100644
--- a/ubuntu/_base/applications/kdmtheme/debian/kdmtheme.lintian-overrides
+++ b/ubuntu/_base/applications/themes/kdmtheme/debian/kdmtheme.lintian-overrides
diff --git a/ubuntu/_base/applications/ktechlab/debian/patches/.gitignore b/ubuntu/_base/applications/themes/kdmtheme/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/ktechlab/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/themes/kdmtheme/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/kdmtheme/debian/rules b/ubuntu/_base/applications/themes/kdmtheme/debian/rules
index dc62a73d6..dc62a73d6 100755
--- a/ubuntu/_base/applications/kdmtheme/debian/rules
+++ b/ubuntu/_base/applications/themes/kdmtheme/debian/rules
diff --git a/ubuntu/_base/applications/kradio/debian/source/format b/ubuntu/_base/applications/themes/kdmtheme/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kradio/debian/source/format
+++ b/ubuntu/_base/applications/themes/kdmtheme/debian/source/format
diff --git a/ubuntu/_base/applications/kradio/debian/source/options b/ubuntu/_base/applications/themes/kdmtheme/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kradio/debian/source/options
+++ b/ubuntu/_base/applications/themes/kdmtheme/debian/source/options
diff --git a/ubuntu/_base/applications/kdmtheme/debian/watch b/ubuntu/_base/applications/themes/kdmtheme/debian/watch
index 5cf8d8c80..5cf8d8c80 100644
--- a/ubuntu/_base/applications/kdmtheme/debian/watch
+++ b/ubuntu/_base/applications/themes/kdmtheme/debian/watch
diff --git a/ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/changelog b/ubuntu/_base/applications/themes/kgtk-qt3/debian/changelog
index e2c2e4920..e2c2e4920 100644
--- a/ubuntu/_base/applications/kgtk-qt3/debian/changelog
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/changelog
diff --git a/ubuntu/_base/applications/kstreamripper/debian/compat b/ubuntu/_base/applications/themes/kgtk-qt3/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kstreamripper/debian/compat
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/compat
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/control b/ubuntu/_base/applications/themes/kgtk-qt3/debian/control
index c7caa3191..c7caa3191 100644
--- a/ubuntu/_base/applications/kgtk-qt3/debian/control
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/control
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/copyright b/ubuntu/_base/applications/themes/kgtk-qt3/debian/copyright
index 0e93ef880..0e93ef880 100644
--- a/ubuntu/_base/applications/kgtk-qt3/debian/copyright
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/copyright
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian b/ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
index f7e4ea7f5..f7e4ea7f5 100644
--- a/ubuntu/_base/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/patches/series b/ubuntu/_base/applications/themes/kgtk-qt3/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/knetworkmanager8/debian/patches/series
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/patches/series
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/preload b/ubuntu/_base/applications/themes/kgtk-qt3/debian/preload
index 9508902de..9508902de 100644
--- a/ubuntu/_base/applications/kgtk-qt3/debian/preload
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/preload
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/rules b/ubuntu/_base/applications/themes/kgtk-qt3/debian/rules
index 4967ded6b..4967ded6b 100755
--- a/ubuntu/_base/applications/kgtk-qt3/debian/rules
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/rules
diff --git a/ubuntu/_base/applications/krename/debian/source/format b/ubuntu/_base/applications/themes/kgtk-qt3/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/krename/debian/source/format
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/source/format
diff --git a/ubuntu/_base/applications/krename/debian/source/options b/ubuntu/_base/applications/themes/kgtk-qt3/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/krename/debian/source/options
+++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/source/options
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/changelog b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/changelog
index 690318477..690318477 100644
--- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/changelog
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/changelog
diff --git a/ubuntu/_base/applications/ksystemlog/debian/compat b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/ksystemlog/debian/compat
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/control b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control
index 26aa2ac82..26aa2ac82 100644
--- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/control
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/copyright b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/copyright
index 087e70775..087e70775 100644
--- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/copyright
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/copyright
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/debiandirs b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/debiandirs
index 0e561941d..0e561941d 100644
--- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/debiandirs
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/debiandirs
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/dirs b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/dirs
index 29183d0bc..29183d0bc 100644
--- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/dirs
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/dirs
diff --git a/ubuntu/_base/applications/kvkbd/debian/patches/.gitignore b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kvkbd/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/rules b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/rules
index 2e7053e8b..2e7053e8b 100755
--- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/rules
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/rules
diff --git a/ubuntu/_base/applications/krusader/debian/source/format b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/krusader/debian/source/format
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/source/format
diff --git a/ubuntu/_base/applications/krusader/debian/source/options b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/krusader/debian/source/options
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/source/options
diff --git a/ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/koffice/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/koffice/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kwin-style-crystal/debian/changelog b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/changelog
index acdd7341d..acdd7341d 100644
--- a/ubuntu/_base/applications/kwin-style-crystal/debian/changelog
+++ b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/changelog
diff --git a/ubuntu/_base/applications/ktechlab/debian/compat b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/ktechlab/debian/compat
+++ b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/compat
diff --git a/ubuntu/_base/applications/kwin-style-crystal/debian/control b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/control
index 67118b2a7..67118b2a7 100644
--- a/ubuntu/_base/applications/kwin-style-crystal/debian/control
+++ b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/control
diff --git a/ubuntu/_base/applications/kwin-style-crystal/debian/copyright b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/copyright
index dbb28c22d..dbb28c22d 100644
--- a/ubuntu/_base/applications/kwin-style-crystal/debian/copyright
+++ b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/copyright
diff --git a/ubuntu/_base/applications/kwin-style-crystal/debian/dirs b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/dirs
index cbf4aa905..cbf4aa905 100644
--- a/ubuntu/_base/applications/kwin-style-crystal/debian/dirs
+++ b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/dirs
diff --git a/ubuntu/_base/applications/kwin-style-crystal/debian/docs b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/_base/applications/kwin-style-crystal/debian/docs
+++ b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/docs
diff --git a/ubuntu/_base/applications/koffice/debian/patches/series b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/koffice/debian/patches/series
+++ b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/patches/series
diff --git a/ubuntu/_base/applications/kwin-style-crystal/debian/rules b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/rules
index 6a0576064..6a0576064 100755
--- a/ubuntu/_base/applications/kwin-style-crystal/debian/rules
+++ b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/rules
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/source/format b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/source/format
+++ b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/source/format
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/source/options b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/source/options
+++ b/ubuntu/_base/applications/themes/kwin-style-crystal/debian/source/options
diff --git a/ubuntu/_base/applications/abakus/debian/abakus-trinity.manpages b/ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.manpages
index 0737a321e..0737a321e 100644
--- a/ubuntu/_base/applications/abakus/debian/abakus-trinity.manpages
+++ b/ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.manpages
diff --git a/ubuntu/_base/applications/abakus/debian/abakus-trinity.menu b/ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.menu
index fb1dcd130..fb1dcd130 100644
--- a/ubuntu/_base/applications/abakus/debian/abakus-trinity.menu
+++ b/ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.menu
diff --git a/ubuntu/_base/applications/abakus/debian/abakus.1 b/ubuntu/_base/applications/utilities/abakus/debian/abakus.1
index 74afe7056..74afe7056 100644
--- a/ubuntu/_base/applications/abakus/debian/abakus.1
+++ b/ubuntu/_base/applications/utilities/abakus/debian/abakus.1
diff --git a/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/konversation/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/abakus/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/konversation/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/utilities/abakus/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/abakus/debian/changelog b/ubuntu/_base/applications/utilities/abakus/debian/changelog
index 4bca3dc33..4bca3dc33 100644
--- a/ubuntu/_base/applications/abakus/debian/changelog
+++ b/ubuntu/_base/applications/utilities/abakus/debian/changelog
diff --git a/ubuntu/_base/applications/ktorrent/debian/compat b/ubuntu/_base/applications/utilities/abakus/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/ktorrent/debian/compat
+++ b/ubuntu/_base/applications/utilities/abakus/debian/compat
diff --git a/ubuntu/_base/applications/abakus/debian/control b/ubuntu/_base/applications/utilities/abakus/debian/control
index 7069b7064..7069b7064 100644
--- a/ubuntu/_base/applications/abakus/debian/control
+++ b/ubuntu/_base/applications/utilities/abakus/debian/control
diff --git a/ubuntu/_base/applications/abakus/debian/copyright b/ubuntu/_base/applications/utilities/abakus/debian/copyright
index 5d11ec083..5d11ec083 100644
--- a/ubuntu/_base/applications/abakus/debian/copyright
+++ b/ubuntu/_base/applications/utilities/abakus/debian/copyright
diff --git a/ubuntu/_base/applications/soundkonverter/debian/docs b/ubuntu/_base/applications/utilities/abakus/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/_base/applications/soundkonverter/debian/docs
+++ b/ubuntu/_base/applications/utilities/abakus/debian/docs
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/patches/series b/ubuntu/_base/applications/utilities/abakus/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/patches/series
+++ b/ubuntu/_base/applications/utilities/abakus/debian/patches/series
diff --git a/ubuntu/_base/applications/abakus/debian/rules b/ubuntu/_base/applications/utilities/abakus/debian/rules
index b836e500f..b836e500f 100755
--- a/ubuntu/_base/applications/abakus/debian/rules
+++ b/ubuntu/_base/applications/utilities/abakus/debian/rules
diff --git a/ubuntu/_base/applications/ksquirrel/debian/source/format b/ubuntu/_base/applications/utilities/abakus/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/ksquirrel/debian/source/format
+++ b/ubuntu/_base/applications/utilities/abakus/debian/source/format
diff --git a/ubuntu/_base/applications/ksquirrel/debian/source/options b/ubuntu/_base/applications/utilities/abakus/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/ksquirrel/debian/source/options
+++ b/ubuntu/_base/applications/utilities/abakus/debian/source/options
diff --git a/ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kopete-otr/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/filelight/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kopete-otr/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/utilities/filelight/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/filelight/debian/changelog b/ubuntu/_base/applications/utilities/filelight/debian/changelog
index d59a45c8e..d59a45c8e 100644
--- a/ubuntu/_base/applications/filelight/debian/changelog
+++ b/ubuntu/_base/applications/utilities/filelight/debian/changelog
diff --git a/ubuntu/_base/applications/kuickshow/debian/compat b/ubuntu/_base/applications/utilities/filelight/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kuickshow/debian/compat
+++ b/ubuntu/_base/applications/utilities/filelight/debian/compat
diff --git a/ubuntu/_base/applications/filelight/debian/control b/ubuntu/_base/applications/utilities/filelight/debian/control
index ba8fabc22..ba8fabc22 100644
--- a/ubuntu/_base/applications/filelight/debian/control
+++ b/ubuntu/_base/applications/utilities/filelight/debian/control
diff --git a/ubuntu/_base/applications/filelight/debian/copyright b/ubuntu/_base/applications/utilities/filelight/debian/copyright
index c02dc5949..c02dc5949 100644
--- a/ubuntu/_base/applications/filelight/debian/copyright
+++ b/ubuntu/_base/applications/utilities/filelight/debian/copyright
diff --git a/ubuntu/_base/applications/filelight/debian/filelight.1 b/ubuntu/_base/applications/utilities/filelight/debian/filelight.1
index ce932984b..ce932984b 100644
--- a/ubuntu/_base/applications/filelight/debian/filelight.1
+++ b/ubuntu/_base/applications/utilities/filelight/debian/filelight.1
diff --git a/ubuntu/_base/applications/filelight/debian/menu b/ubuntu/_base/applications/utilities/filelight/debian/menu
index 4db4c3f62..4db4c3f62 100644
--- a/ubuntu/_base/applications/filelight/debian/menu
+++ b/ubuntu/_base/applications/utilities/filelight/debian/menu
diff --git a/ubuntu/_base/applications/kpowersave/debian/patches/series b/ubuntu/_base/applications/utilities/filelight/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kpowersave/debian/patches/series
+++ b/ubuntu/_base/applications/utilities/filelight/debian/patches/series
diff --git a/ubuntu/_base/applications/filelight/debian/rules b/ubuntu/_base/applications/utilities/filelight/debian/rules
index 9f556724c..9f556724c 100755
--- a/ubuntu/_base/applications/filelight/debian/rules
+++ b/ubuntu/_base/applications/utilities/filelight/debian/rules
diff --git a/ubuntu/_base/applications/kstreamripper/debian/source/format b/ubuntu/_base/applications/utilities/filelight/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kstreamripper/debian/source/format
+++ b/ubuntu/_base/applications/utilities/filelight/debian/source/format
diff --git a/ubuntu/_base/applications/kstreamripper/debian/source/options b/ubuntu/_base/applications/utilities/filelight/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kstreamripper/debian/source/options
+++ b/ubuntu/_base/applications/utilities/filelight/debian/source/options
diff --git a/ubuntu/_base/applications/wlassistant/debian/README.Debian b/ubuntu/_base/applications/utilities/kbarcode/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/_base/applications/wlassistant/debian/README.Debian
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/README.Debian
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kpilot/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kpilot/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kbarcode/debian/changelog b/ubuntu/_base/applications/utilities/kbarcode/debian/changelog
index df15715c2..df15715c2 100644
--- a/ubuntu/_base/applications/kbarcode/debian/changelog
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/changelog
diff --git a/ubuntu/_base/applications/kvirc/debian/compat b/ubuntu/_base/applications/utilities/kbarcode/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kvirc/debian/compat
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/compat
diff --git a/ubuntu/_base/applications/kbarcode/debian/control b/ubuntu/_base/applications/utilities/kbarcode/debian/control
index 45dff7966..45dff7966 100644
--- a/ubuntu/_base/applications/kbarcode/debian/control
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/control
diff --git a/ubuntu/_base/applications/kbarcode/debian/copyright b/ubuntu/_base/applications/utilities/kbarcode/debian/copyright
index 37bf717a2..37bf717a2 100644
--- a/ubuntu/_base/applications/kbarcode/debian/copyright
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/copyright
diff --git a/ubuntu/_base/applications/kstreamripper/debian/docs b/ubuntu/_base/applications/utilities/kbarcode/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/_base/applications/kstreamripper/debian/docs
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/docs
diff --git a/ubuntu/_base/applications/kbarcode/debian/kbarcode.1 b/ubuntu/_base/applications/utilities/kbarcode/debian/kbarcode.1
index 12d3bfaad..12d3bfaad 100644
--- a/ubuntu/_base/applications/kbarcode/debian/kbarcode.1
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/kbarcode.1
diff --git a/ubuntu/_base/applications/kbarcode/debian/menu b/ubuntu/_base/applications/utilities/kbarcode/debian/menu
index 48b3f8eff..48b3f8eff 100644
--- a/ubuntu/_base/applications/kbarcode/debian/menu
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/menu
diff --git a/ubuntu/_base/applications/soundkonverter/debian/patches/.gitignore b/ubuntu/_base/applications/utilities/kbarcode/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/soundkonverter/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/kbarcode/debian/rules b/ubuntu/_base/applications/utilities/kbarcode/debian/rules
index f0d7cbfe2..f0d7cbfe2 100755
--- a/ubuntu/_base/applications/kbarcode/debian/rules
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/rules
diff --git a/ubuntu/_base/applications/kbarcode/debian/source.lintian-overrides b/ubuntu/_base/applications/utilities/kbarcode/debian/source.lintian-overrides
index cb165370f..cb165370f 100644
--- a/ubuntu/_base/applications/kbarcode/debian/source.lintian-overrides
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/source.lintian-overrides
diff --git a/ubuntu/_base/applications/ksystemlog/debian/source/format b/ubuntu/_base/applications/utilities/kbarcode/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/ksystemlog/debian/source/format
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/source/format
diff --git a/ubuntu/_base/applications/ksystemlog/debian/source/options b/ubuntu/_base/applications/utilities/kbarcode/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/ksystemlog/debian/source/options
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/source/options
diff --git a/ubuntu/_base/applications/kbarcode/debian/watch b/ubuntu/_base/applications/utilities/kbarcode/debian/watch
index f0291570e..f0291570e 100644
--- a/ubuntu/_base/applications/kbarcode/debian/watch
+++ b/ubuntu/_base/applications/utilities/kbarcode/debian/watch
diff --git a/ubuntu/_base/applications/kchmviewer/debian/additions/kchmviewer.1 b/ubuntu/_base/applications/utilities/kchmviewer/debian/additions/kchmviewer.1
index 8598644e6..8598644e6 100644
--- a/ubuntu/_base/applications/kchmviewer/debian/additions/kchmviewer.1
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/additions/kchmviewer.1
diff --git a/ubuntu/_base/applications/kchmviewer/debian/changelog b/ubuntu/_base/applications/utilities/kchmviewer/debian/changelog
index 91fe29383..91fe29383 100644
--- a/ubuntu/_base/applications/kchmviewer/debian/changelog
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/changelog
diff --git a/ubuntu/_base/applications/kvkbd/debian/compat b/ubuntu/_base/applications/utilities/kchmviewer/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kvkbd/debian/compat
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/compat
diff --git a/ubuntu/_base/applications/kchmviewer/debian/control b/ubuntu/_base/applications/utilities/kchmviewer/debian/control
index 7d0864525..7d0864525 100644
--- a/ubuntu/_base/applications/kchmviewer/debian/control
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/control
diff --git a/ubuntu/_base/applications/kchmviewer/debian/copyright b/ubuntu/_base/applications/utilities/kchmviewer/debian/copyright
index b221828b7..b221828b7 100644
--- a/ubuntu/_base/applications/kchmviewer/debian/copyright
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/copyright
diff --git a/ubuntu/_base/applications/kchmviewer/debian/debiandirs b/ubuntu/_base/applications/utilities/kchmviewer/debian/debiandirs
index 22e3692f0..22e3692f0 100644
--- a/ubuntu/_base/applications/kchmviewer/debian/debiandirs
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/debiandirs
diff --git a/ubuntu/_base/applications/kchmviewer/debian/dirs b/ubuntu/_base/applications/utilities/kchmviewer/debian/dirs
index 9d345cd36..9d345cd36 100644
--- a/ubuntu/_base/applications/kchmviewer/debian/dirs
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/dirs
diff --git a/ubuntu/_base/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages b/ubuntu/_base/applications/utilities/kchmviewer/debian/kchmviewer-nokde-trinity.manpages
index eb0e0bf59..eb0e0bf59 100644
--- a/ubuntu/_base/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/kchmviewer-nokde-trinity.manpages
diff --git a/ubuntu/_base/applications/kchmviewer/debian/manpages b/ubuntu/_base/applications/utilities/kchmviewer/debian/manpages
index eb0e0bf59..eb0e0bf59 100644
--- a/ubuntu/_base/applications/kchmviewer/debian/manpages
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/manpages
diff --git a/ubuntu/_base/applications/kchmviewer/debian/menu b/ubuntu/_base/applications/utilities/kchmviewer/debian/menu
index 00508b25c..00508b25c 100644
--- a/ubuntu/_base/applications/kchmviewer/debian/menu
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/menu
diff --git a/ubuntu/_base/applications/yakuake/debian/patches/.gitignore b/ubuntu/_base/applications/utilities/kchmviewer/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/yakuake/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/patches/.gitignore
diff --git a/ubuntu/_base/applications/kchmviewer/debian/rules b/ubuntu/_base/applications/utilities/kchmviewer/debian/rules
index 0fdbf1173..0fdbf1173 100755
--- a/ubuntu/_base/applications/kchmviewer/debian/rules
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/rules
diff --git a/ubuntu/_base/applications/ktechlab/debian/source/format b/ubuntu/_base/applications/utilities/kchmviewer/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/ktechlab/debian/source/format
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/source/format
diff --git a/ubuntu/_base/applications/ktechlab/debian/source/options b/ubuntu/_base/applications/utilities/kchmviewer/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/ktechlab/debian/source/options
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/source/options
diff --git a/ubuntu/_base/applications/kchmviewer/debian/watch b/ubuntu/_base/applications/utilities/kchmviewer/debian/watch
index e55a5c924..e55a5c924 100644
--- a/ubuntu/_base/applications/kchmviewer/debian/watch
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/watch
diff --git a/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kpowersave.cmake/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kpowersave.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kcpuload/debian/changelog b/ubuntu/_base/applications/utilities/kcpuload/debian/changelog
index 16264ec9d..16264ec9d 100644
--- a/ubuntu/_base/applications/kcpuload/debian/changelog
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/changelog
diff --git a/ubuntu/_base/applications/kwin-style-crystal/debian/compat b/ubuntu/_base/applications/utilities/kcpuload/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/kwin-style-crystal/debian/compat
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/compat
diff --git a/ubuntu/_base/applications/kcpuload/debian/control b/ubuntu/_base/applications/utilities/kcpuload/debian/control
index f87605737..f87605737 100644
--- a/ubuntu/_base/applications/kcpuload/debian/control
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/control
diff --git a/ubuntu/_base/applications/kcpuload/debian/copyright b/ubuntu/_base/applications/utilities/kcpuload/debian/copyright
index a5ee5d69c..a5ee5d69c 100644
--- a/ubuntu/_base/applications/kcpuload/debian/copyright
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/copyright
diff --git a/ubuntu/_base/applications/kcpuload/debian/doc-base b/ubuntu/_base/applications/utilities/kcpuload/debian/doc-base
index 59af0de31..59af0de31 100644
--- a/ubuntu/_base/applications/kcpuload/debian/doc-base
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/doc-base
diff --git a/ubuntu/_base/applications/kcpuload/debian/docs b/ubuntu/_base/applications/utilities/kcpuload/debian/docs
index 63c61960c..63c61960c 100644
--- a/ubuntu/_base/applications/kcpuload/debian/docs
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/docs
diff --git a/ubuntu/_base/applications/kcpuload/debian/kcpuload.1 b/ubuntu/_base/applications/utilities/kcpuload/debian/kcpuload.1
index 0eb630559..0eb630559 100644
--- a/ubuntu/_base/applications/kcpuload/debian/kcpuload.1
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/kcpuload.1
diff --git a/ubuntu/_base/applications/kcpuload/debian/kcpuload.install b/ubuntu/_base/applications/utilities/kcpuload/debian/kcpuload.install
index d3c2fb81c..d3c2fb81c 100644
--- a/ubuntu/_base/applications/kcpuload/debian/kcpuload.install
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/kcpuload.install
diff --git a/ubuntu/_base/applications/kcpuload/debian/kcpuload.xpm b/ubuntu/_base/applications/utilities/kcpuload/debian/kcpuload.xpm
index 3c49eab7e..3c49eab7e 100644
--- a/ubuntu/_base/applications/kcpuload/debian/kcpuload.xpm
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/kcpuload.xpm
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/links b/ubuntu/_base/applications/utilities/kcpuload/debian/links
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/kdbusnotification/debian/links
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/links
diff --git a/ubuntu/_base/applications/kcpuload/debian/menu b/ubuntu/_base/applications/utilities/kcpuload/debian/menu
index 684348e2f..684348e2f 100644
--- a/ubuntu/_base/applications/kcpuload/debian/menu
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/menu
diff --git a/ubuntu/_base/applications/kcpuload/debian/override b/ubuntu/_base/applications/utilities/kcpuload/debian/override
index e3c6bcea4..e3c6bcea4 100644
--- a/ubuntu/_base/applications/kcpuload/debian/override
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/override
diff --git a/ubuntu/_base/applications/kcpuload/debian/rules b/ubuntu/_base/applications/utilities/kcpuload/debian/rules
index bc0e82531..bc0e82531 100755
--- a/ubuntu/_base/applications/kcpuload/debian/rules
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/rules
diff --git a/ubuntu/_base/applications/kcpuload/debian/source.lintian-overrides b/ubuntu/_base/applications/utilities/kcpuload/debian/source.lintian-overrides
index 417f308dc..417f308dc 100644
--- a/ubuntu/_base/applications/kcpuload/debian/source.lintian-overrides
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/source.lintian-overrides
diff --git a/ubuntu/_base/applications/ktorrent/debian/source/format b/ubuntu/_base/applications/utilities/kcpuload/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/ktorrent/debian/source/format
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/source/format
diff --git a/ubuntu/_base/applications/ktorrent/debian/source/options b/ubuntu/_base/applications/utilities/kcpuload/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/ktorrent/debian/source/options
+++ b/ubuntu/_base/applications/utilities/kcpuload/debian/source/options
diff --git a/ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/kpowersave/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/kpowersave/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kdirstat/debian/changelog b/ubuntu/_base/applications/utilities/kdirstat/debian/changelog
index bf0c6d43b..bf0c6d43b 100644
--- a/ubuntu/_base/applications/kdirstat/debian/changelog
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/changelog
diff --git a/ubuntu/_base/applications/piklab/debian/compat b/ubuntu/_base/applications/utilities/kdirstat/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/piklab/debian/compat
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/compat
diff --git a/ubuntu/_base/applications/kdirstat/debian/control b/ubuntu/_base/applications/utilities/kdirstat/debian/control
index 61124427a..61124427a 100644
--- a/ubuntu/_base/applications/kdirstat/debian/control
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/control
diff --git a/ubuntu/_base/applications/kdirstat/debian/copyright b/ubuntu/_base/applications/utilities/kdirstat/debian/copyright
index 5230f7951..5230f7951 100644
--- a/ubuntu/_base/applications/kdirstat/debian/copyright
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/copyright
diff --git a/ubuntu/_base/applications/kdirstat/debian/kdirstat.1 b/ubuntu/_base/applications/utilities/kdirstat/debian/kdirstat.1
index e58ff535c..e58ff535c 100644
--- a/ubuntu/_base/applications/kdirstat/debian/kdirstat.1
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/kdirstat.1
diff --git a/ubuntu/_base/applications/kdirstat/debian/kdirstat.manpages b/ubuntu/_base/applications/utilities/kdirstat/debian/kdirstat.manpages
index 3e4bf7ff8..3e4bf7ff8 100644
--- a/ubuntu/_base/applications/kdirstat/debian/kdirstat.manpages
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/kdirstat.manpages
diff --git a/ubuntu/_base/applications/krename/debian/patches/series b/ubuntu/_base/applications/utilities/kdirstat/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/krename/debian/patches/series
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/patches/series
diff --git a/ubuntu/_base/applications/kdirstat/debian/rules b/ubuntu/_base/applications/utilities/kdirstat/debian/rules
index efa4effa0..efa4effa0 100755
--- a/ubuntu/_base/applications/kdirstat/debian/rules
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/rules
diff --git a/ubuntu/_base/applications/kdirstat/debian/source.lintian-overrides b/ubuntu/_base/applications/utilities/kdirstat/debian/source.lintian-overrides
index aad24dd30..aad24dd30 100644
--- a/ubuntu/_base/applications/kdirstat/debian/source.lintian-overrides
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/source.lintian-overrides
diff --git a/ubuntu/_base/applications/kuickshow/debian/source/format b/ubuntu/_base/applications/utilities/kdirstat/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kuickshow/debian/source/format
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/source/format
diff --git a/ubuntu/_base/applications/kuickshow/debian/source/options b/ubuntu/_base/applications/utilities/kdirstat/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kuickshow/debian/source/options
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/source/options
diff --git a/ubuntu/_base/applications/kdirstat/debian/watch b/ubuntu/_base/applications/utilities/kdirstat/debian/watch
index 6dc72cf03..6dc72cf03 100644
--- a/ubuntu/_base/applications/kdirstat/debian/watch
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/watch
diff --git a/ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/krename/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/keep/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/krename/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/utilities/keep/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/keep/debian/changelog b/ubuntu/_base/applications/utilities/keep/debian/changelog
index 4cbeb0449..4cbeb0449 100644
--- a/ubuntu/_base/applications/keep/debian/changelog
+++ b/ubuntu/_base/applications/utilities/keep/debian/changelog
diff --git a/ubuntu/_base/applications/potracegui/debian/compat b/ubuntu/_base/applications/utilities/keep/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/potracegui/debian/compat
+++ b/ubuntu/_base/applications/utilities/keep/debian/compat
diff --git a/ubuntu/_base/applications/keep/debian/control b/ubuntu/_base/applications/utilities/keep/debian/control
index c9bd14917..c9bd14917 100644
--- a/ubuntu/_base/applications/keep/debian/control
+++ b/ubuntu/_base/applications/utilities/keep/debian/control
diff --git a/ubuntu/_base/applications/keep/debian/copyright b/ubuntu/_base/applications/utilities/keep/debian/copyright
index ee2494fd8..ee2494fd8 100644
--- a/ubuntu/_base/applications/keep/debian/copyright
+++ b/ubuntu/_base/applications/utilities/keep/debian/copyright
diff --git a/ubuntu/_base/applications/ktechlab/debian/docs b/ubuntu/_base/applications/utilities/keep/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/_base/applications/ktechlab/debian/docs
+++ b/ubuntu/_base/applications/utilities/keep/debian/docs
diff --git a/ubuntu/_base/applications/keep/debian/keep.xml b/ubuntu/_base/applications/utilities/keep/debian/keep.xml
index 31432279d..31432279d 100644
--- a/ubuntu/_base/applications/keep/debian/keep.xml
+++ b/ubuntu/_base/applications/utilities/keep/debian/keep.xml
diff --git a/ubuntu/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/_base/applications/utilities/keep/debian/patches/kubuntu_01_kdepot.diff
index 55238c41a..55238c41a 100644
--- a/ubuntu/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/applications/utilities/keep/debian/patches/kubuntu_01_kdepot.diff
diff --git a/ubuntu/_base/applications/keep/debian/patches/series b/ubuntu/_base/applications/utilities/keep/debian/patches/series
index 9ccf4a125..9ccf4a125 100644
--- a/ubuntu/_base/applications/keep/debian/patches/series
+++ b/ubuntu/_base/applications/utilities/keep/debian/patches/series
diff --git a/ubuntu/_base/applications/keep/debian/rules b/ubuntu/_base/applications/utilities/keep/debian/rules
index de615b1f4..de615b1f4 100755
--- a/ubuntu/_base/applications/keep/debian/rules
+++ b/ubuntu/_base/applications/utilities/keep/debian/rules
diff --git a/ubuntu/_base/applications/kvirc/debian/source/format b/ubuntu/_base/applications/utilities/keep/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kvirc/debian/source/format
+++ b/ubuntu/_base/applications/utilities/keep/debian/source/format
diff --git a/ubuntu/_base/applications/kvirc/debian/source/options b/ubuntu/_base/applications/utilities/keep/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kvirc/debian/source/options
+++ b/ubuntu/_base/applications/utilities/keep/debian/source/options
diff --git a/ubuntu/_base/applications/keep/debian/watch b/ubuntu/_base/applications/utilities/keep/debian/watch
index db207d2d8..db207d2d8 100644
--- a/ubuntu/_base/applications/keep/debian/watch
+++ b/ubuntu/_base/applications/utilities/keep/debian/watch
diff --git a/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kerry/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/utilities/kerry/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/krusader/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kerry/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/krusader/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/utilities/kerry/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/kerry/debian/changelog b/ubuntu/_base/applications/utilities/kerry/debian/changelog
index 3f36fe40e..3f36fe40e 100644
--- a/ubuntu/_base/applications/kerry/debian/changelog
+++ b/ubuntu/_base/applications/utilities/kerry/debian/changelog
diff --git a/ubuntu/_base/applications/rosegarden/debian/compat b/ubuntu/_base/applications/utilities/kerry/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/rosegarden/debian/compat
+++ b/ubuntu/_base/applications/utilities/kerry/debian/compat
diff --git a/ubuntu/_base/applications/kerry/debian/control b/ubuntu/_base/applications/utilities/kerry/debian/control
index b1ab98588..b1ab98588 100644
--- a/ubuntu/_base/applications/kerry/debian/control
+++ b/ubuntu/_base/applications/utilities/kerry/debian/control
diff --git a/ubuntu/_base/applications/kerry/debian/copyright b/ubuntu/_base/applications/utilities/kerry/debian/copyright
index 96a9180c9..96a9180c9 100644
--- a/ubuntu/_base/applications/kerry/debian/copyright
+++ b/ubuntu/_base/applications/utilities/kerry/debian/copyright
diff --git a/ubuntu/_base/applications/kerry/debian/kerry.1.docbook b/ubuntu/_base/applications/utilities/kerry/debian/kerry.1.docbook
index 49eb68460..49eb68460 100644
--- a/ubuntu/_base/applications/kerry/debian/kerry.1.docbook
+++ b/ubuntu/_base/applications/utilities/kerry/debian/kerry.1.docbook
diff --git a/ubuntu/_base/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch b/ubuntu/_base/applications/utilities/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
index 4ee3f268e..4ee3f268e 100644
--- a/ubuntu/_base/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
+++ b/ubuntu/_base/applications/utilities/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
diff --git a/ubuntu/_base/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch b/ubuntu/_base/applications/utilities/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch
index bc560f754..bc560f754 100644
--- a/ubuntu/_base/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch
+++ b/ubuntu/_base/applications/utilities/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch
diff --git a/ubuntu/_base/applications/kerry/debian/patches/kubuntu_05_shortkey.patch b/ubuntu/_base/applications/utilities/kerry/debian/patches/kubuntu_05_shortkey.patch
index d7f3f3649..d7f3f3649 100644
--- a/ubuntu/_base/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
+++ b/ubuntu/_base/applications/utilities/kerry/debian/patches/kubuntu_05_shortkey.patch
diff --git a/ubuntu/_base/applications/kerry/debian/patches/series b/ubuntu/_base/applications/utilities/kerry/debian/patches/series
index f23925f70..f23925f70 100644
--- a/ubuntu/_base/applications/kerry/debian/patches/series
+++ b/ubuntu/_base/applications/utilities/kerry/debian/patches/series
diff --git a/ubuntu/_base/applications/kerry/debian/postinst b/ubuntu/_base/applications/utilities/kerry/debian/postinst
index 98c4063a3..98c4063a3 100644
--- a/ubuntu/_base/applications/kerry/debian/postinst
+++ b/ubuntu/_base/applications/utilities/kerry/debian/postinst
diff --git a/ubuntu/_base/applications/kerry/debian/postrm b/ubuntu/_base/applications/utilities/kerry/debian/postrm
index d1ae3b96c..d1ae3b96c 100644
--- a/ubuntu/_base/applications/kerry/debian/postrm
+++ b/ubuntu/_base/applications/utilities/kerry/debian/postrm
diff --git a/ubuntu/_base/applications/kerry/debian/rules b/ubuntu/_base/applications/utilities/kerry/debian/rules
index 547944ca0..547944ca0 100755
--- a/ubuntu/_base/applications/kerry/debian/rules
+++ b/ubuntu/_base/applications/utilities/kerry/debian/rules
diff --git a/ubuntu/_base/applications/kvkbd/debian/source/format b/ubuntu/_base/applications/utilities/kerry/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kvkbd/debian/source/format
+++ b/ubuntu/_base/applications/utilities/kerry/debian/source/format
diff --git a/ubuntu/_base/applications/kvkbd/debian/source/options b/ubuntu/_base/applications/utilities/kerry/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kvkbd/debian/source/options
+++ b/ubuntu/_base/applications/utilities/kerry/debian/source/options
diff --git a/ubuntu/_base/applications/knutclient/debian/changelog b/ubuntu/_base/applications/utilities/knutclient/debian/changelog
index e63f05435..e63f05435 100644
--- a/ubuntu/_base/applications/knutclient/debian/changelog
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/changelog
diff --git a/ubuntu/_base/applications/smartcardauth/debian/compat b/ubuntu/_base/applications/utilities/knutclient/debian/compat
index 7f8f011eb..7f8f011eb 100755..100644
--- a/ubuntu/_base/applications/smartcardauth/debian/compat
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/compat
diff --git a/ubuntu/_base/applications/knutclient/debian/control b/ubuntu/_base/applications/utilities/knutclient/debian/control
index cc2bd0116..cc2bd0116 100644
--- a/ubuntu/_base/applications/knutclient/debian/control
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/control
diff --git a/ubuntu/_base/applications/knutclient/debian/copyright b/ubuntu/_base/applications/utilities/knutclient/debian/copyright
index 2d9b4b658..2d9b4b658 100644
--- a/ubuntu/_base/applications/knutclient/debian/copyright
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/copyright
diff --git a/ubuntu/_base/applications/knutclient/debian/knutclient.1x b/ubuntu/_base/applications/utilities/knutclient/debian/knutclient.1x
index 231658277..231658277 100644
--- a/ubuntu/_base/applications/knutclient/debian/knutclient.1x
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/knutclient.1x
diff --git a/ubuntu/_base/applications/knutclient/debian/knutclient.menu b/ubuntu/_base/applications/utilities/knutclient/debian/knutclient.menu
index a520f80ba..a520f80ba 100644
--- a/ubuntu/_base/applications/knutclient/debian/knutclient.menu
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/knutclient.menu
diff --git a/ubuntu/_base/applications/knutclient/debian/preinst b/ubuntu/_base/applications/utilities/knutclient/debian/preinst
index 17d2ead82..17d2ead82 100644
--- a/ubuntu/_base/applications/knutclient/debian/preinst
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/preinst
diff --git a/ubuntu/_base/applications/knutclient/debian/rules b/ubuntu/_base/applications/utilities/knutclient/debian/rules
index a009dbf98..a009dbf98 100755
--- a/ubuntu/_base/applications/knutclient/debian/rules
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/rules
diff --git a/ubuntu/_base/applications/kvpnc/debian/source/format b/ubuntu/_base/applications/utilities/knutclient/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kvpnc/debian/source/format
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/source/format
diff --git a/ubuntu/_base/applications/kvpnc/debian/source/options b/ubuntu/_base/applications/utilities/knutclient/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kvpnc/debian/source/options
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/source/options
diff --git a/ubuntu/_base/applications/knutclient/debian/watch b/ubuntu/_base/applications/utilities/knutclient/debian/watch
index 231bd3e50..231bd3e50 100644
--- a/ubuntu/_base/applications/knutclient/debian/watch
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/watch
diff --git a/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk
index f36e3527c..f36e3527c 100644
--- a/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk
diff --git a/ubuntu/_base/applications/ksystemlog/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/krename/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/_base/applications/ksystemlog/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/utilities/krename/debian/cdbs/versions.pl
diff --git a/ubuntu/_base/applications/krename/debian/changelog b/ubuntu/_base/applications/utilities/krename/debian/changelog
index d574638b6..d574638b6 100644
--- a/ubuntu/_base/applications/krename/debian/changelog
+++ b/ubuntu/_base/applications/utilities/krename/debian/changelog
diff --git a/ubuntu/_base/applications/smb4k/debian/compat b/ubuntu/_base/applications/utilities/krename/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/_base/applications/smb4k/debian/compat
+++ b/ubuntu/_base/applications/utilities/krename/debian/compat
diff --git a/ubuntu/_base/applications/krename/debian/control b/ubuntu/_base/applications/utilities/krename/debian/control
index 88bdc9c08..88bdc9c08 100644
--- a/ubuntu/_base/applications/krename/debian/control
+++ b/ubuntu/_base/applications/utilities/krename/debian/control
diff --git a/ubuntu/_base/applications/krename/debian/copyright b/ubuntu/_base/applications/utilities/krename/debian/copyright
index e90f32cab..e90f32cab 100644
--- a/ubuntu/_base/applications/krename/debian/copyright
+++ b/ubuntu/_base/applications/utilities/krename/debian/copyright
diff --git a/ubuntu/_base/applications/piklab/debian/docs b/ubuntu/_base/applications/utilities/krename/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/_base/applications/piklab/debian/docs
+++ b/ubuntu/_base/applications/utilities/krename/debian/docs
diff --git a/ubuntu/_base/applications/krename/debian/krename.1 b/ubuntu/_base/applications/utilities/krename/debian/krename.1
index 153c74797..153c74797 100644
--- a/ubuntu/_base/applications/krename/debian/krename.1
+++ b/ubuntu/_base/applications/utilities/krename/debian/krename.1
diff --git a/ubuntu/_base/applications/krename/debian/krename.manpages b/ubuntu/_base/applications/utilities/krename/debian/krename.manpages
index ded8f6473..ded8f6473 100644
--- a/ubuntu/_base/applications/krename/debian/krename.manpages
+++ b/ubuntu/_base/applications/utilities/krename/debian/krename.manpages
diff --git a/ubuntu/_base/applications/krusader/debian/patches/series b/ubuntu/_base/applications/utilities/krename/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/krusader/debian/patches/series
+++ b/ubuntu/_base/applications/utilities/krename/debian/patches/series
diff --git a/ubuntu/_base/applications/krename/debian/rules b/ubuntu/_base/applications/utilities/krename/debian/rules
index d43628ccb..d43628ccb 100755
--- a/ubuntu/_base/applications/krename/debian/rules
+++ b/ubuntu/_base/applications/utilities/krename/debian/rules
diff --git a/ubuntu/_base/applications/kwin-style-crystal/debian/source/format b/ubuntu/_base/applications/utilities/krename/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/applications/kwin-style-crystal/debian/source/format
+++ b/ubuntu/_base/applications/utilities/krename/debian/source/format
diff --git a/ubuntu/_base/applications/kwin-style-crystal/debian/source/options b/ubuntu/_base/applications/utilities/krename/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/applications/kwin-style-crystal/debian/source/options
+++ b/ubuntu/_base/applications/utilities/krename/debian/source/options
diff --git a/ubuntu/_base/applications/krename/debian/watch b/ubuntu/_base/applications/utilities/krename/debian/watch
index 47a31479a..47a31479a 100644
--- a/ubuntu/_base/applications/krename/debian/watch
+++ b/ubuntu/_base/applications/utilities/krename/debian/watch
diff --git a/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE 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.
-
-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
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# 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:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-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
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-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)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-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
-
-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
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-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 )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(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
-	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/tde/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/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/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/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	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
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/wlassistant/debian/cdbs/versions.pl b/ubuntu/_base/applications/wlassistant/debian/cdbs/versions.pl
deleted file mode 100644
index 75c9add4b..000000000
--- a/ubuntu/_base/applications/wlassistant/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/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($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/_base/applications/wlassistant/debian/compat b/ubuntu/_base/applications/wlassistant/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/ubuntu/_base/applications/wlassistant/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/ubuntu/_base/applications/wlassistant/debian/patches/series b/ubuntu/_base/applications/wlassistant/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
--- a/ubuntu/_base/applications/wlassistant/debian/patches/series
+++ /dev/null
diff --git a/ubuntu/_base/applications/wlassistant/debian/source/format b/ubuntu/_base/applications/wlassistant/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/_base/applications/wlassistant/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ubuntu/_base/applications/wlassistant/debian/source/options b/ubuntu/_base/applications/wlassistant/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/applications/wlassistant/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE 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.
-
-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
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# 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:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-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
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-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)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-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
-
-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
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-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 )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(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
-	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/tde/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/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/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/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	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
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/yakuake/debian/cdbs/versions.pl b/ubuntu/_base/applications/yakuake/debian/cdbs/versions.pl
deleted file mode 100644
index 75c9add4b..000000000
--- a/ubuntu/_base/applications/yakuake/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/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($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/_base/applications/yakuake/debian/compat b/ubuntu/_base/applications/yakuake/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/ubuntu/_base/applications/yakuake/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/ubuntu/_base/applications/yakuake/debian/source/format b/ubuntu/_base/applications/yakuake/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/_base/applications/yakuake/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ubuntu/_base/applications/yakuake/debian/source/options b/ubuntu/_base/applications/yakuake/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/applications/yakuake/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/compat b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/source/options b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/ubuntu/_base/metapackages/redmond-default-settings-ii/debian/compat b/ubuntu/_base/metapackages/redmond-default-settings-ii/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/ubuntu/_base/metapackages/redmond-default-settings-ii/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/ubuntu/_base/metapackages/redmond-default-settings-ii/debian/source/options b/ubuntu/_base/metapackages/redmond-default-settings-ii/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/metapackages/redmond-default-settings-ii/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/ubuntu/_base/metapackages/redmond-default-settings/debian/compat b/ubuntu/_base/metapackages/redmond-default-settings/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/ubuntu/_base/metapackages/redmond-default-settings/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/ubuntu/_base/metapackages/redmond-default-settings/debian/source/options b/ubuntu/_base/metapackages/redmond-default-settings/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/metapackages/redmond-default-settings/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*