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 Thu, 02 July 2009 16:08:00 -0600 - -amarok-trinity (2:1.4.10-0ubuntu5) jaunty; urgency=low - - * Jaunty rebuild - - -- Timothy Pearson 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 Wed, 03 March 2009 20:08:00 -0600 - -amarok-trinity (2:1.4.10-0ubuntu2) intrepid; urgency=low - - * Fixed Debian MP3 autoinstaller - - -- Timothy Pearson Mon, 08 Dec 2008 15:59:00 -0600 - -amarok-trinity (2:1.4.10-0ubuntu1) intrepid; urgency=low - - * Added -trinity prefix - - -- Timothy Pearson 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 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 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 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 Mon, 30 Jun 2008 19:19:04 +0200 - -amarok (2:1.4.9.1-2ubuntu2) intrepid; urgency=low - - * Add manpages - unbreak build - - -- Harald Sitter 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 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 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 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 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 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 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 Sat, 12 Apr 2008 13:47:12 +0200 - -amarok (2:1.4.9.1-0ubuntu1) hardy; urgency=low - - * Upstream patch release - - -- Jonathan Riddell Thu, 10 Apr 2008 23:07:12 +0100 - -amarok (2:1.4.9-0ubuntu1) hardy; urgency=low - - * New upstream release - - -- Harald Sitter 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 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 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 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 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 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 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 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 Wed, 05 Dec 2007 23:47:20 -0600 - -amarok (2:1.4.7-2ubuntu2) hardy; urgency=low - - * Rebuild for libmtp6 -> libmtp7 transition - - -- Jonathan Riddell 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 Mon, 03 Dec 2007 20:01:18 +0000 - -amarok (1.4.7-2) UNRELEASED; urgency=low - - * Build against libgpod-nogtk-dev. - - -- Adeodato Simó 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ó 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ó 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ó 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ó 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 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 - * Add patch to allow amarok get lyrics via http proxy with authentication. - Thanks to Filipe Lautert . (Closes: #409568) - * Added versioned dep on amarok-engines | amarok-engine, thanks to Andreas - Pakulat for pointing this. (Closes: #409996). - - -- Ana Beatriz Guerrero Lopez 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 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 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 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 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 . - * Replaced ${Source-Version} with ${source:Version} and added versioned - build-dependency on dpkg-dev accordingly. - - -- Ana Beatriz Guerrero Lopez 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 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 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 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 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 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 Tue, 3 Apr 2007 17:45:46 +0200 - -amarok (2:1.4.5-0ubuntu6) feisty; urgency=low - - * Fixed the install-mp3 script - - -- Ryan Kavanagh 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 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 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 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 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 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 Mon, 15 Jan 2007 15:39:10 +0000 - -amarok (2:1.4.4-0.3ubuntu3) feisty; urgency=low - - * Rebuild against libtunepimp5 - - -- Jonathan Riddell 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 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 Thu, 23 Nov 2006 03:46:05 -0600 - -amarok (2:1.4.4-0ubuntu3) feisty; urgency=low - - * Compile with MTP Device Support - - -- Brandon Holtsclaw 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 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 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 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 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 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 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 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 Wed, 20 Sep 2006 21:10:11 -0500 - -amarok (2:1.4.3-0ubuntu7) edgy; urgency=low - - * Various fixes to install-mp3 - - -- Jonathan Riddell 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 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 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 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 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 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 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 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 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 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 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 Wed, 12 Jul 2006 00:01:33 +0000 - -amarok (2:1.4.1-0ubuntu1) edgy; urgency=low - - * New upstream release - - -- Jonathan Riddell 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ó 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ó 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ó Sat, 15 Apr 2006 19:47:54 +0200 - -amarok (1.4-beta2-3) experimental; urgency=low - - * Rebuild against libmysqlclient15off. (Closes: #358490) - - -- Adeodato Simó 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ó 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ó 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ó 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ó 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ó 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ó 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 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 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 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 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 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 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 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 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 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 Wed, 1 Feb 2006 11:56:01 +0000 - -amarok (2:1.3.8-0ubuntu1) dapper; urgency=low - - * New upstream release - - -- Jonathan Riddell Sun, 15 Jan 2006 19:10:14 +0000 - -amarok (2:1.3.7-0ubuntu4) dapper; urgency=low - - * weaken build dependencies - - -- Reinhard Tartler 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 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 Wed, 7 Dec 2005 23:52:58 +0100 - -amarok (2:1.3.7-0ubuntu1) dapper; urgency=low - - * New upstream release - - -- Jonathan Riddell 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 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 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 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ó 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ó 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ó 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ó 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ó 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ó 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ó 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 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 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 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 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ó 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ó 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 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 Wed, 13 Jul 2005 18:19:28 +0000 - -amarok (2:1.2.4-0ubuntu2) breezy; urgency=low - - * Default to GStreamer plugin - - -- Jonathan Riddell 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 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ó 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 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 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 Wed, 30 Mar 2005 14:35:20 +0100 - -amarok (2:1.2.3-1ubuntu1) hoary; urgency=low - - * Sync with Debian - - -- Jonathan Riddell 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ó 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ó 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ó 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ó 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ó 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ó 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ó 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ó Fri, 24 Sep 2004 02:49:46 +0200 - -amarok (1.0.2-1) unstable; urgency=low - - * New upstream version. - - -- Peter Rockai (mornfall) 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) 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) 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) 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) 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) Wed, 16 Jun 2004 23:25:29 +0200 - -amarok (1.0-pre1-1) unstable; urgency=low - - * First 1.0.0 prerelease. - - -- Peter Rockai (mornfall) Wed, 16 Jun 2004 10:18:31 +0200 - -amarok (1.0-beta4-2) unstable; urgency=low - - * Patch to final beta4 version. - - -- Peter Rockai (mornfall) 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) Tue, 1 Jun 2004 10:24:09 +0200 - -amarok (1.0-beta3-1) unstable; urgency=low - - * New upstream release. - - -- Peter Rockai (mornfall) Sat, 29 May 2004 17:08:55 +0200 - -amarok (1.0-beta1-0) workstation-unstable; urgency=low - - * Initial packaging - - -- Peter Rockai (mornfall) 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 -XSBC-Original-Maintainer: Modestas Vainius -Uploaders: Ana Beatriz Guerrero Lopez -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 similarity index 100% rename from debian/_base/applications/abakus/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/abakus/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kdbg/debian/changelog rename to debian/_base/applications/development/kdbg/debian/changelog diff --git a/debian/_base/applications/abakus/debian/compat b/debian/_base/applications/development/kdbg/debian/compat similarity index 100% rename from debian/_base/applications/abakus/debian/compat rename to debian/_base/applications/development/kdbg/debian/compat diff --git a/debian/_base/applications/kdbg/debian/control b/debian/_base/applications/development/kdbg/debian/control similarity index 100% rename from debian/_base/applications/kdbg/debian/control rename to debian/_base/applications/development/kdbg/debian/control diff --git a/debian/_base/applications/kdbg/debian/copyright b/debian/_base/applications/development/kdbg/debian/copyright similarity index 100% rename from debian/_base/applications/kdbg/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kdbg/debian/doc-base rename to 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 similarity index 100% rename from debian/_base/applications/kdbg/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kdbg/debian/kdbg.1 rename to 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 similarity index 100% rename from debian/_base/applications/kdbg/debian/kdbg.xpm rename to 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 similarity index 100% rename from debian/_base/applications/kdbg/debian/menu rename to debian/_base/applications/development/kdbg/debian/menu diff --git a/debian/_base/applications/kdbg/debian/rules b/debian/_base/applications/development/kdbg/debian/rules similarity index 100% rename from debian/_base/applications/kdbg/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/abakus/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/abakus/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/adept/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/changelog rename to debian/_base/applications/development/kdesvn/debian/changelog diff --git a/debian/_base/applications/adept/debian/compat b/debian/_base/applications/development/kdesvn/debian/compat similarity index 100% rename from debian/_base/applications/adept/debian/compat rename to debian/_base/applications/development/kdesvn/debian/compat diff --git a/debian/_base/applications/kdesvn/debian/control b/debian/_base/applications/development/kdesvn/debian/control similarity index 100% rename from debian/_base/applications/kdesvn/debian/control rename to debian/_base/applications/development/kdesvn/debian/control diff --git a/debian/_base/applications/kdesvn/debian/copyright b/debian/_base/applications/development/kdesvn/debian/copyright similarity index 100% rename from debian/_base/applications/kdesvn/debian/copyright rename to debian/_base/applications/development/kdesvn/debian/copyright diff --git a/debian/_base/applications/kdesvn/debian/docs b/debian/_base/applications/development/kdesvn/debian/docs similarity index 100% rename from debian/_base/applications/kdesvn/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/icons/kdesvn.xpm rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/kdesvn-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/kdesvn-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/kdesvn-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/libsvnqt-trinity-dev.install rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/libsvnqt4-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/man/kdesvn.1 rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/man/kdesvnaskpass.1 rename to 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 similarity index 100% rename from debian/_base/applications/abakus/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/adept/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/adept/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/adept/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kdiff3/debian/changelog rename to debian/_base/applications/development/kdiff3/debian/changelog diff --git a/debian/_base/applications/amarok/debian/compat b/debian/_base/applications/development/kdiff3/debian/compat similarity index 100% rename from debian/_base/applications/amarok/debian/compat rename to debian/_base/applications/development/kdiff3/debian/compat diff --git a/debian/_base/applications/kdiff3/debian/control b/debian/_base/applications/development/kdiff3/debian/control similarity index 100% rename from debian/_base/applications/kdiff3/debian/control rename to debian/_base/applications/development/kdiff3/debian/control diff --git a/debian/_base/applications/kdiff3/debian/copyright b/debian/_base/applications/development/kdiff3/debian/copyright similarity index 100% rename from debian/_base/applications/kdiff3/debian/copyright rename to debian/_base/applications/development/kdiff3/debian/copyright diff --git a/debian/_base/applications/abakus/debian/docs b/debian/_base/applications/development/kdiff3/debian/docs similarity index 100% rename from debian/_base/applications/abakus/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base rename to 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 similarity index 100% rename from debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.install rename to 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 similarity index 100% rename from debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.links rename to 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 similarity index 100% rename from debian/_base/applications/kdiff3/debian/kdiff3-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kdiff3/debian/kdiff3-trinity.sgml rename to 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 similarity index 100% rename from debian/_base/applications/kbarcode/debian/patches/.gitignore rename to 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 similarity index 100% rename from debian/_base/applications/kdiff3/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kdiff3/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/kpicosim/debian/Makefile.am rename to 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 similarity index 100% rename from debian/_base/applications/kpicosim/debian/changelog rename to debian/_base/applications/development/kpicosim/debian/changelog diff --git a/debian/_base/applications/basket/debian/compat b/debian/_base/applications/development/kpicosim/debian/compat similarity index 100% rename from debian/_base/applications/basket/debian/compat rename to debian/_base/applications/development/kpicosim/debian/compat diff --git a/debian/_base/applications/kpicosim/debian/control b/debian/_base/applications/development/kpicosim/debian/control similarity index 100% rename from debian/_base/applications/kpicosim/debian/control rename to debian/_base/applications/development/kpicosim/debian/control diff --git a/debian/_base/applications/kpicosim/debian/copyright b/debian/_base/applications/development/kpicosim/debian/copyright similarity index 100% rename from debian/_base/applications/kpicosim/debian/copyright rename to debian/_base/applications/development/kpicosim/debian/copyright diff --git a/debian/_base/applications/kpicosim/debian/dirs b/debian/_base/applications/development/kpicosim/debian/dirs similarity index 100% rename from debian/_base/applications/kpicosim/debian/dirs rename to debian/_base/applications/development/kpicosim/debian/dirs diff --git a/debian/_base/applications/kbiff/debian/docs b/debian/_base/applications/development/kpicosim/debian/docs similarity index 100% rename from debian/_base/applications/kbiff/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kpicosim/debian/kpicosim-trinity.links rename to 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 similarity index 100% rename from debian/_base/applications/kpicosim/debian/kpicosim-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/kpicosim/debian/kpicosim.1 rename to 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 similarity index 100% rename from debian/_base/applications/kpicosim/debian/menu rename to debian/_base/applications/development/kpicosim/debian/menu diff --git a/debian/_base/applications/kpicosim/debian/rules b/debian/_base/applications/development/kpicosim/debian/rules similarity index 100% rename from debian/_base/applications/kpicosim/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kpicosim/debian/watch rename to debian/_base/applications/development/kpicosim/debian/watch diff --git a/debian/_base/applications/ktechlab/debian/changelog b/debian/_base/applications/development/ktechlab/debian/changelog similarity index 100% rename from debian/_base/applications/ktechlab/debian/changelog rename to debian/_base/applications/development/ktechlab/debian/changelog diff --git a/debian/_base/applications/bibletime/debian/compat b/debian/_base/applications/development/ktechlab/debian/compat similarity index 100% rename from debian/_base/applications/bibletime/debian/compat rename to debian/_base/applications/development/ktechlab/debian/compat diff --git a/debian/_base/applications/ktechlab/debian/control b/debian/_base/applications/development/ktechlab/debian/control similarity index 100% rename from debian/_base/applications/ktechlab/debian/control rename to debian/_base/applications/development/ktechlab/debian/control diff --git a/debian/_base/applications/ktechlab/debian/copyright b/debian/_base/applications/development/ktechlab/debian/copyright similarity index 100% rename from debian/_base/applications/ktechlab/debian/copyright rename to debian/_base/applications/development/ktechlab/debian/copyright diff --git a/debian/_base/applications/ktechlab/debian/debiandirs b/debian/_base/applications/development/ktechlab/debian/debiandirs similarity index 100% rename from debian/_base/applications/ktechlab/debian/debiandirs rename to debian/_base/applications/development/ktechlab/debian/debiandirs diff --git a/debian/_base/applications/basket/debian/docs b/debian/_base/applications/development/ktechlab/debian/docs similarity index 100% rename from debian/_base/applications/basket/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/ktechlab/debian/ktechlab.1 rename to 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 similarity index 100% rename from debian/_base/applications/ktechlab/debian/manpages rename to debian/_base/applications/development/ktechlab/debian/manpages diff --git a/debian/_base/applications/ktechlab/debian/menu b/debian/_base/applications/development/ktechlab/debian/menu similarity index 100% rename from debian/_base/applications/ktechlab/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/ktechlab/debian/microbe.1 rename to 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 similarity index 100% rename from debian/_base/applications/kchmviewer/debian/patches/.gitignore rename to 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 similarity index 100% rename from debian/_base/applications/ktechlab/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/basket/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/basket/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/piklab/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/compizconfig-backend-kconfig/debian/compat rename to debian/_base/applications/development/piklab/debian/compat diff --git a/debian/_base/applications/piklab/debian/control b/debian/_base/applications/development/piklab/debian/control similarity index 100% rename from debian/_base/applications/piklab/debian/control rename to debian/_base/applications/development/piklab/debian/control diff --git a/debian/_base/applications/piklab/debian/copyright b/debian/_base/applications/development/piklab/debian/copyright similarity index 100% rename from debian/_base/applications/piklab/debian/copyright rename to debian/_base/applications/development/piklab/debian/copyright diff --git a/debian/_base/applications/kbarcode/debian/docs b/debian/_base/applications/development/piklab/debian/docs similarity index 100% rename from debian/_base/applications/kbarcode/debian/docs rename to debian/_base/applications/development/piklab/debian/docs diff --git a/debian/_base/applications/piklab/debian/install b/debian/_base/applications/development/piklab/debian/install similarity index 100% rename from debian/_base/applications/piklab/debian/install rename to debian/_base/applications/development/piklab/debian/install diff --git a/debian/_base/applications/piklab/debian/menu b/debian/_base/applications/development/piklab/debian/menu similarity index 100% rename from debian/_base/applications/piklab/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/piklab/debian/piklab.desktop rename to 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 similarity index 100% rename from debian/_base/applications/piklab/debian/piklab.sng rename to 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 similarity index 100% rename from debian/_base/applications/piklab/debian/piklab.xpm rename to 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 similarity index 100% rename from debian/_base/applications/piklab/debian/piklab48.xpm rename to 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 similarity index 100% rename from debian/_base/applications/piklab/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/bibletime/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/bibletime/debian/source/options rename to 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 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 Fri, 06 March 2009 01:35:00 -0600 - -filelight-l10n-trinity (1.0-2) intrepid; urgency=low - - * Added -trinity suffix - - -- Timothy Pearson 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 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 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 -Uploaders: Raúl Sánchez Siles -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 -on Mon Oct 1 08:59:34 CEST 2007 based on the work by Christopher Martin - with the help of Ana Guerrero and -others. - -The Debian packaging is Copyright 2007, Raul Sánchez Siles -and Christopher Martin 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 - -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 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 similarity index 100% rename from debian/_base/applications/knights/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/desktop-effects-kde/debian/compat rename to debian/_base/applications/games/knights/debian/compat diff --git a/debian/_base/applications/knights/debian/control b/debian/_base/applications/games/knights/debian/control similarity index 100% rename from debian/_base/applications/knights/debian/control rename to debian/_base/applications/games/knights/debian/control diff --git a/debian/_base/applications/knights/debian/copyright b/debian/_base/applications/games/knights/debian/copyright similarity index 100% rename from debian/_base/applications/knights/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/gwenview-i18n/debian/debiandirs rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/knights/debian/knights.1 rename to 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 similarity index 100% rename from debian/_base/applications/knights/debian/knights.xpm rename to 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 similarity index 100% rename from debian/_base/applications/knights/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-lipstik/debian/patches/.gitignore rename to 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 similarity index 100% rename from debian/_base/applications/knights/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/compizconfig-backend-kconfig/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/compizconfig-backend-kconfig/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/knights/debian/watch rename to debian/_base/applications/games/knights/debian/watch diff --git a/debian/_base/applications/digikam/debian/NEWS b/debian/_base/applications/graphics/digikam/debian/NEWS similarity index 100% rename from debian/_base/applications/digikam/debian/NEWS rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/changelog rename to debian/_base/applications/graphics/digikam/debian/changelog diff --git a/debian/_base/applications/digikam/debian/clean b/debian/_base/applications/graphics/digikam/debian/clean similarity index 100% rename from debian/_base/applications/digikam/debian/clean rename to debian/_base/applications/graphics/digikam/debian/clean diff --git a/debian/_base/applications/digikam/debian/compat b/debian/_base/applications/graphics/digikam/debian/compat similarity index 100% rename from debian/_base/applications/digikam/debian/compat rename to debian/_base/applications/graphics/digikam/debian/compat diff --git a/debian/_base/applications/digikam/debian/control b/debian/_base/applications/graphics/digikam/debian/control similarity index 100% rename from debian/_base/applications/digikam/debian/control rename to debian/_base/applications/graphics/digikam/debian/control diff --git a/debian/_base/applications/digikam/debian/copyright b/debian/_base/applications/graphics/digikam/debian/copyright similarity index 100% rename from debian/_base/applications/digikam/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/digikam-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/digikam-trinity.lintian-overrides rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/digikam-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/digikam-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/digikam.manpage rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/showfoto-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/showfoto-trinity.manpage rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/showfoto-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/showfoto-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/desktop-effects-kde/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/desktop-effects-kde/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/xpm.d/digikam-16.xpm rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/xpm.d/digikam.xpm rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/xpm.d/showfoto-16.xpm rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/xpm.d/showfoto.xpm rename to 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 similarity index 100% rename from debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/gwenview-i18n/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/dolphin/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/gwenview-i18n/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/gwenview-i18n/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/debiandirs rename to 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 similarity index 100% rename from debian/_base/applications/basket/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/gwenview-i18n/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/compizconfig-backend-kconfig/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/bibletime/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/gwenview/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/filelight-l10n/debian/compat rename to debian/_base/applications/graphics/gwenview/debian/compat diff --git a/debian/_base/applications/gwenview/debian/control b/debian/_base/applications/graphics/gwenview/debian/control similarity index 100% rename from debian/_base/applications/gwenview/debian/control rename to debian/_base/applications/graphics/gwenview/debian/control diff --git a/debian/_base/applications/gwenview/debian/copyright b/debian/_base/applications/graphics/gwenview/debian/copyright similarity index 100% rename from debian/_base/applications/gwenview/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/gwenview/debian/gwenview.doc-base rename to 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 similarity index 100% rename from debian/_base/applications/gwenview/debian/gwenview.lintian rename to 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 similarity index 100% rename from debian/_base/applications/gwenview/debian/gwenview.xpm rename to 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 similarity index 100% rename from debian/_base/applications/gwenview/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/bibletime/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/gwenview/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/dolphin/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/dolphin/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/ksquirrel/debian/README.debian rename to 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 similarity index 100% rename from debian/_base/applications/ksquirrel/debian/changelog rename to debian/_base/applications/graphics/ksquirrel/debian/changelog diff --git a/debian/_base/applications/filelight/debian/compat b/debian/_base/applications/graphics/ksquirrel/debian/compat similarity index 100% rename from debian/_base/applications/filelight/debian/compat rename to debian/_base/applications/graphics/ksquirrel/debian/compat diff --git a/debian/_base/applications/ksquirrel/debian/control b/debian/_base/applications/graphics/ksquirrel/debian/control similarity index 100% rename from debian/_base/applications/ksquirrel/debian/control rename to debian/_base/applications/graphics/ksquirrel/debian/control diff --git a/debian/_base/applications/ksquirrel/debian/copyright b/debian/_base/applications/graphics/ksquirrel/debian/copyright similarity index 100% rename from debian/_base/applications/ksquirrel/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-qtcurve/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/ksquirrel/debian/ksquirrel-libs-configurator.1 rename to 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 similarity index 100% rename from debian/_base/applications/kdiff3/debian/patches/.gitignore rename to 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 similarity index 100% rename from debian/_base/applications/ksquirrel/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/filelight-l10n/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/filelight-l10n/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/ksquirrel/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kuickshow/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/compat rename to debian/_base/applications/graphics/kuickshow/debian/compat diff --git a/debian/_base/applications/kuickshow/debian/control b/debian/_base/applications/graphics/kuickshow/debian/control similarity index 100% rename from debian/_base/applications/kuickshow/debian/control rename to debian/_base/applications/graphics/kuickshow/debian/control diff --git a/debian/_base/applications/kuickshow/debian/copyright b/debian/_base/applications/graphics/kuickshow/debian/copyright similarity index 100% rename from debian/_base/applications/kuickshow/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kuickshow/debian/icons/kuickshow-16.xpm rename to 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 similarity index 100% rename from debian/_base/applications/kuickshow/debian/icons/kuickshow.xpm rename to 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 similarity index 100% rename from debian/_base/applications/kuickshow/debian/kuickshow-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kuickshow/debian/kuickshow-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/kuickshow/debian/kuickshow-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/kuickshow/debian/kuickshow-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/kuickshow/debian/man/kuickshow.1 rename to 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 similarity index 100% rename from debian/_base/applications/compizconfig-backend-kconfig/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kuickshow/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/filelight/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/filelight/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/potracegui/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/gtk-qt-engine/debian/compat rename to debian/_base/applications/graphics/potracegui/debian/compat diff --git a/debian/_base/applications/potracegui/debian/control b/debian/_base/applications/graphics/potracegui/debian/control similarity index 100% rename from debian/_base/applications/potracegui/debian/control rename to debian/_base/applications/graphics/potracegui/debian/control diff --git a/debian/_base/applications/potracegui/debian/copyright b/debian/_base/applications/graphics/potracegui/debian/copyright similarity index 100% rename from debian/_base/applications/potracegui/debian/copyright rename to debian/_base/applications/graphics/potracegui/debian/copyright diff --git a/debian/_base/applications/potracegui/debian/dirs b/debian/_base/applications/graphics/potracegui/debian/dirs similarity index 100% rename from debian/_base/applications/potracegui/debian/dirs rename to debian/_base/applications/graphics/potracegui/debian/dirs diff --git a/debian/_base/applications/potracegui/debian/docs b/debian/_base/applications/graphics/potracegui/debian/docs similarity index 100% rename from debian/_base/applications/potracegui/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/potracegui/debian/potracegui-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/potracegui/debian/potracegui-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/potracegui/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/potracegui/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kbiff/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/gwenview-i18n/debian/compat rename to debian/_base/applications/internet/kbiff/debian/compat diff --git a/debian/_base/applications/kbiff/debian/control b/debian/_base/applications/internet/kbiff/debian/control similarity index 100% rename from debian/_base/applications/kbiff/debian/control rename to debian/_base/applications/internet/kbiff/debian/control diff --git a/debian/_base/applications/kbiff/debian/copyright b/debian/_base/applications/internet/kbiff/debian/copyright similarity index 100% rename from debian/_base/applications/kbiff/debian/copyright rename to debian/_base/applications/internet/kbiff/debian/copyright diff --git a/debian/_base/applications/basket/debian/dirs b/debian/_base/applications/internet/kbiff/debian/dirs similarity index 100% rename from debian/_base/applications/basket/debian/dirs rename to debian/_base/applications/internet/kbiff/debian/dirs diff --git a/debian/_base/applications/kpicosim/debian/docs b/debian/_base/applications/internet/kbiff/debian/docs similarity index 100% rename from debian/_base/applications/kpicosim/debian/docs rename to debian/_base/applications/internet/kbiff/debian/docs diff --git a/debian/_base/applications/kbiff/debian/menu b/debian/_base/applications/internet/kbiff/debian/menu similarity index 100% rename from debian/_base/applications/kbiff/debian/menu rename to debian/_base/applications/internet/kbiff/debian/menu diff --git a/debian/_base/applications/kbiff/debian/rules b/debian/_base/applications/internet/kbiff/debian/rules similarity index 100% rename from debian/_base/applications/kbiff/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/gtk-qt-engine/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/gtk-qt-engine/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kbiff/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/filelight-l10n/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/dolphin/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/konversation/debian/changelog rename to debian/_base/applications/internet/konversation/debian/changelog diff --git a/debian/_base/applications/gwenview/debian/compat b/debian/_base/applications/internet/konversation/debian/compat similarity index 100% rename from debian/_base/applications/gwenview/debian/compat rename to debian/_base/applications/internet/konversation/debian/compat diff --git a/debian/_base/applications/konversation/debian/control b/debian/_base/applications/internet/konversation/debian/control similarity index 100% rename from debian/_base/applications/konversation/debian/control rename to debian/_base/applications/internet/konversation/debian/control diff --git a/debian/_base/applications/konversation/debian/copyright b/debian/_base/applications/internet/konversation/debian/copyright similarity index 100% rename from debian/_base/applications/konversation/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/konversation/debian/konversation-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/konversation/debian/konversation-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/konversation/debian/konversation-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/konversation/debian/konversation-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/konversation/debian/konversation16x16.xpm rename to 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 similarity index 100% rename from debian/_base/applications/konversation/debian/konversation32x32.xpm rename to 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 similarity index 100% rename from debian/_base/applications/konversation/debian/man/konversation.1.docbook rename to 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 similarity index 100% rename from debian/_base/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook rename to 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 similarity index 100% rename from debian/_base/applications/kdmtheme/debian/patches/.gitignore rename to 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 similarity index 100% rename from debian/_base/applications/konversation/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/gwenview-i18n/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/gwenview-i18n/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/filelight/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/filelight-l10n/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kopete-otr/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/k3b-i18n/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/kopete-otr/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/kopete-otr/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kopete-otr/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/gwenview/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/gwenview/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kopete-otr/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/kstreamripper/debian/README.Debian-source rename to 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 similarity index 100% rename from debian/_base/applications/kstreamripper/debian/changelog rename to debian/_base/applications/internet/kstreamripper/debian/changelog diff --git a/debian/_base/applications/k3b/debian/compat b/debian/_base/applications/internet/kstreamripper/debian/compat similarity index 100% rename from debian/_base/applications/k3b/debian/compat rename to debian/_base/applications/internet/kstreamripper/debian/compat diff --git a/debian/_base/applications/kstreamripper/debian/control b/debian/_base/applications/internet/kstreamripper/debian/control similarity index 100% rename from debian/_base/applications/kstreamripper/debian/control rename to debian/_base/applications/internet/kstreamripper/debian/control diff --git a/debian/_base/applications/kstreamripper/debian/copyright b/debian/_base/applications/internet/kstreamripper/debian/copyright similarity index 100% rename from debian/_base/applications/kstreamripper/debian/copyright rename to debian/_base/applications/internet/kstreamripper/debian/copyright diff --git a/debian/_base/applications/kstreamripper/debian/dirs b/debian/_base/applications/internet/kstreamripper/debian/dirs similarity index 100% rename from debian/_base/applications/kstreamripper/debian/dirs rename to debian/_base/applications/internet/kstreamripper/debian/dirs diff --git a/debian/_base/applications/keep/debian/docs b/debian/_base/applications/internet/kstreamripper/debian/docs similarity index 100% rename from debian/_base/applications/keep/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.postinst rename to 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 similarity index 100% rename from debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.postrm rename to 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 similarity index 100% rename from debian/_base/applications/kstreamripper/debian/kstreamripper.1 rename to 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 similarity index 100% rename from debian/_base/applications/kstreamripper/debian/kstreamripper.desktop rename to 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 similarity index 100% rename from debian/_base/applications/kstreamripper/debian/kstreamripper.menu rename to 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 similarity index 100% rename from debian/_base/applications/kstreamripper/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/k3b-i18n/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/k3b-i18n/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/ktorrent/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/filelight/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/ktorrent/debian/changelog rename to debian/_base/applications/internet/ktorrent/debian/changelog diff --git a/debian/_base/applications/k9copy/debian/compat b/debian/_base/applications/internet/ktorrent/debian/compat similarity index 100% rename from debian/_base/applications/k9copy/debian/compat rename to debian/_base/applications/internet/ktorrent/debian/compat diff --git a/debian/_base/applications/ktorrent/debian/control b/debian/_base/applications/internet/ktorrent/debian/control similarity index 100% rename from debian/_base/applications/ktorrent/debian/control rename to debian/_base/applications/internet/ktorrent/debian/control diff --git a/debian/_base/applications/ktorrent/debian/copyright b/debian/_base/applications/internet/ktorrent/debian/copyright similarity index 100% rename from debian/_base/applications/ktorrent/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/ktorrent/debian/ktorrent.1.docbook rename to 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 similarity index 100% rename from debian/_base/applications/digikam/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/ktorrent/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/ktorrent/debian/watch rename to debian/_base/applications/internet/ktorrent/debian/watch diff --git a/debian/_base/applications/kvirc/debian/changelog b/debian/_base/applications/internet/kvirc/debian/changelog similarity index 100% rename from debian/_base/applications/kvirc/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine-mozilla/debian/compat rename to debian/_base/applications/internet/kvirc/debian/compat diff --git a/debian/_base/applications/kvirc/debian/control b/debian/_base/applications/internet/kvirc/debian/control similarity index 100% rename from debian/_base/applications/kvirc/debian/control rename to debian/_base/applications/internet/kvirc/debian/control diff --git a/debian/_base/applications/kvirc/debian/copyright b/debian/_base/applications/internet/kvirc/debian/copyright similarity index 100% rename from debian/_base/applications/kvirc/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kvirc/debian/kvirc-data-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kvirc/debian/kvirc-data-trinity.links rename to 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 similarity index 100% rename from debian/_base/applications/kvirc/debian/kvirc-data-trinity.postinst rename to 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 similarity index 100% rename from debian/_base/applications/kvirc/debian/kvirc-data-trinity.prerm rename to 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 similarity index 100% rename from debian/_base/applications/kvirc/debian/kvirc-trinity-dev.install rename to 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 similarity index 100% rename from debian/_base/applications/kvirc/debian/kvirc-trinity-dev.links rename to 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 similarity index 100% rename from debian/_base/applications/kvirc/debian/kvirc-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kvirc/debian/kvirc-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/kvirc/debian/overrides/kvirc rename to 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 similarity index 100% rename from debian/_base/applications/dolphin/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kvirc/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/k9copy/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/k9copy/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine-mozilla/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine-mozilla/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/smb4k/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/gtk-qt-engine/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/smb4k/debian/changelog rename to debian/_base/applications/internet/smb4k/debian/changelog diff --git a/debian/_base/applications/kaffeine/debian/compat b/debian/_base/applications/internet/smb4k/debian/compat similarity index 100% rename from debian/_base/applications/kaffeine/debian/compat rename to debian/_base/applications/internet/smb4k/debian/compat diff --git a/debian/_base/applications/smb4k/debian/control b/debian/_base/applications/internet/smb4k/debian/control similarity index 100% rename from debian/_base/applications/smb4k/debian/control rename to debian/_base/applications/internet/smb4k/debian/control diff --git a/debian/_base/applications/smb4k/debian/copyright b/debian/_base/applications/internet/smb4k/debian/copyright similarity index 100% rename from debian/_base/applications/smb4k/debian/copyright rename to debian/_base/applications/internet/smb4k/debian/copyright diff --git a/debian/_base/applications/smb4k/debian/docs b/debian/_base/applications/internet/smb4k/debian/docs similarity index 100% rename from debian/_base/applications/smb4k/debian/docs rename to debian/_base/applications/internet/smb4k/debian/docs diff --git a/debian/_base/applications/smb4k/debian/menu b/debian/_base/applications/internet/smb4k/debian/menu similarity index 100% rename from debian/_base/applications/smb4k/debian/menu rename to debian/_base/applications/internet/smb4k/debian/menu diff --git a/debian/_base/applications/smb4k/debian/rules b/debian/_base/applications/internet/smb4k/debian/rules similarity index 100% rename from debian/_base/applications/smb4k/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/smb4k/debian/watch rename to 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 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 Tue, 06 Oct 2009 19:31:00 -0600 - -knetworkmanager-trinity (1:0.8-0ubuntu7) karmic; urgency=low - - * Fixed various minor glitches - - -- Timothy Pearson 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Thu, 27 Apr 2006 08:01:39 +0200 - -knetworkmanager (0.09+0.1r5964-1) unstable; urgency=low - - * Initial release. - - -- Michael Biebl 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 -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 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 Thu, 05 March 2009 29:52:00 -0600 - -kpowersave-trinity (0.7.3-0ubuntu1) intrepid; urgency=low - - * Added -trinity suffix - - -- Timothy Pearson 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Fri, 20 Oct 2006 00:04:12 +0200 - -kpowersave (0.6.2-2ubuntu2) edgy; urgency=low - - * Rebuild against dbus 0.90 - - -- Sebastian Dröge Wed, 30 Aug 2006 22:04:58 +0200 - -kpowersave (0.6.2-2ubuntu1) edgy; urgency=low - - * Merge from debian unstable. - - -- Luka Renko 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 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 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 Mon, 15 May 2006 02:28:48 +0200 - -kpowersave (0.6.0-1ubuntu4) dapper; urgency=low - - * Added dh_iconcache - - -- Sarah Hobbs 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 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 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 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 Mon, 17 Apr 2006 18:21:14 +0200 - -kpowersave (0.5.11-1ubuntu1) dapper; urgency=low - - * New upstream release. - - -- Luka Renko Sun, 26 Mar 2006 18:59:38 +0200 - -kpowersave (0.5.11-1) unstable; urgency=low - - * New upstream release. - - -- Michael Biebl 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 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 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 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 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 Tue, 14 Feb 2006 23:27:37 +0100 - -kpowersave (0.5.6-1) unstable; urgency=low - - * New upstream release. - - -- Michael Biebl 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 Tue, 31 Jan 2006 01:32:36 +0100 - -kpowersave (0.5.4-1) unstable; urgency=low - - * New upstream release. - - -- Michael Biebl 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 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 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 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 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 Sun, 8 Jan 2006 18:00:08 +0100 - -kpowersave (0.4.5-1) unstable; urgency=low - - * Initial release. Closes: #329922 - - -- Michael Biebl 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 -XSBC-Original-Maintainer: Michael Biebl -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 similarity index 100% rename from debian/_base/applications/bibletime/debian/bibletime.xpm rename to 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 similarity index 100% rename from debian/_base/applications/gwenview/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/gwenview-i18n/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/bibletime/debian/changelog rename to debian/_base/applications/misc/bibletime/debian/changelog diff --git a/debian/_base/applications/katapult/debian/compat b/debian/_base/applications/misc/bibletime/debian/compat similarity index 100% rename from debian/_base/applications/katapult/debian/compat rename to debian/_base/applications/misc/bibletime/debian/compat diff --git a/debian/_base/applications/bibletime/debian/control b/debian/_base/applications/misc/bibletime/debian/control similarity index 100% rename from debian/_base/applications/bibletime/debian/control rename to debian/_base/applications/misc/bibletime/debian/control diff --git a/debian/_base/applications/bibletime/debian/copyright b/debian/_base/applications/misc/bibletime/debian/copyright similarity index 100% rename from debian/_base/applications/bibletime/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/bibletime/debian/de/bibletime.1 rename to 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 similarity index 100% rename from debian/_base/applications/bibletime/debian/dirs rename to 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 similarity index 100% rename from debian/_base/applications/bibletime/debian/en/bibletime.1 rename to 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 similarity index 100% rename from debian/_base/applications/bibletime/debian/install rename to debian/_base/applications/misc/bibletime/debian/install diff --git a/debian/_base/applications/bibletime/debian/menu b/debian/_base/applications/misc/bibletime/debian/menu similarity index 100% rename from debian/_base/applications/bibletime/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/filelight-l10n/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/bibletime/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/katapult/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/katapult/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/gwenview/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/compizconfig-backend-kconfig/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kbarcode/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/compizconfig-backend-kconfig/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/compizconfig-backend-kconfig/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/filelight/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/compizconfig-backend-kconfig/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kbarcode/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kbarcode/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/desktop-effects-kde/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kbfx/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/desktop-effects-kde/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/desktop-effects-kde/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/desktop-effects-kde/debian/desktop-effects-kde-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/desktop-effects-kde/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kbfx/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kbfx/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kbibtex/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/fusion-icon.1 rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/fusion-icon.xpm rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/install rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/links rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/manpages rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/pycompat rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/python-distutils-custom.mk rename to 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 similarity index 100% rename from debian/_base/applications/fusion-icon/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kbibtex/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kbibtex/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/amarok-common-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/amarok-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/amarok-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/amarok-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/amarok_play_audiocd.desktop rename to 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 similarity index 100% rename from debian/_base/applications/k9copy/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/changelog rename to debian/_base/applications/multimedia/amarok/debian/changelog diff --git a/debian/_base/applications/kbiff/debian/compat b/debian/_base/applications/multimedia/amarok/debian/compat similarity index 100% rename from debian/_base/applications/kbiff/debian/compat rename to debian/_base/applications/multimedia/amarok/debian/compat diff --git a/debian/_base/applications/amarok/debian/control b/debian/_base/applications/multimedia/amarok/debian/control similarity index 100% rename from debian/_base/applications/amarok/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/icons/amarok-16.xpm rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/icons/amarok.xpm rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/install-mp3 rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/kubuntu-media-amarok rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/man/amarok-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/man/amarokapp-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/gtk-qt-engine/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kbiff/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kbiff/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/amarok.cmake/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/k3b-i18n/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kbookreader/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/k3b-i18n/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/k3b-i18n/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/k3b-i18n/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kbookreader/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kbookreader/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/k3b-i18n/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/k9copy/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/changelog rename to debian/_base/applications/multimedia/k3b/debian/changelog diff --git a/debian/_base/applications/kchmviewer/debian/compat b/debian/_base/applications/multimedia/k3b/debian/compat similarity index 100% rename from debian/_base/applications/kchmviewer/debian/compat rename to debian/_base/applications/multimedia/k3b/debian/compat diff --git a/debian/_base/applications/k3b/debian/control b/debian/_base/applications/multimedia/k3b/debian/control similarity index 100% rename from debian/_base/applications/k3b/debian/control rename to debian/_base/applications/multimedia/k3b/debian/control diff --git a/debian/_base/applications/k3b/debian/copyright b/debian/_base/applications/multimedia/k3b/debian/copyright similarity index 100% rename from debian/_base/applications/k3b/debian/copyright rename to debian/_base/applications/multimedia/k3b/debian/copyright diff --git a/debian/_base/applications/k3b/debian/docs b/debian/_base/applications/multimedia/k3b/debian/docs similarity index 100% rename from debian/_base/applications/k3b/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b-data-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b-data.files rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b-data.install rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b-rip-audiocd.desktop rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b-rip-videodvd.desktop rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b-trinity.postinst rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b-write-bin-image.desktop rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b-write-iso-image.desktop rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b.files rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b.install rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b.manpages rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b.menu rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b.postinst rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/k3b.xpm rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/libk3b-dev.files rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/libk3b-dev.install rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/libk3b-trinity-dev.install rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/libk3b3-extracodecs-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/libk3b3-extracodecs.install rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/libk3b3-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/libk3b3.files rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/libk3b3.install rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kchmviewer/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kchmviewer/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/k3b/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/katapult/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/k9copy/debian/changelog rename to debian/_base/applications/multimedia/k9copy/debian/changelog diff --git a/debian/_base/applications/kcpuload/debian/compat b/debian/_base/applications/multimedia/k9copy/debian/compat similarity index 100% rename from debian/_base/applications/kcpuload/debian/compat rename to debian/_base/applications/multimedia/k9copy/debian/compat diff --git a/debian/_base/applications/k9copy/debian/control b/debian/_base/applications/multimedia/k9copy/debian/control similarity index 100% rename from debian/_base/applications/k9copy/debian/control rename to debian/_base/applications/multimedia/k9copy/debian/control diff --git a/debian/_base/applications/k9copy/debian/copyright b/debian/_base/applications/multimedia/k9copy/debian/copyright similarity index 100% rename from debian/_base/applications/k9copy/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/k9copy/debian/k9copy.1.docbook rename to 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 similarity index 100% rename from debian/_base/applications/gwenview-i18n/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/k9copy/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kcpuload/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kcpuload/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine-mozilla/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kdbg/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine-mozilla/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine-mozilla/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine-mozilla/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine-mozilla/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kdbg/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kdbg/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/kbarcode/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/katapult/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/changelog rename to debian/_base/applications/multimedia/kaffeine/debian/changelog diff --git a/debian/_base/applications/kdbusnotification/debian/compat b/debian/_base/applications/multimedia/kaffeine/debian/compat similarity index 100% rename from debian/_base/applications/kdbusnotification/debian/compat rename to debian/_base/applications/multimedia/kaffeine/debian/compat diff --git a/debian/_base/applications/kaffeine/debian/control b/debian/_base/applications/multimedia/kaffeine/debian/control similarity index 100% rename from debian/_base/applications/kaffeine/debian/control rename to debian/_base/applications/multimedia/kaffeine/debian/control diff --git a/debian/_base/applications/kaffeine/debian/copyright b/debian/_base/applications/multimedia/kaffeine/debian/copyright similarity index 100% rename from debian/_base/applications/kaffeine/debian/copyright rename to debian/_base/applications/multimedia/kaffeine/debian/copyright diff --git a/debian/_base/applications/kaffeine/debian/docs b/debian/_base/applications/multimedia/kaffeine/debian/docs similarity index 100% rename from debian/_base/applications/kaffeine/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/install-codecs rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/install-css.sh rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/kaffeine-iso.desktop rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/kaffeine-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/kaffeine.1 rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/kaffeine.xpm rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/kaffeine_codecinstall.desktop rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/gwenview/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kdbusnotification/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kdbusnotification/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/kbarcode/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/kbibtex/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kbarcode/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kmplayer/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/compat rename to debian/_base/applications/multimedia/kmplayer/debian/compat diff --git a/debian/_base/applications/kmplayer/debian/control b/debian/_base/applications/multimedia/kmplayer/debian/control similarity index 100% rename from debian/_base/applications/kmplayer/debian/control rename to debian/_base/applications/multimedia/kmplayer/debian/control diff --git a/debian/_base/applications/kmplayer/debian/copyright b/debian/_base/applications/multimedia/kmplayer/debian/copyright similarity index 100% rename from debian/_base/applications/kmplayer/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kmplayer/debian/kmplayer-base-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install rename to 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 similarity index 100% rename from debian/_base/applications/kmplayer/debian/kmplayer-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kmplayer/debian/kmplayer.1.docbook rename to 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 similarity index 100% rename from debian/_base/applications/kmplayer/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/k9copy/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kmplayer/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kmplayer/debian/watch rename to debian/_base/applications/multimedia/kmplayer/debian/watch diff --git a/debian/_base/applications/kradio/debian/changelog b/debian/_base/applications/multimedia/kradio/debian/changelog similarity index 100% rename from debian/_base/applications/kradio/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-lipstik/debian/compat rename to debian/_base/applications/multimedia/kradio/debian/compat diff --git a/debian/_base/applications/kradio/debian/control b/debian/_base/applications/multimedia/kradio/debian/control similarity index 100% rename from debian/_base/applications/kradio/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/kradio/debian/convert-presets.1 rename to 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 similarity index 100% rename from debian/_base/applications/kradio/debian/copyright rename to debian/_base/applications/multimedia/kradio/debian/copyright diff --git a/debian/_base/applications/kradio/debian/docs b/debian/_base/applications/multimedia/kradio/debian/docs similarity index 100% rename from debian/_base/applications/kradio/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kradio/debian/kradio.1 rename to 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 similarity index 100% rename from debian/_base/applications/kradio/debian/manpages rename to debian/_base/applications/multimedia/kradio/debian/manpages diff --git a/debian/_base/applications/kradio/debian/menu b/debian/_base/applications/multimedia/kradio/debian/menu similarity index 100% rename from debian/_base/applications/kradio/debian/menu rename to debian/_base/applications/multimedia/kradio/debian/menu diff --git a/debian/_base/applications/kradio/debian/rules b/debian/_base/applications/multimedia/kradio/debian/rules similarity index 100% rename from debian/_base/applications/kradio/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-lipstik/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-lipstik/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kradio/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/kbiff/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-qtcurve/debian/compat rename to debian/_base/applications/multimedia/rosegarden/debian/compat diff --git a/debian/_base/applications/rosegarden/debian/control b/debian/_base/applications/multimedia/rosegarden/debian/control similarity index 100% rename from debian/_base/applications/rosegarden/debian/control rename to debian/_base/applications/multimedia/rosegarden/debian/control diff --git a/debian/_base/applications/rosegarden/debian/copyright b/debian/_base/applications/multimedia/rosegarden/debian/copyright similarity index 100% rename from debian/_base/applications/rosegarden/debian/copyright rename to debian/_base/applications/multimedia/rosegarden/debian/copyright diff --git a/debian/_base/applications/rosegarden/debian/lintianoverrides b/debian/_base/applications/multimedia/rosegarden/debian/lintianoverrides similarity index 100% rename from debian/_base/applications/rosegarden/debian/lintianoverrides rename to 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 similarity index 100% rename from debian/_base/applications/kaffeine/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/rosegarden-audiofile-importer.1 rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/rosegarden-data-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/rosegarden-lilypondview.1 rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/rosegarden-project-package.1 rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.dirs rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.examples rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.links rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/rosegarden.1 rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/semantic.cache rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-qtcurve/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-qtcurve/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/x-rosegarden.desktop rename to 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 similarity index 100% rename from debian/_base/applications/soundkonverter/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/kbookreader/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kbibtex/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/soundkonverter/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kde-systemsettings/debian/compat rename to debian/_base/applications/multimedia/soundkonverter/debian/compat diff --git a/debian/_base/applications/soundkonverter/debian/control b/debian/_base/applications/multimedia/soundkonverter/debian/control similarity index 100% rename from debian/_base/applications/soundkonverter/debian/control rename to debian/_base/applications/multimedia/soundkonverter/debian/control diff --git a/debian/_base/applications/soundkonverter/debian/copyright b/debian/_base/applications/multimedia/soundkonverter/debian/copyright similarity index 100% rename from debian/_base/applications/soundkonverter/debian/copyright rename to debian/_base/applications/multimedia/soundkonverter/debian/copyright diff --git a/debian/_base/applications/kdiff3/debian/docs b/debian/_base/applications/multimedia/soundkonverter/debian/docs similarity index 100% rename from debian/_base/applications/kdiff3/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kile/debian/patches/.gitignore rename to 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 similarity index 100% rename from debian/_base/applications/soundkonverter/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/soundkonverter/debian/soundkonverter-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides rename to 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 similarity index 100% rename from debian/_base/applications/kde-systemsettings/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kde-systemsettings/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/basket/debian/basket-kontact-integration-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/basket/debian/basket-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/basket/debian/basket.1 rename to 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 similarity index 100% rename from debian/_base/applications/basket/debian/changelog rename to debian/_base/applications/office/basket/debian/changelog diff --git a/debian/_base/applications/kdesudo/debian/compat b/debian/_base/applications/office/basket/debian/compat similarity index 100% rename from debian/_base/applications/kdesudo/debian/compat rename to debian/_base/applications/office/basket/debian/compat diff --git a/debian/_base/applications/basket/debian/control b/debian/_base/applications/office/basket/debian/control similarity index 100% rename from debian/_base/applications/basket/debian/control rename to debian/_base/applications/office/basket/debian/control diff --git a/debian/_base/applications/basket/debian/copyright b/debian/_base/applications/office/basket/debian/copyright similarity index 100% rename from debian/_base/applications/basket/debian/copyright rename to debian/_base/applications/office/basket/debian/copyright diff --git a/debian/_base/applications/kbiff/debian/dirs b/debian/_base/applications/office/basket/debian/dirs similarity index 100% rename from debian/_base/applications/kbiff/debian/dirs rename to debian/_base/applications/office/basket/debian/dirs diff --git a/debian/_base/applications/kile/debian/docs b/debian/_base/applications/office/basket/debian/docs similarity index 100% rename from debian/_base/applications/kile/debian/docs rename to debian/_base/applications/office/basket/debian/docs diff --git a/debian/_base/applications/basket/debian/menu b/debian/_base/applications/office/basket/debian/menu similarity index 100% rename from debian/_base/applications/basket/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/katapult/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/basket/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kdesudo/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kdesudo/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/basket/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/kcpuload/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kbiff/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kbibtex/debian/changelog rename to debian/_base/applications/office/kbibtex/debian/changelog diff --git a/debian/_base/applications/kdesvn/debian/compat b/debian/_base/applications/office/kbibtex/debian/compat similarity index 100% rename from debian/_base/applications/kdesvn/debian/compat rename to debian/_base/applications/office/kbibtex/debian/compat diff --git a/debian/_base/applications/kbibtex/debian/control b/debian/_base/applications/office/kbibtex/debian/control similarity index 100% rename from debian/_base/applications/kbibtex/debian/control rename to debian/_base/applications/office/kbibtex/debian/control diff --git a/debian/_base/applications/kbibtex/debian/copyright b/debian/_base/applications/office/kbibtex/debian/copyright similarity index 100% rename from debian/_base/applications/kbibtex/debian/copyright rename to debian/_base/applications/office/kbibtex/debian/copyright diff --git a/debian/_base/applications/kbibtex/debian/docs b/debian/_base/applications/office/kbibtex/debian/docs similarity index 100% rename from debian/_base/applications/kbibtex/debian/docs rename to debian/_base/applications/office/kbibtex/debian/docs diff --git a/debian/_base/applications/kbibtex/debian/menu b/debian/_base/applications/office/kbibtex/debian/menu similarity index 100% rename from debian/_base/applications/kbibtex/debian/menu rename to debian/_base/applications/office/kbibtex/debian/menu diff --git a/debian/_base/applications/kbibtex/debian/rules b/debian/_base/applications/office/kbibtex/debian/rules similarity index 100% rename from debian/_base/applications/kbibtex/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kbibtex/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/kdbg/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kbookreader/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kbookreader/debian/changelog rename to debian/_base/applications/office/kbookreader/debian/changelog diff --git a/debian/_base/applications/kdiff3/debian/compat b/debian/_base/applications/office/kbookreader/debian/compat similarity index 100% rename from debian/_base/applications/kdiff3/debian/compat rename to debian/_base/applications/office/kbookreader/debian/compat diff --git a/debian/_base/applications/kbookreader/debian/control b/debian/_base/applications/office/kbookreader/debian/control similarity index 100% rename from debian/_base/applications/kbookreader/debian/control rename to debian/_base/applications/office/kbookreader/debian/control diff --git a/debian/_base/applications/kbookreader/debian/copyright b/debian/_base/applications/office/kbookreader/debian/copyright similarity index 100% rename from debian/_base/applications/kbookreader/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kbfx/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kbookreader/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kdiff3/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kdiff3/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kile/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/kile/debian/TODO.Debian rename to 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 similarity index 100% rename from debian/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kcpuload/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kile/debian/changelog rename to debian/_base/applications/office/kile/debian/changelog diff --git a/debian/_base/applications/kdirstat/debian/compat b/debian/_base/applications/office/kile/debian/compat similarity index 100% rename from debian/_base/applications/kdirstat/debian/compat rename to debian/_base/applications/office/kile/debian/compat diff --git a/debian/_base/applications/kile/debian/control b/debian/_base/applications/office/kile/debian/control similarity index 100% rename from debian/_base/applications/kile/debian/control rename to debian/_base/applications/office/kile/debian/control diff --git a/debian/_base/applications/kile/debian/copyright b/debian/_base/applications/office/kile/debian/copyright similarity index 100% rename from debian/_base/applications/kile/debian/copyright rename to debian/_base/applications/office/kile/debian/copyright diff --git a/debian/_base/applications/kmyfirewall/debian/docs b/debian/_base/applications/office/kile/debian/docs similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kile/debian/kile-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kile/debian/kile-trinity.links rename to 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 similarity index 100% rename from debian/_base/applications/kile/debian/kile.1 rename to 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 similarity index 100% rename from debian/_base/applications/kile/debian/kile.xpm rename to 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 similarity index 100% rename from debian/_base/applications/kile/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/knights/debian/patches/.gitignore rename to 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 similarity index 100% rename from debian/_base/applications/kile/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kdirstat/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kdirstat/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kile/debian/watch rename to debian/_base/applications/office/kile/debian/watch diff --git a/debian/_base/applications/kmymoney/debian/NEWS b/debian/_base/applications/office/kmymoney/debian/NEWS similarity index 100% rename from debian/_base/applications/kmymoney/debian/NEWS rename to 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 similarity index 100% rename from debian/_base/applications/kmymoney/debian/README.source rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-qtcurve/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kdbg/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kmymoney/debian/changelog rename to debian/_base/applications/office/kmymoney/debian/changelog diff --git a/debian/_base/applications/kdmtheme/debian/compat b/debian/_base/applications/office/kmymoney/debian/compat similarity index 100% rename from debian/_base/applications/kdmtheme/debian/compat rename to debian/_base/applications/office/kmymoney/debian/compat diff --git a/debian/_base/applications/kmymoney/debian/control b/debian/_base/applications/office/kmymoney/debian/control similarity index 100% rename from debian/_base/applications/kmymoney/debian/control rename to debian/_base/applications/office/kmymoney/debian/control diff --git a/debian/_base/applications/kmymoney/debian/copyright b/debian/_base/applications/office/kmymoney/debian/copyright similarity index 100% rename from debian/_base/applications/kmymoney/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kmymoney/debian/kmymoney2-common-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kmymoney/debian/kmymoney2-trinity-dev.install rename to 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 similarity index 100% rename from debian/_base/applications/kmymoney/debian/kmymoney2-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/kmymoney/debian/kmymoney2-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kmymoney/debian/kmymoney2.xpm rename to 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 similarity index 100% rename from debian/_base/applications/kmymoney/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/kbookreader/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kmymoney/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kdmtheme/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kdmtheme/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kmymoney/debian/watch rename to debian/_base/applications/office/kmymoney/debian/watch diff --git a/debian/_base/applications/knowit/debian/changelog b/debian/_base/applications/office/knowit/debian/changelog similarity index 100% rename from debian/_base/applications/knowit/debian/changelog rename to debian/_base/applications/office/knowit/debian/changelog diff --git a/debian/_base/applications/kdpkg/debian/compat b/debian/_base/applications/office/knowit/debian/compat similarity index 100% rename from debian/_base/applications/kdpkg/debian/compat rename to debian/_base/applications/office/knowit/debian/compat diff --git a/debian/_base/applications/knowit/debian/control b/debian/_base/applications/office/knowit/debian/control similarity index 100% rename from debian/_base/applications/knowit/debian/control rename to debian/_base/applications/office/knowit/debian/control diff --git a/debian/_base/applications/knowit/debian/copyright b/debian/_base/applications/office/knowit/debian/copyright similarity index 100% rename from debian/_base/applications/knowit/debian/copyright rename to debian/_base/applications/office/knowit/debian/copyright diff --git a/debian/_base/applications/knowit/debian/docs b/debian/_base/applications/office/knowit/debian/docs similarity index 100% rename from debian/_base/applications/knowit/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/knowit/debian/knowit.1 rename to 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 similarity index 100% rename from debian/_base/applications/knowit/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kdpkg/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kdpkg/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/knowit/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/koffice-i18n/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/keep/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/koffice-i18n/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/koffice-i18n/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/knights/debian/debiandirs rename to 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 similarity index 100% rename from debian/_base/applications/koffice-i18n/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/keep/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/keep/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/README.MimeType rename to 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 similarity index 100% rename from debian/_base/applications/kde-systemsettings/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kdbusnotification/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/chalk-data-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/chalk-data-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/chalk-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/chalk-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/chalk-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/chalk-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/chalk-trinity.mime rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/chalk.xpm rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/changelog rename to debian/_base/applications/office/koffice/debian/changelog diff --git a/debian/_base/applications/kerry/debian/compat b/debian/_base/applications/office/koffice/debian/compat similarity index 100% rename from debian/_base/applications/kerry/debian/compat rename to debian/_base/applications/office/koffice/debian/compat diff --git a/debian/_base/applications/koffice/debian/control b/debian/_base/applications/office/koffice/debian/control similarity index 100% rename from debian/_base/applications/koffice/debian/control rename to debian/_base/applications/office/koffice/debian/control diff --git a/debian/_base/applications/koffice/debian/copyright b/debian/_base/applications/office/koffice/debian/copyright similarity index 100% rename from debian/_base/applications/koffice/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/fogra27l.icm.uu rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/karbon-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/karbon-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/karbon-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/karbon-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/karbon-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/karbon-trinity.mime rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/karbon.1 rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/karbon.xpm rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kchart-trinity.README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kchart-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kchart-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kchart-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kchart-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kchart-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kchart-trinity.mime rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kchart.1 rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kchart.xpm rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kexi-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kexi-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kexi-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kformula-trinity.README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kformula-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kformula-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kformula-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kformula-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kformula-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kformula-trinity.mime rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kformula.1 rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kformula.xpm rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kivio-data-trinity.README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kivio-data-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kivio-data-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kivio-data-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kivio-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kivio-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kivio-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kivio-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kivio-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kivio-trinity.mime rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kivio.1 rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kivio.xpm rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koconverter.1 rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-data-trinity.README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-data-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-data-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-data-trinity.links rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-dev-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-libs-trinity.README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-libs-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-libs-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-libs-trinity.links rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-libs-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-libs-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-trinity-doc.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-trinity.README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koffice-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koscript.1 rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koshell-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koshell-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koshell-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koshell-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koshell-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koshell.1 rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/koshell.xpm rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kplato-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kplato-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kprconverter.pl.1 rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kpresenter-data-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kpresenter-data-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kpresenter-trinity.README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kpresenter-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kpresenter-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kpresenter-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kpresenter-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kpresenter-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kpresenter-trinity.mime rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kpresenter.1 rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kpresenter.xpm rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kspread-trinity.README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kspread-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kspread-trinity.examples rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kspread-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kspread-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kspread-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kspread-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kspread-trinity.mime rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kspread.1 rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kspread.xpm rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kthesaurus-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kthesaurus-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kthesaurus-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kthesaurus-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kthesaurus.1 rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kthesaurus.xpm rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kudesigner.1 rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kugar-trinity.README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kugar-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kugar-trinity.examples rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kugar-trinity.examples.README rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kugar-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kugar-trinity.links rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kugar-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kugar-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kugar-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kugar-trinity.mime rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kugar.1 rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kugar.xpm rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kword-data-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kword-data-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kword-trinity.README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kword-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kword-trinity.examples rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kword-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kword-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kword-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kword-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kword-trinity.mime rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kword.1 rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/kword.xpm rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/not-installed.list rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kerry/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kerry/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kdesudo/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-qtcurve/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kpilot/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kgtk-qt3/debian/compat rename to debian/_base/applications/office/kpilot/debian/compat diff --git a/debian/_base/applications/kpilot/debian/control b/debian/_base/applications/office/kpilot/debian/control similarity index 100% rename from debian/_base/applications/kpilot/debian/control rename to debian/_base/applications/office/kpilot/debian/control diff --git a/debian/_base/applications/kpilot/debian/copyright b/debian/_base/applications/office/kpilot/debian/copyright similarity index 100% rename from debian/_base/applications/kpilot/debian/copyright rename to debian/_base/applications/office/kpilot/debian/copyright diff --git a/debian/_base/applications/kpilot/debian/rules b/debian/_base/applications/office/kpilot/debian/rules similarity index 100% rename from debian/_base/applications/kpilot/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kgtk-qt3/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kgtk-qt3/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/tellico/debian/changelog rename to debian/_base/applications/office/tellico/debian/changelog diff --git a/debian/_base/applications/kile/debian/compat b/debian/_base/applications/office/tellico/debian/compat similarity index 100% rename from debian/_base/applications/kile/debian/compat rename to debian/_base/applications/office/tellico/debian/compat diff --git a/debian/_base/applications/tellico/debian/control b/debian/_base/applications/office/tellico/debian/control similarity index 100% rename from debian/_base/applications/tellico/debian/control rename to debian/_base/applications/office/tellico/debian/control diff --git a/debian/_base/applications/tellico/debian/copyright b/debian/_base/applications/office/tellico/debian/copyright similarity index 100% rename from debian/_base/applications/tellico/debian/copyright rename to debian/_base/applications/office/tellico/debian/copyright diff --git a/debian/_base/applications/tellico/debian/menu b/debian/_base/applications/office/tellico/debian/menu similarity index 100% rename from debian/_base/applications/tellico/debian/menu rename to debian/_base/applications/office/tellico/debian/menu diff --git a/debian/_base/applications/tellico/debian/rules b/debian/_base/applications/office/tellico/debian/rules similarity index 100% rename from debian/_base/applications/tellico/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kile/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kile/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/tellico/debian/tellico-data-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/tellico/debian/tellico-scripts-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/tellico/debian/tellico-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/tellico/debian/tellico.1x rename to 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 similarity index 100% rename from debian/_base/applications/tellico/debian/tellico.xpm rename to 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 similarity index 100% rename from debian/_base/applications/tellico/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/kbfx/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kima/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/dirs rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/displayconfig-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/knights/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/guidance-backends-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.init rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.postinst rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/mountconfig-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-qtcurve/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/pycompat rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/python-distutils-jaunty.mk rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/pyversions rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/serviceconfig-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/kima/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kima/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/userconfig-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kde-systemsettings/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kde-systemsettings/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kio-apt/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/kde-systemsettings/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/kde-systemsettings/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kde-systemsettings/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kde-systemsettings/debian/kde-settings-laptops.directory rename to 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 similarity index 100% rename from debian/_base/applications/kde-systemsettings/debian/kde-systemsettings-trinity.preinst rename to 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 similarity index 100% rename from debian/_base/applications/kde-systemsettings/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kde-systemsettings/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kio-apt/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kio-apt/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kde-systemsettings/debian/systemsettings.1.docbook rename to 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 similarity index 100% rename from debian/_base/applications/kdiff3/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kdesudo/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kdesudo/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kio-locate/debian/compat rename to debian/_base/applications/settings/kdesudo/debian/compat diff --git a/debian/_base/applications/kdesudo/debian/control b/debian/_base/applications/settings/kdesudo/debian/control similarity index 100% rename from debian/_base/applications/kdesudo/debian/control rename to debian/_base/applications/settings/kdesudo/debian/control diff --git a/debian/_base/applications/kdesudo/debian/copyright b/debian/_base/applications/settings/kdesudo/debian/copyright similarity index 100% rename from debian/_base/applications/kdesudo/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kdesudo/debian/kdesudo-trinity.1.docbook rename to 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 similarity index 100% rename from debian/_base/applications/kdesudo/debian/links rename to 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 similarity index 100% rename from debian/_base/applications/kdesudo/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kdesudo/debian/postinst rename to debian/_base/applications/settings/kdesudo/debian/postinst diff --git a/debian/_base/applications/kdesudo/debian/postrm b/debian/_base/applications/settings/kdesudo/debian/postrm similarity index 100% rename from debian/_base/applications/kdesudo/debian/postrm rename to debian/_base/applications/settings/kdesudo/debian/postrm diff --git a/debian/_base/applications/kdesudo/debian/preinst b/debian/_base/applications/settings/kdesudo/debian/preinst similarity index 100% rename from debian/_base/applications/kdesudo/debian/preinst rename to debian/_base/applications/settings/kdesudo/debian/preinst diff --git a/debian/_base/applications/kdesudo/debian/rules b/debian/_base/applications/settings/kdesudo/debian/rules similarity index 100% rename from debian/_base/applications/kdesudo/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kio-locate/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kio-locate/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kdpkg/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kio-umountwrapper/debian/compat rename to debian/_base/applications/settings/kdpkg/debian/compat diff --git a/debian/_base/applications/kdpkg/debian/control b/debian/_base/applications/settings/kdpkg/debian/control similarity index 100% rename from debian/_base/applications/kdpkg/debian/control rename to debian/_base/applications/settings/kdpkg/debian/control diff --git a/debian/_base/applications/kdpkg/debian/copyright b/debian/_base/applications/settings/kdpkg/debian/copyright similarity index 100% rename from debian/_base/applications/kdpkg/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kdpkg/debian/kdpkg-install.1 rename to 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 similarity index 100% rename from debian/_base/applications/kdpkg/debian/kdpkg.1 rename to 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 similarity index 100% rename from debian/_base/applications/kdpkg/debian/manpages rename to 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 similarity index 100% rename from debian/_base/applications/kdesvn/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kdpkg/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kio-umountwrapper/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kio-umountwrapper/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kima/debian/changelog rename to debian/_base/applications/settings/kima/debian/changelog diff --git a/debian/_base/applications/kiosktool/debian/compat b/debian/_base/applications/settings/kima/debian/compat similarity index 100% rename from debian/_base/applications/kiosktool/debian/compat rename to debian/_base/applications/settings/kima/debian/compat diff --git a/debian/_base/applications/kima/debian/control b/debian/_base/applications/settings/kima/debian/control similarity index 100% rename from debian/_base/applications/kima/debian/control rename to debian/_base/applications/settings/kima/debian/control diff --git a/debian/_base/applications/kima/debian/copyright b/debian/_base/applications/settings/kima/debian/copyright similarity index 100% rename from debian/_base/applications/kima/debian/copyright rename to debian/_base/applications/settings/kima/debian/copyright diff --git a/debian/_base/applications/kima/debian/rules b/debian/_base/applications/settings/kima/debian/rules similarity index 100% rename from debian/_base/applications/kima/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kiosktool/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kiosktool/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kdirstat/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kdiff3/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kiosktool/debian/changelog rename to debian/_base/applications/settings/kiosktool/debian/changelog diff --git a/debian/_base/applications/kmplayer/debian/compat b/debian/_base/applications/settings/kiosktool/debian/compat similarity index 100% rename from debian/_base/applications/kmplayer/debian/compat rename to debian/_base/applications/settings/kiosktool/debian/compat diff --git a/debian/_base/applications/kiosktool/debian/control b/debian/_base/applications/settings/kiosktool/debian/control similarity index 100% rename from debian/_base/applications/kiosktool/debian/control rename to debian/_base/applications/settings/kiosktool/debian/control diff --git a/debian/_base/applications/kiosktool/debian/copyright b/debian/_base/applications/settings/kiosktool/debian/copyright similarity index 100% rename from debian/_base/applications/kiosktool/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/kiosktool/debian/kiosktool-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/kiosktool/debian/kiosktool-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/kdirstat/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kiosktool/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kmplayer/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kmplayer/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/changelog rename to debian/_base/applications/settings/kmyfirewall/debian/changelog diff --git a/debian/_base/applications/kmyfirewall/debian/compat b/debian/_base/applications/settings/kmyfirewall/debian/compat similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/compat rename to debian/_base/applications/settings/kmyfirewall/debian/compat diff --git a/debian/_base/applications/kmyfirewall/debian/control b/debian/_base/applications/settings/kmyfirewall/debian/control similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/control rename to debian/_base/applications/settings/kmyfirewall/debian/control diff --git a/debian/_base/applications/kmyfirewall/debian/copyright b/debian/_base/applications/settings/kmyfirewall/debian/copyright similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/koffice-i18n/debian/debiandirs rename to debian/_base/applications/settings/kmyfirewall/debian/debiandirs diff --git a/debian/_base/applications/kmyfirewall/debian/dirs b/debian/_base/applications/settings/kmyfirewall/debian/dirs similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/dirs rename to debian/_base/applications/settings/kmyfirewall/debian/dirs diff --git a/debian/_base/applications/krename/debian/docs b/debian/_base/applications/settings/kmyfirewall/debian/docs similarity index 100% rename from debian/_base/applications/krename/debian/docs rename to debian/_base/applications/settings/kmyfirewall/debian/docs diff --git a/debian/_base/applications/kmyfirewall/debian/install b/debian/_base/applications/settings/kmyfirewall/debian/install similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/install rename to 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 similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/kmfinstallerplugin.desktop rename to 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 similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/kmyfirewall.1 rename to 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 similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/kmyfirewall.desktop rename to 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 similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/kmyfirewall.xpm rename to 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 similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/manpages rename to debian/_base/applications/settings/kmyfirewall/debian/manpages diff --git a/debian/_base/applications/kmyfirewall/debian/menu b/debian/_base/applications/settings/kmyfirewall/debian/menu similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/menu rename to debian/_base/applications/settings/kmyfirewall/debian/menu diff --git a/debian/_base/applications/kmyfirewall/debian/rules b/debian/_base/applications/settings/kmyfirewall/debian/rules similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kmyfirewall/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager.cmake/debian/README.source rename to 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 similarity index 100% rename from debian/_base/applications/kdmtheme/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kdirstat/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/changelog rename to debian/_base/applications/settings/knetworkmanager8/debian/changelog diff --git a/debian/_base/applications/kmymoney/debian/compat b/debian/_base/applications/settings/knetworkmanager8/debian/compat similarity index 100% rename from debian/_base/applications/kmymoney/debian/compat rename to debian/_base/applications/settings/knetworkmanager8/debian/compat diff --git a/debian/_base/applications/knetworkmanager8/debian/control b/debian/_base/applications/settings/knetworkmanager8/debian/control similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager.cmake/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager.cmake/debian/knetworkmanager.1 rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager.cmake/debian/manpages rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager.cmake/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst rename to 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 similarity index 100% rename from debian/_base/applications/kdpkg/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kmymoney/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kmymoney/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager.cmake/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/kde-guidance/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/keep/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kdmtheme/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/changelog rename to debian/_base/applications/settings/wlassistant/debian/changelog diff --git a/debian/_base/applications/knemo/debian/compat b/debian/_base/applications/settings/wlassistant/debian/compat similarity index 100% rename from debian/_base/applications/knemo/debian/compat rename to debian/_base/applications/settings/wlassistant/debian/compat diff --git a/debian/_base/applications/wlassistant/debian/control b/debian/_base/applications/settings/wlassistant/debian/control similarity index 100% rename from debian/_base/applications/wlassistant/debian/control rename to debian/_base/applications/settings/wlassistant/debian/control diff --git a/debian/_base/applications/wlassistant/debian/copyright b/debian/_base/applications/settings/wlassistant/debian/copyright similarity index 100% rename from debian/_base/applications/wlassistant/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kerry/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/knemo/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/knemo/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/wlassistant-16.xpm rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/wlassistant-trinity.dirs rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/wlassistant-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/wlassistant-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/wlassistant-trinity.manpage rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/wlassistant-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/wlassistant.xpm rename to 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 similarity index 100% rename from debian/_base/applications/adept/debian/adept-batch-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/adept/debian/adept-common-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/adept/debian/adept-installer-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/adept/debian/adept-manager-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/adept/debian/adept-notifier-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/adept/debian/adept-updater-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kerry/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/keep/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/adept/debian/changelog rename to debian/_base/applications/system/adept/debian/changelog diff --git a/debian/_base/applications/knetload/debian/compat b/debian/_base/applications/system/adept/debian/compat similarity index 100% rename from debian/_base/applications/knetload/debian/compat rename to debian/_base/applications/system/adept/debian/compat diff --git a/debian/_base/applications/adept/debian/control b/debian/_base/applications/system/adept/debian/control similarity index 100% rename from debian/_base/applications/adept/debian/control rename to debian/_base/applications/system/adept/debian/control diff --git a/debian/_base/applications/adept/debian/copyright b/debian/_base/applications/system/adept/debian/copyright similarity index 100% rename from debian/_base/applications/adept/debian/copyright rename to debian/_base/applications/system/adept/debian/copyright diff --git a/debian/_base/applications/adept/debian/dirs b/debian/_base/applications/system/adept/debian/dirs similarity index 100% rename from debian/_base/applications/adept/debian/dirs rename to debian/_base/applications/system/adept/debian/dirs diff --git a/debian/_base/applications/adept/debian/docs b/debian/_base/applications/system/adept/debian/docs similarity index 100% rename from debian/_base/applications/adept/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/adept/debian/patches/remove_apport.diff rename to 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 similarity index 100% rename from debian/_base/applications/adept/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/adept/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/knetload/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/knetload/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kerry/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/dolphin/debian/changelog rename to debian/_base/applications/system/dolphin/debian/changelog diff --git a/debian/_base/applications/knetstats/debian/compat b/debian/_base/applications/system/dolphin/debian/compat similarity index 100% rename from debian/_base/applications/knetstats/debian/compat rename to debian/_base/applications/system/dolphin/debian/compat diff --git a/debian/_base/applications/dolphin/debian/control b/debian/_base/applications/system/dolphin/debian/control similarity index 100% rename from debian/_base/applications/dolphin/debian/control rename to debian/_base/applications/system/dolphin/debian/control diff --git a/debian/_base/applications/dolphin/debian/copyright b/debian/_base/applications/system/dolphin/debian/copyright similarity index 100% rename from debian/_base/applications/dolphin/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/dolphin/debian/dolphin.1 rename to 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 similarity index 100% rename from debian/_base/applications/dolphin/debian/manpages rename to 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 similarity index 100% rename from debian/_base/applications/kgtk-qt3/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/dolphin/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/knetstats/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/knetstats/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kile/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kgtk-qt3/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/katapult/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager.cmake/debian/compat rename to debian/_base/applications/system/katapult/debian/compat diff --git a/debian/_base/applications/katapult/debian/control b/debian/_base/applications/system/katapult/debian/control similarity index 100% rename from debian/_base/applications/katapult/debian/control rename to debian/_base/applications/system/katapult/debian/control diff --git a/debian/_base/applications/katapult/debian/copyright b/debian/_base/applications/system/katapult/debian/copyright similarity index 100% rename from debian/_base/applications/katapult/debian/copyright rename to debian/_base/applications/system/katapult/debian/copyright diff --git a/debian/_base/applications/katapult/debian/docs b/debian/_base/applications/system/katapult/debian/docs similarity index 100% rename from debian/_base/applications/katapult/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/katapult/debian/katapult.1.docbook rename to 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 similarity index 100% rename from debian/_base/applications/katapult/debian/lintian rename to debian/_base/applications/system/katapult/debian/lintian diff --git a/debian/_base/applications/katapult/debian/menu b/debian/_base/applications/system/katapult/debian/menu similarity index 100% rename from debian/_base/applications/katapult/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/kio-apt/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/katapult/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager.cmake/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager.cmake/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kmplayer/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/kbfx/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kbfx/debian/cmake.mk rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/compat rename to debian/_base/applications/system/kbfx/debian/compat diff --git a/debian/_base/applications/kbfx/debian/control b/debian/_base/applications/system/kbfx/debian/control similarity index 100% rename from debian/_base/applications/kbfx/debian/control rename to debian/_base/applications/system/kbfx/debian/control diff --git a/debian/_base/applications/kbfx/debian/copyright b/debian/_base/applications/system/kbfx/debian/copyright similarity index 100% rename from debian/_base/applications/kbfx/debian/copyright rename to debian/_base/applications/system/kbfx/debian/copyright diff --git a/debian/_base/applications/kbfx/debian/docs b/debian/_base/applications/system/kbfx/debian/docs similarity index 100% rename from debian/_base/applications/kbfx/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kbfx/debian/kbfx.lintian-overrides rename to 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 similarity index 100% rename from debian/_base/applications/kio-locate/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kbfx/debian/postinst rename to debian/_base/applications/system/kbfx/debian/postinst diff --git a/debian/_base/applications/kbfx/debian/rules b/debian/_base/applications/system/kbfx/debian/rules similarity index 100% rename from debian/_base/applications/kbfx/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kbfx/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/kio-apt/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kile/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kdbusnotification/debian/changelog rename to debian/_base/applications/system/kdbusnotification/debian/changelog diff --git a/debian/_base/applications/knights/debian/compat b/debian/_base/applications/system/kdbusnotification/debian/compat similarity index 100% rename from debian/_base/applications/knights/debian/compat rename to debian/_base/applications/system/kdbusnotification/debian/compat diff --git a/debian/_base/applications/kdbusnotification/debian/control b/debian/_base/applications/system/kdbusnotification/debian/control similarity index 100% rename from debian/_base/applications/kdbusnotification/debian/control rename to debian/_base/applications/system/kdbusnotification/debian/control diff --git a/debian/_base/applications/kdbusnotification/debian/copyright b/debian/_base/applications/system/kdbusnotification/debian/copyright similarity index 100% rename from debian/_base/applications/kdbusnotification/debian/copyright rename to debian/_base/applications/system/kdbusnotification/debian/copyright diff --git a/debian/_base/applications/kcpuload/debian/links b/debian/_base/applications/system/kdbusnotification/debian/links similarity index 100% rename from debian/_base/applications/kcpuload/debian/links rename to debian/_base/applications/system/kdbusnotification/debian/links diff --git a/debian/_base/applications/kdbusnotification/debian/rules b/debian/_base/applications/system/kdbusnotification/debian/rules similarity index 100% rename from debian/_base/applications/kdbusnotification/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/knights/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/knights/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/knemo/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/kio-locate/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kio-apt/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/knemo/debian/changelog rename to debian/_base/applications/system/knemo/debian/changelog diff --git a/debian/_base/applications/knowit/debian/compat b/debian/_base/applications/system/knemo/debian/compat similarity index 100% rename from debian/_base/applications/knowit/debian/compat rename to debian/_base/applications/system/knemo/debian/compat diff --git a/debian/_base/applications/knemo/debian/control b/debian/_base/applications/system/knemo/debian/control similarity index 100% rename from debian/_base/applications/knemo/debian/control rename to debian/_base/applications/system/knemo/debian/control diff --git a/debian/_base/applications/knemo/debian/copyright b/debian/_base/applications/system/knemo/debian/copyright similarity index 100% rename from debian/_base/applications/knemo/debian/copyright rename to debian/_base/applications/system/knemo/debian/copyright diff --git a/debian/_base/applications/knemo/debian/dirs b/debian/_base/applications/system/knemo/debian/dirs similarity index 100% rename from debian/_base/applications/knemo/debian/dirs rename to 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 similarity index 100% rename from debian/_base/applications/kio-umountwrapper/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/knemo/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/knowit/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/knowit/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/knetload/debian/changelog rename to debian/_base/applications/system/knetload/debian/changelog diff --git a/debian/_base/applications/knutclient/debian/compat b/debian/_base/applications/system/knetload/debian/compat similarity index 100% rename from debian/_base/applications/knutclient/debian/compat rename to debian/_base/applications/system/knetload/debian/compat diff --git a/debian/_base/applications/knetload/debian/control b/debian/_base/applications/system/knetload/debian/control similarity index 100% rename from debian/_base/applications/knetload/debian/control rename to debian/_base/applications/system/knetload/debian/control diff --git a/debian/_base/applications/knetload/debian/copyright b/debian/_base/applications/system/knetload/debian/copyright similarity index 100% rename from debian/_base/applications/knetload/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-lipstik/debian/dirs rename to debian/_base/applications/system/knetload/debian/dirs diff --git a/debian/_base/applications/knetload/debian/docs b/debian/_base/applications/system/knetload/debian/docs similarity index 100% rename from debian/_base/applications/knetload/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/knetload/debian/knetload-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/knetload/debian/knetload-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/knetload/debian/knetload.1 rename to 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 similarity index 100% rename from debian/_base/applications/knetload/debian/knetload.xpm rename to 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 similarity index 100% rename from debian/_base/applications/knetload/debian/menu rename to debian/_base/applications/system/knetload/debian/menu diff --git a/debian/_base/applications/knetload/debian/rules b/debian/_base/applications/system/knetload/debian/rules similarity index 100% rename from debian/_base/applications/knetload/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/knutclient/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/knutclient/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kio-umountwrapper/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kio-locate/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/knetstats/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/koffice-i18n/debian/compat rename to debian/_base/applications/system/knetstats/debian/compat diff --git a/debian/_base/applications/knetstats/debian/control b/debian/_base/applications/system/knetstats/debian/control similarity index 100% rename from debian/_base/applications/knetstats/debian/control rename to debian/_base/applications/system/knetstats/debian/control diff --git a/debian/_base/applications/knetstats/debian/copyright b/debian/_base/applications/system/knetstats/debian/copyright similarity index 100% rename from debian/_base/applications/knetstats/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/knetstats/debian/knetstats.1.docbook rename to 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 similarity index 100% rename from debian/_base/applications/kiosktool/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/knetstats/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/koffice-i18n/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/koffice-i18n/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/knetstats/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/kiosktool/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kio-umountwrapper/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave/debian/changelog rename to debian/_base/applications/system/kpowersave/debian/changelog diff --git a/debian/_base/applications/koffice/debian/compat b/debian/_base/applications/system/kpowersave/debian/compat similarity index 100% rename from debian/_base/applications/koffice/debian/compat rename to debian/_base/applications/system/kpowersave/debian/compat diff --git a/debian/_base/applications/kpowersave/debian/control b/debian/_base/applications/system/kpowersave/debian/control similarity index 100% rename from debian/_base/applications/kpowersave/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave.cmake/debian/copyright rename to debian/_base/applications/system/kpowersave/debian/copyright diff --git a/debian/_base/applications/kpowersave/debian/install b/debian/_base/applications/system/kpowersave/debian/install similarity index 100% rename from debian/_base/applications/kpowersave/debian/install rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave/debian/kpowersave-trinity.linda rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave.cmake/debian/kpowersave.1 rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave.cmake/debian/kpowersave.xpm rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave.cmake/debian/manpages rename to debian/_base/applications/system/kpowersave/debian/manpages diff --git a/debian/_base/applications/kpowersave/debian/menu b/debian/_base/applications/system/kpowersave/debian/menu similarity index 100% rename from debian/_base/applications/kpowersave/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/kmplayer/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave.cmake/debian/postrm rename to debian/_base/applications/system/kpowersave/debian/postrm diff --git a/debian/_base/applications/kpowersave/debian/preinst b/debian/_base/applications/system/kpowersave/debian/preinst similarity index 100% rename from debian/_base/applications/kpowersave/debian/preinst rename to debian/_base/applications/system/kpowersave/debian/preinst diff --git a/debian/_base/applications/kpowersave/debian/rules b/debian/_base/applications/system/kpowersave/debian/rules similarity index 100% rename from debian/_base/applications/kpowersave/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave.cmake/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/krusader/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/kmplayer/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kiosktool/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/krusader/debian/changelog rename to debian/_base/applications/system/krusader/debian/changelog diff --git a/debian/_base/applications/konversation/debian/compat b/debian/_base/applications/system/krusader/debian/compat similarity index 100% rename from debian/_base/applications/konversation/debian/compat rename to debian/_base/applications/system/krusader/debian/compat diff --git a/debian/_base/applications/krusader/debian/control b/debian/_base/applications/system/krusader/debian/control similarity index 100% rename from debian/_base/applications/krusader/debian/control rename to debian/_base/applications/system/krusader/debian/control diff --git a/debian/_base/applications/krusader/debian/copyright b/debian/_base/applications/system/krusader/debian/copyright similarity index 100% rename from debian/_base/applications/krusader/debian/copyright rename to debian/_base/applications/system/krusader/debian/copyright diff --git a/debian/_base/applications/krusader/debian/docs b/debian/_base/applications/system/krusader/debian/docs similarity index 100% rename from debian/_base/applications/krusader/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/krusader/debian/krusader.lintian-overrides rename to 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 similarity index 100% rename from debian/_base/applications/krusader/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/kmymoney/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/krusader/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/krusader/debian/source.lintian-overrides rename to 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 similarity index 100% rename from debian/_base/applications/konversation/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/konversation/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/krusader/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/kmymoney/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kmplayer/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/ksystemlog/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kopete-otr/debian/compat rename to debian/_base/applications/system/ksystemlog/debian/compat diff --git a/debian/_base/applications/ksystemlog/debian/control b/debian/_base/applications/system/ksystemlog/debian/control similarity index 100% rename from debian/_base/applications/ksystemlog/debian/control rename to debian/_base/applications/system/ksystemlog/debian/control diff --git a/debian/_base/applications/ksystemlog/debian/copyright b/debian/_base/applications/system/ksystemlog/debian/copyright similarity index 100% rename from debian/_base/applications/ksystemlog/debian/copyright rename to debian/_base/applications/system/ksystemlog/debian/copyright diff --git a/debian/_base/applications/ksystemlog/debian/docs b/debian/_base/applications/system/ksystemlog/debian/docs similarity index 100% rename from debian/_base/applications/ksystemlog/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/ksystemlog/debian/ksystemlog.xml rename to 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 similarity index 100% rename from debian/_base/applications/ksystemlog/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/knemo/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/ksystemlog/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kopete-otr/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kopete-otr/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/ksystemlog/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/knemo/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kmymoney/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kvkbd/debian/changelog rename to debian/_base/applications/system/kvkbd/debian/changelog diff --git a/debian/_base/applications/kpicosim/debian/compat b/debian/_base/applications/system/kvkbd/debian/compat similarity index 100% rename from debian/_base/applications/kpicosim/debian/compat rename to debian/_base/applications/system/kvkbd/debian/compat diff --git a/debian/_base/applications/kvkbd/debian/control b/debian/_base/applications/system/kvkbd/debian/control similarity index 100% rename from debian/_base/applications/kvkbd/debian/control rename to debian/_base/applications/system/kvkbd/debian/control diff --git a/debian/_base/applications/kvkbd/debian/copyright b/debian/_base/applications/system/kvkbd/debian/copyright similarity index 100% rename from debian/_base/applications/kvkbd/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/konversation/debian/patches/.gitignore rename to 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 similarity index 100% rename from debian/_base/applications/kvkbd/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kpicosim/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kpicosim/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/smartcardauth/debian/changelog rename to debian/_base/applications/system/smartcardauth/debian/changelog diff --git a/debian/_base/applications/kpilot/debian/compat b/debian/_base/applications/system/smartcardauth/debian/compat old mode 100644 new mode 100755 similarity index 100% rename from debian/_base/applications/kpilot/debian/compat rename to debian/_base/applications/system/smartcardauth/debian/compat diff --git a/debian/_base/applications/smartcardauth/debian/control b/debian/_base/applications/system/smartcardauth/debian/control similarity index 100% rename from debian/_base/applications/smartcardauth/debian/control rename to debian/_base/applications/system/smartcardauth/debian/control diff --git a/debian/_base/applications/smartcardauth/debian/dirs b/debian/_base/applications/system/smartcardauth/debian/dirs similarity index 100% rename from debian/_base/applications/smartcardauth/debian/dirs rename to debian/_base/applications/system/smartcardauth/debian/dirs diff --git a/debian/_base/applications/smartcardauth/debian/rules b/debian/_base/applications/system/smartcardauth/debian/rules similarity index 100% rename from debian/_base/applications/smartcardauth/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/smartcardauth/debian/smartcardauth.postinst rename to 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 similarity index 100% rename from debian/_base/applications/kpilot/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kpilot/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/yakuake/debian/README rename to 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 similarity index 100% rename from debian/_base/applications/knetstats/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/knemo/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/yakuake/debian/changelog rename to debian/_base/applications/system/yakuake/debian/changelog diff --git a/debian/_base/applications/kpowersave/debian/compat b/debian/_base/applications/system/yakuake/debian/compat similarity index 100% rename from debian/_base/applications/kpowersave/debian/compat rename to debian/_base/applications/system/yakuake/debian/compat diff --git a/debian/_base/applications/yakuake/debian/control b/debian/_base/applications/system/yakuake/debian/control similarity index 100% rename from debian/_base/applications/yakuake/debian/control rename to debian/_base/applications/system/yakuake/debian/control diff --git a/debian/_base/applications/yakuake/debian/copyright b/debian/_base/applications/system/yakuake/debian/copyright similarity index 100% rename from debian/_base/applications/yakuake/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/yakuake/debian/icons/yakuake-16.xpm rename to 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 similarity index 100% rename from debian/_base/applications/yakuake/debian/icons/yakuake.xpm rename to 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 similarity index 100% rename from debian/_base/applications/ksplash-engine-moodin/debian/patches/.gitignore rename to 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 similarity index 100% rename from debian/_base/applications/yakuake/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave.cmake/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave.cmake/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/yakuake/debian/yakuake-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/yakuake/debian/yakuake-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/yakuake/debian/yakuake-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/yakuake/debian/yakuake-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager.cmake/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/knetstats/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kio-apt/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kradio/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/kio-apt/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/kio-apt/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kio-apt/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kio-apt/debian/fixrpath rename to 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 similarity index 100% rename from debian/_base/applications/kio-apt/debian/kdedeb_logo.png.uu rename to 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 similarity index 100% rename from debian/_base/applications/knetstats/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kio-apt/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager.cmake/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kio-locate/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/krename/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/kio-locate/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/kio-locate/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager.cmake/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kio-locate/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kradio/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kradio/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kio-umountwrapper/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/krusader/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/kio-umountwrapper/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/kio-umountwrapper/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kio-umountwrapper/debian/media_safelyremove.desktop rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kio-umountwrapper/debian/postrm rename to 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 similarity index 100% rename from debian/_base/applications/kio-umountwrapper/debian/preinst rename to 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 similarity index 100% rename from debian/_base/applications/kio-umountwrapper/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/krename/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/krename/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 rename to 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 similarity index 100% rename from debian/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4 rename to 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 similarity index 100% rename from debian/_base/applications/konversation/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/gtk-qt-engine/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/ksplash-engine-moodin/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/gtk-qt-engine/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/gtk-qt-engine/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs rename to 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 similarity index 100% rename from debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh rename to 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 similarity index 100% rename from debian/_base/applications/koffice/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/gtk-qt-engine/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/krusader/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/krusader/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-lipstik/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/ksquirrel/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-lipstik/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-lipstik/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/knetload/debian/dirs rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-lipstik/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/ksquirrel/debian/patches/.gitignore rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-lipstik/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/ksplash-engine-moodin/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/ksplash-engine-moodin/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/konversation/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-qtcurve/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kstreamripper/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-qtcurve/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-qtcurve/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/ksquirrel/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave.cmake/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-qtcurve/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kde-style-qtcurve/debian/scan-version rename to 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 similarity index 100% rename from debian/_base/applications/ksquirrel/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/ksquirrel/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kdmtheme/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/kpilot/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kopete-otr/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kdmtheme/debian/changelog rename to debian/_base/applications/themes/kdmtheme/debian/changelog diff --git a/debian/_base/applications/ksystemlog/debian/compat b/debian/_base/applications/themes/kdmtheme/debian/compat similarity index 100% rename from debian/_base/applications/ksystemlog/debian/compat rename to debian/_base/applications/themes/kdmtheme/debian/compat diff --git a/debian/_base/applications/kdmtheme/debian/control b/debian/_base/applications/themes/kdmtheme/debian/control similarity index 100% rename from debian/_base/applications/kdmtheme/debian/control rename to debian/_base/applications/themes/kdmtheme/debian/control diff --git a/debian/_base/applications/kdmtheme/debian/copyright b/debian/_base/applications/themes/kdmtheme/debian/copyright similarity index 100% rename from debian/_base/applications/kdmtheme/debian/copyright rename to debian/_base/applications/themes/kdmtheme/debian/copyright diff --git a/debian/_base/applications/kdmtheme/debian/docs b/debian/_base/applications/themes/kdmtheme/debian/docs similarity index 100% rename from debian/_base/applications/kdmtheme/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kdmtheme/debian/kdmtheme.lintian-overrides rename to 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 similarity index 100% rename from debian/_base/applications/ktechlab/debian/patches/.gitignore rename to 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 similarity index 100% rename from debian/_base/applications/kdmtheme/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kstreamripper/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kstreamripper/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kdmtheme/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave.cmake/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kpilot/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kgtk-qt3/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/ktechlab/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/kgtk-qt3/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/kgtk-qt3/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kgtk-qt3/debian/preload rename to 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 similarity index 100% rename from debian/_base/applications/kgtk-qt3/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/ksystemlog/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/ksystemlog/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/ksplash-engine-moodin/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/ktorrent/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/ksplash-engine-moodin/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/ksplash-engine-moodin/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/ksplash-engine-moodin/debian/debiandirs rename to 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 similarity index 100% rename from debian/_base/applications/ksplash-engine-moodin/debian/dirs rename to 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 similarity index 100% rename from debian/_base/applications/kvkbd/debian/patches/.gitignore rename to 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 similarity index 100% rename from debian/_base/applications/ksplash-engine-moodin/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/ktechlab/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/ktechlab/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave.cmake/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kwin-style-crystal/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kuickshow/debian/compat rename to 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 similarity index 100% rename from debian/_base/applications/kwin-style-crystal/debian/control rename to 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 similarity index 100% rename from debian/_base/applications/kwin-style-crystal/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kwin-style-crystal/debian/dirs rename to 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 similarity index 100% rename from debian/_base/applications/kwin-style-crystal/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/krename/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kwin-style-crystal/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/ktorrent/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/ktorrent/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/abakus/debian/abakus-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/abakus/debian/abakus-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/abakus/debian/abakus.1 rename to 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 similarity index 100% rename from debian/_base/applications/krename/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/abakus/debian/changelog rename to debian/_base/applications/utilities/abakus/debian/changelog diff --git a/debian/_base/applications/kvirc/debian/compat b/debian/_base/applications/utilities/abakus/debian/compat similarity index 100% rename from debian/_base/applications/kvirc/debian/compat rename to debian/_base/applications/utilities/abakus/debian/compat diff --git a/debian/_base/applications/abakus/debian/control b/debian/_base/applications/utilities/abakus/debian/control similarity index 100% rename from debian/_base/applications/abakus/debian/control rename to debian/_base/applications/utilities/abakus/debian/control diff --git a/debian/_base/applications/abakus/debian/copyright b/debian/_base/applications/utilities/abakus/debian/copyright similarity index 100% rename from debian/_base/applications/abakus/debian/copyright rename to debian/_base/applications/utilities/abakus/debian/copyright diff --git a/debian/_base/applications/soundkonverter/debian/docs b/debian/_base/applications/utilities/abakus/debian/docs similarity index 100% rename from debian/_base/applications/soundkonverter/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/krusader/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/abakus/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kuickshow/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kuickshow/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/krusader/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/krename/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/filelight/debian/changelog rename to debian/_base/applications/utilities/filelight/debian/changelog diff --git a/debian/_base/applications/kvkbd/debian/compat b/debian/_base/applications/utilities/filelight/debian/compat similarity index 100% rename from debian/_base/applications/kvkbd/debian/compat rename to debian/_base/applications/utilities/filelight/debian/compat diff --git a/debian/_base/applications/filelight/debian/control b/debian/_base/applications/utilities/filelight/debian/control similarity index 100% rename from debian/_base/applications/filelight/debian/control rename to debian/_base/applications/utilities/filelight/debian/control diff --git a/debian/_base/applications/filelight/debian/copyright b/debian/_base/applications/utilities/filelight/debian/copyright similarity index 100% rename from debian/_base/applications/filelight/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/filelight/debian/filelight.1 rename to 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 similarity index 100% rename from debian/_base/applications/filelight/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/ksystemlog/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/filelight/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kvirc/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kvirc/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/krusader/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kbarcode/debian/changelog rename to 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 similarity index 100% rename from debian/_base/applications/kwin-style-crystal/debian/compat rename to debian/_base/applications/utilities/kbarcode/debian/compat diff --git a/debian/_base/applications/kbarcode/debian/control b/debian/_base/applications/utilities/kbarcode/debian/control similarity index 100% rename from debian/_base/applications/kbarcode/debian/control rename to debian/_base/applications/utilities/kbarcode/debian/control diff --git a/debian/_base/applications/kbarcode/debian/copyright b/debian/_base/applications/utilities/kbarcode/debian/copyright similarity index 100% rename from debian/_base/applications/kbarcode/debian/copyright rename to debian/_base/applications/utilities/kbarcode/debian/copyright diff --git a/debian/_base/applications/kstreamripper/debian/docs b/debian/_base/applications/utilities/kbarcode/debian/docs similarity index 100% rename from debian/_base/applications/kstreamripper/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kbarcode/debian/kbarcode.1 rename to 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 similarity index 100% rename from debian/_base/applications/kbarcode/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/soundkonverter/debian/patches/.gitignore rename to 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 similarity index 100% rename from debian/_base/applications/kbarcode/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kbarcode/debian/source.lintian-overrides rename to 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 similarity index 100% rename from debian/_base/applications/kvkbd/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kvkbd/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kbarcode/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/kchmviewer/debian/additions/kchmviewer.1 rename to 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 similarity index 100% rename from debian/_base/applications/kchmviewer/debian/changelog rename to debian/_base/applications/utilities/kchmviewer/debian/changelog diff --git a/debian/_base/applications/piklab/debian/compat b/debian/_base/applications/utilities/kchmviewer/debian/compat similarity index 100% rename from debian/_base/applications/piklab/debian/compat rename to debian/_base/applications/utilities/kchmviewer/debian/compat diff --git a/debian/_base/applications/kchmviewer/debian/control b/debian/_base/applications/utilities/kchmviewer/debian/control similarity index 100% rename from debian/_base/applications/kchmviewer/debian/control rename to debian/_base/applications/utilities/kchmviewer/debian/control diff --git a/debian/_base/applications/kchmviewer/debian/copyright b/debian/_base/applications/utilities/kchmviewer/debian/copyright similarity index 100% rename from debian/_base/applications/kchmviewer/debian/copyright rename to debian/_base/applications/utilities/kchmviewer/debian/copyright diff --git a/debian/_base/applications/kchmviewer/debian/debiandirs b/debian/_base/applications/utilities/kchmviewer/debian/debiandirs similarity index 100% rename from debian/_base/applications/kchmviewer/debian/debiandirs rename to debian/_base/applications/utilities/kchmviewer/debian/debiandirs diff --git a/debian/_base/applications/kchmviewer/debian/dirs b/debian/_base/applications/utilities/kchmviewer/debian/dirs similarity index 100% rename from debian/_base/applications/kchmviewer/debian/dirs rename to 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 similarity index 100% rename from debian/_base/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/kchmviewer/debian/manpages rename to debian/_base/applications/utilities/kchmviewer/debian/manpages diff --git a/debian/_base/applications/kchmviewer/debian/menu b/debian/_base/applications/utilities/kchmviewer/debian/menu similarity index 100% rename from debian/_base/applications/kchmviewer/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/yakuake/debian/patches/.gitignore rename to 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 similarity index 100% rename from debian/_base/applications/kchmviewer/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kvpnc/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kvpnc/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kchmviewer/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/ktorrent/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/ksystemlog/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kcpuload/debian/changelog rename to debian/_base/applications/utilities/kcpuload/debian/changelog diff --git a/debian/_base/applications/potracegui/debian/compat b/debian/_base/applications/utilities/kcpuload/debian/compat similarity index 100% rename from debian/_base/applications/potracegui/debian/compat rename to debian/_base/applications/utilities/kcpuload/debian/compat diff --git a/debian/_base/applications/kcpuload/debian/control b/debian/_base/applications/utilities/kcpuload/debian/control similarity index 100% rename from debian/_base/applications/kcpuload/debian/control rename to debian/_base/applications/utilities/kcpuload/debian/control diff --git a/debian/_base/applications/kcpuload/debian/copyright b/debian/_base/applications/utilities/kcpuload/debian/copyright similarity index 100% rename from debian/_base/applications/kcpuload/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kcpuload/debian/doc-base rename to 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 similarity index 100% rename from debian/_base/applications/kcpuload/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/kcpuload/debian/kcpuload.1 rename to 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 similarity index 100% rename from debian/_base/applications/kcpuload/debian/kcpuload.install rename to 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 similarity index 100% rename from debian/_base/applications/kcpuload/debian/kcpuload.xpm rename to 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 similarity index 100% rename from debian/_base/applications/kdbusnotification/debian/links rename to debian/_base/applications/utilities/kcpuload/debian/links diff --git a/debian/_base/applications/kcpuload/debian/menu b/debian/_base/applications/utilities/kcpuload/debian/menu similarity index 100% rename from debian/_base/applications/kcpuload/debian/menu rename to debian/_base/applications/utilities/kcpuload/debian/menu diff --git a/debian/_base/applications/kcpuload/debian/override b/debian/_base/applications/utilities/kcpuload/debian/override similarity index 100% rename from debian/_base/applications/kcpuload/debian/override rename to debian/_base/applications/utilities/kcpuload/debian/override diff --git a/debian/_base/applications/kcpuload/debian/rules b/debian/_base/applications/utilities/kcpuload/debian/rules similarity index 100% rename from debian/_base/applications/kcpuload/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kcpuload/debian/source.lintian-overrides rename to 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 similarity index 100% rename from debian/_base/applications/kwin-style-crystal/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/kwin-style-crystal/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kuickshow/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/ktorrent/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kdirstat/debian/changelog rename to debian/_base/applications/utilities/kdirstat/debian/changelog diff --git a/debian/_base/applications/rosegarden/debian/compat b/debian/_base/applications/utilities/kdirstat/debian/compat similarity index 100% rename from debian/_base/applications/rosegarden/debian/compat rename to debian/_base/applications/utilities/kdirstat/debian/compat diff --git a/debian/_base/applications/kdirstat/debian/control b/debian/_base/applications/utilities/kdirstat/debian/control similarity index 100% rename from debian/_base/applications/kdirstat/debian/control rename to debian/_base/applications/utilities/kdirstat/debian/control diff --git a/debian/_base/applications/kdirstat/debian/copyright b/debian/_base/applications/utilities/kdirstat/debian/copyright similarity index 100% rename from debian/_base/applications/kdirstat/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kdirstat/debian/kdirstat.1 rename to 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 similarity index 100% rename from debian/_base/applications/kdirstat/debian/kdirstat.manpages rename to 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 similarity index 100% rename from debian/_base/applications/ktorrent/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kdirstat/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/kdirstat/debian/source.lintian-overrides rename to 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 similarity index 100% rename from debian/_base/applications/piklab/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/piklab/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kdirstat/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/kvkbd/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kuickshow/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/keep/debian/changelog rename to debian/_base/applications/utilities/keep/debian/changelog diff --git a/debian/_base/applications/smartcardauth/debian/compat b/debian/_base/applications/utilities/keep/debian/compat old mode 100755 new mode 100644 similarity index 100% rename from debian/_base/applications/smartcardauth/debian/compat rename to debian/_base/applications/utilities/keep/debian/compat diff --git a/debian/_base/applications/keep/debian/control b/debian/_base/applications/utilities/keep/debian/control similarity index 100% rename from debian/_base/applications/keep/debian/control rename to debian/_base/applications/utilities/keep/debian/control diff --git a/debian/_base/applications/keep/debian/copyright b/debian/_base/applications/utilities/keep/debian/copyright similarity index 100% rename from debian/_base/applications/keep/debian/copyright rename to debian/_base/applications/utilities/keep/debian/copyright diff --git a/debian/_base/applications/ktechlab/debian/docs b/debian/_base/applications/utilities/keep/debian/docs similarity index 100% rename from debian/_base/applications/ktechlab/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/keep/debian/keep.xml rename to 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 similarity index 100% rename from debian/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff rename to 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 similarity index 100% rename from debian/_base/applications/keep/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/keep/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/potracegui/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/potracegui/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/keep/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/kwin-style-crystal/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kvkbd/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/kerry/debian/changelog rename to debian/_base/applications/utilities/kerry/debian/changelog diff --git a/debian/_base/applications/smb4k/debian/compat b/debian/_base/applications/utilities/kerry/debian/compat similarity index 100% rename from debian/_base/applications/smb4k/debian/compat rename to debian/_base/applications/utilities/kerry/debian/compat diff --git a/debian/_base/applications/kerry/debian/control b/debian/_base/applications/utilities/kerry/debian/control similarity index 100% rename from debian/_base/applications/kerry/debian/control rename to debian/_base/applications/utilities/kerry/debian/control diff --git a/debian/_base/applications/kerry/debian/copyright b/debian/_base/applications/utilities/kerry/debian/copyright similarity index 100% rename from debian/_base/applications/kerry/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/kerry/debian/kerry.1.docbook rename to 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 similarity index 100% rename from debian/_base/applications/kuickshow/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kerry/debian/postinst rename to debian/_base/applications/utilities/kerry/debian/postinst diff --git a/debian/_base/applications/kerry/debian/postrm b/debian/_base/applications/utilities/kerry/debian/postrm similarity index 100% rename from debian/_base/applications/kerry/debian/postrm rename to debian/_base/applications/utilities/kerry/debian/postrm diff --git a/debian/_base/applications/kerry/debian/rules b/debian/_base/applications/utilities/kerry/debian/rules similarity index 100% rename from debian/_base/applications/kerry/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/knutclient/debian/changelog rename to debian/_base/applications/utilities/knutclient/debian/changelog diff --git a/debian/_base/applications/soundkonverter/debian/compat b/debian/_base/applications/utilities/knutclient/debian/compat similarity index 100% rename from debian/_base/applications/soundkonverter/debian/compat rename to debian/_base/applications/utilities/knutclient/debian/compat diff --git a/debian/_base/applications/knutclient/debian/control b/debian/_base/applications/utilities/knutclient/debian/control similarity index 100% rename from debian/_base/applications/knutclient/debian/control rename to debian/_base/applications/utilities/knutclient/debian/control diff --git a/debian/_base/applications/knutclient/debian/copyright b/debian/_base/applications/utilities/knutclient/debian/copyright similarity index 100% rename from debian/_base/applications/knutclient/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/knutclient/debian/knutclient.1x rename to 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 similarity index 100% rename from debian/_base/applications/knutclient/debian/knutclient.menu rename to 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 similarity index 100% rename from debian/_base/applications/knutclient/debian/preinst rename to debian/_base/applications/utilities/knutclient/debian/preinst diff --git a/debian/_base/applications/knutclient/debian/rules b/debian/_base/applications/utilities/knutclient/debian/rules similarity index 100% rename from debian/_base/applications/knutclient/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/smartcardauth/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/smartcardauth/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/knutclient/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/kwin-style-crystal/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from debian/_base/applications/krename/debian/changelog rename to debian/_base/applications/utilities/krename/debian/changelog diff --git a/debian/_base/applications/tellico/debian/compat b/debian/_base/applications/utilities/krename/debian/compat similarity index 100% rename from debian/_base/applications/tellico/debian/compat rename to debian/_base/applications/utilities/krename/debian/compat diff --git a/debian/_base/applications/krename/debian/control b/debian/_base/applications/utilities/krename/debian/control similarity index 100% rename from debian/_base/applications/krename/debian/control rename to debian/_base/applications/utilities/krename/debian/control diff --git a/debian/_base/applications/krename/debian/copyright b/debian/_base/applications/utilities/krename/debian/copyright similarity index 100% rename from debian/_base/applications/krename/debian/copyright rename to debian/_base/applications/utilities/krename/debian/copyright diff --git a/debian/_base/applications/piklab/debian/docs b/debian/_base/applications/utilities/krename/debian/docs similarity index 100% rename from debian/_base/applications/piklab/debian/docs rename to 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 similarity index 100% rename from debian/_base/applications/krename/debian/krename.1 rename to 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 similarity index 100% rename from debian/_base/applications/krename/debian/krename.manpages rename to 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 similarity index 100% rename from debian/_base/applications/kvirc/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/krename/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/smb4k/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/smb4k/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/krename/debian/watch rename to 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ó 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 Thu, 02 July 2009 16:08:00 -0600 - -amarok-trinity (2:1.4.10-0ubuntu5) jaunty; urgency=low - - * Jaunty rebuild - - -- Timothy Pearson 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 Wed, 03 March 2009 20:08:00 -0600 - -amarok-trinity (2:1.4.10-0ubuntu2) intrepid; urgency=low - - * Fixed Debian MP3 autoinstaller - - -- Timothy Pearson Mon, 08 Dec 2008 15:59:00 -0600 - -amarok-trinity (2:1.4.10-0ubuntu1) intrepid; urgency=low - - * Added -trinity prefix - - -- Timothy Pearson 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 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 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 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 Mon, 30 Jun 2008 19:19:04 +0200 - -amarok (2:1.4.9.1-2ubuntu2) intrepid; urgency=low - - * Add manpages - unbreak build - - -- Harald Sitter 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 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 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 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 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 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 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 Sat, 12 Apr 2008 13:47:12 +0200 - -amarok (2:1.4.9.1-0ubuntu1) hardy; urgency=low - - * Upstream patch release - - -- Jonathan Riddell Thu, 10 Apr 2008 23:07:12 +0100 - -amarok (2:1.4.9-0ubuntu1) hardy; urgency=low - - * New upstream release - - -- Harald Sitter 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 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 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 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 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 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 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 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 Wed, 05 Dec 2007 23:47:20 -0600 - -amarok (2:1.4.7-2ubuntu2) hardy; urgency=low - - * Rebuild for libmtp6 -> libmtp7 transition - - -- Jonathan Riddell 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 Mon, 03 Dec 2007 20:01:18 +0000 - -amarok (1.4.7-2) UNRELEASED; urgency=low - - * Build against libgpod-nogtk-dev. - - -- Adeodato Simó 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ó 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ó 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ó 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ó 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 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 - * Add patch to allow amarok get lyrics via http proxy with authentication. - Thanks to Filipe Lautert . (Closes: #409568) - * Added versioned dep on amarok-engines | amarok-engine, thanks to Andreas - Pakulat for pointing this. (Closes: #409996). - - -- Ana Beatriz Guerrero Lopez 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 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 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 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 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 . - * Replaced ${Source-Version} with ${source:Version} and added versioned - build-dependency on dpkg-dev accordingly. - - -- Ana Beatriz Guerrero Lopez 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 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 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 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 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 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 Tue, 3 Apr 2007 17:45:46 +0200 - -amarok (2:1.4.5-0ubuntu6) feisty; urgency=low - - * Fixed the install-mp3 script - - -- Ryan Kavanagh 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 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 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 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 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 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 Mon, 15 Jan 2007 15:39:10 +0000 - -amarok (2:1.4.4-0.3ubuntu3) feisty; urgency=low - - * Rebuild against libtunepimp5 - - -- Jonathan Riddell 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 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 Thu, 23 Nov 2006 03:46:05 -0600 - -amarok (2:1.4.4-0ubuntu3) feisty; urgency=low - - * Compile with MTP Device Support - - -- Brandon Holtsclaw 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 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 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 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 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 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 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 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 Wed, 20 Sep 2006 21:10:11 -0500 - -amarok (2:1.4.3-0ubuntu7) edgy; urgency=low - - * Various fixes to install-mp3 - - -- Jonathan Riddell 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 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 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 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 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 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 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 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 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 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 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 Wed, 12 Jul 2006 00:01:33 +0000 - -amarok (2:1.4.1-0ubuntu1) edgy; urgency=low - - * New upstream release - - -- Jonathan Riddell 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ó 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ó 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ó Sat, 15 Apr 2006 19:47:54 +0200 - -amarok (1.4-beta2-3) experimental; urgency=low - - * Rebuild against libmysqlclient15off. (Closes: #358490) - - -- Adeodato Simó 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ó 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ó 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ó 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ó 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ó 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ó 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 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 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 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 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 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 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 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 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 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 Wed, 1 Feb 2006 11:56:01 +0000 - -amarok (2:1.3.8-0ubuntu1) dapper; urgency=low - - * New upstream release - - -- Jonathan Riddell Sun, 15 Jan 2006 19:10:14 +0000 - -amarok (2:1.3.7-0ubuntu4) dapper; urgency=low - - * weaken build dependencies - - -- Reinhard Tartler 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 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 Wed, 7 Dec 2005 23:52:58 +0100 - -amarok (2:1.3.7-0ubuntu1) dapper; urgency=low - - * New upstream release - - -- Jonathan Riddell 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 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 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 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ó 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ó 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ó 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ó 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ó 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ó 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ó 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 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 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 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 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ó 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ó 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 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 Wed, 13 Jul 2005 18:19:28 +0000 - -amarok (2:1.2.4-0ubuntu2) breezy; urgency=low - - * Default to GStreamer plugin - - -- Jonathan Riddell 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 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ó 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 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 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 Wed, 30 Mar 2005 14:35:20 +0100 - -amarok (2:1.2.3-1ubuntu1) hoary; urgency=low - - * Sync with Debian - - -- Jonathan Riddell 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ó 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ó 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ó 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ó 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ó 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ó 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ó 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ó Fri, 24 Sep 2004 02:49:46 +0200 - -amarok (1.0.2-1) unstable; urgency=low - - * New upstream version. - - -- Peter Rockai (mornfall) 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) 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) 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) 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) 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) Wed, 16 Jun 2004 23:25:29 +0200 - -amarok (1.0-pre1-1) unstable; urgency=low - - * First 1.0.0 prerelease. - - -- Peter Rockai (mornfall) Wed, 16 Jun 2004 10:18:31 +0200 - -amarok (1.0-beta4-2) unstable; urgency=low - - * Patch to final beta4 version. - - -- Peter Rockai (mornfall) 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) Tue, 1 Jun 2004 10:24:09 +0200 - -amarok (1.0-beta3-1) unstable; urgency=low - - * New upstream release. - - -- Peter Rockai (mornfall) Sat, 29 May 2004 17:08:55 +0200 - -amarok (1.0-beta1-0) workstation-unstable; urgency=low - - * Initial packaging - - -- Peter Rockai (mornfall) 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 -XSBC-Original-Maintainer: Modestas Vainius -Uploaders: Ana Beatriz Guerrero Lopez -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 2004-04-11 -New maintainer Adeodato Simó 2004-09-22 -New maintainer Modestas Vainius 2007-12-24 - -It was downloaded from: - - - -And the project homepage is: - - - -Upstream Authors: - - | Alexandre Oliveira - | Christian Muehlhaeuser - | Frederik Holljen - | Gábor Lehel - | Ian Monroe - | Jeff Mitchell - | Mark Kretschmann - | Martin Aumueller - | Max Howell - | Mike Diehl - | Pierpaolo Di Panfilo - | Roman Becker - | Seb Ruiz - | Stanislav Karchebny - -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 -Use the X-server display 'displayname'. -.TP -.B \-\-session -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 -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 -defines the application font. -.TP -.B \-\-bg, \-\-background -sets the default background color and an -application palette (light and dark shades are -calculated). -.TP -.B \-\-fg, \-\-foreground -sets the default foreground color. -.TP -.B \-\-btn, \-\-button -sets the default button color. -.TP -.B \-\-name -sets the application name. -.TP -.B \-\-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 similarity index 100% rename from debian/_base/applications/smb4k/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/smb4k/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbg/debian/changelog rename to ubuntu/_base/applications/development/kdbg/debian/changelog diff --git a/debian/_base/applications/wlassistant/debian/compat b/ubuntu/_base/applications/development/kdbg/debian/compat similarity index 100% rename from debian/_base/applications/wlassistant/debian/compat rename to ubuntu/_base/applications/development/kdbg/debian/compat diff --git a/ubuntu/_base/applications/kdbg/debian/control b/ubuntu/_base/applications/development/kdbg/debian/control similarity index 100% rename from ubuntu/_base/applications/kdbg/debian/control rename to ubuntu/_base/applications/development/kdbg/debian/control diff --git a/ubuntu/_base/applications/kdbg/debian/copyright b/ubuntu/_base/applications/development/kdbg/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kdbg/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbg/debian/doc-base rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbg/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbg/debian/kdbg.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbg/debian/kdbg.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbg/debian/menu rename to ubuntu/_base/applications/development/kdbg/debian/menu diff --git a/ubuntu/_base/applications/kdbg/debian/rules b/ubuntu/_base/applications/development/kdbg/debian/rules similarity index 100% rename from ubuntu/_base/applications/kdbg/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/soundkonverter/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/soundkonverter/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/changelog rename to ubuntu/_base/applications/development/kdesvn/debian/changelog diff --git a/debian/_base/applications/yakuake/debian/compat b/ubuntu/_base/applications/development/kdesvn/debian/compat similarity index 100% rename from debian/_base/applications/yakuake/debian/compat rename to ubuntu/_base/applications/development/kdesvn/debian/compat diff --git a/ubuntu/_base/applications/kdesvn/debian/control b/ubuntu/_base/applications/development/kdesvn/debian/control similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/control rename to ubuntu/_base/applications/development/kdesvn/debian/control diff --git a/ubuntu/_base/applications/kdesvn/debian/copyright b/ubuntu/_base/applications/development/kdesvn/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/copyright rename to ubuntu/_base/applications/development/kdesvn/debian/copyright diff --git a/ubuntu/_base/applications/kdesvn/debian/docs b/ubuntu/_base/applications/development/kdesvn/debian/docs similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/icons/kdesvn.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/kdesvn-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/kdesvn-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/kdesvn-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/libsvnqt-trinity-dev.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/libsvnqt4-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/man/kdesvn.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/man/kdesvnaskpass.1 rename to 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 similarity index 100% rename from debian/_base/applications/kwin-style-crystal/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/tellico/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/tellico/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/soundkonverter/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/changelog rename to ubuntu/_base/applications/development/kdiff3/debian/changelog diff --git a/ubuntu/_base/applications/abakus/debian/compat b/ubuntu/_base/applications/development/kdiff3/debian/compat similarity index 100% rename from ubuntu/_base/applications/abakus/debian/compat rename to ubuntu/_base/applications/development/kdiff3/debian/compat diff --git a/ubuntu/_base/applications/kdiff3/debian/control b/ubuntu/_base/applications/development/kdiff3/debian/control similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/control rename to ubuntu/_base/applications/development/kdiff3/debian/control diff --git a/ubuntu/_base/applications/kdiff3/debian/copyright b/ubuntu/_base/applications/development/kdiff3/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/copyright rename to ubuntu/_base/applications/development/kdiff3/debian/copyright diff --git a/ubuntu/_base/applications/abakus/debian/docs b/ubuntu/_base/applications/development/kdiff3/debian/docs similarity index 100% rename from ubuntu/_base/applications/abakus/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.links rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.sgml rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/patches/.gitignore rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpicosim/debian/Makefile.am rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpicosim/debian/changelog rename to ubuntu/_base/applications/development/kpicosim/debian/changelog diff --git a/ubuntu/_base/applications/adept/debian/compat b/ubuntu/_base/applications/development/kpicosim/debian/compat similarity index 100% rename from ubuntu/_base/applications/adept/debian/compat rename to ubuntu/_base/applications/development/kpicosim/debian/compat diff --git a/ubuntu/_base/applications/kpicosim/debian/control b/ubuntu/_base/applications/development/kpicosim/debian/control similarity index 100% rename from ubuntu/_base/applications/kpicosim/debian/control rename to ubuntu/_base/applications/development/kpicosim/debian/control diff --git a/ubuntu/_base/applications/kpicosim/debian/copyright b/ubuntu/_base/applications/development/kpicosim/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kpicosim/debian/copyright rename to ubuntu/_base/applications/development/kpicosim/debian/copyright diff --git a/ubuntu/_base/applications/kpicosim/debian/dirs b/ubuntu/_base/applications/development/kpicosim/debian/dirs similarity index 100% rename from ubuntu/_base/applications/kpicosim/debian/dirs rename to ubuntu/_base/applications/development/kpicosim/debian/dirs diff --git a/ubuntu/_base/applications/kbiff/debian/docs b/ubuntu/_base/applications/development/kpicosim/debian/docs similarity index 100% rename from ubuntu/_base/applications/kbiff/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpicosim/debian/kpicosim-trinity.links rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpicosim/debian/kpicosim-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpicosim/debian/kpicosim.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpicosim/debian/menu rename to ubuntu/_base/applications/development/kpicosim/debian/menu diff --git a/ubuntu/_base/applications/kpicosim/debian/rules b/ubuntu/_base/applications/development/kpicosim/debian/rules similarity index 100% rename from ubuntu/_base/applications/kpicosim/debian/rules rename to 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 similarity index 100% rename from debian/_base/applications/yakuake/debian/source/format rename to 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 similarity index 100% rename from debian/_base/applications/yakuake/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpicosim/debian/watch rename to ubuntu/_base/applications/development/kpicosim/debian/watch diff --git a/ubuntu/_base/applications/ktechlab/debian/changelog b/ubuntu/_base/applications/development/ktechlab/debian/changelog similarity index 100% rename from ubuntu/_base/applications/ktechlab/debian/changelog rename to ubuntu/_base/applications/development/ktechlab/debian/changelog diff --git a/ubuntu/_base/applications/amarok/debian/compat b/ubuntu/_base/applications/development/ktechlab/debian/compat similarity index 100% rename from ubuntu/_base/applications/amarok/debian/compat rename to ubuntu/_base/applications/development/ktechlab/debian/compat diff --git a/ubuntu/_base/applications/ktechlab/debian/control b/ubuntu/_base/applications/development/ktechlab/debian/control similarity index 100% rename from ubuntu/_base/applications/ktechlab/debian/control rename to ubuntu/_base/applications/development/ktechlab/debian/control diff --git a/ubuntu/_base/applications/ktechlab/debian/copyright b/ubuntu/_base/applications/development/ktechlab/debian/copyright similarity index 100% rename from ubuntu/_base/applications/ktechlab/debian/copyright rename to ubuntu/_base/applications/development/ktechlab/debian/copyright diff --git a/ubuntu/_base/applications/ktechlab/debian/debiandirs b/ubuntu/_base/applications/development/ktechlab/debian/debiandirs similarity index 100% rename from ubuntu/_base/applications/ktechlab/debian/debiandirs rename to ubuntu/_base/applications/development/ktechlab/debian/debiandirs diff --git a/ubuntu/_base/applications/basket/debian/docs b/ubuntu/_base/applications/development/ktechlab/debian/docs similarity index 100% rename from ubuntu/_base/applications/basket/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktechlab/debian/ktechlab.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktechlab/debian/manpages rename to ubuntu/_base/applications/development/ktechlab/debian/manpages diff --git a/ubuntu/_base/applications/ktechlab/debian/menu b/ubuntu/_base/applications/development/ktechlab/debian/menu similarity index 100% rename from ubuntu/_base/applications/ktechlab/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktechlab/debian/microbe.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kchmviewer/debian/patches/.gitignore rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktechlab/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/abakus/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/abakus/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/piklab/debian/changelog rename to ubuntu/_base/applications/development/piklab/debian/changelog diff --git a/ubuntu/_base/applications/basket/debian/compat b/ubuntu/_base/applications/development/piklab/debian/compat similarity index 100% rename from ubuntu/_base/applications/basket/debian/compat rename to ubuntu/_base/applications/development/piklab/debian/compat diff --git a/ubuntu/_base/applications/piklab/debian/control b/ubuntu/_base/applications/development/piklab/debian/control similarity index 100% rename from ubuntu/_base/applications/piklab/debian/control rename to ubuntu/_base/applications/development/piklab/debian/control diff --git a/ubuntu/_base/applications/piklab/debian/copyright b/ubuntu/_base/applications/development/piklab/debian/copyright similarity index 100% rename from ubuntu/_base/applications/piklab/debian/copyright rename to ubuntu/_base/applications/development/piklab/debian/copyright diff --git a/ubuntu/_base/applications/kbarcode/debian/docs b/ubuntu/_base/applications/development/piklab/debian/docs similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/docs rename to ubuntu/_base/applications/development/piklab/debian/docs diff --git a/ubuntu/_base/applications/piklab/debian/install b/ubuntu/_base/applications/development/piklab/debian/install similarity index 100% rename from ubuntu/_base/applications/piklab/debian/install rename to ubuntu/_base/applications/development/piklab/debian/install diff --git a/ubuntu/_base/applications/piklab/debian/menu b/ubuntu/_base/applications/development/piklab/debian/menu similarity index 100% rename from ubuntu/_base/applications/piklab/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/piklab/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/piklab/debian/piklab.desktop rename to 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 similarity index 100% rename from ubuntu/_base/applications/piklab/debian/piklab.sng rename to 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 similarity index 100% rename from ubuntu/_base/applications/piklab/debian/piklab.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/piklab/debian/piklab48.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/piklab/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/adept/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/adept/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/knights/debian/changelog rename to ubuntu/_base/applications/games/knights/debian/changelog diff --git a/ubuntu/_base/applications/bibletime/debian/compat b/ubuntu/_base/applications/games/knights/debian/compat similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/compat rename to ubuntu/_base/applications/games/knights/debian/compat diff --git a/ubuntu/_base/applications/knights/debian/control b/ubuntu/_base/applications/games/knights/debian/control similarity index 100% rename from ubuntu/_base/applications/knights/debian/control rename to ubuntu/_base/applications/games/knights/debian/control diff --git a/ubuntu/_base/applications/knights/debian/copyright b/ubuntu/_base/applications/games/knights/debian/copyright similarity index 100% rename from ubuntu/_base/applications/knights/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview-i18n/debian/debiandirs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/knights/debian/knights.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/knights/debian/knights.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/knights/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-lipstik/debian/patches/.gitignore rename to 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 similarity index 100% rename from ubuntu/_base/applications/knights/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/amarok.cmake/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/amarok.cmake/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/knights/debian/watch rename to ubuntu/_base/applications/games/knights/debian/watch diff --git a/ubuntu/_base/applications/digikam/debian/NEWS b/ubuntu/_base/applications/graphics/digikam/debian/NEWS similarity index 100% rename from ubuntu/_base/applications/digikam/debian/NEWS rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/yakuake/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/changelog rename to ubuntu/_base/applications/graphics/digikam/debian/changelog diff --git a/ubuntu/_base/applications/digikam/debian/clean b/ubuntu/_base/applications/graphics/digikam/debian/clean similarity index 100% rename from ubuntu/_base/applications/digikam/debian/clean rename to 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 similarity index 100% rename from ubuntu/_base/applications/compizconfig-backend-kconfig/debian/compat rename to ubuntu/_base/applications/graphics/digikam/debian/compat diff --git a/ubuntu/_base/applications/digikam/debian/control b/ubuntu/_base/applications/graphics/digikam/debian/control similarity index 100% rename from ubuntu/_base/applications/digikam/debian/control rename to ubuntu/_base/applications/graphics/digikam/debian/control diff --git a/ubuntu/_base/applications/digikam/debian/copyright b/ubuntu/_base/applications/graphics/digikam/debian/copyright similarity index 100% rename from ubuntu/_base/applications/digikam/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/digikam-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/digikam-trinity.lintian-overrides rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/digikam-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/digikam-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/digikam.manpage rename to 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 similarity index 100% rename from debian/_base/applications/rosegarden/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/showfoto-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/showfoto-trinity.manpage rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/showfoto-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/showfoto-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/amarok/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/amarok/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/xpm.d/digikam-16.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/xpm.d/digikam.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/xpm.d/showfoto-16.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/xpm.d/showfoto.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from debian/_base/applications/yakuake/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview-i18n/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/desktop-effects-kde/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview-i18n/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview-i18n/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/debiandirs rename to 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 similarity index 100% rename from debian/_base/applications/wlassistant/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview-i18n/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/basket/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/basket/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/adept/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/abakus/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview/debian/changelog rename to ubuntu/_base/applications/graphics/gwenview/debian/changelog diff --git a/ubuntu/_base/applications/digikam/debian/compat b/ubuntu/_base/applications/graphics/gwenview/debian/compat similarity index 100% rename from ubuntu/_base/applications/digikam/debian/compat rename to ubuntu/_base/applications/graphics/gwenview/debian/compat diff --git a/ubuntu/_base/applications/gwenview/debian/control b/ubuntu/_base/applications/graphics/gwenview/debian/control similarity index 100% rename from ubuntu/_base/applications/gwenview/debian/control rename to ubuntu/_base/applications/graphics/gwenview/debian/control diff --git a/ubuntu/_base/applications/gwenview/debian/copyright b/ubuntu/_base/applications/graphics/gwenview/debian/copyright similarity index 100% rename from ubuntu/_base/applications/gwenview/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview/debian/gwenview.doc-base rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview/debian/gwenview.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview/debian/gwenview.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/abakus/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksquirrel/debian/README.debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksquirrel/debian/changelog rename to ubuntu/_base/applications/graphics/ksquirrel/debian/changelog diff --git a/ubuntu/_base/applications/dolphin/debian/compat b/ubuntu/_base/applications/graphics/ksquirrel/debian/compat similarity index 100% rename from ubuntu/_base/applications/dolphin/debian/compat rename to ubuntu/_base/applications/graphics/ksquirrel/debian/compat diff --git a/ubuntu/_base/applications/ksquirrel/debian/control b/ubuntu/_base/applications/graphics/ksquirrel/debian/control similarity index 100% rename from ubuntu/_base/applications/ksquirrel/debian/control rename to ubuntu/_base/applications/graphics/ksquirrel/debian/control diff --git a/ubuntu/_base/applications/ksquirrel/debian/copyright b/ubuntu/_base/applications/graphics/ksquirrel/debian/copyright similarity index 100% rename from ubuntu/_base/applications/ksquirrel/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-qtcurve/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksquirrel/debian/ksquirrel-libs-configurator.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/patches/.gitignore rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksquirrel/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/compizconfig-backend-kconfig/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/compizconfig-backend-kconfig/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksquirrel/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/amarok.cmake/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/adept/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kuickshow/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/filelight-l10n/debian/compat rename to ubuntu/_base/applications/graphics/kuickshow/debian/compat diff --git a/ubuntu/_base/applications/kuickshow/debian/control b/ubuntu/_base/applications/graphics/kuickshow/debian/control similarity index 100% rename from ubuntu/_base/applications/kuickshow/debian/control rename to ubuntu/_base/applications/graphics/kuickshow/debian/control diff --git a/ubuntu/_base/applications/kuickshow/debian/copyright b/ubuntu/_base/applications/graphics/kuickshow/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kuickshow/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kuickshow/debian/icons/kuickshow-16.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/kuickshow/debian/icons/kuickshow.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/kuickshow/debian/man/kuickshow.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/adept/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kuickshow/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/desktop-effects-kde/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/desktop-effects-kde/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/potracegui/debian/changelog rename to ubuntu/_base/applications/graphics/potracegui/debian/changelog diff --git a/ubuntu/_base/applications/filelight/debian/compat b/ubuntu/_base/applications/graphics/potracegui/debian/compat similarity index 100% rename from ubuntu/_base/applications/filelight/debian/compat rename to ubuntu/_base/applications/graphics/potracegui/debian/compat diff --git a/ubuntu/_base/applications/potracegui/debian/control b/ubuntu/_base/applications/graphics/potracegui/debian/control similarity index 100% rename from ubuntu/_base/applications/potracegui/debian/control rename to ubuntu/_base/applications/graphics/potracegui/debian/control diff --git a/ubuntu/_base/applications/potracegui/debian/copyright b/ubuntu/_base/applications/graphics/potracegui/debian/copyright similarity index 100% rename from ubuntu/_base/applications/potracegui/debian/copyright rename to ubuntu/_base/applications/graphics/potracegui/debian/copyright diff --git a/ubuntu/_base/applications/potracegui/debian/dirs b/ubuntu/_base/applications/graphics/potracegui/debian/dirs similarity index 100% rename from ubuntu/_base/applications/potracegui/debian/dirs rename to ubuntu/_base/applications/graphics/potracegui/debian/dirs diff --git a/ubuntu/_base/applications/potracegui/debian/docs b/ubuntu/_base/applications/graphics/potracegui/debian/docs similarity index 100% rename from ubuntu/_base/applications/potracegui/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/potracegui/debian/potracegui-trinity.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/potracegui/debian/potracegui-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/potracegui/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/potracegui/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/amarok.cmake/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbiff/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/compat rename to ubuntu/_base/applications/internet/kbiff/debian/compat diff --git a/ubuntu/_base/applications/kbiff/debian/control b/ubuntu/_base/applications/internet/kbiff/debian/control similarity index 100% rename from ubuntu/_base/applications/kbiff/debian/control rename to ubuntu/_base/applications/internet/kbiff/debian/control diff --git a/ubuntu/_base/applications/kbiff/debian/copyright b/ubuntu/_base/applications/internet/kbiff/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kbiff/debian/copyright rename to ubuntu/_base/applications/internet/kbiff/debian/copyright diff --git a/ubuntu/_base/applications/basket/debian/dirs b/ubuntu/_base/applications/internet/kbiff/debian/dirs similarity index 100% rename from ubuntu/_base/applications/basket/debian/dirs rename to ubuntu/_base/applications/internet/kbiff/debian/dirs diff --git a/ubuntu/_base/applications/kpicosim/debian/docs b/ubuntu/_base/applications/internet/kbiff/debian/docs similarity index 100% rename from ubuntu/_base/applications/kpicosim/debian/docs rename to ubuntu/_base/applications/internet/kbiff/debian/docs diff --git a/ubuntu/_base/applications/kbiff/debian/menu b/ubuntu/_base/applications/internet/kbiff/debian/menu similarity index 100% rename from ubuntu/_base/applications/kbiff/debian/menu rename to ubuntu/_base/applications/internet/kbiff/debian/menu diff --git a/ubuntu/_base/applications/kbiff/debian/rules b/ubuntu/_base/applications/internet/kbiff/debian/rules similarity index 100% rename from ubuntu/_base/applications/kbiff/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/dolphin/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/dolphin/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbiff/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/amarok/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/konversation/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/gtk-qt-engine/debian/compat rename to ubuntu/_base/applications/internet/konversation/debian/compat diff --git a/ubuntu/_base/applications/konversation/debian/control b/ubuntu/_base/applications/internet/konversation/debian/control similarity index 100% rename from ubuntu/_base/applications/konversation/debian/control rename to ubuntu/_base/applications/internet/konversation/debian/control diff --git a/ubuntu/_base/applications/konversation/debian/copyright b/ubuntu/_base/applications/internet/konversation/debian/copyright similarity index 100% rename from ubuntu/_base/applications/konversation/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/konversation/debian/konversation-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/konversation/debian/konversation-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/konversation/debian/konversation-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/konversation/debian/konversation-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/konversation/debian/konversation16x16.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/konversation/debian/konversation32x32.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/konversation/debian/man/konversation.1.docbook rename to 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 similarity index 100% rename from ubuntu/_base/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdmtheme/debian/patches/.gitignore rename to 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 similarity index 100% rename from ubuntu/_base/applications/konversation/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/filelight-l10n/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/filelight-l10n/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/compizconfig-backend-kconfig/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kopete-otr/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview-i18n/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/kopete-otr/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/kopete-otr/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kopete-otr/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/filelight/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/filelight/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kopete-otr/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/README.Debian-source rename to 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 similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/changelog rename to ubuntu/_base/applications/internet/kstreamripper/debian/changelog diff --git a/ubuntu/_base/applications/gwenview/debian/compat b/ubuntu/_base/applications/internet/kstreamripper/debian/compat similarity index 100% rename from ubuntu/_base/applications/gwenview/debian/compat rename to ubuntu/_base/applications/internet/kstreamripper/debian/compat diff --git a/ubuntu/_base/applications/kstreamripper/debian/control b/ubuntu/_base/applications/internet/kstreamripper/debian/control similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/control rename to ubuntu/_base/applications/internet/kstreamripper/debian/control diff --git a/ubuntu/_base/applications/kstreamripper/debian/copyright b/ubuntu/_base/applications/internet/kstreamripper/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/copyright rename to ubuntu/_base/applications/internet/kstreamripper/debian/copyright diff --git a/ubuntu/_base/applications/kstreamripper/debian/dirs b/ubuntu/_base/applications/internet/kstreamripper/debian/dirs similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/dirs rename to ubuntu/_base/applications/internet/kstreamripper/debian/dirs diff --git a/ubuntu/_base/applications/keep/debian/docs b/ubuntu/_base/applications/internet/kstreamripper/debian/docs similarity index 100% rename from ubuntu/_base/applications/keep/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.postinst rename to 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 similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.postrm rename to 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 similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/kstreamripper.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/kstreamripper.desktop rename to 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 similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/kstreamripper.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktorrent/debian/README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktorrent/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b-i18n/debian/compat rename to ubuntu/_base/applications/internet/ktorrent/debian/compat diff --git a/ubuntu/_base/applications/ktorrent/debian/control b/ubuntu/_base/applications/internet/ktorrent/debian/control similarity index 100% rename from ubuntu/_base/applications/ktorrent/debian/control rename to ubuntu/_base/applications/internet/ktorrent/debian/control diff --git a/ubuntu/_base/applications/ktorrent/debian/copyright b/ubuntu/_base/applications/internet/ktorrent/debian/copyright similarity index 100% rename from ubuntu/_base/applications/ktorrent/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktorrent/debian/ktorrent.1.docbook rename to 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 similarity index 100% rename from ubuntu/_base/applications/amarok.cmake/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktorrent/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/gtk-qt-engine/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/gtk-qt-engine/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktorrent/debian/watch rename to ubuntu/_base/applications/internet/ktorrent/debian/watch diff --git a/ubuntu/_base/applications/kvirc/debian/changelog b/ubuntu/_base/applications/internet/kvirc/debian/changelog similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/changelog rename to ubuntu/_base/applications/internet/kvirc/debian/changelog diff --git a/ubuntu/_base/applications/k3b/debian/compat b/ubuntu/_base/applications/internet/kvirc/debian/compat similarity index 100% rename from ubuntu/_base/applications/k3b/debian/compat rename to ubuntu/_base/applications/internet/kvirc/debian/compat diff --git a/ubuntu/_base/applications/kvirc/debian/control b/ubuntu/_base/applications/internet/kvirc/debian/control similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/control rename to ubuntu/_base/applications/internet/kvirc/debian/control diff --git a/ubuntu/_base/applications/kvirc/debian/copyright b/ubuntu/_base/applications/internet/kvirc/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.links rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.postinst rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.prerm rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/kvirc-trinity-dev.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/kvirc-trinity-dev.links rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/kvirc-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/kvirc-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/overrides/kvirc rename to 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 similarity index 100% rename from ubuntu/_base/applications/amarok/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview-i18n/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview-i18n/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/smb4k/debian/README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/smb4k/debian/changelog rename to ubuntu/_base/applications/internet/smb4k/debian/changelog diff --git a/ubuntu/_base/applications/k9copy/debian/compat b/ubuntu/_base/applications/internet/smb4k/debian/compat similarity index 100% rename from ubuntu/_base/applications/k9copy/debian/compat rename to ubuntu/_base/applications/internet/smb4k/debian/compat diff --git a/ubuntu/_base/applications/smb4k/debian/control b/ubuntu/_base/applications/internet/smb4k/debian/control similarity index 100% rename from ubuntu/_base/applications/smb4k/debian/control rename to ubuntu/_base/applications/internet/smb4k/debian/control diff --git a/ubuntu/_base/applications/smb4k/debian/copyright b/ubuntu/_base/applications/internet/smb4k/debian/copyright similarity index 100% rename from ubuntu/_base/applications/smb4k/debian/copyright rename to ubuntu/_base/applications/internet/smb4k/debian/copyright diff --git a/ubuntu/_base/applications/smb4k/debian/docs b/ubuntu/_base/applications/internet/smb4k/debian/docs similarity index 100% rename from ubuntu/_base/applications/smb4k/debian/docs rename to ubuntu/_base/applications/internet/smb4k/debian/docs diff --git a/ubuntu/_base/applications/smb4k/debian/menu b/ubuntu/_base/applications/internet/smb4k/debian/menu similarity index 100% rename from ubuntu/_base/applications/smb4k/debian/menu rename to ubuntu/_base/applications/internet/smb4k/debian/menu diff --git a/ubuntu/_base/applications/smb4k/debian/rules b/ubuntu/_base/applications/internet/smb4k/debian/rules similarity index 100% rename from ubuntu/_base/applications/smb4k/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b-i18n/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b-i18n/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/smb4k/debian/watch rename to 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 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 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 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 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 diff --git a/ubuntu/_base/applications/bibletime/debian/bibletime.xpm b/ubuntu/_base/applications/misc/bibletime/debian/bibletime.xpm similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/bibletime.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/filelight-l10n/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/dolphin/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine-mozilla/debian/compat rename to ubuntu/_base/applications/misc/bibletime/debian/compat diff --git a/ubuntu/_base/applications/bibletime/debian/control b/ubuntu/_base/applications/misc/bibletime/debian/control similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/control rename to ubuntu/_base/applications/misc/bibletime/debian/control diff --git a/ubuntu/_base/applications/bibletime/debian/copyright b/ubuntu/_base/applications/misc/bibletime/debian/copyright similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/de/bibletime.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/dirs rename to 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 similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/en/bibletime.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/install rename to ubuntu/_base/applications/misc/bibletime/debian/install diff --git a/ubuntu/_base/applications/bibletime/debian/menu b/ubuntu/_base/applications/misc/bibletime/debian/menu similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/basket/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/filelight-l10n/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/compizconfig-backend-kconfig/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/compizconfig-backend-kconfig/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/compizconfig-backend-kconfig/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/bibletime/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/compizconfig-backend-kconfig/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/k9copy/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/k9copy/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/desktop-effects-kde/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/katapult/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/desktop-effects-kde/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/desktop-effects-kde/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/desktop-effects-kde/debian/desktop-effects-kde-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/desktop-effects-kde/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine-mozilla/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine-mozilla/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/fusion-icon.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/fusion-icon.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/install rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/links rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/compizconfig-backend-kconfig/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/pycompat rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/python-distutils-custom.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/README.Debian rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/amarok-common-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/amarok-engine-xine-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/amarok-engine-yauap-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/amarok-trinity.install rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/amarok-trinity.manpages rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/amarok-trinity.menu rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/amarok_play_audiocd.desktop rename to 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 similarity index 100% rename from ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/filelight/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/amarok/debian/changelog rename to ubuntu/_base/applications/multimedia/amarok/debian/changelog diff --git a/ubuntu/_base/applications/kbfx/debian/compat b/ubuntu/_base/applications/multimedia/amarok/debian/compat similarity index 100% rename from ubuntu/_base/applications/kbfx/debian/compat rename to ubuntu/_base/applications/multimedia/amarok/debian/compat diff --git a/ubuntu/_base/applications/amarok/debian/control b/ubuntu/_base/applications/multimedia/amarok/debian/control similarity index 100% rename from ubuntu/_base/applications/amarok/debian/control rename to ubuntu/_base/applications/multimedia/amarok/debian/control diff --git a/debian/_base/applications/amarok/debian/copyright b/ubuntu/_base/applications/multimedia/amarok/debian/copyright similarity index 100% rename from debian/_base/applications/amarok/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/icons/amarok-16.xpm rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/icons/amarok.xpm rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/install-mp3 rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/kubuntu-media-amarok rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/man/amarok-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/man/amarok_libvisual-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/man/amarokapp-trinity.1 rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/man/amarokcollectionscanner-trinity.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/digikam/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/amarok/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/katapult/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/katapult/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/amarok/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b-i18n/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbibtex/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b-i18n/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b-i18n/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b-i18n/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b-i18n/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/changelog rename to ubuntu/_base/applications/multimedia/k3b/debian/changelog diff --git a/ubuntu/_base/applications/kbiff/debian/compat b/ubuntu/_base/applications/multimedia/k3b/debian/compat similarity index 100% rename from ubuntu/_base/applications/kbiff/debian/compat rename to ubuntu/_base/applications/multimedia/k3b/debian/compat diff --git a/ubuntu/_base/applications/k3b/debian/control b/ubuntu/_base/applications/multimedia/k3b/debian/control similarity index 100% rename from ubuntu/_base/applications/k3b/debian/control rename to ubuntu/_base/applications/multimedia/k3b/debian/control diff --git a/ubuntu/_base/applications/k3b/debian/copyright b/ubuntu/_base/applications/multimedia/k3b/debian/copyright similarity index 100% rename from ubuntu/_base/applications/k3b/debian/copyright rename to ubuntu/_base/applications/multimedia/k3b/debian/copyright diff --git a/ubuntu/_base/applications/k3b/debian/docs b/ubuntu/_base/applications/multimedia/k3b/debian/docs similarity index 100% rename from ubuntu/_base/applications/k3b/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b-data-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b-data.files rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b-data.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b-rip-audiocd.desktop rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b-rip-videodvd.desktop rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b-trinity.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b-trinity.postinst rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b-write-bin-image.desktop rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b-write-iso-image.desktop rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b.files rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b.postinst rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/k3b.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/libk3b-dev.files rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/libk3b-dev.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/libk3b-trinity-dev.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/libk3b3-extracodecs-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/libk3b3-extracodecs.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/libk3b3-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/libk3b3.files rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/libk3b3.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbfx/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbfx/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview-i18n/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/k9copy/debian/changelog rename to ubuntu/_base/applications/multimedia/k9copy/debian/changelog diff --git a/ubuntu/_base/applications/kbookreader/debian/compat b/ubuntu/_base/applications/multimedia/k9copy/debian/compat similarity index 100% rename from ubuntu/_base/applications/kbookreader/debian/compat rename to ubuntu/_base/applications/multimedia/k9copy/debian/compat diff --git a/ubuntu/_base/applications/k9copy/debian/control b/ubuntu/_base/applications/multimedia/k9copy/debian/control similarity index 100% rename from ubuntu/_base/applications/k9copy/debian/control rename to ubuntu/_base/applications/multimedia/k9copy/debian/control diff --git a/ubuntu/_base/applications/k9copy/debian/copyright b/ubuntu/_base/applications/multimedia/k9copy/debian/copyright similarity index 100% rename from ubuntu/_base/applications/k9copy/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/k9copy/debian/k9copy.1.docbook rename to 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 similarity index 100% rename from ubuntu/_base/applications/dolphin/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/k9copy/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbibtex/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbibtex/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine-mozilla/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kchmviewer/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine-mozilla/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine-mozilla/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine-mozilla/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine-mozilla/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbiff/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbiff/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/changelog rename to ubuntu/_base/applications/multimedia/kaffeine/debian/changelog diff --git a/ubuntu/_base/applications/kcpuload/debian/compat b/ubuntu/_base/applications/multimedia/kaffeine/debian/compat similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/compat rename to ubuntu/_base/applications/multimedia/kaffeine/debian/compat diff --git a/ubuntu/_base/applications/kaffeine/debian/control b/ubuntu/_base/applications/multimedia/kaffeine/debian/control similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/control rename to ubuntu/_base/applications/multimedia/kaffeine/debian/control diff --git a/ubuntu/_base/applications/kaffeine/debian/copyright b/ubuntu/_base/applications/multimedia/kaffeine/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/copyright rename to ubuntu/_base/applications/multimedia/kaffeine/debian/copyright diff --git a/ubuntu/_base/applications/kaffeine/debian/docs b/ubuntu/_base/applications/multimedia/kaffeine/debian/docs similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/install-codecs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/install-css.sh rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/kaffeine-iso.desktop rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/kaffeine.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/kaffeine.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/kaffeine_codecinstall.desktop rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/filelight-l10n/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbookreader/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbookreader/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/k3b/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/changelog rename to ubuntu/_base/applications/multimedia/kmplayer/debian/changelog diff --git a/ubuntu/_base/applications/kdbg/debian/compat b/ubuntu/_base/applications/multimedia/kmplayer/debian/compat similarity index 100% rename from ubuntu/_base/applications/kdbg/debian/compat rename to ubuntu/_base/applications/multimedia/kmplayer/debian/compat diff --git a/ubuntu/_base/applications/kmplayer/debian/control b/ubuntu/_base/applications/multimedia/kmplayer/debian/control similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/control rename to ubuntu/_base/applications/multimedia/kmplayer/debian/control diff --git a/ubuntu/_base/applications/kmplayer/debian/copyright b/ubuntu/_base/applications/multimedia/kmplayer/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/kmplayer-base-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/kmplayer.1.docbook rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/filelight/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kchmviewer/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kchmviewer/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/watch rename to ubuntu/_base/applications/multimedia/kmplayer/debian/watch diff --git a/ubuntu/_base/applications/kradio/debian/changelog b/ubuntu/_base/applications/multimedia/kradio/debian/changelog similarity index 100% rename from ubuntu/_base/applications/kradio/debian/changelog rename to ubuntu/_base/applications/multimedia/kradio/debian/changelog diff --git a/ubuntu/_base/applications/kdbusnotification/debian/compat b/ubuntu/_base/applications/multimedia/kradio/debian/compat similarity index 100% rename from ubuntu/_base/applications/kdbusnotification/debian/compat rename to ubuntu/_base/applications/multimedia/kradio/debian/compat diff --git a/ubuntu/_base/applications/kradio/debian/control b/ubuntu/_base/applications/multimedia/kradio/debian/control similarity index 100% rename from ubuntu/_base/applications/kradio/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/kradio/debian/convert-presets.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kradio/debian/copyright rename to ubuntu/_base/applications/multimedia/kradio/debian/copyright diff --git a/ubuntu/_base/applications/kradio/debian/docs b/ubuntu/_base/applications/multimedia/kradio/debian/docs similarity index 100% rename from ubuntu/_base/applications/kradio/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kradio/debian/kradio.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kradio/debian/manpages rename to ubuntu/_base/applications/multimedia/kradio/debian/manpages diff --git a/ubuntu/_base/applications/kradio/debian/menu b/ubuntu/_base/applications/multimedia/kradio/debian/menu similarity index 100% rename from ubuntu/_base/applications/kradio/debian/menu rename to ubuntu/_base/applications/multimedia/kradio/debian/menu diff --git a/ubuntu/_base/applications/kradio/debian/rules b/ubuntu/_base/applications/multimedia/kradio/debian/rules similarity index 100% rename from ubuntu/_base/applications/kradio/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kradio/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/compat rename to ubuntu/_base/applications/multimedia/rosegarden/debian/compat diff --git a/ubuntu/_base/applications/rosegarden/debian/control b/ubuntu/_base/applications/multimedia/rosegarden/debian/control similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/control rename to ubuntu/_base/applications/multimedia/rosegarden/debian/control diff --git a/ubuntu/_base/applications/rosegarden/debian/copyright b/ubuntu/_base/applications/multimedia/rosegarden/debian/copyright similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/copyright rename to ubuntu/_base/applications/multimedia/rosegarden/debian/copyright diff --git a/ubuntu/_base/applications/rosegarden/debian/lintianoverrides b/ubuntu/_base/applications/multimedia/rosegarden/debian/lintianoverrides similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/lintianoverrides rename to 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 similarity index 100% rename from ubuntu/_base/applications/fusion-icon/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-audiofile-importer.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-data-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-lilypondview.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-project-package.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.dirs rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.examples rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.links rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/rosegarden.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/semantic.cache rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbg/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbg/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/x-rosegarden.desktop rename to 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 similarity index 100% rename from ubuntu/_base/applications/soundkonverter/debian/README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/k9copy/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/soundkonverter/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-lipstik/debian/compat rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/compat diff --git a/ubuntu/_base/applications/soundkonverter/debian/control b/ubuntu/_base/applications/multimedia/soundkonverter/debian/control similarity index 100% rename from ubuntu/_base/applications/soundkonverter/debian/control rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/control diff --git a/ubuntu/_base/applications/soundkonverter/debian/copyright b/ubuntu/_base/applications/multimedia/soundkonverter/debian/copyright similarity index 100% rename from ubuntu/_base/applications/soundkonverter/debian/copyright rename to ubuntu/_base/applications/multimedia/soundkonverter/debian/copyright diff --git a/ubuntu/_base/applications/kdiff3/debian/docs b/ubuntu/_base/applications/multimedia/soundkonverter/debian/docs similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/patches/.gitignore rename to 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 similarity index 100% rename from ubuntu/_base/applications/soundkonverter/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/soundkonverter/debian/soundkonverter-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbusnotification/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbusnotification/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/basket/debian/basket-kontact-integration-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/basket/debian/basket-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/basket/debian/basket.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/basket/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-qtcurve/debian/compat rename to ubuntu/_base/applications/office/basket/debian/compat diff --git a/ubuntu/_base/applications/basket/debian/control b/ubuntu/_base/applications/office/basket/debian/control similarity index 100% rename from ubuntu/_base/applications/basket/debian/control rename to ubuntu/_base/applications/office/basket/debian/control diff --git a/ubuntu/_base/applications/basket/debian/copyright b/ubuntu/_base/applications/office/basket/debian/copyright similarity index 100% rename from ubuntu/_base/applications/basket/debian/copyright rename to ubuntu/_base/applications/office/basket/debian/copyright diff --git a/ubuntu/_base/applications/kbiff/debian/dirs b/ubuntu/_base/applications/office/basket/debian/dirs similarity index 100% rename from ubuntu/_base/applications/kbiff/debian/dirs rename to ubuntu/_base/applications/office/basket/debian/dirs diff --git a/ubuntu/_base/applications/kile/debian/docs b/ubuntu/_base/applications/office/basket/debian/docs similarity index 100% rename from ubuntu/_base/applications/kile/debian/docs rename to ubuntu/_base/applications/office/basket/debian/docs diff --git a/ubuntu/_base/applications/basket/debian/menu b/ubuntu/_base/applications/office/basket/debian/menu similarity index 100% rename from ubuntu/_base/applications/basket/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/gtk-qt-engine/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/basket/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/basket/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbibtex/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-systemsettings/debian/compat rename to ubuntu/_base/applications/office/kbibtex/debian/compat diff --git a/ubuntu/_base/applications/kbibtex/debian/control b/ubuntu/_base/applications/office/kbibtex/debian/control similarity index 100% rename from ubuntu/_base/applications/kbibtex/debian/control rename to ubuntu/_base/applications/office/kbibtex/debian/control diff --git a/ubuntu/_base/applications/kbibtex/debian/copyright b/ubuntu/_base/applications/office/kbibtex/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kbibtex/debian/copyright rename to ubuntu/_base/applications/office/kbibtex/debian/copyright diff --git a/ubuntu/_base/applications/kbibtex/debian/docs b/ubuntu/_base/applications/office/kbibtex/debian/docs similarity index 100% rename from ubuntu/_base/applications/kbibtex/debian/docs rename to ubuntu/_base/applications/office/kbibtex/debian/docs diff --git a/ubuntu/_base/applications/kbibtex/debian/menu b/ubuntu/_base/applications/office/kbibtex/debian/menu similarity index 100% rename from ubuntu/_base/applications/kbibtex/debian/menu rename to ubuntu/_base/applications/office/kbibtex/debian/menu diff --git a/ubuntu/_base/applications/kbibtex/debian/rules b/ubuntu/_base/applications/office/kbibtex/debian/rules similarity index 100% rename from ubuntu/_base/applications/kbibtex/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-lipstik/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-lipstik/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbibtex/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/katapult/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbookreader/debian/changelog rename to ubuntu/_base/applications/office/kbookreader/debian/changelog diff --git a/ubuntu/_base/applications/kdesudo/debian/compat b/ubuntu/_base/applications/office/kbookreader/debian/compat similarity index 100% rename from ubuntu/_base/applications/kdesudo/debian/compat rename to ubuntu/_base/applications/office/kbookreader/debian/compat diff --git a/ubuntu/_base/applications/kbookreader/debian/control b/ubuntu/_base/applications/office/kbookreader/debian/control similarity index 100% rename from ubuntu/_base/applications/kbookreader/debian/control rename to ubuntu/_base/applications/office/kbookreader/debian/control diff --git a/ubuntu/_base/applications/kbookreader/debian/copyright b/ubuntu/_base/applications/office/kbookreader/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kbookreader/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview-i18n/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbookreader/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-qtcurve/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-qtcurve/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/TODO.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/changelog rename to ubuntu/_base/applications/office/kile/debian/changelog diff --git a/ubuntu/_base/applications/kdesvn/debian/compat b/ubuntu/_base/applications/office/kile/debian/compat similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/compat rename to ubuntu/_base/applications/office/kile/debian/compat diff --git a/ubuntu/_base/applications/kile/debian/control b/ubuntu/_base/applications/office/kile/debian/control similarity index 100% rename from ubuntu/_base/applications/kile/debian/control rename to ubuntu/_base/applications/office/kile/debian/control diff --git a/ubuntu/_base/applications/kile/debian/copyright b/ubuntu/_base/applications/office/kile/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kile/debian/copyright rename to ubuntu/_base/applications/office/kile/debian/copyright diff --git a/ubuntu/_base/applications/kmyfirewall/debian/docs b/ubuntu/_base/applications/office/kile/debian/docs similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/kile-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/kile-trinity.links rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/kile.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/kile.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/knights/debian/patches/.gitignore rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-systemsettings/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-systemsettings/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/watch rename to ubuntu/_base/applications/office/kile/debian/watch diff --git a/ubuntu/_base/applications/kmymoney/debian/NEWS b/ubuntu/_base/applications/office/kmymoney/debian/NEWS similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/NEWS rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/README.source rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbibtex/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/changelog rename to ubuntu/_base/applications/office/kmymoney/debian/changelog diff --git a/ubuntu/_base/applications/kdiff3/debian/compat b/ubuntu/_base/applications/office/kmymoney/debian/compat similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/compat rename to ubuntu/_base/applications/office/kmymoney/debian/compat diff --git a/ubuntu/_base/applications/kmymoney/debian/control b/ubuntu/_base/applications/office/kmymoney/debian/control similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/control rename to ubuntu/_base/applications/office/kmymoney/debian/control diff --git a/ubuntu/_base/applications/kmymoney/debian/copyright b/ubuntu/_base/applications/office/kmymoney/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/kmymoney2-common-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity-dev.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/kmymoney2.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/gwenview/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesudo/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesudo/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/watch rename to ubuntu/_base/applications/office/kmymoney/debian/watch diff --git a/ubuntu/_base/applications/knowit/debian/changelog b/ubuntu/_base/applications/office/knowit/debian/changelog similarity index 100% rename from ubuntu/_base/applications/knowit/debian/changelog rename to ubuntu/_base/applications/office/knowit/debian/changelog diff --git a/ubuntu/_base/applications/kdirstat/debian/compat b/ubuntu/_base/applications/office/knowit/debian/compat similarity index 100% rename from ubuntu/_base/applications/kdirstat/debian/compat rename to ubuntu/_base/applications/office/knowit/debian/compat diff --git a/ubuntu/_base/applications/knowit/debian/control b/ubuntu/_base/applications/office/knowit/debian/control similarity index 100% rename from ubuntu/_base/applications/knowit/debian/control rename to ubuntu/_base/applications/office/knowit/debian/control diff --git a/ubuntu/_base/applications/knowit/debian/copyright b/ubuntu/_base/applications/office/knowit/debian/copyright similarity index 100% rename from ubuntu/_base/applications/knowit/debian/copyright rename to ubuntu/_base/applications/office/knowit/debian/copyright diff --git a/ubuntu/_base/applications/knowit/debian/docs b/ubuntu/_base/applications/office/knowit/debian/docs similarity index 100% rename from ubuntu/_base/applications/knowit/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/knowit/debian/knowit.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/knowit/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/knowit/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice-i18n/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdmtheme/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice-i18n/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice-i18n/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/knights/debian/debiandirs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice-i18n/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/README.MimeType rename to 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 similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbiff/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/chalk-data-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/chalk-data-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/chalk-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/chalk-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/chalk-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/chalk-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/chalk-trinity.mime rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/chalk.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/changelog rename to ubuntu/_base/applications/office/koffice/debian/changelog diff --git a/ubuntu/_base/applications/kdpkg/debian/compat b/ubuntu/_base/applications/office/koffice/debian/compat similarity index 100% rename from ubuntu/_base/applications/kdpkg/debian/compat rename to ubuntu/_base/applications/office/koffice/debian/compat diff --git a/ubuntu/_base/applications/koffice/debian/control b/ubuntu/_base/applications/office/koffice/debian/control similarity index 100% rename from ubuntu/_base/applications/koffice/debian/control rename to ubuntu/_base/applications/office/koffice/debian/control diff --git a/ubuntu/_base/applications/koffice/debian/copyright b/ubuntu/_base/applications/office/koffice/debian/copyright similarity index 100% rename from ubuntu/_base/applications/koffice/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/fogra27l.icm.uu rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/karbon-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/karbon-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/karbon-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/karbon-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/karbon-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/karbon-trinity.mime rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/karbon.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/karbon.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kchart-trinity.README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kchart-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kchart-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kchart-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kchart-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kchart-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kchart-trinity.mime rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kchart.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kchart.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kexi-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kexi-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kexi-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kformula-trinity.README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kformula-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kformula-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kformula-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kformula-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kformula-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kformula-trinity.mime rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kformula.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kformula.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kivio-data-trinity.README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kivio-data-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kivio-data-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kivio-data-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kivio-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kivio-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kivio-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kivio-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kivio-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kivio-trinity.mime rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kivio.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kivio.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koconverter.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-data-trinity.README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-data-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-data-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-data-trinity.links rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-dev-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.links rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-trinity-doc.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-trinity.README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koffice-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koscript.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koshell-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koshell-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koshell-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koshell-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koshell-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koshell.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/koshell.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kplato-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kplato-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kprconverter.pl.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kpresenter-data-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kpresenter-data-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kpresenter-trinity.README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kpresenter-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kpresenter-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kpresenter-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kpresenter-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kpresenter-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kpresenter-trinity.mime rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kpresenter.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kpresenter.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.examples rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kspread-trinity.mime rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kspread.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kspread.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kthesaurus.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kthesaurus.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kudesigner.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.examples rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.examples.README rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.links rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kugar-trinity.mime rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kugar.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kugar.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kword-data-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kword-data-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kword-trinity.README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kword-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kword-trinity.examples rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kword-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kword-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kword-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kword-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kword-trinity.mime rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kword.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/kword.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/not-installed.list rename to 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 similarity index 100% rename from ubuntu/_base/applications/k9copy/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdirstat/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdirstat/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbookreader/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpilot/debian/changelog rename to ubuntu/_base/applications/office/kpilot/debian/changelog diff --git a/ubuntu/_base/applications/keep/debian/compat b/ubuntu/_base/applications/office/kpilot/debian/compat similarity index 100% rename from ubuntu/_base/applications/keep/debian/compat rename to ubuntu/_base/applications/office/kpilot/debian/compat diff --git a/ubuntu/_base/applications/kpilot/debian/control b/ubuntu/_base/applications/office/kpilot/debian/control similarity index 100% rename from ubuntu/_base/applications/kpilot/debian/control rename to ubuntu/_base/applications/office/kpilot/debian/control diff --git a/ubuntu/_base/applications/kpilot/debian/copyright b/ubuntu/_base/applications/office/kpilot/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kpilot/debian/copyright rename to ubuntu/_base/applications/office/kpilot/debian/copyright diff --git a/ubuntu/_base/applications/kpilot/debian/rules b/ubuntu/_base/applications/office/kpilot/debian/rules similarity index 100% rename from ubuntu/_base/applications/kpilot/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdmtheme/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdmtheme/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/tellico/debian/changelog rename to ubuntu/_base/applications/office/tellico/debian/changelog diff --git a/ubuntu/_base/applications/kerry/debian/compat b/ubuntu/_base/applications/office/tellico/debian/compat similarity index 100% rename from ubuntu/_base/applications/kerry/debian/compat rename to ubuntu/_base/applications/office/tellico/debian/compat diff --git a/ubuntu/_base/applications/tellico/debian/control b/ubuntu/_base/applications/office/tellico/debian/control similarity index 100% rename from ubuntu/_base/applications/tellico/debian/control rename to ubuntu/_base/applications/office/tellico/debian/control diff --git a/ubuntu/_base/applications/tellico/debian/copyright b/ubuntu/_base/applications/office/tellico/debian/copyright similarity index 100% rename from ubuntu/_base/applications/tellico/debian/copyright rename to ubuntu/_base/applications/office/tellico/debian/copyright diff --git a/ubuntu/_base/applications/tellico/debian/menu b/ubuntu/_base/applications/office/tellico/debian/menu similarity index 100% rename from ubuntu/_base/applications/tellico/debian/menu rename to ubuntu/_base/applications/office/tellico/debian/menu diff --git a/ubuntu/_base/applications/tellico/debian/rules b/ubuntu/_base/applications/office/tellico/debian/rules similarity index 100% rename from ubuntu/_base/applications/tellico/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdpkg/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdpkg/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/tellico/debian/tellico-data-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/tellico/debian/tellico-scripts-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/tellico/debian/tellico-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/tellico/debian/tellico.1x rename to 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 similarity index 100% rename from ubuntu/_base/applications/tellico/debian/tellico.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/tellico/debian/watch rename to 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 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 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 similarity index 100% rename from ubuntu/_base/applications/kbfx/debian/README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kgtk-qt3/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/dirs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/displayconfig-trinity.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/knights/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/guidance-backends-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.init rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.postinst rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/mountconfig-trinity.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kaffeine/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/pycompat rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/python-distutils-jaunty.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/pyversions rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/serviceconfig-trinity.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/keep/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/keep/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/userconfig-trinity.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-systemsettings/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-systemsettings/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-systemsettings/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-systemsettings/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-systemsettings/debian/kde-settings-laptops.directory rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-systemsettings/debian/kde-systemsettings-trinity.preinst rename to 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 similarity index 100% rename from ubuntu/_base/applications/katapult/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-systemsettings/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kerry/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kerry/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-systemsettings/debian/systemsettings.1.docbook rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-qtcurve/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbg/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesudo/debian/changelog rename to ubuntu/_base/applications/settings/kdesudo/debian/changelog diff --git a/ubuntu/_base/applications/kima/debian/compat b/ubuntu/_base/applications/settings/kdesudo/debian/compat similarity index 100% rename from ubuntu/_base/applications/kima/debian/compat rename to ubuntu/_base/applications/settings/kdesudo/debian/compat diff --git a/ubuntu/_base/applications/kdesudo/debian/control b/ubuntu/_base/applications/settings/kdesudo/debian/control similarity index 100% rename from ubuntu/_base/applications/kdesudo/debian/control rename to ubuntu/_base/applications/settings/kdesudo/debian/control diff --git a/ubuntu/_base/applications/kdesudo/debian/copyright b/ubuntu/_base/applications/settings/kdesudo/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kdesudo/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesudo/debian/kdesudo-trinity.1.docbook rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesudo/debian/links rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbfx/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesudo/debian/postinst rename to ubuntu/_base/applications/settings/kdesudo/debian/postinst diff --git a/ubuntu/_base/applications/kdesudo/debian/postrm b/ubuntu/_base/applications/settings/kdesudo/debian/postrm similarity index 100% rename from ubuntu/_base/applications/kdesudo/debian/postrm rename to ubuntu/_base/applications/settings/kdesudo/debian/postrm diff --git a/ubuntu/_base/applications/kdesudo/debian/preinst b/ubuntu/_base/applications/settings/kdesudo/debian/preinst similarity index 100% rename from ubuntu/_base/applications/kdesudo/debian/preinst rename to ubuntu/_base/applications/settings/kdesudo/debian/preinst diff --git a/ubuntu/_base/applications/kdesudo/debian/rules b/ubuntu/_base/applications/settings/kdesudo/debian/rules similarity index 100% rename from ubuntu/_base/applications/kdesudo/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kgtk-qt3/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kgtk-qt3/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdpkg/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-apt/debian/compat rename to ubuntu/_base/applications/settings/kdpkg/debian/compat diff --git a/ubuntu/_base/applications/kdpkg/debian/control b/ubuntu/_base/applications/settings/kdpkg/debian/control similarity index 100% rename from ubuntu/_base/applications/kdpkg/debian/control rename to ubuntu/_base/applications/settings/kdpkg/debian/control diff --git a/ubuntu/_base/applications/kdpkg/debian/copyright b/ubuntu/_base/applications/settings/kdpkg/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kdpkg/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdpkg/debian/kdpkg-install.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdpkg/debian/kdpkg.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdpkg/debian/manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbookreader/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdpkg/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kima/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-locate/debian/compat rename to ubuntu/_base/applications/settings/kima/debian/compat diff --git a/ubuntu/_base/applications/kima/debian/control b/ubuntu/_base/applications/settings/kima/debian/control similarity index 100% rename from ubuntu/_base/applications/kima/debian/control rename to ubuntu/_base/applications/settings/kima/debian/control diff --git a/ubuntu/_base/applications/kima/debian/copyright b/ubuntu/_base/applications/settings/kima/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kima/debian/copyright rename to ubuntu/_base/applications/settings/kima/debian/copyright diff --git a/ubuntu/_base/applications/kima/debian/rules b/ubuntu/_base/applications/settings/kima/debian/rules similarity index 100% rename from ubuntu/_base/applications/kima/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kima/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kima/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-systemsettings/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbusnotification/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kiosktool/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-umountwrapper/debian/compat rename to ubuntu/_base/applications/settings/kiosktool/debian/compat diff --git a/ubuntu/_base/applications/kiosktool/debian/control b/ubuntu/_base/applications/settings/kiosktool/debian/control similarity index 100% rename from ubuntu/_base/applications/kiosktool/debian/control rename to ubuntu/_base/applications/settings/kiosktool/debian/control diff --git a/ubuntu/_base/applications/kiosktool/debian/copyright b/ubuntu/_base/applications/settings/kiosktool/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kiosktool/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kiosktool/debian/kiosktool-trinity.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kiosktool/debian/kiosktool-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff rename to 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 similarity index 100% rename from ubuntu/_base/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff rename to 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 similarity index 100% rename from ubuntu/_base/applications/kiosktool/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kiosktool/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-apt/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-apt/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/changelog rename to ubuntu/_base/applications/settings/kmyfirewall/debian/changelog diff --git a/ubuntu/_base/applications/kiosktool/debian/compat b/ubuntu/_base/applications/settings/kmyfirewall/debian/compat similarity index 100% rename from ubuntu/_base/applications/kiosktool/debian/compat rename to ubuntu/_base/applications/settings/kmyfirewall/debian/compat diff --git a/ubuntu/_base/applications/kmyfirewall/debian/control b/ubuntu/_base/applications/settings/kmyfirewall/debian/control similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/control rename to ubuntu/_base/applications/settings/kmyfirewall/debian/control diff --git a/ubuntu/_base/applications/kmyfirewall/debian/copyright b/ubuntu/_base/applications/settings/kmyfirewall/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice-i18n/debian/debiandirs rename to ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs diff --git a/ubuntu/_base/applications/kmyfirewall/debian/dirs b/ubuntu/_base/applications/settings/kmyfirewall/debian/dirs similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/dirs rename to ubuntu/_base/applications/settings/kmyfirewall/debian/dirs diff --git a/ubuntu/_base/applications/krename/debian/docs b/ubuntu/_base/applications/settings/kmyfirewall/debian/docs similarity index 100% rename from ubuntu/_base/applications/krename/debian/docs rename to ubuntu/_base/applications/settings/kmyfirewall/debian/docs diff --git a/ubuntu/_base/applications/kmyfirewall/debian/install b/ubuntu/_base/applications/settings/kmyfirewall/debian/install similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/kmfinstallerplugin.desktop rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.desktop rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/manpages rename to ubuntu/_base/applications/settings/kmyfirewall/debian/manpages diff --git a/ubuntu/_base/applications/kmyfirewall/debian/menu b/ubuntu/_base/applications/settings/kmyfirewall/debian/menu similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/menu rename to ubuntu/_base/applications/settings/kmyfirewall/debian/menu diff --git a/ubuntu/_base/applications/kmyfirewall/debian/rules b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-locate/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-locate/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/watch rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/README.source rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesudo/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-qtcurve/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetworkmanager8/debian/changelog rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/changelog diff --git a/ubuntu/_base/applications/kmplayer/debian/compat b/ubuntu/_base/applications/settings/knetworkmanager8/debian/compat similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/compat rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/compat diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/control b/ubuntu/_base/applications/settings/knetworkmanager8/debian/control similarity index 100% rename from ubuntu/_base/applications/knetworkmanager8/debian/control rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/control diff --git a/debian/_base/applications/knetworkmanager8/debian/copyright b/ubuntu/_base/applications/settings/knetworkmanager8/debian/copyright similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/copyright rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/knetworkmanager.1 rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/manpages rename to ubuntu/_base/applications/settings/knetworkmanager8/debian/manpages diff --git a/debian/_base/applications/knetworkmanager8/debian/menu b/ubuntu/_base/applications/settings/knetworkmanager8/debian/menu similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/menu rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetworkmanager8/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-umountwrapper/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-umountwrapper/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/knetworkmanager8/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-guidance/debian/README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-systemsettings/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/wlassistant/debian/changelog rename to ubuntu/_base/applications/settings/wlassistant/debian/changelog diff --git a/ubuntu/_base/applications/kmyfirewall/debian/compat b/ubuntu/_base/applications/settings/wlassistant/debian/compat similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/compat rename to ubuntu/_base/applications/settings/wlassistant/debian/compat diff --git a/ubuntu/_base/applications/wlassistant/debian/control b/ubuntu/_base/applications/settings/wlassistant/debian/control similarity index 100% rename from ubuntu/_base/applications/wlassistant/debian/control rename to ubuntu/_base/applications/settings/wlassistant/debian/control diff --git a/ubuntu/_base/applications/wlassistant/debian/copyright b/ubuntu/_base/applications/settings/wlassistant/debian/copyright similarity index 100% rename from ubuntu/_base/applications/wlassistant/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-qtcurve/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/wlassistant/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kiosktool/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kiosktool/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/wlassistant/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/wlassistant/debian/wlassistant-16.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.dirs rename to 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 similarity index 100% rename from ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.manpage rename to 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 similarity index 100% rename from ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/wlassistant/debian/wlassistant.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/adept/debian/adept-batch-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/adept/debian/adept-common-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/adept/debian/adept-installer-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/adept/debian/adept-manager-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/adept/debian/adept-notifier-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/adept/debian/adept-updater-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesudo/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/adept/debian/changelog rename to ubuntu/_base/applications/system/adept/debian/changelog diff --git a/ubuntu/_base/applications/kmymoney/debian/compat b/ubuntu/_base/applications/system/adept/debian/compat similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/compat rename to ubuntu/_base/applications/system/adept/debian/compat diff --git a/ubuntu/_base/applications/adept/debian/control b/ubuntu/_base/applications/system/adept/debian/control similarity index 100% rename from ubuntu/_base/applications/adept/debian/control rename to ubuntu/_base/applications/system/adept/debian/control diff --git a/ubuntu/_base/applications/adept/debian/copyright b/ubuntu/_base/applications/system/adept/debian/copyright similarity index 100% rename from ubuntu/_base/applications/adept/debian/copyright rename to ubuntu/_base/applications/system/adept/debian/copyright diff --git a/ubuntu/_base/applications/adept/debian/dirs b/ubuntu/_base/applications/system/adept/debian/dirs similarity index 100% rename from ubuntu/_base/applications/adept/debian/dirs rename to ubuntu/_base/applications/system/adept/debian/dirs diff --git a/ubuntu/_base/applications/adept/debian/docs b/ubuntu/_base/applications/system/adept/debian/docs similarity index 100% rename from ubuntu/_base/applications/adept/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-systemsettings/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/adept/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmatplot/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmatplot/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdiff3/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/dolphin/debian/changelog rename to ubuntu/_base/applications/system/dolphin/debian/changelog diff --git a/ubuntu/_base/applications/knemo/debian/compat b/ubuntu/_base/applications/system/dolphin/debian/compat similarity index 100% rename from ubuntu/_base/applications/knemo/debian/compat rename to ubuntu/_base/applications/system/dolphin/debian/compat diff --git a/ubuntu/_base/applications/dolphin/debian/control b/ubuntu/_base/applications/system/dolphin/debian/control similarity index 100% rename from ubuntu/_base/applications/dolphin/debian/control rename to ubuntu/_base/applications/system/dolphin/debian/control diff --git a/ubuntu/_base/applications/dolphin/debian/copyright b/ubuntu/_base/applications/system/dolphin/debian/copyright similarity index 100% rename from ubuntu/_base/applications/dolphin/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/dolphin/debian/dolphin.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/dolphin/debian/manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesudo/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/dolphin/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdmtheme/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdirstat/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/katapult/debian/changelog rename to ubuntu/_base/applications/system/katapult/debian/changelog diff --git a/ubuntu/_base/applications/knetload/debian/compat b/ubuntu/_base/applications/system/katapult/debian/compat similarity index 100% rename from ubuntu/_base/applications/knetload/debian/compat rename to ubuntu/_base/applications/system/katapult/debian/compat diff --git a/ubuntu/_base/applications/katapult/debian/control b/ubuntu/_base/applications/system/katapult/debian/control similarity index 100% rename from ubuntu/_base/applications/katapult/debian/control rename to ubuntu/_base/applications/system/katapult/debian/control diff --git a/ubuntu/_base/applications/katapult/debian/copyright b/ubuntu/_base/applications/system/katapult/debian/copyright similarity index 100% rename from ubuntu/_base/applications/katapult/debian/copyright rename to ubuntu/_base/applications/system/katapult/debian/copyright diff --git a/ubuntu/_base/applications/katapult/debian/docs b/ubuntu/_base/applications/system/katapult/debian/docs similarity index 100% rename from ubuntu/_base/applications/katapult/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/katapult/debian/katapult.1.docbook rename to 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 similarity index 100% rename from ubuntu/_base/applications/katapult/debian/lintian rename to ubuntu/_base/applications/system/katapult/debian/lintian diff --git a/ubuntu/_base/applications/katapult/debian/menu b/ubuntu/_base/applications/system/katapult/debian/menu similarity index 100% rename from ubuntu/_base/applications/katapult/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdesvn/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/katapult/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmyfirewall/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbfx/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbfx/debian/cmake.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetstats/debian/compat rename to ubuntu/_base/applications/system/kbfx/debian/compat diff --git a/ubuntu/_base/applications/kbfx/debian/control b/ubuntu/_base/applications/system/kbfx/debian/control similarity index 100% rename from ubuntu/_base/applications/kbfx/debian/control rename to ubuntu/_base/applications/system/kbfx/debian/control diff --git a/ubuntu/_base/applications/kbfx/debian/copyright b/ubuntu/_base/applications/system/kbfx/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kbfx/debian/copyright rename to ubuntu/_base/applications/system/kbfx/debian/copyright diff --git a/ubuntu/_base/applications/kbfx/debian/docs b/ubuntu/_base/applications/system/kbfx/debian/docs similarity index 100% rename from ubuntu/_base/applications/kbfx/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbfx/debian/kbfx.lintian-overrides rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdirstat/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbfx/debian/postinst rename to ubuntu/_base/applications/system/kbfx/debian/postinst diff --git a/ubuntu/_base/applications/kbfx/debian/rules b/ubuntu/_base/applications/system/kbfx/debian/rules similarity index 100% rename from ubuntu/_base/applications/kbfx/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbfx/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdmtheme/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbusnotification/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetworkmanager.cmake/debian/compat rename to ubuntu/_base/applications/system/kdbusnotification/debian/compat diff --git a/ubuntu/_base/applications/kdbusnotification/debian/control b/ubuntu/_base/applications/system/kdbusnotification/debian/control similarity index 100% rename from ubuntu/_base/applications/kdbusnotification/debian/control rename to ubuntu/_base/applications/system/kdbusnotification/debian/control diff --git a/ubuntu/_base/applications/kdbusnotification/debian/copyright b/ubuntu/_base/applications/system/kdbusnotification/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kdbusnotification/debian/copyright rename to ubuntu/_base/applications/system/kdbusnotification/debian/copyright diff --git a/ubuntu/_base/applications/kcpuload/debian/links b/ubuntu/_base/applications/system/kdbusnotification/debian/links similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/links rename to ubuntu/_base/applications/system/kdbusnotification/debian/links diff --git a/ubuntu/_base/applications/kdbusnotification/debian/rules b/ubuntu/_base/applications/system/kdbusnotification/debian/rules similarity index 100% rename from ubuntu/_base/applications/kdbusnotification/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/knemo/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/knemo/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/knemo/debian/README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/keep/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/knemo/debian/changelog rename to ubuntu/_base/applications/system/knemo/debian/changelog diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/compat b/ubuntu/_base/applications/system/knemo/debian/compat similarity index 100% rename from ubuntu/_base/applications/knetworkmanager8/debian/compat rename to ubuntu/_base/applications/system/knemo/debian/compat diff --git a/ubuntu/_base/applications/knemo/debian/control b/ubuntu/_base/applications/system/knemo/debian/control similarity index 100% rename from ubuntu/_base/applications/knemo/debian/control rename to ubuntu/_base/applications/system/knemo/debian/control diff --git a/ubuntu/_base/applications/knemo/debian/copyright b/ubuntu/_base/applications/system/knemo/debian/copyright similarity index 100% rename from ubuntu/_base/applications/knemo/debian/copyright rename to ubuntu/_base/applications/system/knemo/debian/copyright diff --git a/ubuntu/_base/applications/knemo/debian/dirs b/ubuntu/_base/applications/system/knemo/debian/dirs similarity index 100% rename from ubuntu/_base/applications/knemo/debian/dirs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdpkg/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/knemo/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetload/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetload/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetload/debian/changelog rename to ubuntu/_base/applications/system/knetload/debian/changelog diff --git a/ubuntu/_base/applications/knights/debian/compat b/ubuntu/_base/applications/system/knetload/debian/compat similarity index 100% rename from ubuntu/_base/applications/knights/debian/compat rename to ubuntu/_base/applications/system/knetload/debian/compat diff --git a/ubuntu/_base/applications/knetload/debian/control b/ubuntu/_base/applications/system/knetload/debian/control similarity index 100% rename from ubuntu/_base/applications/knetload/debian/control rename to ubuntu/_base/applications/system/knetload/debian/control diff --git a/ubuntu/_base/applications/knetload/debian/copyright b/ubuntu/_base/applications/system/knetload/debian/copyright similarity index 100% rename from ubuntu/_base/applications/knetload/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-lipstik/debian/dirs rename to ubuntu/_base/applications/system/knetload/debian/dirs diff --git a/ubuntu/_base/applications/knetload/debian/docs b/ubuntu/_base/applications/system/knetload/debian/docs similarity index 100% rename from ubuntu/_base/applications/knetload/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetload/debian/knetload-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetload/debian/knetload-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetload/debian/knetload.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetload/debian/knetload.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetload/debian/menu rename to ubuntu/_base/applications/system/knetload/debian/menu diff --git a/ubuntu/_base/applications/knetload/debian/rules b/ubuntu/_base/applications/system/knetload/debian/rules similarity index 100% rename from ubuntu/_base/applications/knetload/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetstats/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetstats/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kerry/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetstats/debian/changelog rename to ubuntu/_base/applications/system/knetstats/debian/changelog diff --git a/ubuntu/_base/applications/knowit/debian/compat b/ubuntu/_base/applications/system/knetstats/debian/compat similarity index 100% rename from ubuntu/_base/applications/knowit/debian/compat rename to ubuntu/_base/applications/system/knetstats/debian/compat diff --git a/ubuntu/_base/applications/knetstats/debian/control b/ubuntu/_base/applications/system/knetstats/debian/control similarity index 100% rename from ubuntu/_base/applications/knetstats/debian/control rename to ubuntu/_base/applications/system/knetstats/debian/control diff --git a/ubuntu/_base/applications/knetstats/debian/copyright b/ubuntu/_base/applications/system/knetstats/debian/copyright similarity index 100% rename from ubuntu/_base/applications/knetstats/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetstats/debian/knetstats.1.docbook rename to 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 similarity index 100% rename from ubuntu/_base/applications/kgtk-qt3/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetstats/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetworkmanager.cmake/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetworkmanager.cmake/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetstats/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kgtk-qt3/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpowersave/debian/changelog rename to ubuntu/_base/applications/system/kpowersave/debian/changelog diff --git a/ubuntu/_base/applications/knutclient/debian/compat b/ubuntu/_base/applications/system/kpowersave/debian/compat similarity index 100% rename from ubuntu/_base/applications/knutclient/debian/compat rename to ubuntu/_base/applications/system/kpowersave/debian/compat diff --git a/ubuntu/_base/applications/kpowersave/debian/control b/ubuntu/_base/applications/system/kpowersave/debian/control similarity index 100% rename from ubuntu/_base/applications/kpowersave/debian/control rename to ubuntu/_base/applications/system/kpowersave/debian/control diff --git a/debian/_base/applications/kpowersave/debian/copyright b/ubuntu/_base/applications/system/kpowersave/debian/copyright similarity index 100% rename from debian/_base/applications/kpowersave/debian/copyright rename to ubuntu/_base/applications/system/kpowersave/debian/copyright diff --git a/ubuntu/_base/applications/kpowersave/debian/install b/ubuntu/_base/applications/system/kpowersave/debian/install similarity index 100% rename from ubuntu/_base/applications/kpowersave/debian/install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpowersave/debian/kpowersave-trinity.linda rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave/debian/kpowersave-trinity.lintian rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave/debian/kpowersave.1 rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave/debian/kpowersave.xpm rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave/debian/manpages rename to ubuntu/_base/applications/system/kpowersave/debian/manpages diff --git a/ubuntu/_base/applications/kpowersave/debian/menu b/ubuntu/_base/applications/system/kpowersave/debian/menu similarity index 100% rename from ubuntu/_base/applications/kpowersave/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-apt/debian/patches/series rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave/debian/postrm rename to ubuntu/_base/applications/system/kpowersave/debian/postrm diff --git a/ubuntu/_base/applications/kpowersave/debian/preinst b/ubuntu/_base/applications/system/kpowersave/debian/preinst similarity index 100% rename from ubuntu/_base/applications/kpowersave/debian/preinst rename to ubuntu/_base/applications/system/kpowersave/debian/preinst diff --git a/ubuntu/_base/applications/kpowersave/debian/rules b/ubuntu/_base/applications/system/kpowersave/debian/rules similarity index 100% rename from ubuntu/_base/applications/kpowersave/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetworkmanager8/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetworkmanager8/debian/source/options rename to 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 similarity index 100% rename from debian/_base/applications/kpowersave/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/krusader/debian/README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-apt/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kile/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/krusader/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice-i18n/debian/compat rename to ubuntu/_base/applications/system/krusader/debian/compat diff --git a/ubuntu/_base/applications/krusader/debian/control b/ubuntu/_base/applications/system/krusader/debian/control similarity index 100% rename from ubuntu/_base/applications/krusader/debian/control rename to ubuntu/_base/applications/system/krusader/debian/control diff --git a/ubuntu/_base/applications/krusader/debian/copyright b/ubuntu/_base/applications/system/krusader/debian/copyright similarity index 100% rename from ubuntu/_base/applications/krusader/debian/copyright rename to ubuntu/_base/applications/system/krusader/debian/copyright diff --git a/ubuntu/_base/applications/krusader/debian/docs b/ubuntu/_base/applications/system/krusader/debian/docs similarity index 100% rename from ubuntu/_base/applications/krusader/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/krusader/debian/krusader.lintian-overrides rename to 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 similarity index 100% rename from ubuntu/_base/applications/krusader/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-locate/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/krusader/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/krusader/debian/source.lintian-overrides rename to 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 similarity index 100% rename from ubuntu/_base/applications/knights/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/knights/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/krusader/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-locate/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-apt/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksystemlog/debian/changelog rename to ubuntu/_base/applications/system/ksystemlog/debian/changelog diff --git a/ubuntu/_base/applications/koffice/debian/compat b/ubuntu/_base/applications/system/ksystemlog/debian/compat similarity index 100% rename from ubuntu/_base/applications/koffice/debian/compat rename to ubuntu/_base/applications/system/ksystemlog/debian/compat diff --git a/ubuntu/_base/applications/ksystemlog/debian/control b/ubuntu/_base/applications/system/ksystemlog/debian/control similarity index 100% rename from ubuntu/_base/applications/ksystemlog/debian/control rename to ubuntu/_base/applications/system/ksystemlog/debian/control diff --git a/ubuntu/_base/applications/ksystemlog/debian/copyright b/ubuntu/_base/applications/system/ksystemlog/debian/copyright similarity index 100% rename from ubuntu/_base/applications/ksystemlog/debian/copyright rename to ubuntu/_base/applications/system/ksystemlog/debian/copyright diff --git a/ubuntu/_base/applications/ksystemlog/debian/docs b/ubuntu/_base/applications/system/ksystemlog/debian/docs similarity index 100% rename from ubuntu/_base/applications/ksystemlog/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksystemlog/debian/ksystemlog.xml rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksystemlog/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-umountwrapper/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksystemlog/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/knowit/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/knowit/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksystemlog/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-umountwrapper/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-locate/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvkbd/debian/changelog rename to ubuntu/_base/applications/system/kvkbd/debian/changelog diff --git a/ubuntu/_base/applications/konversation/debian/compat b/ubuntu/_base/applications/system/kvkbd/debian/compat similarity index 100% rename from ubuntu/_base/applications/konversation/debian/compat rename to ubuntu/_base/applications/system/kvkbd/debian/compat diff --git a/ubuntu/_base/applications/kvkbd/debian/control b/ubuntu/_base/applications/system/kvkbd/debian/control similarity index 100% rename from ubuntu/_base/applications/kvkbd/debian/control rename to ubuntu/_base/applications/system/kvkbd/debian/control diff --git a/ubuntu/_base/applications/kvkbd/debian/copyright b/ubuntu/_base/applications/system/kvkbd/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kvkbd/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/konversation/debian/patches/.gitignore rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvkbd/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/knutclient/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/knutclient/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/smartcardauth/debian/changelog rename to 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 old mode 100644 new mode 100755 similarity index 100% rename from ubuntu/_base/applications/kopete-otr/debian/compat rename to ubuntu/_base/applications/system/smartcardauth/debian/compat diff --git a/ubuntu/_base/applications/smartcardauth/debian/control b/ubuntu/_base/applications/system/smartcardauth/debian/control similarity index 100% rename from ubuntu/_base/applications/smartcardauth/debian/control rename to ubuntu/_base/applications/system/smartcardauth/debian/control diff --git a/ubuntu/_base/applications/smartcardauth/debian/dirs b/ubuntu/_base/applications/system/smartcardauth/debian/dirs similarity index 100% rename from ubuntu/_base/applications/smartcardauth/debian/dirs rename to ubuntu/_base/applications/system/smartcardauth/debian/dirs diff --git a/ubuntu/_base/applications/smartcardauth/debian/rules b/ubuntu/_base/applications/system/smartcardauth/debian/rules similarity index 100% rename from ubuntu/_base/applications/smartcardauth/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/smartcardauth/debian/smartcardauth.postinst rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice-i18n/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice-i18n/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/yakuake/debian/README rename to 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 similarity index 100% rename from ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-umountwrapper/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/yakuake/debian/changelog rename to ubuntu/_base/applications/system/yakuake/debian/changelog diff --git a/ubuntu/_base/applications/kpicosim/debian/compat b/ubuntu/_base/applications/system/yakuake/debian/compat similarity index 100% rename from ubuntu/_base/applications/kpicosim/debian/compat rename to ubuntu/_base/applications/system/yakuake/debian/compat diff --git a/ubuntu/_base/applications/yakuake/debian/control b/ubuntu/_base/applications/system/yakuake/debian/control similarity index 100% rename from ubuntu/_base/applications/yakuake/debian/control rename to ubuntu/_base/applications/system/yakuake/debian/control diff --git a/ubuntu/_base/applications/yakuake/debian/copyright b/ubuntu/_base/applications/system/yakuake/debian/copyright similarity index 100% rename from ubuntu/_base/applications/yakuake/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/yakuake/debian/icons/yakuake-16.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/yakuake/debian/icons/yakuake.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/patches/.gitignore rename to 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 similarity index 100% rename from ubuntu/_base/applications/yakuake/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/yakuake/debian/yakuake-trinity.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/yakuake/debian/yakuake-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/yakuake/debian/yakuake-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/yakuake/debian/yakuake-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kiosktool/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-apt/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpilot/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-apt/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-apt/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-apt/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-apt/debian/fixrpath rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-apt/debian/kdedeb_logo.png.uu rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-apt/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/konversation/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/konversation/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmplayer/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-locate/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpowersave/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-locate/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-locate/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-locate/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kopete-otr/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kopete-otr/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kmymoney/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-umountwrapper/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kradio/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-umountwrapper/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-umountwrapper/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-umountwrapper/debian/media_safelyremove.desktop rename to 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 similarity index 100% rename from ubuntu/_base/applications/knemo/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-umountwrapper/debian/postrm rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-umountwrapper/debian/preinst rename to 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 similarity index 100% rename from ubuntu/_base/applications/kio-umountwrapper/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpicosim/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpicosim/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 rename to 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 similarity index 100% rename from ubuntu/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4 rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/knemo/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/gtk-qt-engine/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/krename/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/gtk-qt-engine/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/gtk-qt-engine/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetstats/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/gtk-qt-engine/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpilot/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpilot/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-lipstik/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/krusader/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-lipstik/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-lipstik/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetload/debian/dirs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-lipstik/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksquirrel/debian/patches/.gitignore rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-lipstik/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpowersave.cmake/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpowersave.cmake/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetworkmanager.cmake/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetstats/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-qtcurve/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-qtcurve/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-qtcurve/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksquirrel/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetworkmanager.cmake/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-qtcurve/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kde-style-qtcurve/debian/scan-version rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpowersave/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpowersave/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdmtheme/debian/README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetworkmanager.cmake/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdmtheme/debian/changelog rename to ubuntu/_base/applications/themes/kdmtheme/debian/changelog diff --git a/ubuntu/_base/applications/ksquirrel/debian/compat b/ubuntu/_base/applications/themes/kdmtheme/debian/compat similarity index 100% rename from ubuntu/_base/applications/ksquirrel/debian/compat rename to ubuntu/_base/applications/themes/kdmtheme/debian/compat diff --git a/ubuntu/_base/applications/kdmtheme/debian/control b/ubuntu/_base/applications/themes/kdmtheme/debian/control similarity index 100% rename from ubuntu/_base/applications/kdmtheme/debian/control rename to ubuntu/_base/applications/themes/kdmtheme/debian/control diff --git a/ubuntu/_base/applications/kdmtheme/debian/copyright b/ubuntu/_base/applications/themes/kdmtheme/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kdmtheme/debian/copyright rename to ubuntu/_base/applications/themes/kdmtheme/debian/copyright diff --git a/ubuntu/_base/applications/kdmtheme/debian/docs b/ubuntu/_base/applications/themes/kdmtheme/debian/docs similarity index 100% rename from ubuntu/_base/applications/kdmtheme/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdmtheme/debian/kdmtheme.lintian-overrides rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktechlab/debian/patches/.gitignore rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdmtheme/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kradio/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kradio/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdmtheme/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetworkmanager8/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kgtk-qt3/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/kgtk-qt3/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/kgtk-qt3/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian rename to 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 similarity index 100% rename from ubuntu/_base/applications/knetworkmanager8/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kgtk-qt3/debian/preload rename to 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 similarity index 100% rename from ubuntu/_base/applications/kgtk-qt3/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/krename/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/krename/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksystemlog/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/debiandirs rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/dirs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvkbd/debian/patches/.gitignore rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/krusader/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/krusader/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kwin-style-crystal/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktechlab/debian/compat rename to 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 similarity index 100% rename from ubuntu/_base/applications/kwin-style-crystal/debian/control rename to 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 similarity index 100% rename from ubuntu/_base/applications/kwin-style-crystal/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kwin-style-crystal/debian/dirs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kwin-style-crystal/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/koffice/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kwin-style-crystal/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksplash-engine-moodin/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/abakus/debian/abakus-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/abakus/debian/abakus-trinity.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/abakus/debian/abakus.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/konversation/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/abakus/debian/changelog rename to ubuntu/_base/applications/utilities/abakus/debian/changelog diff --git a/ubuntu/_base/applications/ktorrent/debian/compat b/ubuntu/_base/applications/utilities/abakus/debian/compat similarity index 100% rename from ubuntu/_base/applications/ktorrent/debian/compat rename to ubuntu/_base/applications/utilities/abakus/debian/compat diff --git a/ubuntu/_base/applications/abakus/debian/control b/ubuntu/_base/applications/utilities/abakus/debian/control similarity index 100% rename from ubuntu/_base/applications/abakus/debian/control rename to ubuntu/_base/applications/utilities/abakus/debian/control diff --git a/ubuntu/_base/applications/abakus/debian/copyright b/ubuntu/_base/applications/utilities/abakus/debian/copyright similarity index 100% rename from ubuntu/_base/applications/abakus/debian/copyright rename to ubuntu/_base/applications/utilities/abakus/debian/copyright diff --git a/ubuntu/_base/applications/soundkonverter/debian/docs b/ubuntu/_base/applications/utilities/abakus/debian/docs similarity index 100% rename from ubuntu/_base/applications/soundkonverter/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpowersave.cmake/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/abakus/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksquirrel/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksquirrel/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kopete-otr/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/filelight/debian/changelog rename to ubuntu/_base/applications/utilities/filelight/debian/changelog diff --git a/ubuntu/_base/applications/kuickshow/debian/compat b/ubuntu/_base/applications/utilities/filelight/debian/compat similarity index 100% rename from ubuntu/_base/applications/kuickshow/debian/compat rename to ubuntu/_base/applications/utilities/filelight/debian/compat diff --git a/ubuntu/_base/applications/filelight/debian/control b/ubuntu/_base/applications/utilities/filelight/debian/control similarity index 100% rename from ubuntu/_base/applications/filelight/debian/control rename to ubuntu/_base/applications/utilities/filelight/debian/control diff --git a/ubuntu/_base/applications/filelight/debian/copyright b/ubuntu/_base/applications/utilities/filelight/debian/copyright similarity index 100% rename from ubuntu/_base/applications/filelight/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/filelight/debian/filelight.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/filelight/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpowersave/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/filelight/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/wlassistant/debian/README.Debian rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpowersave.cmake/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpilot/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/changelog rename to ubuntu/_base/applications/utilities/kbarcode/debian/changelog diff --git a/ubuntu/_base/applications/kvirc/debian/compat b/ubuntu/_base/applications/utilities/kbarcode/debian/compat similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/compat rename to ubuntu/_base/applications/utilities/kbarcode/debian/compat diff --git a/ubuntu/_base/applications/kbarcode/debian/control b/ubuntu/_base/applications/utilities/kbarcode/debian/control similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/control rename to ubuntu/_base/applications/utilities/kbarcode/debian/control diff --git a/ubuntu/_base/applications/kbarcode/debian/copyright b/ubuntu/_base/applications/utilities/kbarcode/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/copyright rename to ubuntu/_base/applications/utilities/kbarcode/debian/copyright diff --git a/ubuntu/_base/applications/kstreamripper/debian/docs b/ubuntu/_base/applications/utilities/kbarcode/debian/docs similarity index 100% rename from ubuntu/_base/applications/kstreamripper/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/kbarcode.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/soundkonverter/debian/patches/.gitignore rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/source.lintian-overrides rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksystemlog/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksystemlog/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kbarcode/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/kchmviewer/debian/additions/kchmviewer.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kchmviewer/debian/changelog rename to ubuntu/_base/applications/utilities/kchmviewer/debian/changelog diff --git a/ubuntu/_base/applications/kvkbd/debian/compat b/ubuntu/_base/applications/utilities/kchmviewer/debian/compat similarity index 100% rename from ubuntu/_base/applications/kvkbd/debian/compat rename to ubuntu/_base/applications/utilities/kchmviewer/debian/compat diff --git a/ubuntu/_base/applications/kchmviewer/debian/control b/ubuntu/_base/applications/utilities/kchmviewer/debian/control similarity index 100% rename from ubuntu/_base/applications/kchmviewer/debian/control rename to ubuntu/_base/applications/utilities/kchmviewer/debian/control diff --git a/ubuntu/_base/applications/kchmviewer/debian/copyright b/ubuntu/_base/applications/utilities/kchmviewer/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kchmviewer/debian/copyright rename to ubuntu/_base/applications/utilities/kchmviewer/debian/copyright diff --git a/ubuntu/_base/applications/kchmviewer/debian/debiandirs b/ubuntu/_base/applications/utilities/kchmviewer/debian/debiandirs similarity index 100% rename from ubuntu/_base/applications/kchmviewer/debian/debiandirs rename to ubuntu/_base/applications/utilities/kchmviewer/debian/debiandirs diff --git a/ubuntu/_base/applications/kchmviewer/debian/dirs b/ubuntu/_base/applications/utilities/kchmviewer/debian/dirs similarity index 100% rename from ubuntu/_base/applications/kchmviewer/debian/dirs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/kchmviewer/debian/manpages rename to ubuntu/_base/applications/utilities/kchmviewer/debian/manpages diff --git a/ubuntu/_base/applications/kchmviewer/debian/menu b/ubuntu/_base/applications/utilities/kchmviewer/debian/menu similarity index 100% rename from ubuntu/_base/applications/kchmviewer/debian/menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/yakuake/debian/patches/.gitignore rename to 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 similarity index 100% rename from ubuntu/_base/applications/kchmviewer/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktechlab/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktechlab/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kchmviewer/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpowersave.cmake/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/changelog rename to 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 similarity index 100% rename from ubuntu/_base/applications/kwin-style-crystal/debian/compat rename to ubuntu/_base/applications/utilities/kcpuload/debian/compat diff --git a/ubuntu/_base/applications/kcpuload/debian/control b/ubuntu/_base/applications/utilities/kcpuload/debian/control similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/control rename to ubuntu/_base/applications/utilities/kcpuload/debian/control diff --git a/ubuntu/_base/applications/kcpuload/debian/copyright b/ubuntu/_base/applications/utilities/kcpuload/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/doc-base rename to 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 similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/kcpuload.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/kcpuload.install rename to 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 similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/kcpuload.xpm rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdbusnotification/debian/links rename to ubuntu/_base/applications/utilities/kcpuload/debian/links diff --git a/ubuntu/_base/applications/kcpuload/debian/menu b/ubuntu/_base/applications/utilities/kcpuload/debian/menu similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/menu rename to ubuntu/_base/applications/utilities/kcpuload/debian/menu diff --git a/ubuntu/_base/applications/kcpuload/debian/override b/ubuntu/_base/applications/utilities/kcpuload/debian/override similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/override rename to ubuntu/_base/applications/utilities/kcpuload/debian/override diff --git a/ubuntu/_base/applications/kcpuload/debian/rules b/ubuntu/_base/applications/utilities/kcpuload/debian/rules similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kcpuload/debian/source.lintian-overrides rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktorrent/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktorrent/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/kpowersave/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdirstat/debian/changelog rename to ubuntu/_base/applications/utilities/kdirstat/debian/changelog diff --git a/ubuntu/_base/applications/piklab/debian/compat b/ubuntu/_base/applications/utilities/kdirstat/debian/compat similarity index 100% rename from ubuntu/_base/applications/piklab/debian/compat rename to ubuntu/_base/applications/utilities/kdirstat/debian/compat diff --git a/ubuntu/_base/applications/kdirstat/debian/control b/ubuntu/_base/applications/utilities/kdirstat/debian/control similarity index 100% rename from ubuntu/_base/applications/kdirstat/debian/control rename to ubuntu/_base/applications/utilities/kdirstat/debian/control diff --git a/ubuntu/_base/applications/kdirstat/debian/copyright b/ubuntu/_base/applications/utilities/kdirstat/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kdirstat/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdirstat/debian/kdirstat.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdirstat/debian/kdirstat.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/krename/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdirstat/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdirstat/debian/source.lintian-overrides rename to 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 similarity index 100% rename from ubuntu/_base/applications/kuickshow/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kuickshow/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/kdirstat/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/krename/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/keep/debian/changelog rename to ubuntu/_base/applications/utilities/keep/debian/changelog diff --git a/ubuntu/_base/applications/potracegui/debian/compat b/ubuntu/_base/applications/utilities/keep/debian/compat similarity index 100% rename from ubuntu/_base/applications/potracegui/debian/compat rename to ubuntu/_base/applications/utilities/keep/debian/compat diff --git a/ubuntu/_base/applications/keep/debian/control b/ubuntu/_base/applications/utilities/keep/debian/control similarity index 100% rename from ubuntu/_base/applications/keep/debian/control rename to ubuntu/_base/applications/utilities/keep/debian/control diff --git a/ubuntu/_base/applications/keep/debian/copyright b/ubuntu/_base/applications/utilities/keep/debian/copyright similarity index 100% rename from ubuntu/_base/applications/keep/debian/copyright rename to ubuntu/_base/applications/utilities/keep/debian/copyright diff --git a/ubuntu/_base/applications/ktechlab/debian/docs b/ubuntu/_base/applications/utilities/keep/debian/docs similarity index 100% rename from ubuntu/_base/applications/ktechlab/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/keep/debian/keep.xml rename to 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 similarity index 100% rename from ubuntu/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff rename to 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 similarity index 100% rename from ubuntu/_base/applications/keep/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/keep/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvirc/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/keep/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/krusader/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/kerry/debian/changelog rename to ubuntu/_base/applications/utilities/kerry/debian/changelog diff --git a/ubuntu/_base/applications/rosegarden/debian/compat b/ubuntu/_base/applications/utilities/kerry/debian/compat similarity index 100% rename from ubuntu/_base/applications/rosegarden/debian/compat rename to ubuntu/_base/applications/utilities/kerry/debian/compat diff --git a/ubuntu/_base/applications/kerry/debian/control b/ubuntu/_base/applications/utilities/kerry/debian/control similarity index 100% rename from ubuntu/_base/applications/kerry/debian/control rename to ubuntu/_base/applications/utilities/kerry/debian/control diff --git a/ubuntu/_base/applications/kerry/debian/copyright b/ubuntu/_base/applications/utilities/kerry/debian/copyright similarity index 100% rename from ubuntu/_base/applications/kerry/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/kerry/debian/kerry.1.docbook rename to 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 similarity index 100% rename from ubuntu/_base/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch rename to 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 similarity index 100% rename from ubuntu/_base/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch rename to 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 similarity index 100% rename from ubuntu/_base/applications/kerry/debian/patches/kubuntu_05_shortkey.patch rename to 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 similarity index 100% rename from ubuntu/_base/applications/kerry/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/kerry/debian/postinst rename to ubuntu/_base/applications/utilities/kerry/debian/postinst diff --git a/ubuntu/_base/applications/kerry/debian/postrm b/ubuntu/_base/applications/utilities/kerry/debian/postrm similarity index 100% rename from ubuntu/_base/applications/kerry/debian/postrm rename to ubuntu/_base/applications/utilities/kerry/debian/postrm diff --git a/ubuntu/_base/applications/kerry/debian/rules b/ubuntu/_base/applications/utilities/kerry/debian/rules similarity index 100% rename from ubuntu/_base/applications/kerry/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvkbd/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvkbd/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/knutclient/debian/changelog rename to ubuntu/_base/applications/utilities/knutclient/debian/changelog diff --git a/ubuntu/_base/applications/smartcardauth/debian/compat b/ubuntu/_base/applications/utilities/knutclient/debian/compat old mode 100755 new mode 100644 similarity index 100% rename from ubuntu/_base/applications/smartcardauth/debian/compat rename to ubuntu/_base/applications/utilities/knutclient/debian/compat diff --git a/ubuntu/_base/applications/knutclient/debian/control b/ubuntu/_base/applications/utilities/knutclient/debian/control similarity index 100% rename from ubuntu/_base/applications/knutclient/debian/control rename to ubuntu/_base/applications/utilities/knutclient/debian/control diff --git a/ubuntu/_base/applications/knutclient/debian/copyright b/ubuntu/_base/applications/utilities/knutclient/debian/copyright similarity index 100% rename from ubuntu/_base/applications/knutclient/debian/copyright rename to 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 similarity index 100% rename from ubuntu/_base/applications/knutclient/debian/knutclient.1x rename to 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 similarity index 100% rename from ubuntu/_base/applications/knutclient/debian/knutclient.menu rename to 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 similarity index 100% rename from ubuntu/_base/applications/knutclient/debian/preinst rename to ubuntu/_base/applications/utilities/knutclient/debian/preinst diff --git a/ubuntu/_base/applications/knutclient/debian/rules b/ubuntu/_base/applications/utilities/knutclient/debian/rules similarity index 100% rename from ubuntu/_base/applications/knutclient/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvpnc/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kvpnc/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/knutclient/debian/watch rename to 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 similarity index 100% rename from ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk rename to 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 similarity index 100% rename from ubuntu/_base/applications/ksystemlog/debian/cdbs/versions.pl rename to 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 similarity index 100% rename from ubuntu/_base/applications/krename/debian/changelog rename to ubuntu/_base/applications/utilities/krename/debian/changelog diff --git a/ubuntu/_base/applications/smb4k/debian/compat b/ubuntu/_base/applications/utilities/krename/debian/compat similarity index 100% rename from ubuntu/_base/applications/smb4k/debian/compat rename to ubuntu/_base/applications/utilities/krename/debian/compat diff --git a/ubuntu/_base/applications/krename/debian/control b/ubuntu/_base/applications/utilities/krename/debian/control similarity index 100% rename from ubuntu/_base/applications/krename/debian/control rename to ubuntu/_base/applications/utilities/krename/debian/control diff --git a/ubuntu/_base/applications/krename/debian/copyright b/ubuntu/_base/applications/utilities/krename/debian/copyright similarity index 100% rename from ubuntu/_base/applications/krename/debian/copyright rename to ubuntu/_base/applications/utilities/krename/debian/copyright diff --git a/ubuntu/_base/applications/piklab/debian/docs b/ubuntu/_base/applications/utilities/krename/debian/docs similarity index 100% rename from ubuntu/_base/applications/piklab/debian/docs rename to 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 similarity index 100% rename from ubuntu/_base/applications/krename/debian/krename.1 rename to 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 similarity index 100% rename from ubuntu/_base/applications/krename/debian/krename.manpages rename to 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 similarity index 100% rename from ubuntu/_base/applications/krusader/debian/patches/series rename to 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 similarity index 100% rename from ubuntu/_base/applications/krename/debian/rules rename to 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 similarity index 100% rename from ubuntu/_base/applications/kwin-style-crystal/debian/source/format rename to 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 similarity index 100% rename from ubuntu/_base/applications/kwin-style-crystal/debian/source/options rename to 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 similarity index 100% rename from ubuntu/_base/applications/krename/debian/watch rename to 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 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 = .*